From 71e430050c5e12dc7c2fde527f7596ee9c5e490b Mon Sep 17 00:00:00 2001
From: Sumeko <sumeko@live.com>
Date: Sun, 12 Oct 2014 03:28:32 +0700
Subject: [PATCH 1/2] change short open tag to regular

---
 follow.php   |  2 +-
 header.php   |  2 +-
 home.php     | 10 +++++-----
 index.php    |  2 +-
 login.php    |  2 +-
 logout.php   |  2 +-
 navbar.php   |  4 ++--
 post.php     |  2 +-
 profile.php  |  4 ++--
 register.php |  6 +++---
 retwis.php   |  5 +++--
 timeline.php |  6 +++---
 12 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/follow.php b/follow.php
index 319dd05..e2bf692 100644
--- a/follow.php
+++ b/follow.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 $r = redisLink();
diff --git a/header.php b/header.php
index fb4c35d..faf05dc 100644
--- a/header.php
+++ b/header.php
@@ -9,5 +9,5 @@
 <div id="page">
 <div id="header">
 <a href="/"><img style="border:none" src="logo.png" width="192" height="85" alt="Retwis"></a>
-<? include("navbar.php") ?>
+<?php include("navbar.php") ?>
 </div>
diff --git a/home.php b/home.php
index 261a7a1..b6c5d1d 100644
--- a/home.php
+++ b/home.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 if (!isLoggedIn()) {
     header("Location: index.php");
@@ -9,7 +9,7 @@
 ?>
 <div id="postform">
 <form method="POST" action="post.php">
-<?=utf8entities($User['username'])?>, what you are doing?
+<?php echo utf8entities($User['username'])?>, what you are doing?
 <br>
 <table>
 <tr><td><textarea cols="70" rows="3" name="status"></textarea></td></tr>
@@ -17,11 +17,11 @@
 </table>
 </form>
 <div id="homeinfobox">
-<?=$r->zcard("followers:".$User['id'])?> followers<br>
-<?=$r->zcard("following:".$User['id'])?> following<br>
+<?php echo $r->zcard("followers:".$User['id'])?> followers<br>
+<?php echo $r->zcard("following:".$User['id'])?> following<br>
 </div>
 </div>
-<?
+<?php
 $start = gt("start") === false ? 0 : intval(gt("start"));
 showUserPostsWithPagination(false,$User['id'],$start,10);
 include("footer.php")
diff --git a/index.php b/index.php
index 0a28172..680032d 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 if (!isLoggedIn()) {
diff --git a/login.php b/login.php
index 1bdb76e..dd3afd4 100644
--- a/login.php
+++ b/login.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 # Form sanity checks
diff --git a/logout.php b/logout.php
index 3416ae4..421f066 100644
--- a/logout.php
+++ b/logout.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 if (!isLoggedIn()) {
diff --git a/navbar.php b/navbar.php
index ca79e24..072ab4b 100644
--- a/navbar.php
+++ b/navbar.php
@@ -1,7 +1,7 @@
 <div id="navbar">
 <a href="index.php">home</a>
 | <a href="timeline.php">timeline</a>
-<?if(isLoggedIn()) {?>
+<?phpif(isLoggedIn()) {?>
 | <a href="logout.php">logout</a>
-<?}?>
+<?php}?>
 </div>
diff --git a/post.php b/post.php
index 5ea70ea..1afcc96 100644
--- a/post.php
+++ b/post.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 if (!isLoggedIn() || !gt("status")) {
diff --git a/profile.php b/profile.php
index db9e1a8..c879507 100644
--- a/profile.php
+++ b/profile.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 include("header.php");
 
@@ -17,7 +17,7 @@
     }
 }
 ?>
-<?
+<?php
 $start = gt("start") === false ? 0 : intval(gt("start"));
 showUserPostsWithPagination(gt("u"),$userid,$start,10);
 include("footer.php")
diff --git a/register.php b/register.php
index af55a86..954f12b 100644
--- a/register.php
+++ b/register.php
@@ -1,4 +1,4 @@
-<?
+<?php
 include("retwis.php");
 
 # Form sanity checks
@@ -32,7 +32,7 @@
 include("header.php");
 ?>
 <h2>Welcome aboard!</h2>
-Hey <?=utf8entities($username)?>, now you have an account, <a href="index.php">a good start is to write your first message!</a>.
-<?
+Hey <?php echo utf8entities($username)?>, now you have an account, <a href="index.php">a good start is to write your first message!</a>.
+<?php
 include("footer.php")
 ?>
diff --git a/retwis.php b/retwis.php
index 86e3687..8ddfdf1 100644
--- a/retwis.php
+++ b/retwis.php
@@ -1,4 +1,4 @@
-<?
+<?php
 require 'Predis/Autoloader.php';
 Predis\Autoloader::register();
 
@@ -39,7 +39,8 @@ function redisLink() {
     static $r = false;
 
     if ($r) return $r;
-    $r = new Predis\Client();
+    $r = new Redis;
+    $r->connect('127.0.0.1');
     return $r;
 }
 
diff --git a/timeline.php b/timeline.php
index 7ea9f8c..1b9008f 100644
--- a/timeline.php
+++ b/timeline.php
@@ -1,14 +1,14 @@
-<?
+<?php
 include("retwis.php");
 include("header.php");
 ?>
 <h2>Timeline</h2>
 <i>Latest registered users (an example of sorted sets)</i><br>
-<?
+<?php
 showLastUsers();
 ?>
 <i>Latest 50 messages from users aroud the world!</i><br>
-<?
+<?php
 showUserPosts(-1,0,50);
 include("footer.php")
 ?>

From 1df4b99d1b89b657a8722149fe8bb2cb0c303729 Mon Sep 17 00:00:00 2001
From: Sumeko <sumeko@live.com>
Date: Sun, 12 Oct 2014 03:48:19 +0700
Subject: [PATCH 2/2] add space after and before tag

---
 header.php   | 2 +-
 home.php     | 6 +++---
 navbar.php   | 4 ++--
 register.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/header.php b/header.php
index faf05dc..e058728 100644
--- a/header.php
+++ b/header.php
@@ -9,5 +9,5 @@
 <div id="page">
 <div id="header">
 <a href="/"><img style="border:none" src="logo.png" width="192" height="85" alt="Retwis"></a>
-<?php include("navbar.php") ?>
+<?php include("navbar.php")  ?>
 </div>
diff --git a/home.php b/home.php
index b6c5d1d..72355e3 100644
--- a/home.php
+++ b/home.php
@@ -9,7 +9,7 @@
 ?>
 <div id="postform">
 <form method="POST" action="post.php">
-<?php echo utf8entities($User['username'])?>, what you are doing?
+<?php echo utf8entities($User['username']) ?>, what you are doing?
 <br>
 <table>
 <tr><td><textarea cols="70" rows="3" name="status"></textarea></td></tr>
@@ -17,8 +17,8 @@
 </table>
 </form>
 <div id="homeinfobox">
-<?php echo $r->zcard("followers:".$User['id'])?> followers<br>
-<?php echo $r->zcard("following:".$User['id'])?> following<br>
+<?php echo $r->zcard("followers:".$User['id']) ?> followers<br>
+<?php echo $r->zcard("following:".$User['id']) ?> following<br>
 </div>
 </div>
 <?php
diff --git a/navbar.php b/navbar.php
index 072ab4b..81a5a5c 100644
--- a/navbar.php
+++ b/navbar.php
@@ -1,7 +1,7 @@
 <div id="navbar">
 <a href="index.php">home</a>
 | <a href="timeline.php">timeline</a>
-<?phpif(isLoggedIn()) {?>
+<?php if(isLoggedIn()) { ?> <?php 'a'  ?>
 | <a href="logout.php">logout</a>
-<?php}?>
+<?php } ?>
 </div>
diff --git a/register.php b/register.php
index 954f12b..6f56960 100644
--- a/register.php
+++ b/register.php
@@ -32,7 +32,7 @@
 include("header.php");
 ?>
 <h2>Welcome aboard!</h2>
-Hey <?php echo utf8entities($username)?>, now you have an account, <a href="index.php">a good start is to write your first message!</a>.
+Hey <?php echo utf8entities($username) ?>, now you have an account, <a href="index.php">a good start is to write your first message!</a>.
 <?php
 include("footer.php")
 ?>