1. http://www.atutor.ca/atutor/mantis/view.php?id=4285

2. fix "delete course"

diff --git a/docs/include/classes/DAO/CoursesDAO.class.php b/docs/include/classes/DAO/CoursesDAO.class.php
index e675786..d66eec9 100644 (file)
--- a/docs/include/classes/DAO/CoursesDAO.class.php
+++ b/docs/include/classes/DAO/CoursesDAO.class.php
@@ -161,10 +161,6 @@ class CoursesDAO extends DAO {
                         WHERE test_id in (SELECT test_id FROM ".TABLE_PREFIX."tests WHERE course_id = ".$courseID.")";
                $this->execute($sql);
                
-               $sql = "DELETE FROM ".TABLE_PREFIX."tests_groups 
-                        WHERE test_id in (SELECT test_id FROM ".TABLE_PREFIX."tests WHERE course_id = ".$courseID.")";
-               $this->execute($sql);
-               
                $sql = "DELETE FROM ".TABLE_PREFIX."tests_questions WHERE course_id = ".$courseID;
                $this->execute($sql);
                                

diff --git a/docs/include/classes/Language/LanguageManager.class.php b/docs/include/classes/Language/LanguageManager.class.php
index 84773e5..6b3af04 100644 (file)
--- a/docs/include/classes/Language/LanguageManager.class.php
+++ b/docs/include/classes/Language/LanguageManager.class.php
@@ -126,7 +126,7 @@ class LanguageManager {
        * @see          getLanguage()
        */
        function getMyLanguage() {
-               global $addslashes, $db; 
+               global $addslashes, $db, $_config; 
 
                if (isset($_GET) && !empty($_GET['lang']) && isset($this->availableLanguages[$_GET['lang']])) {
                        $language = $this->getLanguage($_GET['lang']);
@@ -134,17 +134,16 @@ class LanguageManager {
                        if ($language) {
                                return $language;
                        }
-
                } 
-
+               
                if (isset($_POST) && !empty($_POST['lang']) && isset($this->availableLanguages[$_POST['lang']])) {
                        $language = $this->getLanguage($_POST['lang']);
 
                        if ($language) {
                                return $language;
                        }
+               }
 
-               } 
                if (isset($_SESSION) && isset($_SESSION['lang']) && !empty($_SESSION['lang']) && isset($this->availableLanguages[$_SESSION['lang']])) {
                        $language = $this->getLanguage($_SESSION['lang']);
 
@@ -153,8 +152,19 @@ class LanguageManager {
                        }
                }
 
-               if (!empty($_SERVER['HTTP_ATCEPT_LANGUAGE'])) {
+               // Didn't catch any valid lang : we use the default settings
+               if (isset($_config['default_language'])) $default_lang = $_config['default_language'];
+               else $default_lang = DEFAULT_LANGUAGE_CODE;
+               
+               if (isset($this->availableLanguages[$default_lang])) {
+                       $language = $this->getLanguage($default_lang, DEFAULT_CHARSET);
+
+                       if ($language) {
+                               return $language;
+                       }
+               }
 
+               if (!empty($_SERVER['HTTP_ATCEPT_LANGUAGE'])) {
                        // Language is not defined yet :
                        // try to find out user's language by checking its HTTP_ATCEPT_LANGUAGE
                        $accepted    = explode(',', $_SERVER['HTTP_ATCEPT_LANGUAGE']);
@@ -172,7 +182,6 @@ class LanguageManager {
                }
                
                if (!empty($_SERVER['HTTP_USER_AGENT'])) {
-
                        // Language is not defined yet :
                        // try to find out user's language by checking its HTTP_USER_AGENT
                        foreach ($this->availableLanguages as $codes) {
@@ -184,15 +193,6 @@ class LanguageManager {
                        }
                }
 
-               // Didn't catch any valid lang : we use the default settings
-               if (isset($this->availableLanguages[DEFAULT_LANGUAGE_CODE])) {
-                       $language = $this->getLanguage(DEFAULT_LANGUAGE_CODE, DEFAULT_CHARSET);
-
-                       if ($language) {
-                               return $language;
-                       }
-               }
-               
                // else pick one at random:
                reset($this->availableLanguages);
                $uknown_language = current($this->availableLanguages);

diff --git a/docs/include/vitals.inc.php b/docs/include/vitals.inc.php
index b86b35d..b9bd0d9 100644 (file)
--- a/docs/include/vitals.inc.php
+++ b/docs/include/vitals.inc.php
@@ -117,24 +117,24 @@ $IllegalExtentions = explode('|',$_config['illegal_extentions']);
 /***** end loading $_config *****/
 
 /***** 5. start language block *****/
-       // set current language
-       require(TR_INCLUDE_PATH . 'classes/Language/LanguageManager.class.php');
-       $languageManager = new LanguageManager();
+// set current language
+require(TR_INCLUDE_PATH . 'classes/Language/LanguageManager.class.php');
+$languageManager = new LanguageManager();
 
-       $myLang = $languageManager->getMyLanguage();
+$myLang = $languageManager->getMyLanguage();
 
-       if ($myLang === FALSE) {
-               echo 'There are no languages installed!';
-               exit;
-       }
+if ($myLang === FALSE) {
+       echo 'There are no languages installed!';
+       exit;
+}
 
-       $myLang->saveToSession();
+$myLang->saveToSession();
 
-       /* set right-to-left language */
-       $rtl = '';
-       if ($myLang->isRTL()) {
-               $rtl = 'rtl_'; /* basically the prefix to a rtl variant directory/filename. eg. rtl_atee */
-       }
+/* set right-to-left language */
+$rtl = '';
+if ($myLang->isRTL()) {
+       $rtl = 'rtl_'; /* basically the prefix to a rtl variant directory/filename. eg. rtl_atee */
+}
 /***** end language block ****/
 
 /***** 6. load common libraries *****/

diff --git a/docs/system/index.php b/docs/system/index.php
index bd212e0..739af03 100644 (file)
--- a/docs/system/index.php
+++ b/docs/system/index.php
@@ -55,7 +55,7 @@ if (isset($_POST['cancel'])) {
                if (!$msg->containsErrors()) {
                        $_config['site_name'] = $addslashes($_POST['site_name']);
                        $_config['contact_email'] = $addslashes($_POST['contact_email']);
-                       $_config['default_language'] = $addslashes($_POST['default_language']);
+                       $_config['default_language'] = $_SESSION['lang'] = $addslashes($_POST['default_language']);
                        $_config['max_file_size'] = $_POST['max_file_size'];
                        $_config['illegal_extentions'] = $addslashes($_POST['illegal_extentions']);
                        $_config['latex_server'] = $addslashes($_POST['latex_server']);

diff --git a/docs/themes/default/system/index.tmpl.php b/docs/themes/default/system/index.tmpl.php
index 7678d2f..5b7a1f4 100644 (file)
--- a/docs/themes/default/system/index.tmpl.php
+++ b/docs/themes/default/system/index.tmpl.php
@@ -29,7 +29,7 @@
  * submit_button_text: button text for submit button. "Register" at registration, "Save" at admin creating/editing user
  */
 
-global $onload;
+global $onload, $_config;
 $onload = 'document.form.site_name.focus();';
 
 require(TR_INCLUDE_PATH.'header.inc.php'); 
@@ -87,7 +87,7 @@ require(TR_INCLUDE_PATH.'header.inc.php');
                                $select_lang = $_POST['default_language']; 
                        } else { 
                                $select_lang = $_config['default_language'];
-                       } 
+                       }
                        $this->languageManager->printDropdown($select_lang, 'default_language', 'default_language'); ?>
                        </td>
                </tr>