From 3fc4b57e5389401c5a6c620643aecb9ed4f482c8 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 8 Jun 2009 09:18:25 -0400 Subject: [PATCH] use self:: to reference static functions and constants from with the class --- kronolith/lib/Kronolith.php | 178 ++++++++++++++++++++++---------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index c2dbddf17..d6ef194d9 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -111,9 +111,9 @@ class Kronolith "\n" . '' . htmlspecialchars($page_title) . "\n" . '\n". - Kronolith::wrapInlineScript(Kronolith::includeJSVars()); + self::wrapInlineScript(self::includeJSVars()); - Kronolith::includeStylesheetFiles(true); + self::includeStylesheetFiles(true); echo "\n"; @@ -149,7 +149,7 @@ class Kronolith 'name' => $registry->get('name'), 'is_ie6' => ($browser->isBrowser('msie') && ($browser->getMajor() < 7)), 'login_view' => $prefs->getValue('defaultview'), - 'default_calendar' => 'internal|' . Kronolith::getDefaultCalendar(PERMS_EDIT), + 'default_calendar' => 'internal|' . self::getDefaultCalendar(PERMS_EDIT), 'week_start' => (int)$prefs->getValue('week_start_monday'), 'date_format' => str_replace(array('%e', '%d', '%a', '%A', '%m', '%h', '%b', '%B', '%y', '%Y'), array('d', 'dd', 'ddd', 'dddd', 'MM', 'MMM', 'MMM', 'MMMM', 'yy', 'yyyy'), @@ -168,8 +168,8 @@ class Kronolith 'name' => ($owner ? '' : '[' . Auth::removeHook($calendar->get('owner')) . '] ') . $calendar->get('name'), 'owner' => $owner, - 'fg' => Kronolith::foregroundColor($calendar), - 'bg' => Kronolith::backgroundColor($calendar), + 'fg' => self::foregroundColor($calendar), + 'bg' => self::backgroundColor($calendar), 'show' => in_array($id, $GLOBALS['display_calendars'])); } foreach ($GLOBALS['all_external_calendars'] as $api => $categories) { @@ -186,8 +186,8 @@ class Kronolith foreach ($GLOBALS['all_remote_calendars'] as $calendar) { $code['conf']['calendars']['remote'][$calendar['url']] = array( 'name' => $calendar['name'], - 'fg' => Kronolith::foregroundColor($calendar), - 'bg' => Kronolith::backgroundColor($calendar), + 'fg' => self::foregroundColor($calendar), + 'bg' => self::backgroundColor($calendar), 'show' => in_array($calendar['url'], $GLOBALS['display_remote_calendars'])); } if (!empty($GLOBALS['conf']['holidays']['enable'])) { @@ -222,7 +222,7 @@ class Kronolith Horde_Date_Recurrence::RECUR_YEARLY_DATE, Horde_Date_Recurrence::RECUR_YEARLY_DAY, Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY) as $recurType) { - $code['text']['recur'][$recurType] = Kronolith::recurToString($recurType); + $code['text']['recur'][$recurType] = self::recurToString($recurType); } return array('var Kronolith = ' . Horde_Serialize::serialize($code, Horde_Serialize::JSON, NLS::getCharset()) . ';'); @@ -267,7 +267,7 @@ class Kronolith // If headers have already been sent, we need to output a