=====================

Merged 1.8 into Trunk ===================== git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@262 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
thexerteproject · Mar 1, 2012 · 9465c12 · 9465c12
2 parents 27b47d2 + 5adf449
commit 9465c12
Show file tree

Hide file tree

Showing 341 changed files with 11,195 additions and 5,764 deletions.
diff --git a/USER-FILES/1-guest2-Nottingham/data.xml b/USER-FILES/1-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/1-guest2-Nottingham/preview.xml b/USER-FILES/1-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/2-guest-Nottingham/data.xml b/USER-FILES/2-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/2-guest-Nottingham/preview.xml b/USER-FILES/2-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/2-guest2-Nottingham/data.xml b/USER-FILES/2-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/2-guest2-Nottingham/preview.xml b/USER-FILES/2-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default">		<title linkID="PG1305360189612" name="Enter Page Title" size="30"><![CDATA[Enter title here]]></title>	</learningObject>

diff --git a/USER-FILES/3-guest2-Nottingham/data.xml b/USER-FILES/3-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/3-guest2-Nottingham/preview.xml b/USER-FILES/3-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/4-guest-Nottingham/data.xml b/USER-FILES/4-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/4-guest-Nottingham/preview.xml b/USER-FILES/4-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/5-guest-Nottingham/data.xml b/USER-FILES/5-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/5-guest-Nottingham/preview.xml b/USER-FILES/5-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/6-guest-Nottingham/data.xml b/USER-FILES/6-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/6-guest-Nottingham/preview.xml b/USER-FILES/6-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/8-guest-Nottingham/data.xml b/USER-FILES/8-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/USER-FILES/8-guest-Nottingham/preview.xml b/USER-FILES/8-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+	<learningObject name="Learning Object Title" navigation="Linear" textSize="12" displayMode="default" />
diff --git a/bugfixes.txt b/bugfixes.txt
@@ -1,3 +1,7 @@
+19/10/2011
+----------
+Changes made
+
 27/1/2010
 
 setup/Page3.php

diff --git a/config.php b/config.php
@@ -1,5 +1,4 @@
 <?php
-
 //moodle integration (please view moodle_integration_readme.txt before use)
 //The require path below is the path to the moodle installation config file 
 //this needs to be the path from root rather than something like ../../moodle/config.php
@@ -29,15 +28,17 @@
 // Change this to FALSE for production sites.
 global $development;
 $development = false;
-if(php_uname('n') == 'orange') {
-    $development = true;
-}
+
 ini_set('error_reporting', 0);
 if($development) {
     ini_set('error_reporting', E_ALL);
 }
 
 if(!function_exists('_debug')) {
+    /**
+     * @param string $string - the message to write to the debug file.
+     * @param int $up - how far up the call stack we go to; this affects the line number/file name given in logging
+     */
     function _debug($string, $up = 0) {
         global $development;
         if(isset($development) && $development) {
@@ -50,13 +51,23 @@ function _debug($string, $up = 0) {
         }
     }
 }
+if(!function_exists('_load_language_file')) {
+    function _load_language_file($file_path) { 
+        if(isset($_SESSION['toolkits_language'])) {
+            $file_path = dirname(__FILE__) . '/languages/' . $_SESSION['toolkits_language'] . $file_path;
+        }
+        else {
+            // additional logic could use e.g. $_GET['language'] or $_COOKIE['language'] at this point... or something like Zend_Locale and HTTP accept headers...
+            // we'll just fall back to assuming en-gb if nothing else is specified here.
+            $file_path = dirname(__FILE__) . '/languages/en-gb/' . $file_path;
+        }
+        require_once($file_path);
+        return true;
+    }
+}
+
+if(!isset($xerte_toolkits_site)){
 
-if(!isset($xerte_toolkits_site)) {
-    //check if using external authentication integration and if not start session as usual
-    if(empty($_SESSION)) {
-        session_start();
-        $_SESSION['xertetoolkits'] = true;
-    }	
     // create new generic object to hold all our config stuff in....
     $xerte_toolkits_site = new StdClass();
 
@@ -68,12 +79,14 @@ function _debug($string, $up = 0) {
     }
 
     require_once(dirname(__FILE__) . '/database.php');
+
     require_once(dirname(__FILE__) . '/website_code/php/database_library.php');
+    if(!database_connect("","")) {
+        die("database.php isn't correctly configured; cannot connect to database; have you run /setup?");
+    }    
 
     $row = db_query_one("SELECT * FROM {$xerte_toolkits_site->database_table_prefix}sitedetails");
-    if(!$row) {
-        die("Error talking to database; perhaps it is offline?");
-    }
+
     /** 
      * Access the database to get the variables
      * @version 1.0
@@ -228,7 +241,10 @@ function _debug($string, $up = 0) {
                      array($session_handle,'xerte_session_destroy'),
                      array($session_handle,'xerte_session_clean'));
      */
-
-    $_SESSION['toolkits_sessionid'] = session_id();
+
+    session_start();
+    // fall back to en-gb if nothing is chosen elsewhere.
+    if(!isset($_SESSION['toolkits_language'])) {
+        $_SESSION['toolkits_language'] = "en-gb";
+    }
 }
-
diff --git a/data.php b/data.php
@@ -9,7 +9,9 @@
  * @package
  */
 
-require_once("config.php");
+require_once(dirname(__FILE__) . "/config.php");
+
+_load_language_file('data.inc');
 
 require $xerte_toolkits_site->php_library_path  . "template_status.php";
 require $xerte_toolkits_site->php_library_path  . "display_library.php";
@@ -102,7 +104,7 @@
       Display nothing
      */
 
-    echo "XML Sharing not set up";
+    echo DATA_XMLFAIL;
 
     dont_show_template();
 

diff --git a/data.xml b/data.xml