merge master

1 files changed, 48 insertions, 29 deletions

diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php
index 95c4384..b023840 100644
--- a/src/SemanticScuttle/constants.php
+++ b/src/SemanticScuttle/constants.php
@@ -1,34 +1,51 @@
 <?php
-/*
+/**
  * Define constants used in all the application.
  * Some constants are based on variables from configuration file.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category    Bookmarking
+ * @package     SemanticScuttle
+ * @subcategory Base
+ * @author      Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author      Christian Weiske <cweiske@cweiske.de>
+ * @author      Eric Dane <ericdane@users.sourceforge.net>
+ * @license     GPL http://www.gnu.org/licenses/gpl.html
+ * @link        http://sourceforge.net/projects/semanticscuttle
  */
 
 // Debug managament
-if(isset($GLOBALS['debugMode'])) {
-	define('DEBUG_MODE', $GLOBALS['debugMode']);
-	define('DEBUG_EXTRA', $GLOBALS['debugMode']); // Constant used exclusively into db/ directory
+if (isset($GLOBALS['debugMode'])) {
+    define('DEBUG_MODE', $GLOBALS['debugMode']);
+    // Constant used exclusively into db/ directory
+    define('DEBUG_EXTRA', $GLOBALS['debugMode']);
 }
 
 // Determine the base URL as ROOT
 if (!isset($GLOBALS['root'])) {
-	$pieces = explode('/', $_SERVER['SCRIPT_NAME']);
-	
-	$rootTmp = '/';
-	foreach ($pieces as $piece) {
-		//we eliminate possible sscuttle subfolders (like gsearch for example)
-		if ($piece != '' && !strstr($piece, '.php') && $piece != 'gsearch') {
-			$rootTmp .= $piece .'/';
-		}
-	}
-	if (($rootTmp != '/') && (substr($rootTmp, -1, 1) != '/')) {
-		$rootTmp .= '/';
-	}
-
-	define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp);
+    $pieces = explode('/', $_SERVER['SCRIPT_NAME']);
+
+    $rootTmp = '/';
+    foreach ($pieces as $piece) {
+        //we eliminate possible sscuttle subfolders (like gsearch for example)
+        if ($piece != '' && !strstr($piece, '.php')
+            && $piece != 'gsearch' && $piece != 'ajax'
+        ) {
+            $rootTmp .= $piece .'/';
+        }
+    }
+    if (($rootTmp != '/') && (substr($rootTmp, -1, 1) != '/')) {
+        $rootTmp .= '/';
+    }
+
+    define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp);
 } else {
-	define('ROOT', $GLOBALS['root']);
+    define('ROOT', $GLOBALS['root']);
 }
+define('ROOT_JS', ROOT . 'js/jstree-1.0-rc2/');
 
 // Error codes
 define('GENERAL_MESSAGE', 200);
@@ -44,19 +61,21 @@ define('PAGE_WATCHLIST', "watchlist");
 
 // Miscellanous
 
-// INSTALLATION_ID is based on directory DB and used as prefix (in session and cookie) to prevent mutual login for different installations on the same host server
+// INSTALLATION_ID is based on directory DB and used as prefix
+// (in session and cookie) to prevent mutual login for different
+// installations on the same host server
 define('INSTALLATION_ID', md5($GLOBALS['dbname'].$GLOBALS['tableprefix']));
 
 // Correct bugs with PATH_INFO (maybe for Apache 1 or CGI) -- for 1&1 host...
 if (isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO'])) {
-	if(strlen($_SERVER["PATH_INFO"])<strlen($_SERVER["ORIG_PATH_INFO"])) {
-		$_SERVER["PATH_INFO"] = $_SERVER["ORIG_PATH_INFO"];
-	}
-	if(strcasecmp($_SERVER["PATH_INFO"], $_SERVER["SCRIPT_NAME "]) == 0) {
-		unset($_SERVER["PATH_INFO"]);
-	}
-	if(strpos($_SERVER["PATH_INFO"], '.php') !== false) {
-		unset($_SERVER["PATH_INFO"]);
-	}
+    if (strlen($_SERVER["PATH_INFO"])<strlen($_SERVER["ORIG_PATH_INFO"])) {
+        $_SERVER["PATH_INFO"] = $_SERVER["ORIG_PATH_INFO"];
+    }
+    if (strcasecmp($_SERVER["PATH_INFO"], $_SERVER["SCRIPT_NAME "]) == 0) {
+        unset($_SERVER["PATH_INFO"]);
+    }
+    if (strpos($_SERVER["PATH_INFO"], '.php') !== false) {
+        unset($_SERVER["PATH_INFO"]);
+    }
 }
 ?>