From: <var...@us...> - 2012-11-21 11:08:50
|
Revision: 8508 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8508&view=rev Author: vargenau Date: 2012-11-21 11:08:38 +0000 (Wed, 21 Nov 2012) Log Message: ----------- Remove check_php_version(5) Modified Paths: -------------- trunk/lib/CachedMarkup.php trunk/lib/IniConfig.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/WikiTheme.php trunk/lib/WikiUser/BogoLogin.php trunk/lib/WikiUser/Db.php trunk/lib/WikiUserNew.php trunk/lib/plugin/RssFeed.php trunk/lib/stdlib.php Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/CachedMarkup.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -214,10 +214,7 @@ foreach ($this->_content as $item) { if (is_string($item)) { $xml .= $item; - } elseif (is_subclass_of($item, - check_php_version(5) - ? 'Cached_DynamicContent' - : 'cached_dynamiccontent') + } elseif (is_subclass_of($item, 'Cached_DynamicContent') ) { $val = $item->expand($basepage, $this); $xml .= $val->asXML(); @@ -236,10 +233,7 @@ $item = $this->_content[$i]; if (is_string($item)) { print $item; - } elseif (is_subclass_of($item, - check_php_version(5) - ? 'Cached_DynamicContent' - : 'cached_dynamiccontent') + } elseif (is_subclass_of($item, 'Cached_DynamicContent') ) { // give the content the chance to know about itself or even // to change itself $val = $item->expand($basepage, $this); Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/IniConfig.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -324,9 +324,6 @@ E_USER_ERROR); unset($valid_database_types); if (DATABASE_TYPE == 'PDO') { - if (!check_php_version(5)) - trigger_error("Invalid DATABASE_TYPE=PDO. PDO requires at least php-5.0!", - E_USER_ERROR); // try to load it dynamically (unix only) if (!loadPhpExtension("pdo")) { echo $GLOBALS['php_errormsg'], "<br>\n"; Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/WikiDB/backend/PearDB.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -15,7 +15,7 @@ // if DB would have exported its version number, it would be easier. @require_once('DB/common.php'); // Either our local pear copy or the system one // check the version! - $name = check_php_version(5) ? "escapeSimple" : strtolower("escapeSimple"); + $name = "escapeSimple"; // TODO: apparently some Pear::Db version adds LIMIT 1,0 to getOne(), // which is invalid for "select version()" if (!in_array($name, get_class_methods("DB_common"))) { Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/WikiTheme.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -1689,12 +1689,7 @@ function Button($text, $url, $class = false, $options = false) { global $request; - //php5 workaround - if (check_php_version(5)) { - $this->_init('a', array('href' => $url)); - } else { - $this->__construct('a', array('href' => $url)); - } + $this->_init('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); if ($request->getArg('frame')) Modified: trunk/lib/WikiUser/BogoLogin.php =================================================================== --- trunk/lib/WikiUser/BogoLogin.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/WikiUser/BogoLogin.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -48,9 +48,6 @@ if (isset($this->_prefs->_method) and $this->_prefs->_method == 'HomePage') { $user = new _PersonalPagePassUser($this->_userid, $this->_prefs); if ($user->checkPass($submitted_password)) { - if (!check_php_version(5)) - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; $user = UpgradeUser($this, $user); $this->_level = WIKIAUTH_USER; return $this->_level; Modified: trunk/lib/WikiUser/Db.php =================================================================== --- trunk/lib/WikiUser/Db.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/WikiUser/Db.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -67,31 +67,13 @@ $dbtype = $dbi->getParam('dbtype'); if ($dbtype == 'ADODB') { include_once 'lib/WikiUser/AdoDb.php'; - if (check_php_version(5)) - return new _AdoDbPassUser($UserName, $this->_prefs); - else { - $user = new _AdoDbPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - return $user; - } + return new _AdoDbPassUser($UserName, $this->_prefs); } elseif ($dbtype == 'SQL') { include_once 'lib/WikiUser/PearDb.php'; - if (check_php_version(5)) - return new _PearDbPassUser($UserName, $this->_prefs); - else { - $user = new _PearDbPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - return $user; - } + return new _PearDbPassUser($UserName, $this->_prefs); } elseif ($dbtype == 'PDO') { include_once 'lib/WikiUser/PdoDb.php'; - if (check_php_version(5)) - return new _PdoDbPassUser($UserName, $this->_prefs); - else { - $user = new _PdoDbPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - return $user; - } + return new _PdoDbPassUser($UserName, $this->_prefs); } return false; } Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/WikiUserNew.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -690,9 +690,6 @@ $class = "_" . $this->_current_method . "PassUser"; include_once 'lib/WikiUser/' . $this->_current_method . '.php'; $user = new $class($userid, $this->_prefs); - if (!check_php_version(5)) - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; $this->_level = $authlevel; return $user; } @@ -710,9 +707,6 @@ $class = "_" . $this->_current_method . "PassUser"; include_once 'lib/WikiUser/' . $this->_current_method . '.php'; $user = new $class($userid, $this->_prefs); - if (!check_php_version(5)) - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; $user->_level = $authlevel; return $user; } @@ -1021,73 +1015,31 @@ // before we have to upgrade it manually. if (!empty($GLOBALS['PHP_AUTH_USER']) or !empty($_SERVER['REMOTE_USER'])) { include_once 'lib/WikiUser/HttpAuth.php'; - if (check_php_version(5)) - return new _HttpAuthPassUser($UserName, $this->_prefs); - else { - $user = new _HttpAuthPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } + return new _HttpAuthPassUser($UserName, $this->_prefs); } elseif (in_array('Db', $dbh->getAuthParam('USER_AUTH_ORDER')) and $dbh->getAuthParam('auth_check') and ($dbh->getAuthParam('auth_dsn') or $dbh->getParam('dsn')) ) { - if (check_php_version(5)) - return new _DbPassUser($UserName, $this->_prefs); - else { - $user = new _DbPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } + return new _DbPassUser($UserName, $this->_prefs); } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and function_exists('ldap_connect') ) { include_once 'lib/WikiUser/LDAP.php'; - if (check_php_version(5)) - return new _LDAPPassUser($UserName, $this->_prefs); - else { - $user = new _LDAPPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } + return new _LDAPPassUser($UserName, $this->_prefs); } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and defined('IMAP_AUTH_HOST') and function_exists('imap_open') ) { include_once 'lib/WikiUser/IMAP.php'; - if (check_php_version(5)) return new _IMAPPassUser($UserName, $this->_prefs); - else { - $user = new _IMAPPassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } } elseif (in_array('File', $dbh->getAuthParam('USER_AUTH_ORDER')) and defined('AUTH_USER_FILE') and file_exists(AUTH_USER_FILE) ) { include_once 'lib/WikiUser/File.php'; - if (check_php_version(5)) - return new _FilePassUser($UserName, $this->_prefs); - else { - $user = new _FilePassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } + return new _FilePassUser($UserName, $this->_prefs); } else { include_once 'lib/WikiUser/PersonalPage.php'; - if (check_php_version(5)) - return new _PersonalPagePassUser($UserName, $this->_prefs); - else { - $user = new _PersonalPagePassUser($UserName, $this->_prefs); - eval("\$this = \$user;"); - // /*PHP5 patch*/$this = $user; - return $user; - } + return new _PersonalPagePassUser($UserName, $this->_prefs); } } else // else use the page methods defined in _PassUser. @@ -1302,8 +1254,6 @@ } /* new user => false does not return false, but the _userid is empty then */ while ($user and $user->_userid) { - if (!check_php_version(5)) - eval("\$this = \$user;"); $user = UpgradeUser($this, $user); if ($user->userExists()) { $user = UpgradeUser($this, $user); @@ -1464,8 +1414,6 @@ ) { $class = $this->nextClass(); while ($user = new $class($this->_userid, $this->_prefs)) { - if (!check_php_version(5)) - eval("\$this = \$user;"); $user = UpgradeUser($this, $user); if ($user->userExists()) { $user = UpgradeUser($this, $user); Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/plugin/RssFeed.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -110,8 +110,6 @@ } else { $html = HTML::div(array('class' => 'rss'), HTML::em(_("no RSS items"))); } - if (!check_php_version(5)) - $rss_parser->__destruct(); return $html; } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2012-11-21 10:34:31 UTC (rev 8507) +++ trunk/lib/stdlib.php 2012-11-21 11:08:38 UTC (rev 8508) @@ -1779,12 +1779,7 @@ */ function isa($object, $class) { - //if (check_php_version(5)) - // return $object instanceof $class; - if (!check_php_version(5)) - return is_a($object, $class); - - $lclass = check_php_version(5) ? $class : strtolower($class); + $lclass = $class; return is_object($object) && (strtolower(get_class($object)) == strtolower($class) || is_subclass_of($object, $lclass)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |