Suggest leaving development = true in config.php on until dev finished

Demo.txt fixed to allow for login bug in preview nesting resolved lots of require_once added to the PHP folder files - suspect more git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/trunk@265 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
thexerteproject · Mar 2, 2012 · e2d9fb9 · e2d9fb9
1 parent 3c2eb88
commit e2d9fb9
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 57 deletions.
diff --git a/config.php b/config.php
@@ -27,7 +27,7 @@
 
 // Change this to FALSE for production sites.
 global $development;
-$development = false;
+$development = true;
 
 ini_set('error_reporting', 0);
 if($development) {
@@ -54,7 +54,7 @@ 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;
+            $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...

diff --git a/demo.txt b/demo.txt
@@ -16,6 +16,7 @@ _load_language_file("/index.inc");
 
 
 include $xerte_toolkits_site->php_library_path . "login_library.php";
+include $xerte_toolkits_site->php_library_path . "user_library.php";
 include $xerte_toolkits_site->php_library_path . "display_library.php";
 
 	/*
@@ -24,12 +25,11 @@ include $xerte_toolkits_site->php_library_path . "display_library.php";
 
 	$_SESSION['toolkits_firstname'] = "Guest";
 	$_SESSION['toolkits_surname'] = "User 2";
-
-if(check_if_first_time($_SESSION['toolkits_logon_username'])){
+	$_SESSION['toolkits_logon_username'] = "guest_user";
 
 	$mysql_id=database_connect("index.php database connect success","index.php database connect fail");	
 
-	$_SESSION['toolkits_logon_username'] = "guestuser2";
+	$_SESSION['toolkits_logon_id'] = "guestuser2";
 
 	/*
 	 * Check to see if this is a users' first time on the site
@@ -47,7 +47,6 @@ if(check_if_first_time($_SESSION['toolkits_logon_username'])){
 		 *   create a virtual root folder for this user
 		 */
 
-}
 
 	}else{
 
@@ -63,8 +62,6 @@ if(check_if_first_time($_SESSION['toolkits_logon_username'])){
 
 	}
 
-echo "<script type=\"text/javascript\"> // JAVASCRIPT library for fixed variables\n // management of javascript is set up here\n // SITE SETTINGS\n";
-
 	/*
 	 * Output the main page, including the user's and blank templates
 	 */
@@ -122,7 +119,7 @@ body_scroll handles the calculation of the documents actual height in IE.
 
 -->
 
-<body onload="javascript:sort_display_settings()"  onselectstart="return false;" onscroll="body_scroll()">
+<body onload="javascript:sort_display_settings()" onselectstart="return false;" onscroll="body_scroll()">
 
 <!-- 
 

diff --git a/preview.php b/preview.php
@@ -35,79 +35,87 @@
 
 		$query_for_preview_content_strip = str_replace("\" . \$xerte_toolkits_site->database_table_prefix . \"", $xerte_toolkits_site->database_table_prefix, $xerte_toolkits_site->play_edit_preview_query);
 
-if(is_numeric($_GET['template_id'])){
+		if(is_numeric($_GET['template_id'])){
 
-    $safe_template_id = mysql_real_escape_string($_GET['template_id']);
+			$safe_template_id = mysql_real_escape_string($_GET['template_id']);
 
-    $mysql_id=database_connect("Preview database connect successful","Preview database connect failed");
-
-    /*
-     * Standard query
-     */
+			$mysql_id=database_connect("Preview database connect successful","Preview database connect failed");
 
 			/*
-			 * Check users has some rights to this template
+			 * Standard query
 			 */
 
-    $query_for_preview_content = str_replace("TEMPLATE_ID_TO_REPLACE", $safe_template_id, $query_for_preview_content_strip);	
+			$query_for_preview_content = str_replace("TEMPLATE_ID_TO_REPLACE", $safe_template_id, $query_for_preview_content_strip);	
 
-				$query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $row['user_id'] . "\"";
+			$query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $_SESSION['toolkits_logon_id'] . "\"";
 
-				$query_for_username_response = mysql_query($query_for_username);
+			$query_for_username_response = mysql_query($query_for_username);
+
+			$query_for_preview_content_response = mysql_query($query_for_preview_content);
+
+			$row = mysql_fetch_array($query_for_preview_content_response);
 
-				$row_username = mysql_fetch_array($query_for_username_response);
+			$row_username = mysql_fetch_array($query_for_username_response);
+
+			if(mysql_num_rows($query_for_preview_content_response)!=0){
 
-    if(mysql_num_rows($query_for_preview_content_response)!=0){
+				require $xerte_toolkits_site->root_file_path . "modules/" . $row['template_framework'] . "/preview.php";
 
 				show_preview_code($row, $row_username);		
 
-				/*
-				 * User might be admin so show code then
-				 */	
-
 			}else if(is_user_admin()){
 
-        if(has_rights_to_this_template($row['template_id'], $_SESSION['toolkits_logon_id'])){
+				if(has_rights_to_this_template($row['template_id'], $_SESSION['toolkits_logon_id'])){
 
-				$query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $row['user_id'] . "\"";
+					$query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $_SESSION['toolkits_logon_id'] . "\"";
 
-				$query_for_username_response = mysql_query($query_for_username);
+					$query_for_username_response = mysql_query($query_for_username);
 
-				$row_username = mysql_fetch_array($query_for_username_response);
+					$row_username = mysql_fetch_array($query_for_username_response);
 
-            $query_for_username_response = mysql_query($query_for_username);
+					$query_for_username_response = mysql_query($query_for_username);
 
-            $row_username = mysql_fetch_array($query_for_username_response);
+					$row_username = mysql_fetch_array($query_for_username_response);
+
+					require $xerte_toolkits_site->root_file_path . "modules/" . $row['template_framework'] . "/preview.php";
 
-			}		
+					show_preview_code($row, $row_username);	
 
-		}else{
+				}		
 
-			/*
-			 * No rights, show error
-			 */
+			}else{
 
-			echo PREVIEW_RESOURCE_FAIL;
+				/*
+				* No rights, show error
+				*/
 
-        }else if(is_user_admin()){
+				echo PREVIEW_RESOURCE_FAIL;
+
+			}
+
+		}else if(is_user_admin()){
 
-            $mysql_id=database_connect("Preview database connect successful","Preview database connect failed");
+				$mysql_id=database_connect("Preview database connect successful","Preview database connect failed");
 
-            $query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $row['user_id'] . "\"";
+				$query_for_username = "select username from " . $xerte_toolkits_site->database_table_prefix . "logindetails where login_id=\"" . $_SESSION['toolkits_logon_id'] . "\"";
 
-		echo PREVIEW_RESOURCE_FAIL;
+				echo PREVIEW_RESOURCE_FAIL;
 
-            require $xerte_toolkits_site->root_file_path . "modules/" . $row['template_framework'] . "/preview.php";
+				require $xerte_toolkits_site->root_file_path . "modules/" . $row['template_framework'] . "/preview.php";
 
-            show_preview_code($row, $row_username);	
+				show_preview_code($row, $row_username);	
 
-}else{
+			}else{
 
-	echo PREVIEW_RESOURCE_FAIL;
+				echo PREVIEW_RESOURCE_FAIL;
 
-	die();
+				die();
 
-}
+			}
+
+		}
+
+	}
 
 
 ?>
diff --git a/website_code/php/templates/new_template.php b/website_code/php/templates/new_template.php
@@ -12,9 +12,9 @@
 
 require_once("../../../config.php");
 
-include "../user_library.php";
-include "../template_library.php";
-include "../file_library.php";
+require_once("../user_library.php");
+require_once("../template_library.php");
+require_once("../file_library.php");
 
 /*
  * get the root folder for this user

diff --git a/website_code/php/templates/sort_templates.php b/website_code/php/templates/sort_templates.php
@@ -6,8 +6,8 @@
 // Calls the function from the display library
 
 require_once("../../../config.php");
-include "../display_library.php";
-include "../user_library.php";
+require_once("../display_library.php");
+require_once("../user_library.php");
 
 $database_connect_id = database_connect("your templates database connect success", "your templates database connect failed");
 

diff --git a/website_code/php/templates/your_templates.php b/website_code/php/templates/your_templates.php
@@ -7,10 +7,10 @@
 
 require_once("../../../config.php");
 
-include "../display_library.php";
+require_once("../display_library.php");
 
-include "../display_library.php";
-include "../user_library.php";
+require_once("../display_library.php");
+require_once("../user_library.php");
 
 $_SESSION['sort_type'] = "date_down";
 

diff --git a/website_code/php/user_library.php b/website_code/php/user_library.php
@@ -211,7 +211,7 @@ function update_user_logon_time(){
 
     if(mysql_query($query)){
 
-        receive_message($_SESSION['toolkits_logon_username'], "ADMIN", "SUCCESS", "Succeeded in updating users login time " . $_SESSION['toolkits_logon_username'], "Succeeded in updating users login time " .$_SESSION['toolkits_logon_id']);
+        receive_message($_SESSION['toolkits_logon_username'], "ADMIN", "SUCCESS", "Succeeded in updating users login time " . $_SESSION['toolkits_logon_username'], "Succeeded in updating users login time " . $_SESSION['toolkits_logon_id']);
 
     }else{