[phpwiki-checkins] SF.net SVN: phpwiki:[8420] trunk/lib

[<var...@us...>]

Revision: 8420
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8420&view=rev
Author:   vargenau
Date:     2012-10-26 13:14:46 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
elseif [PSR-2] The keyword elseif should be used instead of else if so that all control keywords looks like single words.

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/wikilens/Buddy.php
    trunk/lib/ziplib.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/WikiTheme.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -266,7 +266,7 @@
         }
         if (isset($this->_default_theme)) {
             return $this->_default_theme->_findFile($file, $missing_okay);
-        } else if (!$missing_okay) {
+        } elseif (!$missing_okay) {
             trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
             if (DEBUG & _DEBUG_TRACE) {
                 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
@@ -1691,8 +1691,6 @@
 
 }
 
-
-
 /**
  * A class representing a clickable "button".
  *
@@ -1735,9 +1733,6 @@
 
 }
 
-
-
-
 /**
  * A clickable image button.
  */
@@ -1771,8 +1766,6 @@
     }
 }
 
-
-
 /**
  * A class representing a form <samp>submit</samp> button.
  */
@@ -1801,8 +1794,6 @@
 
 }
 
-
-
 /**
  * A class representing an image form <samp>submit</samp> button.
  */
@@ -1834,8 +1825,6 @@
 
 }
 
-
-
 /**
  * A sidebar box with title and body, narrow fixed-width.
  * To represent abbrevated content of plugins, links or forms,

Modified: trunk/lib/wikilens/Buddy.php
===================================================================
--- trunk/lib/wikilens/Buddy.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/wikilens/Buddy.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -90,9 +90,9 @@
         $buddy_rating = $buddy_rating_array['ratingvalue'];
         if ($buddy_rating == "") {
             $agree = 1;
-        } else if ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
+        } elseif ($agreePos && $buddy_rating >= $MIDDLE_RATING) {
             $agree = 1;
-        } else if (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
+        } elseif (!$agreePos && $buddy_rating < $MIDDLE_RATING) {
             $agree = 1;
         } else {
             $agree = 0;
@@ -101,7 +101,7 @@
     }
     if ($agree && $agreePos) {
         return 1;
-    } else if ($agree && !$agreePos) {
+    } elseif ($agree && !$agreePos) {
         return -1;
     } else {
         return 0;

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2012-10-26 13:07:18 UTC (rev 8419)
+++ trunk/lib/ziplib.php	2012-10-26 13:14:46 UTC (rev 8420)
@@ -492,7 +492,7 @@
 
         if ($comp_type == ZIP_DEFLATE) {
             $data = zip_inflate($data, $crc32, $uncomp_size);
-        } else if ($comp_type == ZIP_STORE) {
+        } elseif ($comp_type == ZIP_STORE) {
             $crc = zip_crc32($data);
             if ($crc32 != $crc)
                 ExitWiki(sprintf("CRC mismatch %x != %x", $crc, $crc32));
@@ -813,7 +813,7 @@
     }
     if ("$type/$subtype" == 'multipart/mixed') {
         return ParseMimeMultipart($data, $params['boundary']);
-    } else if ("$type/$subtype" != 'application/x-phpwiki') {
+    } elseif ("$type/$subtype" != 'application/x-phpwiki') {
         trigger_error(sprintf("Bad %s", "content-type: $type/$subtype"),
             E_USER_WARNING);
         return false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.