Changeset 1693

Timestamp:

05/14/10 13:44:19 (3 years ago)

Author:

shibuya246

Message:

[branch 1.3] added a smartloader class for class libs to the core

Location:

branches/1.3

Files:

• Hotaru.php (modified) (88 diffs)
• libs/smartloader.class.php (added)

branches/1.3/Hotaru.php

@@ -70 +70 @@
         public function __construct($start = '')
         {
+            require_once(LIBS . 'smartloader.class.php');
                 // initialize Hotaru
-                if (!$start) { 
-                        require_once(LIBS . 'Initialize.php');
+                if (!$start) {
+                        
                         $init = new Initialize($this);
+                        
                         $this->db           = $init->db;            // database object
                         $this->cage         = $init->cage;          // Inspekt cage
@@ -102 +104 @@
                 // Set up debugging:
                 if ($this->isDebug) { 
-                        require_once(LIBS . 'Debug.php');
                         $this->debug = new Debug();
                 }
@@ -378 +379 @@
         public function pagination($query, $total_items, $items_per_page = 10, $cache_table = '')
         {
-                require_once(LIBS . 'Paginator.php');
                 $paginator = new Paginator();
                 return $paginator->pagination($this, $query, $total_items, $items_per_page, $cache_table);
@@ -393 +393 @@
         public function paginationFull($data, $items_per_page = 10)
         {
-                require_once(LIBS . 'Paginator.php');
                 $paginator = new Paginator();
                 return $paginator->paginationFull($this, $data, $items_per_page);
@@ -423 +422 @@
         public function breadcrumbs()
         {
-                require_once(LIBS . 'Breadcrumbs.php');
                 $breadcrumbs = new Breadcrumbs();
                 return $breadcrumbs->buildBreadcrumbs($this);
@@ -438 +436 @@
         public function rssBreadcrumbsLink($status = '', $vars = array())
         {
-                require_once(LIBS . 'Breadcrumbs.php');
                 $breadcrumbs = new Breadcrumbs();
                 return $breadcrumbs->rssBreadcrumbsLink($this, $status, $vars);
@@ -593 +590 @@
         public function getUserNameFromId($id = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getUserNameFromId($this, $id);
@@ -607 +603 @@
         public function getUserIdFromName($username = '')
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getUserIdFromName($this, $username);
@@ -621 +616 @@
         public function getEmailFromId($userid = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getEmailFromId($this, $userid);
@@ -635 +629 @@
         public function getUserIdFromEmail($email = '')
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getUserIdFromEmail($this, $email);
@@ -648 +641 @@
         public function isAdmin($username)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->isAdmin($this->db, $username);
@@ -665 +657 @@
         public function userExists($id = 0, $username = '', $email = '')
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->userExists($this->db, $id, $username, $email);
@@ -681 +672 @@
         public function nameExists($username = '', $role = '', $exclude = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->nameExists($this, $username, $role, $exclude);
@@ -697 +687 @@
         public function emailExists($email = '', $role = '', $exclude = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->emailExists($this, $email, $role, $exclude);
@@ -712 +701 @@
         public function getMods($permission = 'can_access_admin', $value = 'yes')
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getMods($this, $permission, $value);
@@ -725 +713 @@
         public function getUniqueRoles() 
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->getUniqueRoles($this);
@@ -739 +726 @@
         public function userIdNameList($role = '')
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->userIdNameList($this, $role);
@@ -755 +741 @@
         public function userListFull($id_array = array(), $start = 0, $range = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->userListFull($this, $id_array, $start, $range);
@@ -769 +754 @@
         public function userSettingsList($userid = 0)
         {
-                require_once(LIBS . 'UserInfo.php');
                 $userInfo = new UserInfo();
                 return $userInfo->userSettingsList($this, $userid);
@@ -1037 +1021 @@
         public function readThemeMeta($theme = 'default')
         {
-                require_once(LIBS . 'ThemeSettings.php');
                 $themeSettings = new ThemeSettings();
                 return $themeSettings->readThemeMeta($this, $theme);
@@ -1052 +1035 @@
         public function getThemeSettings($theme = '', $return = 'value')
         {
-                require_once(LIBS . 'ThemeSettings.php');
                 $themeSettings = new ThemeSettings();
                 return $themeSettings->getThemeSettings($this, $theme, $return);
@@ -1068 +1050 @@
         public function updateThemeSettings($settings = array(), $theme = '', $column = 'value')
         {
-                require_once(LIBS . 'ThemeSettings.php');
                 $themeSettings = new ThemeSettings();
                 return $themeSettings->updateThemeSettings($this, $settings, $theme, $column);
@@ -1155 +1136 @@
         public function showMessage($msg = '', $msg_type = 'green')
         {
-                require_once(LIBS . 'Messages.php');
                 $messages = new Messages();
                 $messages->showMessage($this, $msg, $msg_type);
@@ -1166 +1146 @@
         public function showMessages()
         {
-                require_once(LIBS . 'Messages.php');
                 $messages = new Messages();
                 $messages->showMessages($this);
@@ -1187 +1166 @@
         public function checkAnnouncements($announcement = '') 
         {
-                require_once(LIBS . 'Announcements.php');
                 $announce = new Announcements();
                 if ($this->isAdmin) {
@@ -1209 +1187 @@
         public function showQueriesAndTime()
         {
-                if ($this->isDebug) {
-                        $this->debug->showQueriesAndTime($this);
+                if ($this->isDebug) {              
+                   $this->debug->showQueriesAndTime($this);
                 }
         }
@@ -1257 +1235 @@
         {
                 if (!is_object($this->debug)) { 
-                        require_once(LIBS . 'Debug.php');
                         $this->debug = new Debug();
                 }
@@ -1282 +1259 @@
         public function newSimplePie($feed='', $cache=RSS_CACHE, $cache_duration=RSS_CACHE_DURATION)
         {
-                require_once(LIBS . 'Feeds.php');
                 $feeds = new Feeds();
                 return $feeds->newSimplePie($feed, $cache, $cache_duration);
@@ -1297 +1273 @@
         public function adminNews($max_items = 10, $items_with_content = 3, $max_chars = 300)
         {
-                require_once(LIBS . 'Feeds.php');
                 $feeds = new Feeds();
                 $feeds->adminNews($this->lang, $max_items, $items_with_content, $max_chars);
@@ -1313 +1288 @@
         public function rss($title = '', $link = '', $description = '', $items = array())
         {
-                require_once(LIBS . 'Feeds.php');
                 $feeds = new Feeds();
                 $feeds->rss($this, $title, $link, $description, $items);
@@ -1331 +1305 @@
         public function adminPages($page = 'admin_login')
         {
-                require_once(LIBS . 'AdminPages.php');
                 $admin = new AdminPages();
                 $admin->pages($this, $page);
@@ -1344 +1317 @@
         public function adminLoginLogout($action = 'logout')
         {
-                require_once(LIBS . 'AdminAuth.php');
                 $admin = new AdminAuth();
                 return ($action == 'login') ? $admin->adminLogin($this) : $admin->adminLogout($this);
@@ -1355 +1327 @@
         public function adminLoginForm()
         {
-                require_once(LIBS . 'AdminAuth.php');
                 $admin = new AdminAuth();
                 $admin->adminLoginForm($this);
@@ -1382 +1353 @@
                 if ($this->pageName == 'admin_login') { return true; }
                 
-                require_once(LIBS . 'Maintenance.php');
-                $maintenance = new Maintenance();
+                                $maintenance = new Maintenance();
                 return $maintenance->siteClosed($this, $this->lang); // displays "Site Closed for Maintenance"
         }
@@ -1395 +1365 @@
         public function openCloseSite($switch = 'open')
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->openCloseSite($this, $switch);
@@ -1406 +1375 @@
         public function optimizeTables()
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->optimizeTables($this);
@@ -1420 +1388 @@
         public function emptyTable($table_name = '', $msg = true)
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->emptyTable($this, $table_name, $msg);
@@ -1434 +1401 @@
         public function dropTable($table_name = '', $msg = true)
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->dropTable($this, $table_name, $msg);
@@ -1448 +1414 @@
         public function removeSettings($folder = '', $msg = true)
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->removeSettings($this, $folder, $msg);
@@ -1462 +1427 @@
         public function deleteSettings($setting = '', $folder = '')
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->deleteSettings($this, $setting, $folder);
@@ -1476 +1440 @@
         public function deleteFiles($dir = '')
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->deleteFiles($dir);
@@ -1490 +1453 @@
         public function clearCache($folder = '', $msg = true)
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 $maintenance->clearCache($this, $folder, $msg);
@@ -1505 +1467 @@
         public function getFiles($dir = '', $exclude = array())
         {
-                require_once(LIBS . 'Maintenance.php');
                 $maintenance = new Maintenance();
                 return $maintenance->getFiles($dir, $exclude);
@@ -1540 +1501 @@
         public function smartCache($switch = 'off', $table = '', $timeout = 0, $html_sql = '', $label = '')
         {
-                require_once(LIBS . 'Caching.php');
                 $caching = new Caching();
                 return $caching->smartCache($this, $switch, $table, $timeout, $html_sql, $label);
@@ -1558 +1518 @@
         public function cacheHTML($timeout = 0, $html = '', $label = '')
         {
-                require_once(LIBS . 'Caching.php');
                 $caching = new Caching();
                 return $caching->cacheHTML($this, $timeout, $html, $label);
@@ -1580 +1539 @@
         public function isBlocked($type = '', $value = '', $operator = '=')
         {
-                require_once(LIBS . 'Blocked.php');
                 $blocked = new Blocked();
                 return $blocked->isBlocked($this->db, $type, $value, $operator);
@@ -1596 +1554 @@
         public function addToBlockedList($type = '', $value = 0, $msg = false)
         {
-                require_once(LIBS . 'Blocked.php');
                 $blocked = new Blocked();
                 return $blocked->addToBlockedList($this, $type, $value, $msg);
@@ -1620 +1577 @@
         public function includeLanguage($folder = '', $filename = '')
         {
-                require_once(LIBS . 'Language.php');
                 $language = new Language();
                 $language->includeLanguage($this, $folder, $filename);
@@ -1636 +1592 @@
         public function includeThemeLanguage($filename = 'main')
         {
-                require_once(LIBS . 'Language.php');
                 $language = new Language();
                 $language->includeThemeLanguage($this, $filename);
@@ -1844 +1799 @@
         public function sendTrackback()
         {
-                require_once(LIBS . 'Trackback.php');
                 $trackback = new Trackback();
                 return $trackback->sendTrackback($this);
@@ -1917 +1871 @@
         public function getCatId($cat_safe_name = '')
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatId($this, $cat_safe_name);
@@ -1932 +1885 @@
         public function getCatName($cat_id = 0, $cat_safe_name = '')
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatName($this, $cat_id, $cat_safe_name);
@@ -1946 +1898 @@
         public function getCatSafeName($cat_id = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatSafeName($this, $cat_id);
@@ -1960 +1911 @@
         public function getCatParent($cat_id = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatParent($this, $cat_id);
@@ -1974 +1924 @@
         public function getCatChildren($cat_parent_id = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatChildren($this, $cat_parent_id);
@@ -1987 +1936 @@
         public function getCategories($args = array())
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCategories($this, $args);
@@ -2001 +1949 @@
         public function getCatMeta($cat_id = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->getCatMeta($this, $cat_id);
@@ -2014 +1961 @@
          * @return bool
          */
-        public function addNewCategory($parent = 0, $new_cat_name = '')
-        {
-                require_once(LIBS . 'Category.php');
+        public function addCategory($parent = 0, $new_cat_name = '')
+        {
                 $category = new Category();
-                return $category->addNewCategory($this, $parent, $new_cat_name);
+                return $category->addCategory($this, $parent, $new_cat_name);
         }
 
@@ -2031 +1977 @@
         public function rebuildTree($parent_id = 0, $left = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->rebuildTree($this, $parent_id, $left);
@@ -2045 +1990 @@
         function deleteCategory($delete_category = 0)
         {
-                require_once(LIBS . 'Category.php');
                 $category = new Category();
                 return $category->deleteCategories($this, $delete_category);
@@ -2066 +2010 @@
         function countComments($digits_only = true, $no_comments_text = '')
         {
-                require_once(LIBS . 'Comment.php');
                 $comment = new Comment();
                 return $comment->countComments($this, $digits_only, $no_comments_text);
@@ -2080 +2023 @@
         function countUserComments($user_id = 0)
         {
-                require_once(LIBS . 'Comment.php');
                 $comment = new Comment();
                 return $comment->countUserComments($this, $user_id);
@@ -2094 +2036 @@
         public function deleteComments($user_id) 
         {
-                require_once(LIBS . 'Comment.php');
                 $comment = new Comment();
                 return $comment->deleteComments($this, $user_id);
@@ -2108 +2049 @@
         function getComment($comment_id = 0)
         {
-                require_once(LIBS . 'Comment.php');
                 $comment = new Comment();
                 return $comment->getComment($this, $comment_id);
@@ -2121 +2061 @@
         function readComment($comment_row = array())
         {
-                require_once(LIBS . 'Comment.php');
                 $comment = new Comment();
                 return $comment->readComment($this, $comment_row);
@@ -2142 +2081 @@
         public function addWidget($plugin = '', $function = '', $args = '')
         {
-                require_once(LIBS . 'Widget.php');
                 $widget = new Widget();
                 $widget->addWidget($this, $plugin, $function, $args);
@@ -2159 +2097 @@
         public function getArrayWidgets($widget_name = '')
         {
-                require_once(LIBS . 'Widget.php');
                 $widget = new Widget();
                 return $widget->getArrayWidgets($this, $widget_name);
@@ -2172 +2109 @@
         public function deleteWidget($function)
         {
-                require_once(LIBS . 'Widget.php');
                 $widget = new Widget();
                 $widget->deleteWidget($this, $function);
@@ -2185 +2121 @@
         public function getPluginFromFunction($function)
         {
-                require_once(LIBS . 'Widget.php');
                 $widget = new Widget();
                 return $widget->getPluginFromFunction($this, $function);
@@ -2210 +2145 @@
         {
                 if (!is_object($this->email)) { 
-                        require_once(LIBS . 'EmailFunctions.php');
                         $this->email = new EmailFunctions();
                 }
@@ -2238 +2172 @@
         public function countFollowers($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->countFriends($this, $user_id, 'follower');
@@ -2252 +2185 @@
         public function countFollowing($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->countFriends($this, $user_id, 'following');
@@ -2267 +2199 @@
         public function getFollowers($user_id = 0, $return = 'array')
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->getFriends($this, $user_id, 'follower', $return);
@@ -2282 +2213 @@
         public function getFollowing($user_id = 0, $return = 'array')
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->getFriends($this, $user_id, 'following', $return);
@@ -2296 +2226 @@
         public function isFollower($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->checkFriends($this, $user_id, 'follower');
@@ -2310 +2239 @@
         public function isFollowing($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->checkFriends($this, $user_id, 'following');
@@ -2324 +2252 @@
         public function follow($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->updateFriends($this, $user_id, 'follow');
@@ -2338 +2265 @@
         public function unfollow($user_id = 0)
         {
-                require_once(LIBS . 'Friends.php');
                 $friends = new Friends();
                 return $friends->updateFriends($this, $user_id, 'unfollow');
@@ -2361 +2287 @@
         public function getLatestActivity($limit = 0, $userid = 0, $type = '')
         {
-                require_once(LIBS . 'UserActivity.php');
                 $activity = new UserActivity();
                 return $activity->getLatestActivity($this, $limit, $userid, $type);
@@ -2375 +2300 @@
         public function activityExists($args = array())
         {
-                require_once(LIBS . 'UserActivity.php');
                 $activity = new UserActivity();
                 return $activity->activityExists($this, $args);
@@ -2388 +2312 @@
         public function insertActivity($args = array())
         {
-                require_once(LIBS . 'UserActivity.php');
                 $activity = new UserActivity();
                 return $activity->insertActivity($this, $args);
@@ -2401 +2324 @@
         public function updateActivity($args = array())
         {
-                require_once(LIBS . 'UserActivity.php');
                 $activity = new UserActivity();
                 return $activity->updateActivity($this, $args);
@@ -2414 +2336 @@
         public function removeActivity($args = array())
         {
-                require_once(LIBS . 'UserActivity.php');
                 $activity = new UserActivity();
                 return $activity->removeActivity($this, $args);
@@ -2436 +2357 @@
         public function getMessages($box = 'inbox', $type = '')
         {
-                require_once(LIBS . 'PrivateMessaging.php');
                 $pm = new PrivateMessaging();
                 return $pm->getMessages($this, $box, $type);
@@ -2450 +2370 @@
         public function getMessage($message_id = 0)
         {
-                require_once(LIBS . 'PrivateMessaging.php');
                 $pm = new PrivateMessaging();
                 return $pm->getMessage($this, $message_id);
@@ -2463 +2382 @@
         public function markRead($message_id = 0)
         {
-                require_once(LIBS . 'PrivateMessaging.php');
                 $pm = new PrivateMessaging();
                 $pm->markRead($this, $message_id);
@@ -2478 +2396 @@
         public function deleteMessage($message_id = 0, $box = 'inbox')
         {
-                require_once(LIBS . 'PrivateMessaging.php');
                 $pm = new PrivateMessaging();
                 $pm->deleteMessage($this, $message_id, $box);
@@ -2495 +2412 @@
         public function sendMessage($to = '', $from = '', $subject = '', $body = '')
         {
-                require_once(LIBS . 'PrivateMessaging.php');
                 $pm = new PrivateMessaging();
                 return $pm->sendMessage($this, $to, $from, $subject, $body);