From 5fbac949e6d791e85b9befd4016aae8581389103 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 31 Aug 2012 13:15:51 +0000
Subject: [PATCH] elseif

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8282 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/BlockParser.php                           |  2 +-
 lib/EditToolbar.php                           |  2 +-
 lib/InlineParser.php                          | 14 ++++++------
 lib/WikiDB/adodb/adodb-lib.inc.php            |  6 ++---
 lib/WikiDB/adodb/adodb-time.inc.php           |  2 +-
 lib/WikiDB/adodb/adodb.inc.php                | 12 +++++-----
 lib/WikiDB/adodb/drivers/adodb-ado.inc.php    |  2 +-
 lib/WikiDB/adodb/drivers/adodb-db2.inc.php    |  4 ++--
 lib/WikiDB/adodb/drivers/adodb-ibase.inc.php  |  4 ++--
 lib/WikiDB/adodb/drivers/adodb-mssql.inc.php  | 10 ++++-----
 .../adodb/drivers/adodb-mssqlnative.inc.php   |  4 ++--
 lib/WikiDB/adodb/drivers/adodb-oci8.inc.php   |  4 ++--
 lib/WikiDB/adodb/drivers/adodb-odbc.inc.php   |  8 +++----
 lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php  |  4 ++--
 .../adodb/drivers/adodb-postgres64.inc.php    |  2 +-
 lib/WikiDB/adodb/drivers/adodb-sybase.inc.php |  2 +-
 lib/WikiDB/backend/cvs.php                    |  2 +-
 lib/WikiUser/OpenID.php                       |  2 +-
 lib/display.php                               |  4 ++--
 lib/loadsave.php                              | 10 ++++-----
 lib/main.php                                  |  2 +-
 lib/plugin/Chart.php                          |  4 ++--
 lib/plugin/CreateToc.php                      |  8 +++----
 lib/plugin/MostPopular.php                    |  2 +-
 lib/plugin/PageGroup.php                      |  2 +-
 lib/plugin/PhotoAlbum.php                     |  2 +-
 lib/plugin/PrevNext.php                       | 22 +++++++++----------
 lib/plugin/WantedPagesOld.php                 |  2 +-
 lib/plugin/WikiAdminSetAclSimple.php          |  2 +-
 lib/plugin/WikicreoleTable.php                | 20 ++++++++---------
 view.php                                      |  2 +-
 wikiadmin.php                                 |  4 ++--
 32 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/lib/BlockParser.php b/lib/BlockParser.php
index 63973e550..d39e31579 100644
--- a/lib/BlockParser.php
+++ b/lib/BlockParser.php
@@ -926,7 +926,7 @@ class Block_pre extends BlockMarkup
     if ($m->match == '<noinclude>') {
         $text = TransformText($text);
         $this->_element = new Block_HtmlElement('div', false, $text);
-    } else if ($m->match == '<nowiki>') {
+    } elseif ($m->match == '<nowiki>') {
             $text = TransformInlineNowiki($text);
         $this->_element = new Block_HtmlElement('p', false, $text);
     } else {
diff --git a/lib/EditToolbar.php b/lib/EditToolbar.php
index ca66a5e70..ad767d739 100644
--- a/lib/EditToolbar.php
+++ b/lib/EditToolbar.php
@@ -302,7 +302,7 @@ msg_repl_close     = '"._("Close")."'
         $page = $p->getName();
                 if (FUSIONFORGE) {
                     $categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
-        } else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
+        } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
             $categories[] = "['$page', '%0A%5B".$page."%5D']";
         } else {
             $categories[] = "['$page', '%0A".$page."']";
diff --git a/lib/InlineParser.php b/lib/InlineParser.php
index 4d00efe75..6656156bb 100644
--- a/lib/InlineParser.php
+++ b/lib/InlineParser.php
@@ -355,15 +355,15 @@ function LinkBracketLink($bracketlink) {
     // Remove spaces before and after ":", if any
     if (string_starts_with($rawlink, "Upload")) {
         $rawlink = preg_replace("/^Upload\\s*:\\s*/", "Upload:", $rawlink);
-    } else if (string_starts_with($rawlink, "upload")) {
+    } elseif (string_starts_with($rawlink, "upload")) {
         $rawlink = preg_replace("/^upload\\s*:\\s*/", "Upload:", $rawlink);
-    } else if (string_starts_with($rawlink, "Image")) {
+    } elseif (string_starts_with($rawlink, "Image")) {
         $rawlink = preg_replace("/^Image\\s*:\\s*/", "Upload:", $rawlink);
-    } else if (string_starts_with($rawlink, "image")) {
+    } elseif (string_starts_with($rawlink, "image")) {
         $rawlink = preg_replace("/^image\\s*:\\s*/", "Upload:", $rawlink);
-    } else if (string_starts_with($rawlink, "File")) {
+    } elseif (string_starts_with($rawlink, "File")) {
         $rawlink = preg_replace("/^File\\s*:\\s*/", "Upload:", $rawlink);
-    } else if (string_starts_with($rawlink, "file")) {
+    } elseif (string_starts_with($rawlink, "file")) {
         $rawlink = preg_replace("/^file\\s*:\\s*/", "Upload:", $rawlink);
     }
 
@@ -410,7 +410,7 @@ function LinkBracketLink($bracketlink) {
         if (preg_match('/^\.\.\//', $link)) {
             return new Cached_ExternalLink($link, $label);
         }
-    } else if (preg_match('/^(\.\.\/|\/)/', $link)) {
+    } elseif (preg_match('/^(\.\.\/|\/)/', $link)) {
         return new Cached_ExternalLink($link, $label);
     }
 
@@ -1095,7 +1095,7 @@ class Markup_template_plugin  extends SimpleMarkup
         if (is_image($imagename)) {
             if ((strpos($imagename, "http://") === 0) || (strpos($imagename, "https://") === 0)) {
                 return LinkImage($imagename, $alt);
-            } else if ($imagename[0] == '/') {
+            } elseif ($imagename[0] == '/') {
                 return LinkImage(DATA_PATH . '/' . $imagename, $alt);
             } else {
                 return LinkImage(getUploadDataPath() . $imagename, $alt);
diff --git a/lib/WikiDB/adodb/adodb-lib.inc.php b/lib/WikiDB/adodb/adodb-lib.inc.php
index b86eaec08..4e7b2afd8 100644
--- a/lib/WikiDB/adodb/adodb-lib.inc.php
+++ b/lib/WikiDB/adodb/adodb-lib.inc.php
@@ -106,7 +106,7 @@ function _adodb_getmenu(&$zthis, $name,$defstr='',$blank1stItem=true,$multiple=f
         if ($size==0) $size=5;
         $attr = " multiple size=$size";
         if (!strpos($name,'[]')) $name .= '[]';
-    } else if ($size) $attr = " size=$size";
+    } elseif ($size) $attr = " size=$size";
     else $attr ='';
 
     $s = "<select name=\"$name\"$attr $selectAttr>";
@@ -175,7 +175,7 @@ function _adodb_getcount(&$zthis, $sql,$inputarr=false,$secs2cache=0)
             $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
             $rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
 
-        } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7')  {
+        } elseif ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7')  {
 
             $info = $zthis->ServerInfo();
             if (substr($info['version'],0,3) >= 7.1) { // good till version 999
@@ -478,7 +478,7 @@ function _adodb_getinsertsql(&$zthis,&$rs,$arrFields,$magicq=false)
         $recordSet->connection = &$zthis;
 
         $columns = $zthis->MetaColumns( $tableName );
-    } else if (is_subclass_of($rs, 'adorecordset')) {
+    } elseif (is_subclass_of($rs, 'adorecordset')) {
         for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
             $columns[] = $rs->FetchField($i);
         $recordSet =& $rs;
diff --git a/lib/WikiDB/adodb/adodb-time.inc.php b/lib/WikiDB/adodb/adodb-time.inc.php
index 0ed9950e4..a99316964 100644
--- a/lib/WikiDB/adodb/adodb-time.inc.php
+++ b/lib/WikiDB/adodb/adodb-time.inc.php
@@ -460,7 +460,7 @@ function _adodb_is_leap_year($year)
     if ($year % 400 == 0) {
         return true;
     // if gregorian calendar (>1582), century not-divisible by 400 is not leap
-    } else if ($year > 1582 && $year % 100 == 0 ) {
+    } elseif ($year > 1582 && $year % 100 == 0 ) {
         return false;
     }
 
diff --git a/lib/WikiDB/adodb/adodb.inc.php b/lib/WikiDB/adodb/adodb.inc.php
index e2f59d1b5..1d9c284bb 100644
--- a/lib/WikiDB/adodb/adodb.inc.php
+++ b/lib/WikiDB/adodb/adodb.inc.php
@@ -92,9 +92,9 @@
 
         if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
             define('ADODB_PHPVER',0x4300);
-        } else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
+        } elseif (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
             define('ADODB_PHPVER',0x4200);
-        } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
+        } elseif (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
             define('ADODB_PHPVER',0x4050);
         } else {
             define('ADODB_PHPVER',0x4000);
@@ -328,7 +328,7 @@
             $fn = ADODB_OUTP;
             $fn($msg,$newline);
             return;
-        } else if (isset($ADODB_OUTP)) {
+        } elseif (isset($ADODB_OUTP)) {
             $fn = $ADODB_OUTP;
             $fn($msg,$newline);
             return;
@@ -832,7 +832,7 @@
                 if($emsg = $this->ErrorMsg()) {
                     if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
                 }
-            } else if (!$this->_queryID) {
+            } elseif (!$this->_queryID) {
                 ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg());
             }
         } else {
@@ -1085,7 +1085,7 @@
                             $ret =& $this->Execute($sql,$inputarr);
                         }
                         return $ret; // PHP5 fix
-                    } else if ($ismssql){
+                    } elseif ($ismssql){
                         $sql = preg_replace(
                         '/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
                     } else {
@@ -3145,7 +3145,7 @@
             // is the char field is too long, return as text field...
             if ($this->blobSize >= 0) {
                 if ($len > $this->blobSize) return 'X';
-            } else if ($len > 250) {
+            } elseif ($len > 250) {
                 return 'X';
             }
             return 'C';
diff --git a/lib/WikiDB/adodb/drivers/adodb-ado.inc.php b/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
index bfd8b95fa..303efef81 100644
--- a/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
@@ -76,7 +76,7 @@ class ADODB_ado extends ADOConnection {
 
             //use trusted conection for SQL if username not specified
             if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
-        } else if ($argProvider=='access')
+        } elseif ($argProvider=='access')
             $argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 
         if ($argProvider) $dbc->Provider = $argProvider;
diff --git a/lib/WikiDB/adodb/drivers/adodb-db2.inc.php b/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
index 905ca9f85..4df6aa13e 100644
--- a/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
@@ -164,8 +164,8 @@ class ADODB_DB2 extends ADODB_odbc {
             if ($ttype) {
                 if ($isview) {
                     if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-                } else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
-            } else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
+                } elseif (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
+            } elseif (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
         }
         return $arr2;
     }
diff --git a/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php b/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
index d6e7817a1..6840c71b4 100644
--- a/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
@@ -734,7 +734,7 @@ class ADORecordset_ibase extends ADORecordSet
             } else {
                 if (!isset($f[$i])) {
                     $f[$i] = null;
-                } else if ($rtrim && is_string($f[$i])) {
+                } elseif ($rtrim && is_string($f[$i])) {
                     $f[$i] = rtrim($f[$i]);
                 }
             }
@@ -744,7 +744,7 @@ class ADORecordset_ibase extends ADORecordSet
         $this->fields = $f;
         if ($this->fetchMode == ADODB_FETCH_ASSOC) {
             $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
-        } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+        } elseif ($this->fetchMode == ADODB_FETCH_BOTH) {
             $this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
         }
         return true;
diff --git a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
index 5786bf7b7..3b7d056cf 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
@@ -574,7 +574,7 @@ order by constraint_name, referenced_table_name, keyno";
                     }
 
                     $params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
-                } else if (is_integer($v)) {
+                } elseif (is_integer($v)) {
                     $decl .= "@P$i INT";
                     $params .= "@P$i=".$v;
                 } else {
@@ -587,7 +587,7 @@ order by constraint_name, referenced_table_name, keyno";
             if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
             $rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
 
-        } else if (is_array($sql)) {
+        } elseif (is_array($sql)) {
             # PrepareSP()
             $rez = mssql_execute($sql[1]);
 
@@ -733,7 +733,7 @@ class ADORecordset_mssql extends ADORecordSet {
                     foreach($this->fields as $k=>$v) {
                         $this->fields[strtolower($k)] = $v;
                     }
-                } else if (ADODB_ASSOC_CASE == 1) {
+                } elseif (ADODB_ASSOC_CASE == 1) {
                     foreach($this->fields as $k=>$v) {
                         $this->fields[strtoupper($k)] = $v;
                     }
@@ -774,11 +774,11 @@ class ADORecordset_mssql extends ADORecordSet {
             }
 
             if (!$this->fields) {
-            } else if (ADODB_ASSOC_CASE == 0) {
+            } elseif (ADODB_ASSOC_CASE == 0) {
                 foreach($this->fields as $k=>$v) {
                     $this->fields[strtolower($k)] = $v;
                 }
-            } else if (ADODB_ASSOC_CASE == 1) {
+            } elseif (ADODB_ASSOC_CASE == 1) {
                 foreach($this->fields as $k=>$v) {
                     $this->fields[strtoupper($k)] = $v;
                 }
diff --git a/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php b/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
index 0ef9083ee..551ff7aab 100644
--- a/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
@@ -453,7 +453,7 @@ class ADODB_mssqlnative extends ADOConnection {
         $this->_errorMsg = false;
         if (is_array($inputarr)) {
             $rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
-        } else if (is_array($sql)) {
+        } elseif (is_array($sql)) {
             $rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
         } else {
             $rez = sqlsrv_query($this->_connectionID,$sql);
@@ -758,7 +758,7 @@ class ADORecordset_mssqlnative extends ADORecordSet {
                 foreach($this->fields as $k=>$v) {
                     $this->fields[strtolower($k)] = $v;
                 }
-            } else if (ADODB_ASSOC_CASE == 1) {
+            } elseif (ADODB_ASSOC_CASE == 1) {
                 foreach($this->fields as $k=>$v) {
                     $this->fields[strtoupper($k)] = $v;
                 }
diff --git a/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php b/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
index f8e6714a1..7383abd2b 100644
--- a/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
@@ -184,7 +184,7 @@ NATSOFT.DOMAIN =
         if ($mode==1) {
             $this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
             if ($this->_connectionID && $this->autoRollback)  OCIrollback($this->_connectionID);
-        } else if ($mode==2) {
+        } elseif ($mode==2) {
             $this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
         } else {
             $this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
@@ -684,7 +684,7 @@ NATSOFT.DOMAIN =
             if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
             else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
             $stmt[2] += 1;
-        } else if ($type == OCI_B_BLOB){
+        } elseif ($type == OCI_B_BLOB){
             //we have to create a new Descriptor here
             $_blob = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
             $rez = OCIBindByName($stmt[1], ":".$name, $_blob, -1, OCI_B_BLOB);
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
index d2683298c..d672dd2f6 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
@@ -282,8 +282,8 @@ class ADODB_odbc extends ADOConnection {
             if ($ttype) {
                 if ($isview) {
                     if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
-                } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
-            } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+                } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+            } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
         }
         return $arr2;
     }
@@ -440,7 +440,7 @@ class ADODB_odbc extends ADOConnection {
                 $fld->not_null = !empty($rs->fields[10]);
                 $fld->scale = $rs->fields[8];
                 $retarr[strtoupper($fld->name)] = $fld;
-            } else if (sizeof($retarr)>0)
+            } elseif (sizeof($retarr)>0)
                 break;
             $rs->MoveNext();
         }
@@ -488,7 +488,7 @@ class ADODB_odbc extends ADOConnection {
                 return false;
             }
 
-        } else if (is_array($sql)) {
+        } elseif (is_array($sql)) {
             $stmtid = $sql[1];
             if (!odbc_execute($stmtid)) {
                 //@odbc_free_result($stmtid);
diff --git a/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php b/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
index 9e390b8a4..96af0ca70 100644
--- a/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
@@ -295,7 +295,7 @@ class ADODB_odbtp extends ADOConnection{
                      $fld->default_value = $rs->fields[12];
                 }
                 $retarr[strtoupper($fld->name)] = $fld;
-            } else if (sizeof($retarr)>0)
+            } elseif (sizeof($retarr)>0)
                 break;
             $rs->MoveNext();
         }
@@ -497,7 +497,7 @@ class ADODB_odbtp extends ADOConnection{
             if (! odbtp_execute($stmtid) ) {
                 return false;
             }
-        } else if (is_array($sql)) {
+        } elseif (is_array($sql)) {
             $stmtid = $sql[1];
             if (!odbtp_execute($stmtid)) {
                 return false;
diff --git a/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php b/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
index 893c76787..6a9bcd008 100644
--- a/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
@@ -654,7 +654,7 @@ WHERE c2.relname=\'%s\'';
                     if ($params) $params .= ',';
                     if (is_string($v)) {
                         $params .= 'VARCHAR';
-                    } else if (is_integer($v)) {
+                    } elseif (is_integer($v)) {
                         $params .= 'INTEGER';
                     } else {
                         $params .= "REAL";
diff --git a/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php b/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
index 08929e881..c293004a7 100644
--- a/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
+++ b/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
@@ -313,7 +313,7 @@ class ADORecordset_sybase extends ADORecordSet {
     {
         if ($this->fetchMode == ADODB_FETCH_NUM) {
             $this->fields = @sybase_fetch_row($this->_queryID);
-        } else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+        } elseif ($this->fetchMode == ADODB_FETCH_ASSOC) {
             $this->fields = @sybase_fetch_row($this->_queryID);
             if (is_array($this->fields)) {
                 $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
diff --git a/lib/WikiDB/backend/cvs.php b/lib/WikiDB/backend/cvs.php
index 7602368bc..6deb0335d 100644
--- a/lib/WikiDB/backend/cvs.php
+++ b/lib/WikiDB/backend/cvs.php
@@ -472,7 +472,7 @@ extends WikiDB_backend
                 $returnVal[] = $key;
                 $limit--;
             }
-        } else if ( isset( $params['since'] ) ) {
+        } elseif ( isset( $params['since'] ) ) {
             while ( (list($key, $val) = each($a)) ) {
 
                 if ( $val > $params['since'] ) {
diff --git a/lib/WikiUser/OpenID.php b/lib/WikiUser/OpenID.php
index 3e57d8cce..6adde114e 100644
--- a/lib/WikiUser/OpenID.php
+++ b/lib/WikiUser/OpenID.php
@@ -57,7 +57,7 @@ extends _PassUser
         }
         if (isset($params["openid_claimed_id"])) {
             $identity = $params["openid_claimed_id"];
-        } else if (isset($params["openid_identity"])){
+        } elseif (isset($params["openid_identity"])){
             $identity = $params["openid_identity"];
         } else {
             $identity = "";
diff --git a/lib/display.php b/lib/display.php
index e2e7aa76a..d3c06dfa2 100644
--- a/lib/display.php
+++ b/lib/display.php
@@ -367,10 +367,10 @@ function displayPage(&$request, $template=false) {
     if ($pagename == _("SandBox")) {
         $robots = "noindex,nofollow";
         $toks['ROBOTS_META'] = $robots;
-    } else if (isActionPage($pagename)) {
+    } elseif (isActionPage($pagename)) {
         $robots = "noindex,nofollow";
         $toks['ROBOTS_META'] = $robots;
-    } else if (!isset($toks['ROBOTS_META'])) {
+    } elseif (!isset($toks['ROBOTS_META'])) {
         $robots = "index,follow";
         $toks['ROBOTS_META'] = $robots;
     }
diff --git a/lib/loadsave.php b/lib/loadsave.php
index 7d2aa1e5a..5a1a67224 100644
--- a/lib/loadsave.php
+++ b/lib/loadsave.php
@@ -118,21 +118,21 @@ function EndLoadDump(&$request)
         echo "</div>\n";
         echo "</article>\n";
         echo "</div>\n";
-    } else if (isa($WikiTheme, 'WikiTheme_Sidebar')
+    } elseif (isa($WikiTheme, 'WikiTheme_Sidebar')
            or isa($WikiTheme, 'WikiTheme_MonoBook')) {
         echo "</div>\n";
         echo "</div>\n";
         echo "</div>\n";
         echo "</div>\n";
-    } else if (isa($WikiTheme, 'WikiTheme_wikilens')) {
+    } elseif (isa($WikiTheme, 'WikiTheme_wikilens')) {
         echo "</div>\n";
         echo "</td>\n";
         echo "</tr>\n";
         echo "</table>\n";
-    } else if (isa($WikiTheme, 'WikiTheme_blog')) {
+    } elseif (isa($WikiTheme, 'WikiTheme_blog')) {
         echo "</div>\n";
         echo "</div>\n";
-    } else if (isa($WikiTheme, 'WikiTheme_Crao')
+    } elseif (isa($WikiTheme, 'WikiTheme_Crao')
            or isa($WikiTheme, 'WikiTheme_Hawaiian')
            or isa($WikiTheme, 'WikiTheme_MacOSX')
            or isa($WikiTheme, 'WikiTheme_shamino_com')
@@ -1521,7 +1521,7 @@ function SetupWiki (&$request)
 
     if (!FUSIONFORGE) {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
-    } else if (WIKI_NAME == "help") {
+    } elseif (WIKI_NAME == "help") {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
     } else {
         $mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
diff --git a/lib/main.php b/lib/main.php
index c9f7a78ee..ae81cf010 100644
--- a/lib/main.php
+++ b/lib/main.php
@@ -964,7 +964,7 @@ class WikiRequest extends Request {
                 if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
                     return false;
                 }
-            } else if (isa($user, WikiUserClassname())) {
+            } elseif (isa($user, WikiUserClassname())) {
                 $this->_user = $user;
                 $this->_user->_authhow = 'session';
                 return ENABLE_USER_NEW ? $user->UserName() : $this->_user;
diff --git a/lib/plugin/Chart.php b/lib/plugin/Chart.php
index 3de646d02..a406f49c3 100644
--- a/lib/plugin/Chart.php
+++ b/lib/plugin/Chart.php
@@ -114,7 +114,7 @@ extends WikiPlugin
                         .  'line(point1, point2);';
                 $abscisse += 1;
             }
-        } else if ($type == "line") {
+        } elseif ($type == "line") {
             $abscisse = 0;
             $source .= 'strokewidth = 3; p = []; ';
             foreach ($values as $value) {
@@ -126,7 +126,7 @@ extends WikiPlugin
                 $abscisse += 1;
             }
             $source .= 'path(p);';
-        } else if ($type == "pie") {
+        } elseif ($type == "pie") {
             $source = 'initPicture(-1.1,1.1,-1.1,1.1); stroke = "'.$color.'"; strokewidth = 1;'
                     . 'center = [0, 0]; circle(center, 1);'
                     . 'point = [1, 0]; line(center, point);';
diff --git a/lib/plugin/CreateToc.php b/lib/plugin/CreateToc.php
index 545889e8b..924c3fa8e 100644
--- a/lib/plugin/CreateToc.php
+++ b/lib/plugin/CreateToc.php
@@ -110,7 +110,7 @@ extends WikiPlugin
     function _getCounter(&$counter, $level, $firstlevelstyle) {
         if ($firstlevelstyle == 'roman') {
             $str= $this->_roman_counter($counter[1]);
-        } else if ($firstlevelstyle == 'letter') {
+        } elseif ($firstlevelstyle == 'letter') {
             $str= $this->_letter_counter($counter[1]);
         } else {
             $str=$counter[1];
@@ -252,15 +252,15 @@ extends WikiPlugin
             if (preg_match('/^\s*{\|/', $content[$i])) {
                $insidetable = true;
                continue;
-            } else if (preg_match('/^\s*{{{/', $content[$i])
+            } elseif (preg_match('/^\s*{{{/', $content[$i])
                     || preg_match('/^\s*<pre>/', $content[$i])
                     || preg_match('/^\s*<verbatim>/', $content[$i])) {
                $insideverbatim = true;
                continue;
-            } else if (preg_match('/^\s*\|}/', $content[$i])) {
+            } elseif (preg_match('/^\s*\|}/', $content[$i])) {
                $insidetable = false;
                continue;
-            } else if (preg_match('/^\s*}}}/', $content[$i])
+            } elseif (preg_match('/^\s*}}}/', $content[$i])
                     || preg_match('/^\s*<\/pre>/', $content[$i])
                     || preg_match('/^\s*<\/verbatim>/', $content[$i])) {
                $insideverbatim = false;
diff --git a/lib/plugin/MostPopular.php b/lib/plugin/MostPopular.php
index a9ec453b3..3afea28f5 100644
--- a/lib/plugin/MostPopular.php
+++ b/lib/plugin/MostPopular.php
@@ -87,7 +87,7 @@ extends WikiPlugin
         if (! $noheader) {
             if ($limit > 0) {
                 $pagelist->setCaption(fmt("The %d most popular pages of this wiki:", $limit));
-            } else if ($limit < 0) {
+            } elseif ($limit < 0) {
                 $pagelist->setCaption(fmt("The %d least popular pages of this wiki:", -$limit));
             } else {
                 $pagelist->setCaption(_("Visited pages on this wiki, ordered by popularity:"));
diff --git a/lib/plugin/PageGroup.php b/lib/plugin/PageGroup.php
index 458564262..75e41186f 100644
--- a/lib/plugin/PageGroup.php
+++ b/lib/plugin/PageGroup.php
@@ -171,7 +171,7 @@ extends WikiPlugin
                                                    //previous,next
                     }
                 }
-            } else if ($go_item == 'next') {
+            } elseif ($go_item == 'next') {
                 if ($loop) {
                     if ($thispage == $lastindex) {
                         $linkpage  = $c[1];
diff --git a/lib/plugin/PhotoAlbum.php b/lib/plugin/PhotoAlbum.php
index d97d8390b..4484661f6 100644
--- a/lib/plugin/PhotoAlbum.php
+++ b/lib/plugin/PhotoAlbum.php
@@ -308,7 +308,7 @@ display_slides();"));
             if ($cellwidth != 'auto') {
                 if ($cellwidth == 'equal') {
                     $newcellwidth = round(100/$numcols)."%";
-                } else if ($cellwidth == 'image') {
+                } elseif ($cellwidth == 'image') {
                     $newcellwidth = $newwidth;
                 } else {
                     $newcellwidth = $cellwidth;
diff --git a/lib/plugin/PrevNext.php b/lib/plugin/PrevNext.php
index 1cf968e23..a04e5ad08 100644
--- a/lib/plugin/PrevNext.php
+++ b/lib/plugin/PrevNext.php
@@ -79,7 +79,7 @@ extends WikiPlugin
         if ($align == 'center') {
             $tr = HTML::tr();
             $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
-        } else if ($align == 'right') {
+        } elseif ($align == 'right') {
             $td = HTML::td(array('align' => $align));
             $links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
         } else {
@@ -92,7 +92,7 @@ extends WikiPlugin
             }
             if ($align == 'center') {
                 $tr->pushContent(HTML::td(array('align' => $align), " [ "));
-            } else if ($align == 'right') {
+            } elseif ($align == 'right') {
                 $td->pushcontent(" [ ");
             } else {
                 $links->pushcontent(" [ ");
@@ -110,7 +110,7 @@ extends WikiPlugin
                         if ($last_is_text) {
                             if ($align == 'center') {
                                 $tr->pushContent(HTML::td(array('align' => $align), $sep));
-                            } else if ($align == 'right') {
+                            } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
                                 $links->pushcontent($sep);
@@ -118,7 +118,7 @@ extends WikiPlugin
                         }
                         if ($align == 'center') {
                             $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
-                        } else if ($align == 'right') {
+                        } elseif ($align == 'right') {
                             $td->pushContent(new ImageButton($label, $url, false, $imgurl));
                         } else {
                             $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -129,7 +129,7 @@ extends WikiPlugin
                         if ($last_is_text) {
                             if ($align == 'center') {
                                 $tr->pushContent(HTML::td(array('align' => $align), $sep));
-                            } else if ($align == 'right') {
+                            } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
                                 $links->pushcontent($sep);
@@ -137,7 +137,7 @@ extends WikiPlugin
                         }
                         if ($align == 'center') {
                             $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
-                        } else if ($align == 'right') {
+                        } elseif ($align == 'right') {
                             $td->pushContent(new ImageButton($label, $url, false, $imgurl));
                         } else {
                             $links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -147,7 +147,7 @@ extends WikiPlugin
                         if (! $this_is_first) {
                             if ($align == 'center') {
                                 $tr->pushContent(HTML::td(array('align' => $align), $sep));
-                            } else if ($align == 'right') {
+                            } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
                                 $links->pushcontent($sep);
@@ -155,7 +155,7 @@ extends WikiPlugin
                         }
                         if ($align == 'center') {
                             $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
-                        } else if ($align == 'right') {
+                        } elseif ($align == 'right') {
                             $td->pushContent(new Button($label, $url, $class));
                         } else {
                             $links->pushcontent(new Button($label, $url, $class));
@@ -166,7 +166,7 @@ extends WikiPlugin
                     if (! $this_is_first) {
                         if ($align == 'center') {
                             $tr->pushContent(HTML::td(array('align' => $align), $sep));
-                        } else if ($align == 'right') {
+                        } elseif ($align == 'right') {
                             $td->pushcontent($sep);
                         } else {
                             $links->pushcontent($sep);
@@ -174,7 +174,7 @@ extends WikiPlugin
                     }
                     if ($align == 'center') {
                         $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
-                    } else if ($align == 'right') {
+                    } elseif ($align == 'right') {
                         $td->pushContent(new Button($label, $url, $class));
                     } else {
                         $links->pushcontent(new Button($label, $url, $class));
@@ -187,7 +187,7 @@ extends WikiPlugin
         if ($style == 'text') {
             if ($align == 'center') {
                 $tr->pushContent(HTML::td(array('align' => $align), " ] "));
-            } else if ($align == 'right') {
+            } elseif ($align == 'right') {
                 $td->pushcontent(" ] ");
             } else {
                 $links->pushcontent(" ] ");
diff --git a/lib/plugin/WantedPagesOld.php b/lib/plugin/WantedPagesOld.php
index 666c045d9..aeebc3f2c 100644
--- a/lib/plugin/WantedPagesOld.php
+++ b/lib/plugin/WantedPagesOld.php
@@ -74,7 +74,7 @@ extends WikiPlugin
                 if (! in_array($name, $exclude))
                     $this->_iterateLinks($page_handle, $dbi);
             }
-        } else if ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
+        } elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
             //only get WantedPages links for one page
             $page_handle = $dbi->getPage($page);
             $this->_iterateLinks($page_handle, $dbi);
diff --git a/lib/plugin/WikiAdminSetAclSimple.php b/lib/plugin/WikiAdminSetAclSimple.php
index 460d8a295..10eec049a 100644
--- a/lib/plugin/WikiAdminSetAclSimple.php
+++ b/lib/plugin/WikiAdminSetAclSimple.php
@@ -73,7 +73,7 @@ extends WikiPlugin_WikiAdminSetAcl
             }
             if (!empty($post_args['aclliberal'])) {
                 return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
-            } else if (!empty($post_args['aclrestricted'])) {
+            } elseif (!empty($post_args['aclrestricted'])) {
                 return $this->setaclPages($request, array_keys($p), $this->restrictedPerms());
             }
         }
diff --git a/lib/plugin/WikicreoleTable.php b/lib/plugin/WikicreoleTable.php
index 46cc64f25..1027c6c66 100644
--- a/lib/plugin/WikicreoleTable.php
+++ b/lib/plugin/WikicreoleTable.php
@@ -104,7 +104,7 @@ extends WikiPlugin
             for ($j=0; $j<$nbcols; $j++) {
                 if (!isset($table[$i][$j])) {
                     $table[$i][$j] = '';
-                } else if (preg_match('/@@/', $table[$i][$j])) {
+                } elseif (preg_match('/@@/', $table[$i][$j])) {
                     $table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols);
                 }
             }
@@ -180,7 +180,7 @@ extends WikiPlugin
             }
             return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
             for ($index=0; $index<$jmax; $index++) {
                 if (is_numeric($table[$i][$index])) {
                     $result += $table[$i][$index];
@@ -188,7 +188,7 @@ extends WikiPlugin
             }
             return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
             for ($index=0; $index<$imax; $index++) {
                 if (is_numeric($table[$index][$j])) {
                     $result += $table[$index][$j];
@@ -198,7 +198,7 @@ extends WikiPlugin
             $result=$result/$counter;
             return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
             for ($index=0; $index<$jmax; $index++) {
                 if (is_numeric($table[$i][$index])) {
                     $result += $table[$i][$index];
@@ -208,7 +208,7 @@ extends WikiPlugin
             $result=$result/$counter;
             return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
             for ($index=0; $index<$imax; $index++) {
                 if (is_numeric($table[$index][$j])) {
                     if (!$found) {
@@ -224,7 +224,7 @@ extends WikiPlugin
             }
             return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
             for ($index=0; $index<$jmax; $index++) {
                 if (is_numeric($table[$i][$index])) {
                     if (!$found) {
@@ -240,7 +240,7 @@ extends WikiPlugin
             }
             return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
             for ($index=0; $index<$imax; $index++) {
                 if (is_numeric($table[$index][$j])) {
                     if (!$found) {
@@ -256,7 +256,7 @@ extends WikiPlugin
             }
             return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
             for ($index=0; $index<$jmax; $index++) {
                 if (is_numeric($table[$i][$index])) {
                     if (!$found) {
@@ -272,7 +272,7 @@ extends WikiPlugin
             }
             return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
             for ($index=0; $index<$imax; $index++) {
                 // exclude header
                 if (!string_starts_with(trim($table[$index][$j]), "=")) {
@@ -282,7 +282,7 @@ extends WikiPlugin
             $result = $counter-1; // exclude self
             return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]);
 
-        } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
+        } elseif (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
             for ($index=0; $index<$jmax; $index++) {
                 // exclude header
                 if (!string_starts_with(trim($table[$i][$index]), "=")) {
diff --git a/view.php b/view.php
index bf4bb0b4e..57e19db79 100644
--- a/view.php
+++ b/view.php
@@ -50,7 +50,7 @@ $sysdebug_enable = false;
 
 if (!$group_id || !$project) {
    exit_no_group();
-} else if (!($project->usesPlugin("wiki"))) {
+} elseif (!($project->usesPlugin("wiki"))) {
    exit_disabled('home');
 }
 
diff --git a/wikiadmin.php b/wikiadmin.php
index 3d143b4f4..eea501623 100644
--- a/wikiadmin.php
+++ b/wikiadmin.php
@@ -51,9 +51,9 @@ $user = session_get_user(); // get the session user
 
 if (!$user || !is_object($user)) {
     exit_error(_('Invalid User'),'home');
-} else if ( $user->isError()) {
+} elseif ( $user->isError()) {
     exit_error($user->getErrorMessage(),'home');
-} else if ( !$user->isActive()) {
+} elseif ( !$user->isActive()) {
     exit_error(_('User not active'),'home');
 }
 
-- 
2.45.0