Changeset 560 for trunk/plog-load-config.php

Timestamp:

07/15/08 17:05:24 (5 months ago)

Author:

sidtheduck

Message:

+ Fix for ticket #179
+ Fixes for miscellaneous minor bugs

Files:

• trunk/plog-load-config.php (modified) (6 diffs)

trunk/plog-load-config.php

@@ -42 +42 @@
 $config = mysql_fetch_assoc($result);
 
-$config["basedir"] = $plog_basedir;
+$config['basedir'] = $plog_basedir;
 
-$url_parts = parse_url($_SERVER["REQUEST_URI"]);
-$config["baseurl"] = $url_parts["path"];
+$url_parts = parse_url($_SERVER['REQUEST_URI']);
+$config['baseurl'] = "http://".$_SERVER['HTTP_HOST'].$url_parts['path'];
 
 // Try to figure out whether we are embedded (for example running from Wordpress)
@@ -52 +52 @@
 if (!defined('PLOGGER_EMBEDDED') || PLOGGER_EMBEDDED=='') {
         if (dirname(__FILE__) != dirname(realpath($_SERVER['SCRIPT_FILENAME'])) && strpos($_SERVER['SCRIPT_FILENAME'],"plog-admin") === false) {
-                $config["embedded"] = 1;
+                $config['embedded'] = 1;
                 // disable our own cruft-free urls, because the URL has already been processed
                 // by WordPress
-                $config["use_mod_rewrite"] = 0;
+                $config['use_mod_rewrite'] = 0;
                 trace('Plogger is embedded');
                 trace('dirname: ' . dirname(__FILE__));
@@ -61 +61 @@
                 trace('realpath($_SERVER[\'SCRIPT_FILENAME\'])' .': '. realpath($_SERVER['SCRIPT_FILENAME']));
         } else {
-                $config["embedded"] = 0;
+                $config['embedded'] = 0;
                 // if mod_rewrite is on, make sure to remove the file basename
-                if ($config["use_mod_rewrite"] == 1) {
-                        $config["baseurl"] = "http://".$_SERVER["HTTP_HOST"]. substr($_SERVER["PHP_SELF"],0,strrpos($_SERVER["PHP_SELF"],"/")) . "/";
+                if ($config['use_mod_rewrite'] == 1) {
+                        $config['baseurl'] = "http://".$_SERVER['HTTP_HOST']. substr($_SERVER['PHP_SELF'],0,strrpos($_SERVER['PHP_SELF'],"/")) . "/";
                 }
         }
@@ -70 +70 @@
         // Set PLOGGER_EMBEDDED to 1 in config file to overrule automatic test
         if (PLOGGER_EMBEDDED == '1') {
-                $config["embedded"] = 1;
-                $config["use_mod_rewrite"] = 0;
+                $config['embedded'] = 1;
+                $config['use_mod_rewrite'] = 0;
                 trace('Plogger is embedded');
                 // Set PLOGGER_EMBEDDED to 0 in case Plogger inclusion in different folder location, but does not already use mod_rewrite paths
         } else {
-                $config["embedded"] = 0;
+                $config['embedded'] = 0;
                 // if mod_rewrite is on, make sure to remove the file basename
-                if ($config["use_mod_rewrite"] == 1) {
-                        $config["baseurl"] = "http://".$_SERVER["HTTP_HOST"]. substr($_SERVER["PHP_SELF"],0,strrpos($_SERVER["PHP_SELF"],"/")) . "/";
+                if ($config['use_mod_rewrite'] == 1) {
+                        $config['baseurl'] = "http://".$_SERVER['HTTP_HOST']. substr($_SERVER['PHP_SELF'],0,strrpos($_SERVER['PHP_SELF'],"/")) . "/";
                 }
         }
@@ -85 +85 @@
 // remove plog-admin/ from the end, if present .. is there a better way to determine the full url?
 // had to update this for new use of links without mod_rewrite turned on (only affects the View gallery greybox in Admin)
-if (strpos($config["baseurl"], "plog-admin/")) {
-        $config["baseurl"] = substr($config["baseurl"],0,strpos($config["baseurl"], "plog-admin/"));
+if (strpos($config['baseurl'], "plog-admin/")) {
+        $config['baseurl'] = substr($config['baseurl'],0,strpos($config['baseurl'], "plog-admin/"));
 }
 
-$config["theme_url"] = $config["gallery_url"]."plog-content/themes/".basename($config["theme_dir"])."/";
+$config['theme_url'] = $config['gallery_url']."plog-content/themes/".basename($config['theme_dir'])."/";
 
-$urlarray = parse_url($config["gallery_url"]);
-$config["address"] = $urlarray['scheme'] . '://' . $urlarray['host'];
+$urlarray = parse_url($config['gallery_url']);
+$config['address'] = $urlarray['scheme'] . '://' . $urlarray['host'];
 
 $config['charset'] = 'utf-8';
@@ -158 +158 @@
 
 
-if (!isset($_SESSION["plogger_sortby"])){
-        $_SESSION["plogger_sortby"] = $config['default_sortby'];
+if (!isset($_SESSION['plogger_sortby'])){
+        $_SESSION['plogger_sortby'] = $config['default_sortby'];
 }
 
-if (!isset($_SESSION["plogger_sortdir"])){
-        $_SESSION["plogger_sortdir"] = $config['default_sortdir'];
+if (!isset($_SESSION['plogger_sortdir'])){
+        $_SESSION['plogger_sortdir'] = $config['default_sortdir'];
 }
 
-if (!isset($_SESSION["plogger_details"])){
-        $_SESSION["plogger_details"] = 0;
+if (!isset($_SESSION['plogger_details'])){
+        $_SESSION['plogger_details'] = 0;
 
 }