Changeset 2316

Timestamp:

12/19/10 10:34:57 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Complementary changes to last commit (r2315)

Location:

branches/1.5/libs

Files:

• Initialize.php (modified) (2 diffs)
• Maintenance.php (modified) (8 diffs)

branches/1.5/libs/Initialize.php

@@ -46 +46 @@
 
                 $this->MakeCacheFolders();
-                $this->getFiles();
+                $this->includeFiles();
                 $this->initInspektCage();
                 $this->initDatabase();
@@ -153 +153 @@
          * @return null
          */
-        private function getFiles()
+        private function includeFiles()
         {
                 require_once(FUNCTIONS.'funcs.strings.php');

branches/1.5/libs/Maintenance.php

@@ -31 +31 @@
          * Calls the delete_files function, then displays a message.
          *
+         * @todo Should be moved to the libs/Caching.php
          * @param string $folder - path to the cache folder
          * @param string $msg - show "cleared" message or not
@@ -43 +44 @@
 
                 // go delete the files
-                $success = $this->deleteFiles(CACHE.$folder);
+                $success = FileSystem::deleteFiles(CACHE.$folder);
 
                 // lang_cache only:
@@ -50 +51 @@
                         $h->lang = $langObj->includeLanguagePack($h->lang, 'main');
                         $h->lang = $langObj->includeLanguagePack($h->lang, 'admin');
+                        /* @todo        This doesn't load the language files from plugins that are
+                         *                      using Admin Area/Maintenance hooks (messaging comes to mind) we
+                         *                      should implement a hook in here for plugins that want the language
+                         *                      to be included when the language cache is created or just make
+                         *                      the language cache be more smart...
+                         */
                 }
 
@@ -67 +74 @@
 
                 // return boolean result
-                return $success;
-        }
-
-        /**
-         * Remove plugin settings
-         *
-         * @param string $folder - plugin folder name
-         * @param bool $msg - show "Removed" message or not
-         */
-        public function removeSettings($h, $folder, $msg = true)
-        {
-                if (!$folder) {
-                        $folder = $h->plugin->folder;
-                }
-                $sql = "DELETE FROM ".TABLE_PLUGINSETTINGS."pluginsettings WHERE plugin_folder = %s";
-                $h->db->get_results($h->db->prepare($sql, $folder));
-
-                if ($msg) {
-                        $h->message = $h->lang['admin_maintenance_settings_removed'];
-                        $h->messageType = 'green';
-                }
-        }
-
-        /**
-         * Deletes rows from pluginsettings that match a given setting or plugin
-         *
-         * @param string $setting name of the setting to remove
-         * @param string $folder name of plugin folder
-         */
-        public function deleteSettings($h, $setting = '', $folder = '')
-        {
-                if ($setting) {
-                        $sql = "DELETE FROM ".TABLE_PLUGINSETTINGS." WHERE plugin_setting = %s";
-                        $h->db->query($h->db->prepare($sql, $setting));
-                } elseif ($folder) {
-                        $sql = "DELETE FROM ".TABLE_PLUGINSETTINGS." WHERE plugin_folder = %s";
-                        $h->db->query($h->db->prepare($sql, $folder));
-                }
-
-                // optimize the table
-                $h->db->query("OPTIMIZE TABLE ".TABLE_PLUGINSETTINGS);
-        }
-
-        /**
-         * Delete all files in the specified directory except placeholder.txt
-         *
-         * @param string $dir - path to the cache folder
-         * @return bool
-         */
-        public function deleteFiles($dir)
-        {
-                $handle = opendir($dir);
-
-                $success = false;
-                while (($file = readdir($handle)) !== false) {
-                        if (is_file($dir.'/'.$file)) {
-                                if ($file != 'placeholder.txt') {
-                                        if (@unlink($dir.'/'.$file)) {
-                                                // ignore setting $success for the JavascriptConstants file which is ALWAYS present (even gets regenerated after deletion)
-                                                if ($file != 'JavascriptConstants.js') {
-                                                        $success = true;
-                                                }
-                                        } else {
-                                                $success = false;
-                                        }
-                                }
-                        }
-                }
-                closedir($handle);
                 return $success;
         }
@@ -173 +111 @@
                 // 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">';
+                        echo '<link rel="stylesheet" href="'.SITEURL.'content/themes/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 '<link rel="stylesheet" href="'.THEME_URL.'css/style.css" type="text/css">\n';
                 }
                 echo '</head><body>';
@@ -196 +134 @@
         /**
          * Get Site Annoucement for Maintenance Page (AdminPages.php)
+         *
+         * @todo Should be moved into libs/Announcements.php
+         * @param Hotaru $h
          */
-        public function getSiteAnnouncement($h)
+        public function getSiteAnnouncement(Hotaru $h)
         {
                 // get announcement from database
@@ -226 +167 @@
          * Add Site Annoucement from Maintenance Page (AdminPages.php)
          *
-         * @param object $announcement_exists - result from getSiteAnnouncement()
+         * @todo Should be moved into libs/Announcements.php
+         * @param Hotaru $h the Hotaru instance
          */
-        public function addSiteAnnouncement($h)
+        public function addSiteAnnouncement(Hotaru $h)
         {
                 $allowable_tags = "<div><p><span><b><i><u><a><img><blockquote><del><br>";
@@ -248 +190 @@
         }
 
-        /**
-         * Get all files in the specified directory except placeholder.txt
-         *
-         * @param string $dir - path to the folder
-         * @param array $exclude - array of file/folder names to exclude
-         * @return array
-         */
-        public function getFiles($dir, $exclude = array())
-        {
-                $files = array();
-                $exceptions = array_merge(array('.svn', '.', '..', 'placeholder.txt'), $exclude);
-
-                foreach (new DirectoryIterator($dir) as $file) {
-                        if ($file->isDot() || in_array($file->getFilename(), $exceptions)) {
-                                continue;
-                        }
-                        $files[] = $file;
-                }
-
-                if ($files) {
-                        return $files;
-                }
-
-                return FALSE;
-        }
-
 }