mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +02:00
Code Issues Releases Wiki Activity

e107 class: improvements

Browse Source
This commit is contained in:
secretr
2009-09-10 19:10:00 +00:00
parent 4fb453dd46
commit fd879ae5bd
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/e107_class.php
View File

@@ -9,8 +9,8 @@
* e107 Main * e107 Main
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
* $Revision: 1.45 $ * $Revision: 1.46 $
* $Date: 2009-09-08 12:13:00 $ * $Date: 2009-09-10 19:10:00 $
* $Author: secretr $ * $Author: secretr $
*/ */
@@ -483,7 +483,7 @@ class e107
* $instance_id * $instance_id
* *
* @param string $instance_id * @param string $instance_id
* @return db * @return e_db_mysql
*/ */
public static function getDb($instance_id = '') public static function getDb($instance_id = '')
{ {
@@ -823,11 +823,15 @@ class e107
return FALSE; // Nothing found return FALSE; // Nothing found
} }
/**
* Check if plugin is installed
* @param string $plugname
* @return boolean
*/
public static function isInstalled($plugname) public static function isInstalled($plugname)
{ {
global $pref;
// Could add more checks here later if appropriate // Could add more checks here later if appropriate
return isset($pref['plug_installed'][$plugname]); return self::getConfig()->isData('plug_installed/'.$plugname);
} }
/** /**
@@ -835,15 +839,14 @@ class e107
*/ */
public function set_base_path() public function set_base_path()
{ {
global $pref; $this->base_path = (self::getPref('ssl_enabled') == 1 ? $this->https_path : $this->http_path);
$this->base_path = ($pref['ssl_enabled'] == 1 ? $this->https_path : $this->http_path);
return $this; return $this;
} }
/** /**
* Set all environment vars and constants * Set all environment vars and constants
* * FIXME - remove globals
*/ */
public function set_paths() public function set_paths()
{ {
@@ -1115,6 +1118,7 @@ class e107
public function add_ban($bantype, $ban_message = '', $ban_ip = '', $ban_user = 0, $ban_notes = '') public function add_ban($bantype, $ban_message = '', $ban_ip = '', $ban_user = 0, $ban_notes = '')
{ {
global $sql, $pref, $e107, $admin_log; global $sql, $pref, $e107, $admin_log;
if(!$ban_message) if(!$ban_message)
{ {
$ban_message = 'No explanation given'; $ban_message = 'No explanation given';