Fixed "Disallowed Key Characters" error when creating new survey.

Fixed "undefined var" error after logout. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10323 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jun 22, 2011 · baf966e · baf966e
1 parent 2ae560b
commit baf966e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.project b/.project
@@ -5,7 +5,18 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.editor.php.aptanaPhpBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.aptana.editor.php.phpNature</nature>
 	</natures>
 </projectDescription>
diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php
@@ -10,13 +10,11 @@
  * other free or open source software licenses.
  * See COPYRIGHT.php for copyright notices and details.
  * 
- * @package	LimeSurvey
- * 
  * $Id$
  * 
  */
 
-/*
+/**
  * Authentication Controller
  *
  * This controller performs authentication
@@ -26,7 +24,7 @@
  */
 class Authentication extends AdminController {
 
-	/*
+	/**
 	 * Constructor
 	 */
 	function __construct()
@@ -35,15 +33,15 @@ function __construct()
 
 	}
 
-	/*
+	/**
 	 * Default Controller Action
 	 */
 	function index()
 	{
 		redirect('/admin', 'refresh');
 	}
 
-	/*
+	/**
 	 * Show login screen and parse login data
 	 */
 	function login()

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -5307,8 +5307,8 @@ function killSession()  //added by Dennis
 	$CI->session->sess_destroy();
 
     // making dummy session variable check to destroy session completely!
-    if($this->session->userdata('loginID'))
-    $this->session->unset_userdata('loginID');
+    if($CI->session->userdata('loginID'))
+    $CI->session->unset_userdata('loginID');
 
    /* // Delete the Session Cookie
     $CookieInfo = session_get_cookie_params();

diff --git a/application/views/admin/Survey/superview/SuperPresentation_view.php b/application/views/admin/Survey/superview/SuperPresentation_view.php
@@ -348,13 +348,13 @@
                 if (empty($sel_showqnc['B']) && empty($sel_showqnc['C']) && empty($sel_showqnc['N']) && empty($sel_showqnc['X'])) {
 		    	$sel_showqnc['X'] = ' selected="selected"';
 		    }; ?>
-		    \n\t<li>\n\t\t<label for="showqnumcode"><?php echo $clang->gT('Show question number and/or code'); ?></label>\n\t\t
-		    <select id=\"showqnumcode\" name=\"showqnumcode\">\n\t\t\t
-		    <option value="B"<?php echo $sel_showqnc['B'].'>'.$clang->gT('Show both'); ?></option>\n\t\t\t
-		    <option value="N"<?php echo $sel_showqnc['N'].'>'.$clang->gT('Show question number only'); ?></option>\n\t\t\t
-		    <option value="C"<?php echo $sel_showqnc['C'].'>'.$clang->gT('Show question code only'); ?></option>\n\t\t\t
-		    <option value="X"<?php echo $sel_showqnc['X'].'>'.$clang->gT('Hide both'); ?></option>\n\t\t
-		    </select>\n\t</li>
+		    <li><label for="showqnumcode"><?php echo $clang->gT('Show question number and/or code'); ?></label>
+		    <select id="showqnumcode" name="showqnumcode">
+		    <option value="B"<?php echo $sel_showqnc['B'].'>'.$clang->gT('Show both'); ?></option>
+		    <option value="N"<?php echo $sel_showqnc['N'].'>'.$clang->gT('Show question number only'); ?></option>
+		    <option value="C"<?php echo $sel_showqnc['C'].'>'.$clang->gT('Show question code only'); ?></option>
+		    <option value="X"<?php echo $sel_showqnc['X'].'>'.$clang->gT('Hide both'); ?></option>
+		    </select></li>
 		    <?php unset($sel_showqnc,$set_showqnc);
 		    break;
 	    }; ?>