prework to upgrade codeigniter to 2.2.6

codepot/src/codepot/controllers/api.php

@@ -1,6 +1,6 @@
 <?php
 
-class API extends Controller 
+class API extends CI_Controller 
 {
 	function __construct ()
 	{

codepot/src/codepot/controllers/code.php

@@ -1,6 +1,6 @@
 <?php
 
-class Code extends Controller
+class Code extends CI_Controller
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_FOLDER = 'code_folder';
@@ -21,7 +21,6 @@ class Code extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG); 
 		$this->lang->load ('code', CODEPOT_LANG); 
 	}

codepot/src/codepot/controllers/file.php

@@ -1,6 +1,6 @@
 <?php
 
-class File extends Controller
+class File extends CI_Controller
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_HOME = 'file_home';
@@ -14,7 +14,6 @@ class File extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('file', CODEPOT_LANG);
 	}

codepot/src/codepot/controllers/graph.php

@@ -1,6 +1,6 @@
 <?php
 
-class Graph extends Controller
+class Graph extends CI_Controller
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_MAIN = 'graph_main';
@@ -13,7 +13,6 @@ class Graph extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG); 
 		$this->lang->load ('code', CODEPOT_LANG); 
 	}

codepot/src/codepot/controllers/issue.php

@@ -1,6 +1,6 @@
 <?php
 
-class Issue extends Controller
+class Issue extends CI_Controller
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_HOME = 'issue_home';
@@ -15,7 +15,6 @@ class Issue extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->load->library ('IssueHelper', 'issuehelper');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('issue', CODEPOT_LANG);

codepot/src/codepot/controllers/main.php

@@ -1,6 +1,6 @@
 <?php
 
-class Main extends Controller 
+class Main extends CI_Controller 
 {
 	function __construct ()
 	{
@@ -11,7 +11,6 @@ class Main extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 	}
 
@@ -35,7 +34,7 @@ class Main extends Controller
 			}
 			else
 			{
-				$settings = $this->users->fetchSettings($user_name);
+				$settings = $this->users->fetchSettings ($user_name);
 				if ($settings !== FALSE) $this->login->setUserSettings ($settings);
 				print 'ok';
 			}

codepot/src/codepot/controllers/project.php

@@ -1,6 +1,6 @@
 <?php
 
-class Project extends Controller 
+class Project extends CI_Controller 
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_HOME = 'project_home';
@@ -19,7 +19,6 @@ class Project extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('project', CODEPOT_LANG);
 

codepot/src/codepot/controllers/site.php

@@ -1,6 +1,6 @@
 <?php
 
-class Site extends Controller 
+class Site extends CI_Controller 
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_SHOW = 'site_show';
@@ -20,7 +20,6 @@ class Site extends Controller
 		$this->load->library ('WikiHelper', 'wikihelper');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('site', CODEPOT_LANG);
 

codepot/src/codepot/controllers/user.php

@@ -1,6 +1,6 @@
 <?php
 
-class User extends Controller 
+class User extends CI_Controller 
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_LOG = 'log';
@@ -17,7 +17,6 @@ class User extends Controller
 		$this->load->library ('Converter', 'converter');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('user', CODEPOT_LANG);
 	}

codepot/src/codepot/controllers/wiki.php

@@ -1,6 +1,6 @@
 <?php
 
-class Wiki extends Controller
+class Wiki extends CI_Controller
 {
 	var $VIEW_ERROR = 'error';
 	var $VIEW_HOME = 'wiki_home';
@@ -19,7 +19,6 @@ class Wiki extends Controller
 		$this->load->library ('WikiHelper', 'wikihelper');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
-		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('wiki', CODEPOT_LANG);
 	}

codepot/src/codepot/models/codemodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class CodeModel extends Model
+class CodeModel extends CI_Model
 {
 	protected $errmsg = '';
 

codepot/src/codepot/models/coderepomodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class CodeRepoModel extends Model
+class CodeRepoModel extends CI_Model
 {
 	protected $errmsg = '';
 

codepot/src/codepot/models/filemodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class FileModel extends Model
+class FileModel extends CI_Model
 {
 	protected $errmsg = '';
 

codepot/src/codepot/models/issuemodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class IssueModel extends Model
+class IssueModel extends CI_Model
 {
 	protected $errmsg = '';
 

codepot/src/codepot/models/loginmodel.php

@@ -5,7 +5,7 @@
 //       AuthModel or IdentityModel?
 //
 
-class LoginModel extends Model
+class LoginModel extends CI_Model
 {
 	var $error_message = '';
 

codepot/src/codepot/models/logmodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class LogModel extends Model
+class LogModel extends CI_Model
 {
 	function __construct ()
 	{

codepot/src/codepot/models/projectmodel.php

@@ -3,7 +3,7 @@
 $CI = &get_instance();
 $CI->load->model('SubversionModel');
 
-class ProjectModel extends Model
+class ProjectModel extends CI_Model
 {
 	function __construct ()
 	{

codepot/src/codepot/models/sitemodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class SiteModel extends Model
+class SiteModel extends CI_Model
 {
 	function __construct ()
 	{

codepot/src/codepot/models/usermodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class UserModel extends Model
+class UserModel extends CI_Model
 {
 	function __construct ()
 	{

codepot/src/codepot/models/wikimodel.php

@@ -1,6 +1,6 @@
 <?php
 
-class WikiModel extends Model
+class WikiModel extends CI_Model
 {
 	protected $errmsg = '';
 

codepot/src/index.php

@@ -117,7 +117,7 @@ if (CODEPOT_HTTPS_COMPULSORY)
 | LOAD THE FRONT CONTROLLER
 |---------------------------------------------------------------
 */
-require_once BASEPATH.'codeigniter/CodeIgniter'.EXT;
+require_once BASEPATH.'core/CodeIgniter'.EXT;
 
 /* End of file index.php */
 /* Location: ./index.php */