Changeset 2317 for branches

Timestamp:

12/19/10 10:35:49 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Removing the urlencode/urldecode from the core as far as database is concerned.

Location:

branches/1.5/libs

Files:

• Announcements.php (modified) (3 diffs)
• Category.php (modified) (5 diffs)
• Feeds.php (modified) (1 diff)
• PluginManagement.php (modified) (11 diffs)
• Post.php (modified) (8 diffs)

branches/1.5/libs/Announcements.php

@@ -56 +56 @@
                 $maintenance->getSiteAnnouncement($h);
                 if ($h->vars['admin_announcement_enabled']) {
-                        $announcements[] = urldecode($h->vars['admin_announcement']);
+                        $announcements[] = $h->vars['admin_announcement'];
                 }
 
@@ -88 +88 @@
 
                 // Check if install file has not been run
-                $sql = "SELECT miscdata_value FROM ".TABLE_MISCDATA." WHERE miscdata_key = %s";
-                $hotaru_version = $h->db->get_var($h->db->prepare($sql, 'hotaru_version'));
+                $hotaru_version = $h->db->get_var("SELECT miscdata_value FROM ".TABLE_MISCDATA." WHERE miscdata_key = 'hotaru_version'");
                 if (version_compare($h->version, $hotaru_version, '>')) {
                         $announcements[] = $h->lang['admin_announcement_run_install'];
@@ -114 +113 @@
                 $announcements = $h->vars['admin_announcements'];
 
-                if (!is_array($announcements)) {
-                        return false;
-                } else {
+                if (is_array($announcements)) {
                         return $announcements;
                 }
+                return FALSE;
         }
 

branches/1.5/libs/Category.php

@@ -36 +36 @@
         {
                 $sql = "SELECT category_id FROM " . TABLE_CATEGORIES . " WHERE category_safe_name = %s";
-                $cat_id = $h->db->get_var($h->db->prepare($sql, urlencode($cat_safe_name)));
+                $cat_id = $h->db->get_var($h->db->prepare($sql, $cat_safe_name));
                 return $cat_id;
         }
@@ -59 +59 @@
                         $cat_name = $h->db->get_var($h->db->prepare($sql, $cat_id));
                 }
-                return urldecode($cat_name);
+                return $cat_name;
         }
         
@@ -88 +88 @@
                 }
                 
-                return urldecode($cat_safe_name);
+                return $cat_safe_name;
         }
         
@@ -243 +243 @@
                 // return false if duplicate name
                 $sql = "SELECT category_name FROM " . TABLE_CATEGORIES . " WHERE category_name = %s";
-                $exists = $h->db->get_var($h->db->prepare($sql, urlencode($new_cat_name)));
+                $exists = $h->db->get_var($h->db->prepare($sql, $new_cat_name));
                 if ($exists) { return false; }
 
@@ -258 +258 @@
                 //insert new category after parent category:
                 $sql = "INSERT INTO " . TABLE_CATEGORIES . " (category_parent, category_name, category_safe_name, category_order, category_updateby) VALUES (%d, %s, %s, %d, %d)";
-                $h->db->query($h->db->prepare($sql, $parent, urlencode($new_cat_name), urlencode(make_url_friendly($new_cat_name)), $position, $h->currentUser->id));
+                $h->db->query($h->db->prepare($sql, $parent, $new_cat_name, make_url_friendly($new_cat_name), $position, $h->currentUser->id));
                 
                 $this->rebuildTree($h, 1, 0);

branches/1.5/libs/Feeds.php

@@ -40 +40 @@
                 
                 $feed = new RSS($h->url(array('page'=>'rss')));
-                $feed->title = stripslashes(html_entity_decode(urldecode($title), ENT_QUOTES, 'UTF-8'));
+                $feed->title = stripslashes(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
                 $feed->link = html_entity_decode($link, ENT_QUOTES, 'UTF-8');
                 $feed->description = $description;

branches/1.5/libs/PluginManagement.php

@@ -64 +64 @@
                                 $p['folder'] = $plugin_row->plugin_folder;
                                 $p['author'] = $plugin_row->plugin_author;
-                                $p['authorurl'] = urldecode($plugin_row->plugin_authorurl);
+                                $p['authorurl'] = $plugin_row->plugin_authorurl;
                                 $p['status'] = ($plugin_row->plugin_enabled) ? 'active' : 'inactive';
                                 $p['version'] = $plugin_row->plugin_version;
@@ -82 +82 @@
 
                                 if (isset($plugin_details['authorurl'])) {
-                                        $p['authorurl'] = urldecode($plugin_details['authorurl']);
+                                        $p['authorurl'] = $plugin_details['authorurl'];
                                 }
 
@@ -166 +166 @@
         public function getPluginsMeta()
         {
-                $plugin_list = getFilenames(PLUGINS, "short");
+                $plugin_list = FileSystem::listFiles(PLUGINS);
                 $plugins_array = array();
                 foreach ($plugin_list as $plugin_folder_name) {
@@ -184 +184 @@
         public function readPluginMeta($plugin_file)
         {
-                if ($plugin_file == 'placeholder.txt') {
-                        return FALSE;
-                }
-
                 // Include the generic_pmd class that reads post metadata from the a plugin
                 require_once(EXTENSIONS.'GenericPHPConfig/class.metadata.php');
@@ -227 +223 @@
                 // Clear the database cache to ensure stored plugins and hooks
                 // are up-to-date.
-                $h->deleteFiles(CACHE.'db_cache');
+                FileSystem::deleteFiles(CACHE.'db_cache');
 
                 // Clear the css/js cache to ensure any new ones get included
-                $h->deleteFiles(CACHE.'css_js_cache');
+                FileSystem::deleteFiles(CACHE.'css_js_cache');
 
                 // Clear the language cache to ensure any new language files get included
@@ -263 +259 @@
 
                         $sql = "REPLACE INTO ".TABLE_PLUGINS." (plugin_enabled, plugin_name, plugin_folder, plugin_class, plugin_extends, plugin_type, plugin_desc, plugin_requires, plugin_version, plugin_author, plugin_authorurl, plugin_updateby) VALUES (%d, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d)";
-                        $h->db->query($h->db->prepare($sql, $h->plugin->enabled, $h->plugin->name, $h->plugin->folder, $h->plugin->class, $h->plugin->extends, $h->plugin->type, $h->plugin->desc, $h->plugin->requires, $h->plugin->version, $h->plugin->author, urlencode($h->plugin->authorurl), $h->currentUser->id));
+                        $h->db->query($h->db->prepare($sql, $h->plugin->enabled, $h->plugin->name, $h->plugin->folder, $h->plugin->class, $h->plugin->extends, $h->plugin->type, $h->plugin->desc, $h->plugin->requires, $h->plugin->version, $h->plugin->author, $h->plugin->authorurl, $h->currentUser->id));
 
                         // Get the last order number - doing this after REPLACE INTO because
@@ -276 +272 @@
                         // upgrading:
                         $sql = "UPDATE ".TABLE_PLUGINS." SET plugin_enabled = %d, plugin_name = %s, plugin_folder = %s, plugin_class = %s, plugin_extends = %s, plugin_type = %s, plugin_desc = %s, plugin_requires = %s, plugin_version = %s, plugin_author = %s, plugin_authorurl = %s, plugin_updateby = %d WHERE plugin_folder = %s";
-                        $h->db->query($h->db->prepare($sql, $h->plugin->enabled, $h->plugin->name, $h->plugin->folder, $h->plugin->class, $h->plugin->extends, $h->plugin->type, $h->plugin->desc, $h->plugin->requires, $h->plugin->version, $h->plugin->author, urlencode($h->plugin->authorurl), $h->currentUser->id, $h->plugin->folder));
+                        $h->db->query($h->db->prepare($sql, $h->plugin->enabled, $h->plugin->name, $h->plugin->folder, $h->plugin->class, $h->plugin->extends, $h->plugin->type, $h->plugin->desc, $h->plugin->requires, $h->plugin->version, $h->plugin->author, $h->plugin->authorurl, $h->currentUser->id, $h->plugin->folder));
                 }
 
@@ -398 +394 @@
         {
                 // Clear the database cache to ensure plugins and hooks are up-to-date.
-                $h->deleteFiles(CACHE.'db_cache');
+                FileSystem::deleteFiles(CACHE.'db_cache');
 
                 // Clear the css/js cache to ensure any new ones get included
-                $h->deleteFiles(CACHE.'css_js_cache');
+                FileSystem::deleteFiles(CACHE.'css_js_cache');
 
                 // Clear the language cache to ensure any new language files get included
@@ -420 +416 @@
         {
                 // Clear the database cache to ensure plugins and hooks are up-to-date.
-                $h->deleteFiles(CACHE.'db_cache');
+                FileSystem::deleteFiles(CACHE.'db_cache');
 
                 // Clear the css/js cache to ensure this plugin's files are removed
-                $h->deleteFiles(CACHE.'css_js_cache');
+                FileSystem::deleteFiles(CACHE.'css_js_cache');
 
                 // Clear the language cache to ensure any new language files get included
@@ -553 +549 @@
         { // 0 = deactivate, 1 = activate
                 // Clear the database cache to ensure plugins and hooks are up-to-date.
-                $h->deleteFiles(CACHE.'db_cache');
+                FileSystem::deleteFiles(CACHE.'db_cache');
 
                 // Clear the css/js cache to ensure any new ones get included
-                $h->deleteFiles(CACHE.'css_js_cache');
+                FileSystem::deleteFiles(CACHE.'css_js_cache');
 
                 // Get the enabled status for this plugin...
@@ -770 +766 @@
 
 }
-
-?>

branches/1.5/libs/Post.php

@@ -94 +94 @@
                         $this->pubDate = $post_row->post_pub_date;
                         $this->status = $post_row->post_status;
-                        $this->type = urldecode($post_row->post_type);
-                        $this->category = urldecode($post_row->post_category);
-                        $this->tags = stripslashes(urldecode($post_row->post_tags));
-                        $this->title = stripslashes(urldecode($post_row->post_title));
-                        $this->origUrl = urldecode($post_row->post_orig_url);
-                        $this->domain = urldecode($post_row->post_domain);
-                        $this->url = urldecode($post_row->post_url);
-                        $this->content = stripslashes(urldecode($post_row->post_content));
+                        $this->type = $post_row->post_type;
+                        $this->category = $post_row->post_category;
+                        $this->tags = stripslashes($post_row->post_tags);
+                        $this->title = stripslashes($post_row->post_title);
+                        $this->origUrl = $post_row->post_orig_url;
+                        $this->domain = $post_row->post_domain;
+                        $this->url = $post_row->post_url;
+                        $this->content = stripslashes($post_row->post_content);
                         $this->comments = $post_row->post_comments;
                         $this->subscribe = $post_row->post_subscribe;
@@ -155 +155 @@
                 $sql = "INSERT INTO " . TABLE_POSTS . " SET post_author = %d, post_date = CURRENT_TIMESTAMP, post_status = %s, post_type = %s, post_category = %d, post_tags = %s, post_title = %s, post_orig_url = %s, post_domain = %s, post_url = %s, post_content = %s, post_subscribe = %d, post_updateby = %d";
                 
-                $h->db->query($h->db->prepare($sql, $this->author, $this->status, urlencode($this->type), $this->category, urlencode(trim($this->tags)), urlencode(trim($this->title)), urlencode($this->origUrl), urlencode($this->domain), urlencode(trim($this->url)), urlencode(trim($this->content)), $this->subscribe, $h->currentUser->id));
+                $h->db->query($h->db->prepare($sql, $this->author, $this->status, $this->type, $this->category, trim($this->tags), trim($this->title), $this->origUrl, $this->domain, trim($this->url), trim($this->content), $this->subscribe, $h->currentUser->id));
                 
                 $last_insert_id = $h->db->get_var($h->db->prepare("SELECT LAST_INSERT_ID()"));
@@ -194 +194 @@
                 $sql = "UPDATE " . TABLE_POSTS . " SET post_author = %d, post_status = %s, post_type = %s, post_category = %d, post_tags = %s, post_title = %s, post_orig_url = %s, post_domain = %s, post_url = %s, post_content = %s, post_subscribe = %d, post_comments = %s, post_updateby = %d WHERE post_id = %d";
                 
-                $h->db->query($h->db->prepare($sql, $this->author, $this->status, urlencode($this->type), $this->category, urlencode(trim($this->tags)), urlencode(trim($this->title)), urlencode($this->origUrl), urlencode($this->domain), urlencode(trim($this->url)), urlencode(trim($this->content)), $this->subscribe, $this->comments, $h->currentUser->id, $this->id));
+                $h->db->query($h->db->prepare($sql, $this->author, $this->status, $this->type, $this->category, trim($this->tags), trim($this->title), $this->origUrl, $this->domain, trim($this->url), trim($this->content), $this->subscribe, $this->comments, $h->currentUser->id, $this->id));
                 
                 $h->post->id = $this->id; // a small hack to get the id for use in plugins.
@@ -282 +282 @@
         {
                 $sql = "SELECT post_id, post_status FROM " . TABLE_POSTS . " WHERE post_orig_url = %s";
-                $posts = $h->db->get_results($h->db->prepare($sql, urlencode($url)));
+                $posts = $h->db->get_results($h->db->prepare($sql, $url));
                 
                 if (!$posts) { return false; }
@@ -296 +296 @@
                 // One last check to see if a post is present:
                 $sql = "SELECT * FROM " . TABLE_POSTS . " WHERE post_orig_url = %s LIMIT 1";
-                $post = $h->db->get_row($h->db->prepare($sql, urlencode($url)));
+                $post = $h->db->get_row($h->db->prepare($sql, $url));
                 
                 // if present return the first existing row
@@ -316 +316 @@
 
                 $sql = "SELECT post_id, post_status FROM " . TABLE_POSTS . " WHERE post_title = %s";
-                $posts = $h->db->get_results($h->db->prepare($sql, urlencode($title)));
+                $posts = $h->db->get_results($h->db->prepare($sql, $title));
                 
                 if (!$posts) { return false; }
@@ -330 +330 @@
                 // One last check to see if a post is present:
                 $sql = "SELECT post_id FROM " . TABLE_POSTS . " WHERE post_title = %s LIMIT 1";
-                $post_id = $h->db->get_var($h->db->prepare($sql, urlencode($title)));
+                $post_id = $h->db->get_var($h->db->prepare($sql, $title));
                 
                 if ($post_id) { return $post_id; } else { return false; }
@@ -345 +345 @@
         {
                 $sql = "SELECT post_id FROM " . TABLE_POSTS . " WHERE post_url = %s LIMIT 1";
-                $post_id = $h->db->get_var($h->db->prepare($sql, urlencode($post_url)));
+                $post_id = $h->db->get_var($h->db->prepare($sql, $post_url));
                 if ($post_id) { return $post_id; } else { return false; }
         }