Changeset 529

Timestamp:

04/22/08 13:25:21 (7 months ago)

Author:

sidtheduck

Message:

Ran into troubles with mod_rewrite paths and regular expressions with characters matching regex metacharacters in filenames. Changed to a LIKE MySQL search (escaping the wildcards '%' and '_' for LIKE expressions in filenames).

Files:

• trunk/plog-functions.php (modified) (1 diff)

trunk/plog-functions.php

@@ -989 +989 @@
                 if (!$picture) {
                         $filepath = join("/",$names);
+                        $like_match = array("_", "%");
+                        $like_replace = array("\_", "\%");
+                        $esc_filepath = str_replace($like_match, $like_replace, $filepath);
                         $sql = "SELECT *
                                 FROM `".TABLE_PREFIX."pictures`
-                                WHERE `path` RLIKE '^" . mysql_real_escape_string($filepath)."\..{3}$'
+                                WHERE `path` LIKE '" . mysql_real_escape_string($esc_filepath)."____'
                                         AND `parent_album`=".intval($album["id"]);
                         $result = run_query($sql);