Fixed some issues in frontend

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11956 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 9, 2012 · 2a47016 · 2a47016
1 parent 7c1811e
commit 2a47016
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -25,8 +25,6 @@
 
 // FILE LOCATIONS
 
-// $rooturl            =   "http://{$_SERVER['HTTP_HOST']}/limesurvey"; //The root web url for your limesurvey installation.
-
 $config['rootdir']            =   getcwd(); //dirname(__FILE__); // This is the physical disk location for your limesurvey installation. Normally you don't have to touch this setting.
 // If you use IIS then you MUST enter the complete rootdir e.g. : $rootDir="C:\Inetpub\wwwroot\limesurvey"!
 // Some IIS installations also require to use forward slashes instead of backslashes, e.g.  $rootDir="C:/Inetpub/wwwroot/limesurvey"!

diff --git a/application/helpers/database_helper.php b/application/helpers/database_helper.php
@@ -14,6 +14,7 @@
  */
 function &db_execute_assoc($sql,$inputarr=false,$silent=false)
 {
+
 	try {
 		if($inputarr)
 		{
@@ -48,7 +49,7 @@ function &db_execute($sql,$inputarr=false,$silent=false)
 		$affected=false;
 	}
 
-    if (!$silent && !$affected)  {safe_die('Error executing query in db_execute_assoc:'.$sql);}
+    if (!$silent && !$affected)  {safe_die('Error executing query in db_execute:'.$sql);}
     return $affected;
 }
 

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -3959,7 +3959,6 @@ static function FinishProcessingPage()
 
         if (count($LEM->syntaxErrors) > 0 && (($LEM->debugLevel & LEM_DEBUG_LOG_SYNTAX_ERRORS_TO_DB) == LEM_DEBUG_LOG_SYNTAX_ERRORS_TO_DB))
         {
-            global $connect;
             foreach ($LEM->syntaxErrors as $err)
             {
                 $query = "INSERT INTO {{expression_errors}} (errortime,sid,gid,qid,gseq,qseq,type,eqn,prettyprint) VALUES("
@@ -4014,14 +4013,14 @@ static function ShowPageTailorings()
      */
     static function GetRelevanceAndTailoringJavaScript()
     {
-        global $rooturl;
         $now = microtime(true);
         $LEM =& LimeExpressionManager::singleton();
 
         $knownVars =& $LEM->knownVars;
 
         $jsParts=array();
         $allJsVarsUsed=array();
+        $jsParts[] = '<script type="text/javascript" src="'.Yii::app()->getConfig('publicurl').'scripts/admin/expressions/em_javascript.js"></script>';
         $jsParts[] = "\n<script type='text/javascript'>\n<!--\n";
         $jsParts[] = "var LEMgid=" . $LEM->groupNum . ";\n";    // current group num so can compute isOnCurrentPage
         $jsParts[] = "var LEMallOnOnePage=" . (($LEM->allOnOnePage) ? 'true' : 'false') . ";\n";
@@ -4720,7 +4719,6 @@ public static function ShowStackTrace($msg=NULL,&$args=NULL)
     private function gT($string)
     {
         // eventually replace this with i8n
-        global $clang;
         if (isset($clang))  {
             return $clang->gT($string);
         }
@@ -4989,7 +4987,6 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
         // SQ1, name [scale], relevance [validation], text
         // A1, code, assessment_value, text
         // End Message
-        global $rooturl;
 
         $LEM =& LimeExpressionManager::singleton();
 

diff --git a/application/libraries/Save.php b/application/libraries/Save.php
@@ -472,7 +472,6 @@ function createinsertquery($surveyid, $move, $thissurvey, $thisstep, $postedfiel
     {
 
 
-
         global $thistpl;
 
         $clang = Yii::app()->lang;
@@ -735,7 +734,7 @@ function createinsertquery($surveyid, $move, $thissurvey, $thisstep, $postedfiel
                                 {
                                     $qfield = $_POST[$field];
                                 }
-                                $query .= db_quote_id($field)." = ".$qfield.",";
+                                $query .= db_quote_id($field)." = ".Yii::app()->db->quoteValue($qfield).",";
                             }
                         }
                     }