Changeset 560

Timestamp:

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

Author:

sidtheduck

Message:

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

Location:

trunk

Files:

• plog-admin/includes/install-functions.php (modified) (1 diff)
• plog-globals.php (modified) (1 diff)
• plog-includes/plog-functions.php (modified) (4 diffs)
• plog-load-config.php (modified) (6 diffs)

trunk/plog-admin/includes/install-functions.php

@@ -304 +304 @@
 
         $config['gallery_url'] = "http://".$_SERVER["SERVER_NAME"]. dirname(dirname($_SERVER["PHP_SELF"]));
+        // remove plog-admin/ from the end, if present .. is there a better way to determine the full url?
+        if (strpos($config['gallery_url'], "plog-admin/")) {
+                $config['gallery_url'] = substr($config['gallery_url'],0,strpos($config['gallery_url'], "plog-admin/"));
+        }
         // verify that gallery URL contains a trailing slash. if not, add one.
         if      ($config['gallery_url']{strlen($config['gallery_url'])-1} != '/'){

trunk/plog-globals.php

@@ -1 +1 @@
 <?php
-ini_set('include_path', ini_get('include_path'));
+@ini_set('include_path', ini_get('include_path'));
 @ini_set("arg_separator.output","&amp;");
 if (intval(ini_get("max_execution_time")) < 300){

trunk/plog-includes/plog-functions.php

@@ -792 +792 @@
         function get_album_by_name($name) {
                 $sql = "SELECT *
-                FROM `".TABLE_PREFIX."albumss`
+                FROM `".TABLE_PREFIX."albums`
                 WHERE `name` = '".mysql_real_escape_string($name)."'";
                 $result = run_query($sql);
@@ -1260 +1260 @@
         }
 
-        // Ardamis fix from diffuser theme, don't quite understand why it's needed
-        if (!$plaintext){
-                $rv = str_replace("&id","&id",$rv);
+        // replace & with & if outputting to email
+        if ($plaintext !== false){
+                $rv = str_replace("&","&",$rv);
         }
 
@@ -1336 +1336 @@
                 $msg .= plog_tr("Comment") . ":\n$comment\n\n";
                 $msg .= plog_tr("You can see all the comments for this picture here") . ":\n";
-                $picurl = generate_url("picture",$parent_id);
+                $picurl = generate_url("picture", $parent_id, NULL, true);
                 $msg .= $picurl;
                 $headers  = "From: $author <$email>\r\n";
@@ -1345 +1345 @@
                 $config['admin_email'],
                 '[' . SmartStripSlashes($config['gallery_name']) . '] ' . plog_tr('New Comment From') . ' ' . $author,
-                $msg,
+                SmartStripSlashes($msg),
                 $headers);
         }

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;
 
 }