diff --git a/USER-FILES/1-guest2-Nottingham/data.xml b/USER-FILES/1-guest2-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/1-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/1-guest2-Nottingham/preview.xml b/USER-FILES/1-guest2-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/1-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/2-guest-Nottingham/data.xml b/USER-FILES/2-guest-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/2-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/2-guest-Nottingham/preview.xml b/USER-FILES/2-guest-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/2-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/2-guest2-Nottingham/data.xml b/USER-FILES/2-guest2-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/2-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/2-guest2-Nottingham/preview.xml b/USER-FILES/2-guest2-Nottingham/preview.xml
new file mode 100644
index 0000000000..90772cf455
--- /dev/null
+++ b/USER-FILES/2-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/3-guest2-Nottingham/data.xml b/USER-FILES/3-guest2-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/3-guest2-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/3-guest2-Nottingham/preview.xml b/USER-FILES/3-guest2-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/3-guest2-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/4-guest-Nottingham/data.xml b/USER-FILES/4-guest-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/4-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/4-guest-Nottingham/preview.xml b/USER-FILES/4-guest-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/4-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/5-guest-Nottingham/data.xml b/USER-FILES/5-guest-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/5-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/5-guest-Nottingham/preview.xml b/USER-FILES/5-guest-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/5-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/6-guest-Nottingham/data.xml b/USER-FILES/6-guest-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/6-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/6-guest-Nottingham/preview.xml b/USER-FILES/6-guest-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/6-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/8-guest-Nottingham/data.xml b/USER-FILES/8-guest-Nottingham/data.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/8-guest-Nottingham/data.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/USER-FILES/8-guest-Nottingham/preview.xml b/USER-FILES/8-guest-Nottingham/preview.xml
new file mode 100644
index 0000000000..1fb08e5e9b
--- /dev/null
+++ b/USER-FILES/8-guest-Nottingham/preview.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/bugfixes.txt b/bugfixes.txt
index 93d5605e8e..64e5e195df 100644
--- 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
index e32ad0fa60..2fc01137dd 100644
--- a/config.php
+++ b/config.php
@@ -1,5 +1,4 @@
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
index 16f6ffd6ac..003a90a58b 100644
--- 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
deleted file mode 100644
index 317658b03a..0000000000
--- a/data.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/demo.php b/demo.php
new file mode 100644
index 0000000000..356924db0e
--- /dev/null
+++ b/demo.php
@@ -0,0 +1,276 @@
+php_library_path . "login_library.php";
+
+include $xerte_toolkits_site->php_library_path . "display_library.php";
+
+$_SESSION['toolkits_firstname'] = "Guest";
+
+$_SESSION['toolkits_surname'] = "User";
+
+include $xerte_toolkits_site->php_library_path . "user_library.php";
+
+$_SESSION['toolkits_logon_username'] = "guest";
+
+$mysql_id=database_connect("index.php database connect success","index.php database connect fail");
+
+/*
+ * Check to see if this is a users' first time on the site
+ */
+
+if(check_if_first_time($_SESSION['toolkits_logon_username'])){
+
+ /*
+ * create the user a new id
+ */
+
+ $_SESSION['toolkits_logon_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
+
+ /*
+ * create a virtual root folder for this user
+ */
+
+ create_a_virtual_root_folder();
+
+}else{
+
+ /*
+ * User exists so update the user settings
+ */
+
+ $_SESSION['toolkits_logon_id'] = get_user_id();
+
+ update_user_logon_time();
+
+}
+
+recycle_bin();
+
+/*
+ * Output the main page, including the user's and blank templates
+ */
+?>
+
+
+
+
+
+ site_title; ?>
+
+
+ // JAVASCRIPT library for fixed variables\n // management of javascript is set up here\n // SITE SETTINGS\n";
+
+echo "var site_url = \"" . $xerte_toolkits_site->site_url . "\";\n";
+
+echo "var site_apache = \"" . $xerte_toolkits_site->apache . "\";\n";
+
+echo "var properties_ajax_php_path = \"website_code/php/properties/\";\n var management_ajax_php_path = \"website_code/php/management/\";\n var ajax_php_path = \"website_code/php/\";\n";
+
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pod_one; ?>
+
+
+
+ pod_two; ?>
+
+
+
+
+
+
+
+ copyright; ?>
+
+
+
+
+
diff --git a/demo.txt b/demo.txt
index d3e449a10a..5f416f38a4 100644
--- a/demo.txt
+++ b/demo.txt
@@ -1,17 +1,12 @@
php_library_path . "display_library.php";
-
-// fake our authentication tokens etc.
-$_SESSION['toolkits_firstname'] = "Guest";
-$_SESSION['toolkits_surname'] = "User 2";
-include $xerte_toolkits_site->php_library_path . "user_library.php";
-
-$_SESSION['toolkits_logon_username'] = "guest2";
+include $xerte_toolkits_site->php_library_path . "login_library.php";
+include $xerte_toolkits_site->php_library_path . "display_library.php";
+ /*
+ * Get some user details back from LDAP
+ */
-/*
- * Check to see if this is a users' first time on the site
- */
+ $_SESSION['toolkits_firstname'] = "Guest";
+ $_SESSION['toolkits_surname'] = "User 2";
if(check_if_first_time($_SESSION['toolkits_logon_username'])){
- /*
- * create the user a new id
- */
+ $mysql_id=database_connect("index.php database connect success","index.php database connect fail");
- $_SESSION['toolkits_logon_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
+ $_SESSION['toolkits_logon_username'] = "guestuser2";
- /*
- * create a virtual root folder for this user
- */
+ /*
+ * Check to see if this is a users' first time on the site
+ */
- create_a_virtual_root_folder();
+ if(check_if_first_time($_SESSION['toolkits_logon_username'])===FALSE){
+
+ /*
+ * create the user a new id
+ */
-}else{
+ $_SESSION['toolkits_logon_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
- /*
- * User exists so update the user settings
- */
-
- $_SESSION['toolkits_logon_id'] = get_user_id();
-
- update_user_logon_time();
+ /*
+ * create a virtual root folder for this user
+ */
}
-recycle_bin();
+ }else{
+
+ /*
+ * User exists so update the user settings
+ */
/*
* Output the main page, including the user's and blank templates
*/
-echo file_get_contents($xerte_toolkits_site->website_code_path . "management_headers");
+ update_user_logon_time();
+ }
+
echo "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pod_one; ?>
+
+
+
+ pod_two; ?>
+
+
+
+
+
+
+
+ copyright; ?>
+
+
+
+
+