mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Replace all 'e107::' with 'self::'

Browse Source
This commit is contained in:
Cameron
2017-01-27 11:14:11 -08:00
parent b72cdbbacb
commit 1f237e3f6f
1 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
e107_handlers/e107_class.php
View File

@@ -854,7 +854,7 @@ class e107
} }
if(class_exists($class_name, false)) if(class_exists($class_name, false))
{ {
e107::setRegistry($id, new $class_name($vars)); self::setRegistry($id, new $class_name($vars));
} }
return self::getRegistry($id); return self::getRegistry($id);
@@ -936,8 +936,8 @@ class e107
if($name == 'core') // prevent loop between pref and cache handlers. if($name == 'core') // prevent loop between pref and cache handlers.
{ {
e107::getCache()->UserCacheActive = self::getPref('cachestatus'); self::getCache()->UserCacheActive = self::getPref('cachestatus');
e107::getCache()->SystemCacheActive = self::getPref('syscachestatus'); self::getCache()->SystemCacheActive = self::getPref('syscachestatus');
} }
} }
@@ -1131,8 +1131,8 @@ class e107
*/ */
public static function setThemePref($pref_name, $pref_value = null) public static function setThemePref($pref_name, $pref_value = null)
{ {
if(is_array($pref_name)) return e107::getConfig()->set('sitetheme_pref', $pref_name); if(is_array($pref_name)) return self::getConfig()->set('sitetheme_pref', $pref_name);
return e107::getConfig()->updatePref('sitetheme_pref/'.$pref_name, $pref_value, false); return self::getConfig()->updatePref('sitetheme_pref/'.$pref_name, $pref_value, false);
} }
@@ -1558,8 +1558,8 @@ class e107
if(null === $config) if(null === $config)
{ {
$config = array( $config = array(
'base_url' => e107::getUrl()->create('system/xup/endpoint', array(), array('full' => true)), 'base_url' => self::getUrl()->create('system/xup/endpoint', array(), array('full' => true)),
'providers' => e107::getPref('social_login', array()), 'providers' => self::getPref('social_login', array()),
'debug_mode' => false, 'debug_mode' => false,
'debug_file' => '' 'debug_file' => ''
); );
@@ -1851,7 +1851,7 @@ class e107
*/ */
public static function library($action = '', $library = null, $variant = null) public static function library($action = '', $library = null, $variant = null)
{ {
$libraryHandler = e107::getLibrary(); $libraryHandler = self::getLibrary();
switch($action) switch($action)
{ {
@@ -1860,7 +1860,7 @@ class e107
break; break;
case 'load': case 'load':
$cdn = (bool) e107::getPref('e_jslib_cdn', true); $cdn = (bool) self::getPref('e_jslib_cdn', true);
$debug = (bool) deftrue('e_DEBUG'); $debug = (bool) deftrue('e_DEBUG');
// Try to detect and load CDN version. // Try to detect and load CDN version.
@@ -1959,7 +1959,7 @@ class e107
return null; return null;
} }
$jshandler = e107::getJs(); $jshandler = self::getJs();
$jshandler->setDependency($dep); $jshandler->setDependency($dep);
switch ($type) switch ($type)
@@ -2057,7 +2057,7 @@ class e107
return null; return null;
} }
$jshandler = e107::getJs(); $jshandler = self::getJs();
$jshandler->setDependency($dep); $jshandler->setDependency($dep);
switch ($type) switch ($type)
@@ -2171,7 +2171,7 @@ class e107
} }
e107::js('footer-inline', $text); self::js('footer-inline', $text);
} }
@@ -2209,15 +2209,15 @@ class e107
{ {
if($name == 'description') if($name == 'description')
{ {
e107::getUrl()->response()->addMetaDescription($content); //Cam: TBD self::getUrl()->response()->addMetaDescription($content); //Cam: TBD
} }
if($name == 'keywords') if($name == 'keywords')
{ {
e107::getUrl()->response()->addMetaKeywords($content); //Cam: TBD self::getUrl()->response()->addMetaKeywords($content); //Cam: TBD
} }
return e107::getUrl()->response()->addMeta($name, $content, $extended); return self::getUrl()->response()->addMeta($name, $content, $extended);
} }
/** /**
@@ -2287,7 +2287,7 @@ class e107
{ {
$new_addon = array(); $new_addon = array();
$sql = e107::getDb(); // Might be used by older plugins. $sql = self::getDb(); // Might be used by older plugins.
$filename = $addonName; // e.g. 'e_cron'; $filename = $addonName; // e.g. 'e_cron';
if(!$className) if(!$className)
@@ -2331,7 +2331,7 @@ class e107
*/ */
public static function callMethod($class_name, $method_name, $param=null, $param2=null) public static function callMethod($class_name, $method_name, $param=null, $param2=null)
{ {
$mes = e107::getMessage(); $mes = self::getMessage();
if(is_object($class_name) || class_exists($class_name)) if(is_object($class_name) || class_exists($class_name))
{ {
@@ -2382,7 +2382,7 @@ class e107
switch($for ) switch($for )
{ {
case 'admin': case 'admin':
$for = e107::getPref('admintheme'); $for = self::getPref('admintheme');
break; break;
case 'front': case 'front':
@@ -2393,7 +2393,7 @@ class e107
} }
else else
{ {
$for = isset($user_pref['sitetheme']) ? $user_pref['sitetheme'] : e107::getPref('sitetheme'); $for = isset($user_pref['sitetheme']) ? $user_pref['sitetheme'] : self::getPref('sitetheme');
} }
break; break;
@@ -2574,7 +2574,7 @@ class e107
if(ADMIN && E107_DBG_INCLUDES) if(ADMIN && E107_DBG_INCLUDES)
{ {
e107::getMessage()->addDebug( "Attempting to load Template File: ".$path ); self::getMessage()->addDebug( "Attempting to load Template File: ".$path );
} }
$id = str_replace('/', '_', $id); $id = str_replace('/', '_', $id);
@@ -2786,7 +2786,7 @@ class e107
{ {
if(E107_DBG_BBSC) if(E107_DBG_BBSC)
{ {
e107::getMessage()->addDebug("Found wrapper: ".$SC_WRAPPER); self::getMessage()->addDebug("Found wrapper: ".$SC_WRAPPER);
} }
self::scStyle($SC_WRAPPER); self::scStyle($SC_WRAPPER);
} }
@@ -2796,7 +2796,7 @@ class e107
{ {
if(E107_DBG_BBSC) if(E107_DBG_BBSC)
{ {
e107::getMessage()->addDebug("Found ID wrapper: ".$wrapper); self::getMessage()->addDebug("Found ID wrapper: ".$wrapper);
} }
self::setRegistry($wrapperRegPath, $$wrapper); self::setRegistry($wrapperRegPath, $$wrapper);
} }
@@ -2865,7 +2865,7 @@ class e107
* e107::coreLan('comment'); * e107::coreLan('comment');
* *
* // import defeinitions from /e107_languages/[CurrentLanguage]/admin/lan_banlist.php * // import defeinitions from /e107_languages/[CurrentLanguage]/admin/lan_banlist.php
* e107::coreLan('banlist', true); * self::coreLan('banlist', true);
* </code> * </code>
* *
* @param string $fname filename without the extension part (e.g. 'comment') * @param string $fname filename without the extension part (e.g. 'comment')
@@ -2875,12 +2875,12 @@ class e107
public static function coreLan($fname, $admin = false) public static function coreLan($fname, $admin = false)
{ {
$cstring = 'corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front'); $cstring = 'corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front');
if(e107::getRegistry($cstring)) return; if(self::getRegistry($cstring)) return;
$fname = ($admin ? 'admin/' : '').'lan_'.preg_replace('/[^\w]/', '', trim($fname, '/')).'.php'; $fname = ($admin ? 'admin/' : '').'lan_'.preg_replace('/[^\w]/', '', trim($fname, '/')).'.php';
$path = e_LANGUAGEDIR.e_LANGUAGE.'/'.$fname; $path = e_LANGUAGEDIR.e_LANGUAGE.'/'.$fname;
e107::setRegistry($cstring, true); self::setRegistry($cstring, true);
self::includeLan($path, false); self::includeLan($path, false);
} }
@@ -2915,7 +2915,7 @@ class e107
public static function plugLan($plugin, $fname = '', $flat = false) public static function plugLan($plugin, $fname = '', $flat = false)
{ {
$cstring = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0'); $cstring = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0');
if(e107::getRegistry($cstring)) return; if(self::getRegistry($cstring)) return;
$plugin = preg_replace('/[^\w]/', '', $plugin); $plugin = preg_replace('/[^\w]/', '', $plugin);
@@ -2946,11 +2946,11 @@ class e107
if(deftrue('E107_DBG_INCLUDES')) if(deftrue('E107_DBG_INCLUDES'))
{ {
e107::getMessage()->addDebug("Attempting to Load: ".$path); self::getMessage()->addDebug("Attempting to Load: ".$path);
} }
e107::setRegistry($cstring, true); self::setRegistry($cstring, true);
self::includeLan($path, false); self::includeLan($path, false);
} }
@@ -2987,7 +2987,7 @@ class e107
else $theme = e_THEME.preg_replace('#[^\w/]#', '', $theme).'/languages/'; else $theme = e_THEME.preg_replace('#[^\w/]#', '', $theme).'/languages/';
$cstring = 'themelan/'.$theme.$fname.($flat ? '_1' : '_0'); $cstring = 'themelan/'.$theme.$fname.($flat ? '_1' : '_0');
if(e107::getRegistry($cstring)) return; if(self::getRegistry($cstring)) return;
if($fname) $fname = e_LANGUAGE.($flat ? '_' : '/').preg_replace('#[^\w/]#', '', trim($fname, '/')); if($fname) $fname = e_LANGUAGE.($flat ? '_' : '/').preg_replace('#[^\w/]#', '', trim($fname, '/'));
else $fname = e_LANGUAGE; else $fname = e_LANGUAGE;
@@ -2996,10 +2996,10 @@ class e107
if(E107_DBG_INCLUDES) if(E107_DBG_INCLUDES)
{ {
e107::getMessage()->addDebug("Attempting to Load: ".$path); self::getMessage()->addDebug("Attempting to Load: ".$path);
} }
e107::setRegistry($cstring, true); self::setRegistry($cstring, true);
self::includeLan($path, false); self::includeLan($path, false);
} }
@@ -3104,11 +3104,11 @@ class e107
if(!$tmp = self::getRegistry('core/e107/addons/e_url')) if(!$tmp = self::getRegistry('core/e107/addons/e_url'))
{ {
$tmp = e107::getAddonConfig('e_url'); $tmp = self::getAddonConfig('e_url');
self::setRegistry('core/e107/addons/e_url',$tmp); self::setRegistry('core/e107/addons/e_url',$tmp);
} }
$tp = e107::getParser(); $tp = self::getParser();
$pref = self::getPref('e_url_alias'); $pref = self::getPref('e_url_alias');
$sefActive = self::getPref('e_url_list'); $sefActive = self::getPref('e_url_list');
@@ -3149,7 +3149,7 @@ class e107
{ {
if(!isset($row[$v])) if(!isset($row[$v]))
{ {
e107::getMessage()->addDebug("Missing value for ".$v." in ".$plugin."/e_url.php - '".$key."'"); self::getMessage()->addDebug("Missing value for ".$v." in ".$plugin."/e_url.php - '".$key."'");
$active = false; $active = false;
break; break;
} }
@@ -3220,7 +3220,7 @@ class e107
if(!empty($plugin)) if(!empty($plugin))
{ {
e107::getMessage()->addDebug("e_url.php in <b>".e_PLUGIN.$plugin."</b> is missing the key: <b>".$key."</b>. Or, you may need to <a href='".e_ADMIN."db.php?mode=plugin_scan'>scan your plugin directories</a> to register e_url.php"); self::getMessage()->addDebug("e_url.php in <b>".e_PLUGIN.$plugin."</b> is missing the key: <b>".$key."</b>. Or, you may need to <a href='".e_ADMIN."db.php?mode=plugin_scan'>scan your plugin directories</a> to register e_url.php");
} }
return false; return false;
@@ -3406,7 +3406,7 @@ class e107
return (isset($ret)) ? $ret : ""; return (isset($ret)) ? $ret : "";
} }
} }
if (e107::getPref('noLanguageSubs') || (e_LANGUAGE == 'English')) if (self::getPref('noLanguageSubs') || (e_LANGUAGE == 'English'))
{ {
return FALSE; // No point looking for the English files twice return FALSE; // No point looking for the English files twice
} }
@@ -3496,12 +3496,12 @@ class e107
$_SERVER['PHP_SELF'] = (($pos = stripos($_SERVER['PHP_SELF'], '.php')) !== false ? substr($_SERVER['PHP_SELF'], 0, $pos+4) : $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = (($pos = stripos($_SERVER['PHP_SELF'], '.php')) !== false ? substr($_SERVER['PHP_SELF'], 0, $pos+4) : $_SERVER['PHP_SELF']);
// setup some php options // setup some php options
e107::ini_set('magic_quotes_runtime', 0); self::ini_set('magic_quotes_runtime', 0);
e107::ini_set('magic_quotes_sybase', 0); self::ini_set('magic_quotes_sybase', 0);
e107::ini_set('arg_separator.output', '&amp;'); self::ini_set('arg_separator.output', '&amp;');
e107::ini_set('session.use_only_cookies', 1); self::ini_set('session.use_only_cookies', 1);
e107::ini_set('session.use_trans_sid', 0); self::ini_set('session.use_trans_sid', 0);
e107::ini_set('session.cookie_httponly', 1); // cookie won't be accessible by scripting languages, such as JavaScript. Can effectively help to reduce identity theft through XSS attacks self::ini_set('session.cookie_httponly', 1); // cookie won't be accessible by scripting languages, such as JavaScript. Can effectively help to reduce identity theft through XSS attacks
// Ensure thet '.' is the first part of the include path // Ensure thet '.' is the first part of the include path
$inc_path = explode(PATH_SEPARATOR, ini_get('include_path')); $inc_path = explode(PATH_SEPARATOR, ini_get('include_path'));
@@ -3509,7 +3509,7 @@ class e107
{ {
array_unshift($inc_path, '.'); array_unshift($inc_path, '.');
$inc_path = implode(PATH_SEPARATOR, $inc_path); $inc_path = implode(PATH_SEPARATOR, $inc_path);
e107::ini_set('include_path', $inc_path); self::ini_set('include_path', $inc_path);
} }
unset($inc_path); unset($inc_path);
@@ -4244,7 +4244,7 @@ class e107
*/ */
public static function canCache($set = null) public static function canCache($set = null)
{ {
$_data = e107::getSession()->get('__sessionBrowserCache'); $_data = self::getSession()->get('__sessionBrowserCache');
if(!is_array($_data)) $_data = array(); if(!is_array($_data)) $_data = array();
if(null === $set) if(null === $set)
@@ -4259,7 +4259,7 @@ class e107
if(false !== $check) if(false !== $check)
{ {
unset($_data[$check]); unset($_data[$check]);
e107::getSession()->set('__sessionBrowserCache', $_data); self::getSession()->set('__sessionBrowserCache', $_data);
return; return;
} }
} }
@@ -4272,7 +4272,7 @@ class e107
if(empty($set) || !is_string($set) || in_array($set, $_data)) return; if(empty($set) || !is_string($set) || in_array($set, $_data)) return;
$_data[] = $set; $_data[] = $set;
e107::getSession()->set('__sessionBrowserCache', array_unique($_data)); self::getSession()->set('__sessionBrowserCache', array_unique($_data));
} }
/** /**
@@ -4342,7 +4342,7 @@ class e107
*/ */
public function getip() public function getip()
{ {
return e107::getIPHandler()->getIP(FALSE); return self::getIPHandler()->getIP(FALSE);
} }
/** /**
@@ -4356,7 +4356,7 @@ class e107
public function ipEncode($ip, $div = ':') public function ipEncode($ip, $div = ':')
{ {
return e107::getIPHandler()->ipEncode($ip); return self::getIPHandler()->ipEncode($ip);
} }
/** /**
@@ -4371,7 +4371,7 @@ class e107
*/ */
public function ipdecode($ip, $IP4Legacy = TRUE) public function ipdecode($ip, $IP4Legacy = TRUE)
{ {
return e107::getIPHandler()->ipDecode($ip, $IP4Legacy); return self::getIPHandler()->ipDecode($ip, $IP4Legacy);
} }
/** /**
@@ -4569,7 +4569,7 @@ class e107
break; break;
} }
$filename = e107::getHandlerPath($className, true); $filename = self::getHandlerPath($className, true);
//TODO add debug screen Auto-loaded classes - ['core: '.$filename.' - '.$className]; //TODO add debug screen Auto-loaded classes - ['core: '.$filename.' - '.$className];
break; break;
} }
@@ -4586,55 +4586,55 @@ class e107
switch ($name) switch ($name)
{ {
case 'tp': case 'tp':
$ret = e107::getParser(); $ret = self::getParser();
break; break;
case 'sql': case 'sql':
$ret = e107::getDb(); $ret = self::getDb();
break; break;
case 'ecache': case 'ecache':
$ret = e107::getCache(); $ret = self::getCache();
break; break;
case 'arrayStorage': case 'arrayStorage':
$ret = e107::getArrayStorage(); $ret = self::getArrayStorage();
break; break;
case 'e_event': case 'e_event':
$ret = e107::getEvent(); $ret = self::getEvent();
break; break;
case 'ns': case 'ns':
$ret = e107::getRender(); $ret = self::getRender();
break; break;
case 'url': case 'url':
$ret = e107::getUrl(); $ret = self::getUrl();
break; break;
case 'admin_log': case 'admin_log':
$ret = e107::getAdminLog(); $ret = self::getAdminLog();
break; break;
case 'override': case 'override':
$ret = e107::getSingleton('override', e_HANDLER.'override_class.php'); $ret = self::getSingleton('override', e_HANDLER.'override_class.php');
break; break;
case 'notify': case 'notify':
$ret = e107::getNotify(); $ret = self::getNotify();
break; break;
case 'e_online': case 'e_online':
$ret = e107::getOnline(); $ret = self::getOnline();
break; break;
case 'eIPHandler': case 'eIPHandler':
$ret = e107::getIPHandler(); $ret = self::getIPHandler();
break; break;
case 'user_class': case 'user_class':
$ret = e107::getUserClass(); $ret = self::getUserClass();
break; break;
default: default:
@@ -4717,7 +4717,7 @@ class e107
return false; return false;
} }
$xml = e107::getXml(); $xml = self::getXml();
$file = "https://e107.org/releases.php"; $file = "https://e107.org/releases.php";
if(!$xdata = $xml->loadXMLfile($file,true,false)) if(!$xdata = $xml->loadXMLfile($file,true,false))
{ {
@@ -4736,7 +4736,7 @@ class e107
} }
e107::getDebug()->log("New Version:".$newVersion); self::getDebug()->log("New Version:".$newVersion);
if(version_compare($curVersion,$newVersion) === -1) if(version_compare($curVersion,$newVersion) === -1)
{ {