Changeset 2312

Timestamp:

12/18/10 11:28:20 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Assigned the functionality of database maintenance to the Database class and the AdminPages class, it was in Maintenance class.

Location:

branches/1.5/libs

Files:

• AdminPages.php (modified) (4 diffs)
• Database.php (modified) (1 diff)
• Maintenance.php (modified) (8 diffs)

branches/1.5/libs/AdminPages.php

@@ -1 +1 @@
 <?php
+
 /**
  * Functions for Admin pages, e.g. settings, maintenance, blocked list...
@@ -313 +314 @@
                                 break;
                         case 'optimize':
-                                $h->optimizeTables();
+                                $h->db->optimizeTables();
+                                $h->message = $h->lang['admin_maintenance_optimize_success'];
+                                $h->messageType = 'green';
                                 break;
                         case 'empty':
-                                $h->emptyTable($h->cage->get->testAlnumLines('table'));
+                                $h->db->emptyTable($h->cage->get->testAlnumLines('table'));
+                                $h->message = $h->lang['admin_maintenance_table_emptied'];
+                                $h->messageType = 'green';
                                 break;
                         case 'drop':
-                                $h->dropTable($h->cage->get->testAlnumLines('table'));
+                                $h->db->dropTable($h->cage->get->testAlnumLines('table'));
+                                $h->message = $h->lang['admin_maintenance_table_deleted'];
+                                $h->messageType = 'green';
                                 break;
                         case 'remove_settings':
@@ -374 +381 @@
                 if ($exclude_tables) {
                         $exclude = array(
-                                DB_PREFIX . 'settings',
-                                DB_PREFIX . 'users',
-                                DB_PREFIX . 'usermeta',
-                                DB_PREFIX . 'categories',
-                                DB_PREFIX . 'comments',
-                                DB_PREFIX . 'miscdata',
-                                DB_PREFIX . 'posts',
-                                DB_PREFIX . 'postvotes',
-                                DB_PREFIX . 'tags',
-                                DB_PREFIX . 'widgets',
+                                DB_PREFIX.'settings',
+                                DB_PREFIX.'users',
+                                DB_PREFIX.'usermeta',
+                                DB_PREFIX.'categories',
+                                DB_PREFIX.'comments',
+                                DB_PREFIX.'miscdata',
+                                DB_PREFIX.'posts',
+                                DB_PREFIX.'postvotes',
+                                DB_PREFIX.'tags',
+                                DB_PREFIX.'widgets',
                         );
                 }
@@ -404 +411 @@
         }
 
-        /**************************************************************
+        /*       * ************************************************************
          *
          *  BLOCKED PAGE
          *
-         *************************************************************/
+         * *********************************************************** */
 
         /**

branches/1.5/libs/Database.php

@@ -367 +367 @@
 
         /**
+         * Optimize all database tables
+         */
+        public function optimizeTables()
+        {
+                foreach ($this->get_col("SHOW TABLES", 0) as $table_name) {
+                        $this->query("OPTIMIZE TABLE ".$table_name);
+                }
+        }
+
+        /**
+         * Empty plugin database table
+         *
+         * @param string $table_name - table to empty
+         * @param string $msg - show "emptied" message or not
+         */
+        public function emptyTable($table_name)
+        {
+                $this->query("DELETE FROM ".$table_name);
+        }
+
+        /**
+         * Delete plugin database table
+         *
+         * @param string $table_name - table to drop
+         */
+        public function dropTable($table_name)
+        {
+                $this->query("DROP TABLE ".$table_name);
+        }
+
+        /**
          * Store a result to the cache
          *

branches/1.5/libs/Maintenance.php

@@ -140 +140 @@
 
         /**
-         * Optimize all database tables
-         */
-        public function optimizeTables($h)
-        {
-                $h->db->selectDB(DB_NAME);
-
-                foreach ($h->db->get_col("SHOW TABLES", 0) as $table_name) {
-                        $h->db->query("OPTIMIZE TABLE ".$table_name);
-                }
-
-                $h->message = $h->lang['admin_maintenance_optimize_success'];
-                $h->messageType = 'green';
-        }
-
-        /**
-         * Empty plugin database table
-         *
-         * @param string $table_name - table to empty
-         * @param string $msg - show "emptied" message or not
-         */
-        public function emptyTable($h, $table_name, $msg = true)
-        {
-                $h->db->query("DELETE FROM ".$table_name);
-
-                if ($msg) {
-                        $h->message = $h->lang['admin_maintenance_table_emptied'];
-                        $h->messageType = 'green';
-                }
-        }
-
-        /**
-         * Delete plugin database table
-         *
-         * @param string $table_name - table to drop
-         */
-        public function dropTable($h, $table_name, $msg = true)
-        {
-                $h->db->query("DROP TABLE ".$table_name);
-
-                if ($msg) {
-                        $h->message = $h->lang['admin_maintenance_table_deleted'];
-                        $h->messageType = 'green';
-                }
-        }
-
-        /**
          * Open or close the site for maintenance
          *
-         * @param object $h
+         * @param Hotaru $h
          * @param string $switch - 'open' or 'close'
          */
@@ -195 +149 @@
                 if ($switch == 'open') {
                         // open
-                        $sql = "UPDATE ".TABLE_SETTINGS." SET settings_value = %s WHERE settings_name = %s";
-                        $h->db->query($h->db->prepare($sql, 'true', 'SITE_OPEN'));
+                        $h->db->query("UPDATE ".TABLE_SETTINGS." SET settings_value = 'true' WHERE settings_name = 'SITE_OPEN'");
                         $h->message = $h->lang['admin_maintenance_site_opened'];
                         $h->messageType = 'green';
                 } else {
                         //close
-                        $sql = "UPDATE ".TABLE_SETTINGS." SET settings_value = %s WHERE settings_name = %s";
-                        $h->db->query($h->db->prepare($sql, 'false', 'SITE_OPEN'));
+                        $h->db->query("UPDATE ".TABLE_SETTINGS." SET settings_value = 'false' WHERE settings_name = 'SITE_OPEN'");
                         $h->message = $h->lang['admin_maintenance_site_closed'];
                         $h->messageType = 'green';
@@ -215 +167 @@
         public function siteClosed($h, $lang)
         {
+
                 // site closed and access not granted
-                echo "<HTML id='site_closed_body'>\n<HEAD>\n";
+                echo '<html><head>';
 
                 // include current theme style and default style
                 if (file_exists(BASE.'content/themes/'.$h->pageHandling->default.'css/style.css')) {
-                        echo "<link rel='stylesheet' href='".SITEURL."content/themes/".$h->pageHandling->default."css/style.css' type='text/css'>\n";
+                        echo '<link rel="stylesheet" href="'.SITEURL.'content/themes/'.$h->pageHandling->default.'css/style.css" type="text/css">';
                 }
                 if (file_exists(BASE.'content/themes/'.THEME.'css/style.css')) {
-                        echo "<link rel='stylesheet' href='".SITEURL."content/themes/".THEME."css/style.css' type='text/css'>\n";
-                }
-                echo "</HEAD>\n<BODY>\n";
-                echo "<div id='site_closed'>\n";
+                        echo '<link rel="stylesheet" href="'.SITEURL.'content/themes/'.THEME.'css/style.css" type="text/css">\n';
+                }
+                echo '</head><body>';
+                echo '<div id="site_closed">';
 
                 // show custom maintenance page if one exists:
@@ -233 +186 @@
                 } else {
                         // show default maintenance page:
-                        echo $lang['main_hotaru_site_closed'];
-                        echo "<br /><span id='site_closed_admin_link'>[<a href='".SITEURL."admin_index.php?page=admin_login'>Admin Login</a>]</span>";
-                }
-
-                echo "\n</div>\n</BODY>\n</HTML>\n";
+                        echo $lang['main_hotaru_site_closed'].'<br /><span id="site_closed_admin_link">[<a href="'.SITEURL.'admin_index.php?page=admin_login">Admin Login</a>]</span>';
+                }
+                echo '</div></body></html>';
 
                 die();
@@ -249 +200 @@
         {
                 // get announcement from database
-                $sql = "SELECT miscdata_value FROM ".TABLE_MISCDATA." WHERE miscdata_key = %s";
-                $query = $h->db->prepare($sql, 'site_announcement');
+                $query = "SELECT miscdata_value FROM ".TABLE_MISCDATA." WHERE miscdata_key = 'site_announcement'";
 
                 if ($h->pageName != 'maintenance') {
@@ -265 +215 @@
                 if ($result) {
                         $result = unserialize($result);
-                        $h->vars['admin_announcement'] = urldecode($result['announcement']);
+                        $h->vars['admin_announcement'] = $result['announcement'];
                         $h->vars['admin_announcement_enabled'] = $result['enabled'];
                 } else {
-                        $h->vars['admin_announcement'] = "";
-                        $h->vars['admin_announcement_enabled'] = "";
+                        $h->vars['admin_announcement'] = '';
+                        $h->vars['admin_announcement_enabled'] = '';
                 }
         }
@@ -282 +232 @@
                 $allowable_tags = "<div><p><span><b><i><u><a><img><blockquote><del><br>";
                 $h->vars['admin_announcement'] = sanitize($h->cage->get->getHtmLawed('announcement_text'), 'tags', $allowable_tags);
-                if ($h->cage->get->keyExists('announcement_enabled')) {
-                        $h->vars['admin_announcement_enabled'] = "checked";
-                } else {
-                        $h->vars['admin_announcement_enabled'] = "";
-                }
+                $h->vars['admin_announcement_enabled'] = ($h->cage->get->keyExists('announcement_enabled')) ? 'checked' : '';
 
                 // prepare annoucment for database entry:
-                $value = array('announcement' => urlencode($h->vars['admin_announcement']), 'enabled' => $h->vars['admin_announcement_enabled']);
-                $value = serialize($value);
+                $value = serialize(array('announcement' => $h->vars['admin_announcement'],'enabled' => $h->vars['admin_announcement_enabled']));
 
                 // update existing db record
-                $sql = "UPDATE ".TABLE_MISCDATA." SET miscdata_value = %s, miscdata_updateby = %d WHERE miscdata_key = %s";
-                $h->db->query($h->db->prepare($sql, $value, $h->currentUser->id, 'site_announcement'));
+                $sql = "UPDATE ".TABLE_MISCDATA." SET miscdata_value = %s, miscdata_updateby = %d WHERE miscdata_key = 'site_announcement'";
+                $h->db->query($h->db->prepare($sql, $value, $h->currentUser->id));
 
                 // clear the database cache:
@@ -313 +258 @@
         {
                 $files = array();
-                $exceptions = array('.svn', '.', '..', 'placeholder.txt');
-                $exceptions = array_merge($exceptions, $exclude);
-
-                $handle = opendir($dir);
-
-                while (($file = readdir($handle)) !== false) {
-                        if (!in_array($file, $exceptions)) {
-                                array_push($files, $file);
+                $exceptions = array_merge(array('.svn', '.', '..', 'placeholder.txt'), $exclude);
+
+                foreach (new DirectoryIterator($dir) as $file) {
+                        if ($file->isDot() || in_array($file->getFilename(), $exceptions)) {
+                                continue;
                         }
-                }
-                closedir($handle);
+                        $files[] = $file;
+                }
 
                 if ($files) {
                         return $files;
                 }
-                return false;
+
+                return FALSE;
         }