[Web-erp-svn] SF.net SVN: web-erp:[7792] trunk/includes

[<ex...@us...>]

Revision: 7792
          http://sourceforge.net/p/web-erp/reponame/7792
Author:   exsonqu
Date:     2017-06-21 04:02:03 +0000 (Wed, 21 Jun 2017)
Log Message:
-----------
21/06/17 Exson: Fixed bug of Add menu features. 

Modified Paths:
--------------
    trunk/includes/GetConfig.php
    trunk/includes/header.php
    trunk/includes/session.php

Modified: trunk/includes/GetConfig.php
===================================================================
--- trunk/includes/GetConfig.php	2017-06-20 11:03:31 UTC (rev 7791)
+++ trunk/includes/GetConfig.php	2017-06-21 04:02:03 UTC (rev 7792)
@@ -115,6 +115,15 @@
 		$_SESSION['SMTPSettings']['timeout']=$myrow['timeout'];
 		$_SESSION['SMTPSettings']['auth']=$myrow['auth'];
 	}
+	//Add favorite scripts 
+	$sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'";
+	$result = DB_query($sql);
+	if (DB_num_rows($result)>0) {
+		while ($myrow = DB_fetch_array($result)) {
+			$_SESSION['Favourites'][$myrow['href']] = $myrow['caption'];
+		}
+	}
+
 } //end if force reload or not set already
 
 
@@ -138,4 +147,4 @@
 $RadioBeaconFTP_user_name = RadioBeacon ftp server user name
 $RadionBeaconFTP_user_pass = Radio Beacon remote ftp server password
 */
-?>
\ No newline at end of file
+?>

Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php	2017-06-20 11:03:31 UTC (rev 7791)
+++ trunk/includes/header.php	2017-06-21 04:02:03 UTC (rev 7792)
@@ -77,8 +77,8 @@
 		}
 		if (isset($_POST['DelFromMenu'])) {
 			unset($_SESSION['Favourites'][$_POST['ScriptName']]);
-			}
-			if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
+		}
+		if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
 					echo '<ul>';
 					foreach ($_SESSION['Favourites'] as $url=>$ttl) {
 						echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>';
@@ -85,7 +85,7 @@
 
 			}
 			echo '</ul>';
-			}
+		}
 		echo '</li>'; //take off inline formatting, use CSS instead ===HJ===
 
 		if (count($_SESSION['AllowedPageSecurityTokens'])>1){

Modified: trunk/includes/session.php
===================================================================
--- trunk/includes/session.php	2017-06-20 11:03:31 UTC (rev 7791)
+++ trunk/includes/session.php	2017-06-21 04:02:03 UTC (rev 7792)
@@ -88,9 +88,10 @@
 		$ErrMsg = _('Failed to retrieve favorites');
 		$result = DB_query($sql,$ErrMsg);
 		if (DB_num_rows($result)>0) {
+			$sql = array();
 			while ($myrow = DB_fetch_array($result)) {
 				if (!isset($_SESSION['Favourites'][$myrow['href']])) {//The script is removed;
-					$sql[] = "DELECT FROM favourites WHERE href='" . $myrow['href'] . "' AND userid='" . $_SESSION['UserID'] . "'";
+					$sql[] = "DELETE FROM favourites WHERE href='" . $myrow['href'] . "' AND userid='" . $_SESSION['UserID'] . "'";
 
 				} else {
 					unset($_SESSION['Favourites'][$myrow['href']]);
@@ -110,7 +111,9 @@
 			foreach ($sql as $sq) {
 				$result = DB_query($sq);
 			}
-			$result = DB_query($sqli);
+			if (isset($sqli)) {
+				$result = DB_query($sqli);
+			}
 		} else {
 		
 			$sqli = "INSERT INTO favourites(href,caption,userid) VALUES ";
@@ -122,7 +125,9 @@
 				$sqli .= "('" . $url . "', '" . $ttl . "','" . $_SESSION['UserID'] . "')";
 				$k++;
 			}
-			$result = DB_query($sqli);
+			if ($k) {
+				$result = DB_query($sqli);
+			}
 		}
 }