Changeset 531 for trunk

Timestamp:

04/22/08 15:35:58 (8 months ago)

Author:

sidtheduck

Message:

+ use SmartStripSlashes?() for cruft-free URLs that have apostrophes (')
+ fix for thumbnail navigation with cruft-free URLs that have apostrophes (')

Location:

trunk

Files:

• admin/plog-admin-functions.php (modified) (2 diffs)
• plog-functions.php (modified) (4 diffs)

trunk/admin/plog-admin-functions.php

@@ -133 +133 @@
                 VALUES
           ('".$albumdata['collection_id']."',
-           '".$albumdata['album_id']."','".mysql_real_escape_string($picture_path)."',
+           '".$albumdata['album_id']."',
+           '".mysql_real_escape_string($picture_path)."',
            NOW(),
            NOW(),
@@ -410 +411 @@
                 $album_path = $row['album_path'];
 
-                $new_path = mysql_real_escape_string($target_name."/".$album_path."/".$filename);
+                $new_path = mysql_real_escape_string(SmartStripSlashes($target_name."/".$album_path."/".$filename));
 
                 // update database

trunk/plog-functions.php

@@ -1071 +1071 @@
                         $result = run_query($query);
                         $row = mysql_fetch_assoc($result);
-                        $rv = $config["baseurl"].rawurlencode($row["path"]);
+                        $rv = $config["baseurl"].rawurlencode(SmartStripSlashes($row["path"]));
                 } else if ($level == "album") {
                         $query = "SELECT
@@ -1082 +1082 @@
                         $row = mysql_fetch_assoc($result);
                         
-                        $rv = $config["baseurl"].rawurlencode($row["collection_path"]) . '/' . rawurlencode($row["album_path"]);
+                        $rv = $config["baseurl"].rawurlencode(SmartStripSlashes($row["collection_path"])) . '/' . rawurlencode(SmartStripSlashes($row["album_path"]));
                         
                         // I need to give additional arguments to the url-s
@@ -1093 +1093 @@
                         $pic = get_picture_by_id($id);
                         $album = $pic["parent_album"];
-                        $rv = $config["baseurl"].substr($pic['path'], 0, -4);
+                        $rv = $config["baseurl"].substr(SmartStripSlashes($pic['path']), 0, -4);
                 }
         } else {
@@ -2117 +2117 @@
 
 function plogger_thumb_nav_item($link, $title, $img_path, $class = '') {
-        return "\t\t<li class='$class'><a href='$link' title='$title'><img src='$img_path' /></a></li>\n";
+        return "\t\t<li class=\"".$class."\"><a href=\"".$link."\" title=\"".$title."\"><img src=\"".$img_path."\" /></a></li>\n";
 }