change create_user_id to take parameters; merge from trunk

git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/branches/1.8@190 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
thexerteproject · Oct 25, 2011 · 8188622 · 8188622
1 parent 77afeb3
commit 8188622
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 195 deletions.
diff --git a/demo.php b/demo.php
@@ -28,7 +28,7 @@
      *	create the user a new id			
      */
 
-    $_SESSION['toolkits_logon_id'] = create_user_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

diff --git a/demo.txt b/demo.txt
@@ -1,8 +1,13 @@
 <?php
 
-require_once("config.php");
+/** 
+ * This script is designed to replace 'index.php' and is idea for e.g. use with XAMMP. 
+ * When this script is in place, NO AUTHENTICATION is required to use Xerte. 
+ * All users will appear as 'Guest User 2'.
+ *
+ */
 
-session_start();
+require_once("config.php");
 
 /**
  * 
@@ -14,24 +19,16 @@ session_start();
  * @package
  */
 
-/**
- *  Create the basic session
- */
-
-include $xerte_toolkits_site->php_library_path . "login_library.php";
-
 include $xerte_toolkits_site->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";
 
-$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
@@ -43,7 +40,7 @@ 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_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
 
     /*
      *   create a virtual root folder for this user
@@ -79,7 +76,7 @@ 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";
 
-echo file_get_contents($xerte_toolkits_site->website_code_path . "management_top");
+echo login_page_format_top(file_get_contents($xerte_toolkits_site->website_code_path . "management_top"));
 
 list_users_projects("data_down");
 

diff --git a/index.php b/index.php
@@ -226,7 +226,7 @@ function show_page($extra,$xerte_toolkits_site){
                  *	create the user a new id			
                  */
 
-                $_SESSION['toolkits_logon_id'] = create_user_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

diff --git a/integration.php b/integration.php
@@ -43,7 +43,7 @@
      *   create the user a new id			
      */
 
-    $_SESSION['toolkits_logon_id'] = create_user_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

diff --git a/integration.txt b/integration.txt
@@ -42,7 +42,8 @@ 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_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
+
 
     /*
      *   create a virtual root folder for this user

diff --git a/switch.txt b/switch.txt
@@ -130,7 +130,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                  *	create the user a new id			
                  */
 
-                $_SESSION['toolkits_logon_id'] = create_user_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

diff --git a/webctlink.php b/webctlink.php
@@ -73,7 +73,7 @@
      *   create the user a new id			
      */
 
-    $_SESSION['toolkits_logon_id'] = create_user_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

diff --git a/webctlink.txt b/webctlink.txt
@@ -75,7 +75,8 @@ 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_id'] = create_user_id($_SESSION['toolkits_logon_username'], $_SESSION['toolkits_firstname'], $_SESSION['toolkits_surname']);
+
 
     /*
      *   create a virtual root folder for this user