Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8282] trunk
|
From: <var...@us...> - 2012-08-31 13:15:59
|
Revision: 8282
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8282&view=rev
Author: vargenau
Date: 2012-08-31 13:15:51 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
elseif
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/EditToolbar.php
trunk/lib/InlineParser.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/display.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikicreoleTable.php
trunk/view.php
trunk/wikiadmin.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/BlockParser.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -926,7 +926,7 @@
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 {
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/EditToolbar.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -302,7 +302,7 @@
$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."']";
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/InlineParser.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -355,15 +355,15 @@
// 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 @@
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 @@
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);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -106,7 +106,7 @@
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 @@
$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 @@
$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;
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -460,7 +460,7 @@
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;
}
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -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';
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -76,7 +76,7 @@
//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;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -164,8 +164,8 @@
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;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -734,7 +734,7 @@
} 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 @@
$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;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -574,7 +574,7 @@
}
$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 @@
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 @@
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 @@
}
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;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -453,7 +453,7 @@
$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 @@
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;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -184,7 +184,7 @@
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 @@
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);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -282,8 +282,8 @@
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 @@
$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 @@
return false;
}
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
$stmtid = $sql[1];
if (!odbc_execute($stmtid)) {
//@odbc_free_result($stmtid);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -295,7 +295,7 @@
$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 @@
if (! odbtp_execute($stmtid) ) {
return false;
}
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
$stmtid = $sql[1];
if (!odbtp_execute($stmtid)) {
return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -654,7 +654,7 @@
if ($params) $params .= ',';
if (is_string($v)) {
$params .= 'VARCHAR';
- } else if (is_integer($v)) {
+ } elseif (is_integer($v)) {
$params .= 'INTEGER';
} else {
$params .= "REAL";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -313,7 +313,7 @@
{
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);
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/backend/cvs.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -472,7 +472,7 @@
$returnVal[] = $key;
$limit--;
}
- } else if ( isset( $params['since'] ) ) {
+ } elseif ( isset( $params['since'] ) ) {
while ( (list($key, $val) = each($a)) ) {
if ( $val > $params['since'] ) {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiUser/OpenID.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -57,7 +57,7 @@
}
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 = "";
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/display.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -367,10 +367,10 @@
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;
}
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/loadsave.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -118,21 +118,21 @@
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 @@
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');
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/main.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -964,7 +964,7 @@
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;
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/Chart.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -114,7 +114,7 @@
. '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 @@
$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);';
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/CreateToc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -110,7 +110,7 @@
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 @@
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;
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/MostPopular.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -87,7 +87,7 @@
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:"));
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PageGroup.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -171,7 +171,7 @@
//previous,next
}
}
- } else if ($go_item == 'next') {
+ } elseif ($go_item == 'next') {
if ($loop) {
if ($thispage == $lastindex) {
$linkpage = $c[1];
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PhotoAlbum.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -308,7 +308,7 @@
if ($cellwidth != 'auto') {
if ($cellwidth == 'equal') {
$newcellwidth = round(100/$numcols)."%";
- } else if ($cellwidth == 'image') {
+ } elseif ($cellwidth == 'image') {
$newcellwidth = $newwidth;
} else {
$newcellwidth = $cellwidth;
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PrevNext.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -79,7 +79,7 @@
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 @@
}
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 @@
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 @@
}
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 @@
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 @@
}
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 @@
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 @@
}
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 @@
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 @@
}
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 @@
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(" ] ");
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -74,7 +74,7 @@
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);
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -73,7 +73,7 @@
}
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());
}
}
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikicreoleTable.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -104,7 +104,7 @@
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 @@
}
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 @@
}
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 @@
$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 @@
$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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
$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]), "=")) {
Modified: trunk/view.php
===================================================================
--- trunk/view.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/view.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -50,7 +50,7 @@
if (!$group_id || !$project) {
exit_no_group();
-} else if (!($project->usesPlugin("wiki"))) {
+} elseif (!($project->usesPlugin("wiki"))) {
exit_disabled('home');
}
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/wikiadmin.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -51,9 +51,9 @@
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');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
