Fixed #856: Something is wrong with the handling of spaces in folder …

…names
thexerteproject · Sep 22, 2019 · 11fd9f8 · 11fd9f8
1 parent d72b21f
commit 11fd9f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/rss.php b/rss.php
@@ -33,7 +33,7 @@
 
     $query_modifier = "export";
 
-    $action_modifder = "export";
+    $action_modifier = "export";
 
 }
 if(isset($_GET['html5'])){
@@ -105,8 +105,8 @@
             WHERE $query_modifier='true' AND creator_id=? AND {$xerte_toolkits_site->database_table_prefix}templatedetails.template_id = {$xerte_toolkits_site->database_table_prefix}templatesyndication.template_id";
         $params[] = $row_create['login_id'];
     }else{
-        $row_folder = db_query_one("SELECT folder_id FROM {$xerte_toolkits_site->database_table_prefix}folderdetails WHERE folder_name = ?", array(str_replace("_", " ", $_GET['folder_name'])));
-
+        $row_folder = db_query_one("SELECT folder_id FROM {$xerte_toolkits_site->database_table_prefix}folderdetails WHERE 
+            folder_name = ? or folder_name = ?", array(str_replace("_", " ", $_GET['folder_name']), $_GET['folder_name']));
         if(empty($row_folder)) {
             die("Invalid folder name");
         }

diff --git a/rssdownload.php b/rssdownload.php
@@ -109,7 +109,8 @@
             WHERE $query_modifier='true' AND creator_id=? AND td.template_id = ts.template_id AND td.template_type_id=ot.template_type_id";
         $params[] = $row_create['login_id'];
     }else{
-        $row_folder = db_query_one("SELECT folder_id FROM {$xerte_toolkits_site->database_table_prefix}folderdetails WHERE folder_name = ?", array(str_replace("_", " ", $_GET['folder_name'])));
+        $row_folder = db_query_one("SELECT folder_id FROM {$xerte_toolkits_site->database_table_prefix}folderdetails WHERE 
+            folder_name = ? or folder_name = ?", array(str_replace("_", " ", $_GET['folder_name']), $_GET['folder_name']));
 
         if(empty($row_folder)) {
             die("Invalid folder name");

diff --git a/website_code/php/folderproperties/rename_folder_template.php b/website_code/php/folderproperties/rename_folder_template.php
@@ -40,15 +40,15 @@
     $prefix = $xerte_toolkits_site->database_table_prefix;
 
     $query = "update {$prefix}folderdetails SET folder_name = ? WHERE folder_id = ?";
-    $params = array(str_replace(" ", "_", $_POST['folder_name']), $_POST['folder_id']);
+    $params = array($_POST['folder_name'], $_POST['folder_id']);
 
     $ok = db_query($query, $params);
 
     if($ok) {
 
         echo "<p class=\"header\"><span>" . FOLDER_PROPERTIES_PROPERTIES . "</span></p>";			
 
-        echo "<p>" . FOLDER_PROPERTIES_CALLED . " " . str_replace("_", " ", $_POST['folder_name']) . "</p>";
+        echo "<p>" . FOLDER_PROPERTIES_CALLED . " " . $_POST['folder_name'] . "</p>";
 
         echo "<p>" . FOLDER_PROPERTIES_CHANGE . "</p>";