Changeset 538 for trunk

Timestamp:

05/09/08 16:22:50 (7 months ago)

Author:

sidtheduck

Message:

+ additional cleanup for ticket #157
+ additional bug fixes for ticket #156

Location:

trunk

Files:

• admin/plog-admin-functions.php (modified) (2 diffs)
• admin/plog-import.php (modified) (1 diff)
• gallery.php (modified) (5 diffs)
• plog-functions.php (modified) (3 diffs)
• plog-rss.php (modified) (2 diffs)

trunk/admin/plog-admin-functions.php

@@ -83 +83 @@
                 $result['errors'] .= sprintf(plog_tr('Could not create directory %s!'),$create_path);
                 return $result;
-        };
+        }
 
         if (is_uploaded_file($tmpname)) {
@@ -95 +95 @@
                 $result['errors'] .= sprintf(plog_tr('Could not move file! %s to %s'),$tmpname,$final_fqfn);
                 return $result;
-        };
+        }
 
         if (is_file($tmpname)){
                 @unlink($tmpname);
         }
-        $res = chmod($final_fqfn, 0755);
+        $res = @chmod($final_fqfn, 0755);
 
         // Get the EXIF data.

trunk/admin/plog-import.php

@@ -61 +61 @@
         $captions = $_POST['captions'];
         $descriptions = $_POST['descriptions'];
-        $files = $_POST['files'];
+        $files = isset($_POST['files']) ? $_POST['files'] : '';
         $selected = $_POST['Selected'];
 

trunk/gallery.php

@@ -18 +18 @@
                 if (isset($resolved_path['mode'])) {
                         $_GET['mode'] = $resolved_path['mode'];
-                };
+                }
 
                 // get page number from url, if present
@@ -25 +25 @@
                         parse_str($parts["query"],$query_parts);
                         if (!empty($query_parts["plog_page"])) $_GET["plog_page"] = $query_parts["plog_page"];
-                };
+                }
                 $path = $parts["path"];
-        };
-};
+        }
+}
 
 // Set sorting session variables if they are passed
 if (isset($_GET['sortby'])) {
         $_SESSION['plogger_sortby'] = $_GET['sortby'];
-};
+}
 
 if (isset($_GET['sortdir'])) {
         $_SESSION['plogger_sortdir'] = $_GET['sortdir'];
-};
+}
 
 // The three GET parameters that it accepts are
@@ -55 +55 @@
 if (!in_array($GLOBALS['plogger_level'],$allowed_levels)) {
         $GLOBALS['plogger_level'] = 'collections';
-};
+}
 
 // Some Estonian remarks was here ?!?
@@ -85 +85 @@
                 } else {
                         $use_file = 'search.php';
-                };
+                }
         }
         elseif ($GLOBALS['plogger_level'] == "album") {
@@ -93 +93 @@
                 } else {
                         $use_file = 'album.php';
-                };
+                }
         }
         else if ($GLOBALS['plogger_level'] == "collection") {
                 $use_file = 'collection.php';
-        };
+        }
 
         // if the theme does not have the requested file, then use the one from the default template

trunk/plog-functions.php

@@ -1408 +1408 @@
         
         // right now only single id is supported, maybe I want to specify multiple id-s as well
-        $value = ($arr['value'] > 0) ? $arr['value'] : -1;
+        $value = (isset($arr['value']) && $arr['value'] > 0) ? $arr['value'] : -1;
         
         if ('collection' == $type) {
@@ -1987 +1987 @@
 
 function plogger_get_picture_description() {
-        return SmartStripSlashes($GLOBALS["current_picture"]["description"]);
+        if (isset($GLOBALS['current_picture']['description'])){
+                return SmartStripSlashes($GLOBALS['current_picture']['description']);
+        } else {
+                return false;
+        }
 }
 
@@ -2261 +2265 @@
                 $numresult = run_query($numquery);
                 return mysql_result($numresult, 'num_pictures');
+        } else {
+                return 0;
         }
 }

trunk/plog-rss.php

@@ -111 +111 @@
 header("Content-Type: application/xml");
 
-$level = isset($_GET["level"]) ? $_GET["level"] : "";
-$id = isset($_GET["id"]) ? intval($_GET["id"]) : "";
+$level = isset($_GET['level']) ? $_GET['level'] : "";
+$id = isset($_GET['id']) ? intval($_GET['id']) : "";
 
 // process path here - is set if mod_rewrite is in use
 
 // Some Estonian remarks was here
-if (!empty($_REQUEST["path"])) {
+if (!empty($_REQUEST['path'])) {
         // The following line calculates the path in the album and excludes any subdirectories if
         // Plogger is installed in one
@@ -123 +123 @@
         $resolved_path = resolve_path($path);
         // there is no meaningful RSS feed for images
-        if (is_array($resolved_path) && $resolved_path["level"] != "picture") {
-                $level = $resolved_path["level"];
-                $id = $resolved_path["id"];
-        };
-};
+        if (is_array($resolved_path) && isset($resolved_path['level']) && $resolved_path['level'] != "picture") {
+                $level = $resolved_path['level'];
+                $id = $resolved_path['id'];
+        }
+}
 
-$parts = parse_url($_SERVER["REQUEST_URI"]);
-parse_str($parts["query"],$query_parts);
-if (isset($query_parts["searchterms"])) {
-        generate_RSS_feed($level, $id, $query_parts["searchterms"]);
+$parts = parse_url($_SERVER['REQUEST_URI']);
+if (isset($parts['query'])){
+        parse_str($parts['query'],$query_parts);
+}
+if (isset($query_parts['searchterms'])) {
+        generate_RSS_feed($level, $id, $query_parts['searchterms']);
 } else {
         generate_RSS_feed($level, $id);