Removed unnecessary classes folder (duplicate classes). Moved adodb t…

…o third_party folder. Updated classes paths.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10721 b72ed6b6-b9f8-46b5-92b4-906544132732

application/controllers/installer.php

@@ -301,7 +301,7 @@ function install($step=0)
                 {
 
                     //to establish connection withh different DB.
-                    require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+                    require_once(APPPATH.'third_party/adodb/adodb.inc.php');
                     //lets assume
 
 
@@ -840,7 +840,7 @@ function optional()
         }
 
         //include(dirname(__FILE__).'/../../../config-sample.php');
-        require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+        require_once(APPPATH.'third_party/adodb/adodb.inc.php');
 
         //check if passwords match , input class take care of any xss filetring or sql injection
         if ($this->input->post('adminLoginPwd') == $this->input->post('confirmPwd'))
@@ -1030,7 +1030,7 @@ function createdb()
         }
 
         //include(dirname(__FILE__).'/../../../config-sample.php');
-        require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+        require_once(APPPATH.'third_party/adodb/adodb.inc.php');
         $dbname = $this->session->userdata('dbname');
         $databasetype = $this->session->userdata('databasetype');
         $connect=ADONewConnection($databasetype);
@@ -1110,7 +1110,7 @@ function populatedb()
         }
 
         //include(dirname(__FILE__).'/../../../config-sample.php');
-        require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+        require_once(APPPATH.'third_party/adodb/adodb.inc.php');
         $dbname = $this->session->userdata('dbname');
         $databasetype = $this->session->userdata('databasetype');
 
@@ -1191,7 +1191,7 @@ function _modify_database($sqlfile='', $sqlstring='')
 
 
         //include(dirname(__FILE__).'/../../../config-sample.php');
-        require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+        require_once(APPPATH.'third_party/adodb/adodb.inc.php');
         $dbname = $this->session->userdata('dbname');
         $databasetype = $this->session->userdata('databasetype');
         $connect=ADONewConnection($databasetype);
@@ -1441,7 +1441,7 @@ function _getRandomID()
     function _db_execute_num($sql,$inputarr=false)
     {
         //include(dirname(__FILE__).'/../../../config-sample.php');
-        require_once($this->config->item('rootdir').'/classes/adodb/adodb.inc.php');
+        require_once(APPPATH.'third_party/adodb/adodb.inc.php');
         $dbname = $this->session->userdata('dbname');
         $databasetype = $this->session->userdata('databasetype');
         $connect=ADONewConnection($databasetype);;

application/controllers/survey.php

@@ -332,7 +332,7 @@ function action()
 		        {
 		            safe_die('You cannot start this script directly');
 		        }
-		        require_once(dirname(__FILE__).'/classes/core/language.php');
+		        //require_once(dirname(__FILE__).'/classes/core/language.php');
 		        $baselang = GetBaseLanguageFromSurveyID($surveyid);
 		        $this->load->library('Limesurvey_lang',array("langcode"=>$baselang));
 				$clang = $this->limesurvey_lang;

application/helpers/admin/statistics_helper.php

@@ -3195,7 +3195,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                         if ($language=='ar')
                         {
                             $lblout=$lbl; //reset text order to original
-                            include_once($rootdir.'/classes/core/Arabic.php');
+                            $CI->load->library("admin/Arabic");
                             $Arabic = new Arabic('ArGlyphs');
                             foreach($lblout as $kkey => $kval){
                                 if (preg_match("^[A-Za-z]^", $kval)) { //auto detect if english

application/libraries/Limesurvey_lang.php

@@ -188,7 +188,7 @@ function javascript_escape($str, $strip_tags=false, $htmldecode=false) {
 
 }
 
-require_once(dirname(__FILE__).'/../../classes/php-gettext/streams.php');
-require_once(dirname(__FILE__).'/../../classes/php-gettext/gettext.php');
+require_once(APPPATH.'third_party/php-gettext/streams.php');
+require_once(APPPATH.'third_party/php-gettext/gettext.php');
 
 ?>

application/libraries/Save.php

@@ -457,10 +457,7 @@ function createinsertquery($surveyid, $move, $thissurvey, $thisstep, $postedfiel
 
 		$clang = $CI->limesurvey_lang;
 		$timeadjust = $CI->config->item("timeadjust");
-
-	    require_once("classes/inputfilter/class.inputfilter_clean.php");
-	    $myFilter = new InputFilter('','',1,1,1);
-
+
 	    $fieldmap=createFieldMap($surveyid); //Creates a list of the legitimate questions for this survey
 
 	    if (isset($_SESSION['insertarray']) && is_array($_SESSION['insertarray']))