Changeset 2298

Timestamp:

12/13/10 22:51:54 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Fixed calling of friendlyToStandardUrl(), now it is only available from $h->pageHandling->friendlyToStandardUrl().
Removed Hotaru::email(), use EmailFunctions::email() instead, fixed that throughout the core.
Removed unused PageHandling::pageBar().

Location:

branches/1.5

Files:

• Hotaru.php (modified) (3 diffs)
• libs/Debug.php (modified) (2 diffs)
• libs/PageHandling.php (modified) (2 diffs)
• libs/Paginator.php (modified) (1 diff)
• libs/ThemeSettings.php (modified) (1 diff)

branches/1.5/Hotaru.php

@@ -379 +379 @@
         }
 
-
-        /**
-         * Converts a friendly url into a standard one
-         *
-         * @param string $friendly_url
-         * return string $standard_url
-         */
-        public function friendlyToStandardUrl($friendly_url)
-        {
-                return $this->pageHandling->friendlyToStandardUrl($this, $friendly_url);
-        }
-
-
         /**
          * Generate either default or friendly urls
@@ -1089 +1076 @@
         {
                 $themeSettings = new ThemeSettings();
-                return $themeSettings->readThemeMeta($this, $theme);
+                return $themeSettings->readThemeMeta($theme);
         }
 
@@ -2169 +2156 @@
 
 
-/* *************************************************************
- *
- *  EMAIL FUNCTIONS
- *
- * *********************************************************** */
-
-        /**
-         * Send emails
-         *
-         * @param string $to - defaults to SITE_EMAIL
-         * @param string $subject - defaults to "No Subject";
-         * @param string $body - returns false if empty
-         * @param string $headers default is "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
-         * @param string $type - default is "email", but you can write to a "log" file, print to "screen" or "return" an array of the content
-         * @return array|false - only if $type = "return"
-         */
-        public function email($to = '', $subject = '', $body = '', $headers = array(), $type = 'email', $from='')
-        {
-                return EmailFunctions::email($to, $subject, $body, $from, $headers);
-        }
-
-
  /* *************************************************************
  *

branches/1.5/libs/Debug.php

@@ -114 +114 @@
                         $subject = "System Report from ".SITE_NAME;
                         $body = $sysinfo->logSystemReport($h, $report);
-                        $h->email($to, $subject, $body);
-                        $h->message = $h->lang['admin_maintenance_system_report_emailed'];
-                        $h->messageType = 'green';
+                        EmailFunctions::email($to, $subject, $body);
+                        $h->messages[$h->lang['admin_maintenance_system_report_emailed']] = 'green';
                         return true;
                 }
@@ -122 +121 @@
 
                 if (self::log('system_report', $sysinfo->logSystemReport($h, $report), FALSE)) {
-                        $h->message = $h->lang['admin_maintenance_system_report_success'];
-                        $h->messageType = 'green';
+                        $h->messages[$h->lang['admin_maintenance_system_report_success']] = 'green';
                         return TRUE;
                 }
 
-                $h->message = $h->lang['admin_maintenance_system_report_failure'];
-                $h->messageType = 'red';
+                $h->messages[$h->lang['admin_maintenance_system_report_failure']] = 'red';
                 return FALSE;
         }

branches/1.5/libs/PageHandling.php

@@ -391 +391 @@
 
         /**
-         * Return page numbers bar
-         *
-         * @param object $pageObject - current object of type Paginated
-         * @return string - HTML for page number bar
-         */
-        public function pageBar($h, $pageObject = NULL)
-        {
-                require_once(EXTENSIONS . 'Paginated/Paginated.php');
-                require_once(EXTENSIONS . 'Paginated/DoubleBarLayout.php');
-
-                $pageObject->setLayout(new DoubleBarLayout());
-                return $pageObject->fetchPagedNavigation($h);
-        }
-
-
-        /**
          * Converts a friendly url into a standard one
          *
@@ -413 +397 @@
          * return string $standard_url
          */
-        public function friendlyToStandardUrl(Hotaru $h, $friendly_url = '')
+        public function friendlyToStandardUrl($friendly_url = '', $is_admin = FALSE)
         {
                 $path = $friendly_url;
 
-                $head = (($h->isAdmin)?'admin_':'').'index.php?';
+                $head = (($is_admin)?'admin_':'').'index.php?';
 
                 /*      Many pages use standard urls even if friendly urls is enabled. For example,

branches/1.5/libs/Paginator.php

@@ -103 +103 @@
                 // if it doesn't contain $head, then it must be a friendly url
                 if ($path != SITEURL && !strrpos($path, $head)) {
-                        $path = $h->friendlyToStandardUrl($path);
+                        $path = $h->pageHandling->friendlyToStandardUrl($path, (bool) $h->isAdmin);
                 }
 

branches/1.5/libs/ThemeSettings.php

@@ -34 +34 @@
          * @return array|false
          */
-        public function readThemeMeta($h, $theme = 'default')
+        public function readThemeMeta($theme = 'default')
         {
                 if (!$theme) {