PEAR Coding Standards intermediate update for files changed

diff --git a/src/phorkie/Repository.php b/src/phorkie/Repository.php
index 995a16d01282272b381467496e7a183c8156c27a..43f2b23dddf0be98f7ac56626cd1cc506be35541 100644 (file)
--- a/src/phorkie/Repository.php
+++ b/src/phorkie/Repository.php
@@ -104,6 +104,11 @@ class Repository
         $this->hash = $output;
     }
 
         $this->hash = $output;
     }
 

+       /**
+     * Populates $this->message
+     *
+     * @return void
+     */

     public function loadMessage()
     {
         $rev = (isset($this->hash)) ? $this->hash : 'HEAD';
     public function loadMessage()
     {
         $rev = (isset($this->hash)) ? $this->hash : 'HEAD';

diff --git a/www/auth.php b/www/auth.php
index b8d08ff0a90cde6f3464e301042fe417f29d0584..1cafd5934242e4c0095a40de30b8a760821d5245 100644 (file)
--- a/www/auth.php
+++ b/www/auth.php
@@ -27,7 +27,7 @@ if (isset($_REQUEST['logout'])) {
     session_destroy();
     $redirect = 'http://' . $_SERVER['HTTP_HOST'];
     header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));
     session_destroy();
     $redirect = 'http://' . $_SERVER['HTTP_HOST'];
     header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));

-       exit;
+    exit;

 }
 
 if (!count($_GET) && !count($_POST)) {
 }
 
 if (!count($_GET) && !count($_POST)) {


@@ -59,9 +59,7 @@ try {
     exit;
 }
 
     exit;
 }
 

-if (!empty($_POST['disable_associations'])
-    || !empty($_SESSION['disable_associations'])) {
-
+if (!empty($_POST['disable_associations']) || !empty($_SESSION['disable_associations'])) {

     $o->disableAssociations();
     $_SESSION['disable_associations'] = true;
 }
     $o->disableAssociations();
     $_SESSION['disable_associations'] = true;
 }


@@ -159,8 +157,7 @@ if (isset($_POST['start'])) {
     $mode    = $message->get('openid.mode');
 
     try {
     $mode    = $message->get('openid.mode');
 
     try {

-        $result = $o->verify(new Net_URL2($returnTo . '?' . $queryString),
-                                          $message);
+        $result = $o->verify(new Net_URL2($returnTo . '?' . $queryString), $message);

 
         if ($result->success()) {
             $status  = "<tr><td>Status:</td><td><font color='green'>SUCCESS!";
 
         if ($result->success()) {
             $status  = "<tr><td>Status:</td><td><font color='green'>SUCCESS!";


@@ -202,7 +199,7 @@ if (isset($_POST['start'])) {
 
     $openid = $message->getArrayFormat();
 
 
     $openid = $message->getArrayFormat();
 

-       $email = (isset($openid['openid.ext1.value.email'])) ? $openid['openid.ext1.value.email'] : null;
+    $email = (isset($openid['openid.ext1.value.email'])) ? $openid['openid.ext1.value.email'] : null;

     $email = (isset($openid['openid.ext2.value.email']) && !isset($email)) ? $openid['openid.ext2.value.email'] : $email;
     $email = (isset($openid['openid.sreg.email']) && !isset($email)) ? $openid['openid.sreg.email'] : $email;
     $email = (isset($openid['openid.ax.value.email']) && !isset($email)) ? $openid['openid.ax.value.email'] : $email;
     $email = (isset($openid['openid.ext2.value.email']) && !isset($email)) ? $openid['openid.ext2.value.email'] : $email;
     $email = (isset($openid['openid.sreg.email']) && !isset($email)) ? $openid['openid.sreg.email'] : $email;
     $email = (isset($openid['openid.ax.value.email']) && !isset($email)) ? $openid['openid.ax.value.email'] : $email;

diff --git a/www/delete.php b/www/delete.php
index f332028876216ec01e636e78145d467f1f6d6605..85f62582e9b6daca8c93f4201bca32a7b8d20274 100644 (file)
--- a/www/delete.php
+++ b/www/delete.php
@@ -5,7 +5,7 @@ namespace phorkie;
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 $repo = new Repository();
 }
 
 $repo = new Repository();

diff --git a/www/display.php b/www/display.php
index 2376d30b58416ec5112c108539161eb7ac4cc5a1..6f754d9ec4c01d4ee0e7d4e36996ac6e4c5e49ac 100644 (file)
--- a/www/display.php
+++ b/www/display.php
@@ -5,7 +5,7 @@ namespace phorkie;
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 $repo = new Repository();
 }
 
 $repo = new Repository();

diff --git a/www/edit.php b/www/edit.php
index db4428b3cb36958778bf86cafb408bb58428fa49..20e779386a422494db506fcd4b144ab45641f7a4 100644 (file)
--- a/www/edit.php
+++ b/www/edit.php
@@ -5,7 +5,7 @@ namespace phorkie;
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 $repo = new Repository();
 }
 
 $repo = new Repository();

diff --git a/www/forbidden.php b/www/forbidden.php
index 1f587a2a10d2e5da5cd16ed15fc347a18af07baf..3646b0a4c589ef5b622eb777bab959e31eba34b6 100644 (file)
--- a/www/forbidden.php
+++ b/www/forbidden.php
@@ -1,6 +1,6 @@
 <?php
 /**
 <?php
 /**

- * Access Denied
+ * Access Denied page

  */
 namespace phorkie;
 require_once 'www-header.php';
  */
 namespace phorkie;
 require_once 'www-header.php';

diff --git a/www/fork.php b/www/fork.php
index cc2ed33c68de4d754162b4f0e4e81630d8cdcf3f..64dceb92a860ea9ce869d1012722fb8c53c8d784 100644 (file)
--- a/www/fork.php
+++ b/www/fork.php
@@ -5,7 +5,7 @@
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
 }
 
 if ($_SERVER['REQUEST_METHOD'] !== 'POST') {


@@ -33,4 +33,4 @@ foreach (\glob($new->gitDir . '/hooks/*') as $hookfile) {
 
 //FIXME: where to put fork source link?
 redirect($new->getLink('display'));
 
 //FIXME: where to put fork source link?
 redirect($new->getLink('display'));

-?>
\ No newline at end of file
+?>

diff --git a/www/list.php b/www/list.php
index 17f46b1eb6de7de8f89db8881356e509cca0753b..5a394ebac52aad2037a91b7503f2ac0343199cfa 100644 (file)
--- a/www/list.php
+++ b/www/list.php
@@ -5,7 +5,7 @@
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 $rs = new Repositories();
 
 }
 $rs = new Repositories();
 

diff --git a/www/new.php b/www/new.php
index 8d1a231d1ff9e339f2bc062702c886ea074ddc20..0675b4d3b0d1d8c78edff6b228f895da3d144935 100644 (file)
--- a/www/new.php
+++ b/www/new.php
@@ -12,7 +12,7 @@ namespace phorkie;
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {
  */
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] > 0) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 $repopo = new Repository_Post();
 }
 
 $repopo = new Repository_Post();

diff --git a/www/raw.php b/www/raw.php
index 67a21ee2287b818e211651f74fc9440a0d5b5f77..6b20633920da1c7217e408212931a04477203ad2 100644 (file)
--- a/www/raw.php
+++ b/www/raw.php
@@ -5,7 +5,7 @@
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {
 namespace phorkie;
 require_once 'www-header.php';
 if ($GLOBALS['phorkie']['auth']['secure'] == 2) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 $repo = new Repository();
 $repo->loadFromRequest();
 }
 $repo = new Repository();
 $repo->loadFromRequest();

diff --git a/www/user.php b/www/user.php
index 1cc8aebe52fa8269a91c12bf18ad02ef50176ae3..fd851c4ebfd627270ba0019c9cec51d18ef6b655 100644 (file)
--- a/www/user.php
+++ b/www/user.php
@@ -5,7 +5,7 @@
 namespace phorkie;
 require_once 'www-header.php';
 if (!isset($_SESSION['identity'])) {
 namespace phorkie;
 require_once 'www-header.php';
 if (!isset($_SESSION['identity'])) {

-    require_once 'secure.php';
+    include_once 'secure.php';

 }
 
 if (isset($_POST['name'])) {
 }
 
 if (isset($_POST['name'])) {

diff --git a/www/www-header.php b/www/www-header.php
index 5785a3ec300ff16552a627896f99ebf65e71fca2..64dca1104a1810d1a0d91977e9c86e4e37e21ee8 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -50,8 +50,12 @@ if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
 
 // Set/Get git commit session variables
 $_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];
 
 // Set/Get git commit session variables
 $_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];

-if (!isset($_SESSION['name']))  { $_SESSION['name']  = $GLOBALS['phorkie']['auth']['anonymousName'];  }
-if (!isset($_SESSION['email'])) { $_SESSION['email'] = $GLOBALS['phorkie']['auth']['anonymousEmail']; }
+if (!isset($_SESSION['name'])) {
+    $_SESSION['name'] = $GLOBALS['phorkie']['auth']['anonymousName'];
+}
+if (!isset($_SESSION['email'])) {
+    $_SESSION['email'] = $GLOBALS['phorkie']['auth']['anonymousEmail'];
+}

 
 \Twig_Autoloader::register();
 
 
 \Twig_Autoloader::register();