changed many files for php7 compatibility

This commit is contained in:
hyung-hwan 2019-02-01 06:56:29 +00:00
parent e132623d43
commit 1ced89908e
70 changed files with 123 additions and 119 deletions

View File

@ -2,9 +2,9 @@
class API extends Controller
{
function API()
function __construct ()
{
parent::Controller();
parent::__construct ();
}
function check_access ()

View File

@ -13,9 +13,9 @@ class Code extends Controller
var $VIEW_FETCH = 'code_fetch';
var $VIEW_SEARCH = 'code_search';
function Code ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');
$this->load->library ('Converter', 'converter');

View File

@ -6,9 +6,9 @@ class File extends Controller
var $VIEW_HOME = 'file_home';
var $VIEW_SHOW = 'file_show';
function File ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');
$this->load->library ('Converter', 'converter');

View File

@ -5,9 +5,9 @@ class Graph extends Controller
var $VIEW_ERROR = 'error';
var $VIEW_MAIN = 'graph_main';
function Graph ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');
$this->load->library ('Converter', 'converter');

View File

@ -6,9 +6,9 @@ class Issue extends Controller
var $VIEW_HOME = 'issue_home';
var $VIEW_SHOW = 'issue_show';
function Issue ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -2,9 +2,9 @@
class Main extends Controller
{
function Main()
function __construct ()
{
parent::Controller();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -10,9 +10,9 @@ class Project extends Controller
var $VIEW_LOG = 'log';
var $VIEW_MAP = 'project_map';
function Project ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -10,9 +10,9 @@ class Site extends Controller
var $VIEW_CATALOG = 'site_catalog';
var $VIEW_LOG = 'log';
function Site ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -8,9 +8,9 @@ class User extends Controller
var $VIEW_ISSUE = 'user_issue';
var $VIEW_SETTINGS = 'user_settings';
function User ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -9,9 +9,9 @@ class Wiki extends Controller
var $VIEW_EDITX = 'wiki_editx';
var $VIEW_DELETE = 'wiki_delete';
function Wiki ()
function __construct ()
{
parent::Controller ();
parent::__construct ();
$this->load->helper ('url');
$this->load->helper ('form');

View File

@ -72,7 +72,7 @@ class Lang_detect
/**
* Constructor
*/
function Lang_detect()
function __construct()
{
$this->obj =& get_instance();
// get list of supported languages

View File

@ -2,7 +2,7 @@
class Converter
{
function Converter ()
function __construct ()
{
}

View File

@ -31,7 +31,7 @@ class IssueHelper
var $PRIORITY_LOW = 'low';
var $PRIORITY_OTHER = 'other';
function IssueHelper ()
function __construct ()
{
}

View File

@ -10,7 +10,7 @@ class WikiHelper
'##F' => '__FILE__'
);
function WikiHelper ()
function __construct ()
{
}

View File

@ -9,9 +9,9 @@ class CodeModel extends Model
return $this->errmsg;
}
function CodeModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -3,9 +3,9 @@ require_once 'loginmodel.php';
class DbLoginModel extends LoginModel
{
function DbLoginModel ()
function __construct ()
{
parent::LoginModel ();
parent::__construct ();
$this->load->database ();
}
@ -77,7 +77,7 @@ class DbLoginModel extends LoginModel
}
// TODO: implement $insider like LdapLoginModel
return parent::authenticate ($userid, $user->passwd, $user->email);
return parent::__authenticate ($userid, $user->passwd, $user->email);
}
function changePassword ($userid, $passwd)

View File

@ -14,9 +14,9 @@ class FileModel extends Model
return $this->errmsg;
}
function FileModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -5,9 +5,9 @@ $CI->load->model('CodeRepoModel');
class GitModel extends CodeRepoModel
{
function GitModel ()
function __construct ()
{
parent::CodeRepoModel ();
parent::__construct ();
}
private function _canonical_path($path)

View File

@ -14,9 +14,9 @@ class IssueModel extends Model
return $this->errmsg;
}
function IssueModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -3,9 +3,9 @@ require_once 'loginmodel.php';
class LdapLoginModel extends LoginModel
{
function LdapLoginModel ()
function __construct ()
{
parent::LoginModel ();
parent::__construct ();
}
function authenticate ($userid, $password)
@ -171,7 +171,7 @@ class LdapLoginModel extends LoginModel
//@ldap_unbind ($ldap);
@ldap_close ($ldap);
return parent::authenticate ($userid, $password, $email, $insider);
return parent::__authenticate ($userid, $password, $email, $insider);
}
function queryUserInfo ($userid)

View File

@ -9,9 +9,9 @@ class LoginModel extends Model
{
var $error_message = '';
function LoginModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->library ('session');
}
@ -66,7 +66,7 @@ class LoginModel extends Model
);
}
function authenticate ($userid, $password, $email = '', $insider = NULL)
function __authenticate ($userid, $password, $email = '', $insider = NULL)
{
//$server = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'];
$server = $_SERVER['HTTP_HOST'];

View File

@ -2,9 +2,9 @@
class LogModel extends Model
{
function LogModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -5,9 +5,9 @@ $CI->load->model('SubversionModel');
class ProjectModel extends Model
{
function ProjectModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -2,9 +2,9 @@
class SiteModel extends Model
{
function SiteModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -5,9 +5,9 @@ $CI->load->model('CodeRepoModel');
class SubversionModel extends CodeRepoModel
{
function SubversionModel ()
function __construct ()
{
parent::CodeRepoModel ();
parent::__construct ();
}
private function _canonical_path($path)

View File

@ -2,9 +2,9 @@
class UserModel extends Model
{
function UserModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -14,9 +14,9 @@ class WikiModel extends Model
return $this->errmsg;
}
function WikiModel ()
function __construct ()
{
parent::Model ();
parent::__construct ();
$this->load->database ();
}

View File

@ -40,10 +40,10 @@
*/
class CI_Base extends CI_Loader {
function CI_Base()
function __construct()
{
// This allows syntax like $this->load->foo() to work
parent::CI_Loader();
parent::__construct();
$this->load =& $this;
// This allows resources used within controller constructors to work

View File

@ -34,7 +34,7 @@ class CI_Base {
private static $instance;
public function CI_Base()
public function __construct()
{
self::$instance =& $this;
}

View File

@ -139,13 +139,15 @@ function &load_class($class, $instantiate = TRUE)
{
$name = config_item('subclass_prefix').$class;
$objects[$class] =& instantiate_class(new $name());
$obj = new $name();
$objects[$class] =& instantiate_class(obj);
return $objects[$class];
}
$name = ($class != 'Controller') ? 'CI_'.$class : $class;
$objects[$class] =& instantiate_class(new $name());
$obj = new $name();
$objects[$class] =& instantiate_class($obj);
return $objects[$class];
}

View File

@ -130,7 +130,8 @@ function &DB($params = '', $active_record_override = FALSE)
// Instantiate the DB adapter
$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
$DB =& instantiate_class(new $driver($params));
$obj = new $driver($params);
$DB =& instantiate_class($obj);
if ($DB->autoinit == TRUE)
{

View File

@ -33,7 +33,7 @@ class CI_DB_Cache {
* Grabs the CI super object instance so we can access it.
*
*/
function CI_DB_Cache(&$db)
function __construct(&$db)
{
// Assign the main CI object to $this->CI
// and load the file helper since we use it a lot

View File

@ -78,7 +78,7 @@ class CI_DB_driver {
*
* @param array
*/
function CI_DB_driver($params)
function __construct($params)
{
if (is_array($params))
{

View File

@ -35,7 +35,7 @@ class CI_DB_forge {
* Grabs the CI super object instance so we can access it.
*
*/
function CI_DB_forge()
function __construct()
{
// Assign the main database object to $this->db
$CI =& get_instance();

View File

@ -33,7 +33,7 @@ class CI_DB_utility extends CI_DB_forge {
* Grabs the CI super object instance so we can access it.
*
*/
function CI_DB_utility()
function __construct()
{
// Assign the main database object to $this->db
$CI =& get_instance();

View File

@ -48,9 +48,9 @@ class CI_DB_odbc_driver extends CI_DB {
var $_random_keyword;
function CI_DB_odbc_driver($params)
function __construct($params)
{
parent::CI_DB($params);
parent::__construct($params);
$this->_random_keyword = ' RND('.time().')'; // database specific random keyword
}

View File

@ -45,7 +45,7 @@ class CI_Calendar {
*
* @access public
*/
function CI_Calendar($config = array())
function __construct($config = array())
{
$this->CI =& get_instance();

View File

@ -40,7 +40,7 @@ class CI_Cart {
*
* The constructor loads the Session class, used to store the shopping cart contents.
*/
function CI_Cart($params = array())
function __construct($params = array())
{
// Set the super object to a local variable for use later
$this->CI =& get_instance();

View File

@ -42,7 +42,7 @@ class CI_Config {
* @param boolean true if errors should just return false, false if an error message should be displayed
* @return boolean if the file was successfully loaded or not
*/
function CI_Config()
function __construct()
{
$this->config =& get_config();
log_message('debug', "Config Class Initialized");

View File

@ -37,9 +37,9 @@ class Controller extends CI_Base {
*
* Calls the initialize() function
*/
function Controller()
function __construct()
{
parent::CI_Base();
parent::__construct();
$this->_ci_initialize();
log_message('debug', "Controller Class Initialized");
}

View File

@ -82,7 +82,7 @@ class CI_Email {
*
* The constructor can be passed an array of config values
*/
function CI_Email($config = array())
function __construct($config = array())
{
if (count($config) > 0)
{

View File

@ -41,7 +41,7 @@ class CI_Encrypt {
* Simply determines whether the mcrypt library exists.
*
*/
function CI_Encrypt()
function __construct()
{
$this->CI =& get_instance();
$this->_mcrypt_exists = ( ! function_exists('mcrypt_encrypt')) ? FALSE : TRUE;

View File

@ -52,7 +52,7 @@ class CI_Exceptions {
* Constructor
*
*/
function CI_Exceptions()
function __construct()
{
$this->ob_level = ob_get_level();
// Note: Do not log messages from this constructor.

View File

@ -41,7 +41,7 @@ class CI_Form_validation {
* Constructor
*
*/
function CI_Form_validation($rules = array())
function __construct($rules = array())
{
$this->CI =& get_instance();

View File

@ -40,7 +40,7 @@ class CI_FTP {
*
* The constructor can be passed an array of config values
*/
function CI_FTP($config = array())
function __construct($config = array())
{
if (count($config) > 0)
{

View File

@ -37,7 +37,7 @@ class CI_Hooks {
* Constructor
*
*/
function CI_Hooks()
function __construct()
{
$this->_initialize();
log_message('debug', "Hooks Class Initialized");

View File

@ -83,7 +83,7 @@ class CI_Image_lib {
* @param string
* @return void
*/
function CI_Image_lib($props = array())
function __construct($props = array())
{
if (count($props) > 0)
{

View File

@ -61,7 +61,7 @@ class CI_Input {
*
* @access public
*/
function CI_Input()
function __construct()
{
log_message('debug', "Input Class Initialized");

View File

@ -34,7 +34,7 @@ class CI_Language {
*
* @access public
*/
function CI_Language()
function __construct()
{
log_message('debug', "Language Class Initialized");
}

View File

@ -49,7 +49,7 @@ class CI_Loader {
*
* @access public
*/
function CI_Loader()
function __construct()
{
$this->_ci_is_php5 = (floor(phpversion()) >= 5) ? TRUE : FALSE;
$this->_ci_view_path = APPPATH.'views/';
@ -252,7 +252,8 @@ class CI_Loader {
require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT);
$class = 'CI_DB_'.$CI->db->dbdriver.'_utility';
$CI->dbutil =& instantiate_class(new $class());
$obj = new $class();
$CI->dbutil =& instantiate_class($obj);
$CI->load->_ci_assign_to_models();
}

View File

@ -37,7 +37,7 @@ class CI_Log {
*
* @access public
*/
function CI_Log()
function __construct()
{
$config =& get_config();

View File

@ -33,7 +33,7 @@ class Model {
*
* @access public
*/
function Model()
function __construct()
{
// If the magic __get() or __set() methods are used in a Model references can't be used.
$this->_assign_libraries( (method_exists($this, '__get') OR method_exists($this, '__set')) ? FALSE : TRUE );

View File

@ -34,7 +34,7 @@ class CI_Output {
var $enable_profiler = FALSE;
function CI_Output()
function __construct()
{
log_message('debug', "Output Class Initialized");
}

View File

@ -59,7 +59,7 @@ class CI_Pagination {
* @access public
* @param array initialization parameters
*/
function CI_Pagination($params = array())
function __construct($params = array())
{
if (count($params) > 0)
{

View File

@ -34,7 +34,7 @@ class CI_Profiler {
var $CI;
function CI_Profiler()
function __construct()
{
$this->CI =& get_instance();
$this->CI->load->language('profiler');

View File

@ -43,7 +43,7 @@ class CI_Router {
*
* Runs the route mapping function.
*/
function CI_Router()
function __construct()
{
$this->config =& load_class('Config');
$this->uri =& load_class('URI');

View File

@ -51,7 +51,7 @@ class CI_Session {
* The constructor runs the session routines automatically
* whenever the class is instantiated.
*/
function CI_Session($params = array())
function __construct($params = array())
{
log_message('debug', "Session Class Initialized");

View File

@ -44,7 +44,7 @@
*/
class CI_SHA {
function CI_SHA()
function __construct()
{
log_message('debug', "SHA1 Class Initialized");
}

View File

@ -37,7 +37,7 @@ class CI_Table {
var $empty_cells = "";
function CI_Table()
function __construct()
{
log_message('debug', "Table Class Initialized");
}

View File

@ -40,7 +40,7 @@ class CI_Trackback {
*
* @access public
*/
function CI_Trackback()
function __construct()
{
log_message('debug', "Trackback Class Initialized");
}

View File

@ -48,7 +48,7 @@ class CI_Typography {
* Nothing to do here...
*
*/
function CI_Typography()
function __construct()
{
}

View File

@ -42,7 +42,7 @@ class CI_URI {
*
* @access public
*/
function CI_URI()
function __construct()
{
$this->config =& load_class('Config');
log_message('debug', "URI Class Initialized");

View File

@ -34,7 +34,7 @@ class CI_Unit_test {
var $_template = NULL;
var $_template_rows = NULL;
function CI_Unit_test()
function __construct()
{
log_message('debug', "Unit Testing Class Initialized");
}

View File

@ -58,7 +58,7 @@ class CI_Upload {
*
* @access public
*/
function CI_Upload($props = array())
function __construct($props = array())
{
if (count($props) > 0)
{

View File

@ -56,7 +56,7 @@ class CI_User_agent {
* @access public
* @return void
*/
function CI_User_agent()
function __construct()
{
if (isset($_SERVER['HTTP_USER_AGENT']))
{

View File

@ -43,7 +43,7 @@ class CI_Validation {
* Constructor
*
*/
function CI_Validation()
function __construct()
{
$this->CI =& get_instance();

View File

@ -68,7 +68,7 @@ class CI_Xmlrpc {
// VALUES THAT MULTIPLE CLASSES NEED
//-------------------------------------
function CI_Xmlrpc ($config = array())
function __construct($config = array())
{
$this->xmlrpcName = $this->xmlrpcName;
$this->xmlrpc_backslash = chr(92).chr(92);
@ -359,9 +359,9 @@ class XML_RPC_Client extends CI_Xmlrpc
var $timeout = 5;
var $no_multicall = false;
function XML_RPC_Client($path, $server, $port=80)
function __construct($path, $server, $port=80)
{
parent::CI_Xmlrpc();
parent::__construct();
$this->port = $port;
$this->server = $server;
@ -434,7 +434,7 @@ class XML_RPC_Response
var $errstr = '';
var $headers = array();
function XML_RPC_Response($val, $code = 0, $fstr = '')
function __construct($val, $code = 0, $fstr = '')
{
if ($code != 0)
{
@ -614,9 +614,9 @@ class XML_RPC_Message extends CI_Xmlrpc
var $params = array();
var $xh = array();
function XML_RPC_Message($method, $pars=0)
function __construct($method, $pars=0)
{
parent::CI_Xmlrpc();
parent::__construct();
$this->method_name = $method;
if (is_array($pars) && count($pars) > 0)
@ -1209,9 +1209,9 @@ class XML_RPC_Values extends CI_Xmlrpc
var $me = array();
var $mytype = 0;
function XML_RPC_Values($val=-1, $type='')
function __construct($val=-1, $type='')
{
parent::CI_Xmlrpc();
parent::__construct();
if ($val != -1 OR $type != '')
{

View File

@ -48,9 +48,9 @@ class CI_Xmlrpcs extends CI_Xmlrpc
// Constructor, more or less
//-------------------------------------
function CI_Xmlrpcs($config=array())
function __construct($config=array())
{
parent::CI_Xmlrpc();
parent::__construct ();
$this->set_system_methods();
if (isset($config['functions']) && is_array($config['functions']))

View File

@ -38,7 +38,7 @@ class CI_Zip {
var $file_num = 0;
var $offset = 0;
function CI_Zip()
function __construct()
{
log_message('debug', "Zip Compression Class Initialized");
}

View File

@ -32,7 +32,7 @@ class Scaffolding {
var $base_url = '';
var $lang = array();
function Scaffolding($db_table)
function __construct($db_table)
{
$this->CI =& get_instance();