From 3a01ec4d26caf870c53388496c78c27b524e344e Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Tue, 4 Mar 2014 14:03:48 +0000 Subject: [PATCH] Rename StyleInterface::availableStyles to "getAvailableStyles" --- src/mibew/libs/classes/Mibew/Style/ChatStyle.php | 4 ++-- src/mibew/libs/classes/Mibew/Style/InvitationStyle.php | 2 +- src/mibew/libs/classes/Mibew/Style/PageStyle.php | 2 +- src/mibew/libs/classes/Mibew/Style/StyleInterface.php | 2 +- src/mibew/operator/getcode.php | 4 ++-- src/mibew/operator/invitationthemes.php | 2 +- src/mibew/operator/page_themes.php | 2 +- src/mibew/operator/settings.php | 6 +++--- src/mibew/operator/themes.php | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mibew/libs/classes/Mibew/Style/ChatStyle.php b/src/mibew/libs/classes/Mibew/Style/ChatStyle.php index 79a1fcac..cd99c731 100644 --- a/src/mibew/libs/classes/Mibew/Style/ChatStyle.php +++ b/src/mibew/libs/classes/Mibew/Style/ChatStyle.php @@ -110,7 +110,7 @@ class ChatStyle extends AbstractStyle implements StyleInterface } // Get all style list and make sure that in has at least one style. - $available_styles = self::availableStyles(); + $available_styles = self::getAvailableStyles(); if (empty($available_styles)) { throw new \RuntimeException('There are no dialog styles in the system'); } @@ -154,7 +154,7 @@ class ChatStyle extends AbstractStyle implements StyleInterface * * @param array List of styles names */ - public static function availableStyles() + public static function getAvailableStyles() { $styles_root = MIBEW_FS_ROOT . '/styles/dialogs'; diff --git a/src/mibew/libs/classes/Mibew/Style/InvitationStyle.php b/src/mibew/libs/classes/Mibew/Style/InvitationStyle.php index b76761cb..28e95e5a 100644 --- a/src/mibew/libs/classes/Mibew/Style/InvitationStyle.php +++ b/src/mibew/libs/classes/Mibew/Style/InvitationStyle.php @@ -98,7 +98,7 @@ class InvitationStyle extends AbstractStyle implements StyleInterface * * @param array List of styles names */ - public static function availableStyles() + public static function getAvailableStyles() { $styles_root = MIBEW_FS_ROOT . '/styles/invitations'; diff --git a/src/mibew/libs/classes/Mibew/Style/PageStyle.php b/src/mibew/libs/classes/Mibew/Style/PageStyle.php index 52552192..6c25b72e 100644 --- a/src/mibew/libs/classes/Mibew/Style/PageStyle.php +++ b/src/mibew/libs/classes/Mibew/Style/PageStyle.php @@ -133,7 +133,7 @@ class PageStyle extends AbstractStyle implements StyleInterface * * @param array List of styles names */ - public static function availableStyles() + public static function getAvailableStyles() { $styles_root = MIBEW_FS_ROOT . '/styles/pages'; diff --git a/src/mibew/libs/classes/Mibew/Style/StyleInterface.php b/src/mibew/libs/classes/Mibew/Style/StyleInterface.php index 9e11a3cf..5fed39de 100644 --- a/src/mibew/libs/classes/Mibew/Style/StyleInterface.php +++ b/src/mibew/libs/classes/Mibew/Style/StyleInterface.php @@ -52,7 +52,7 @@ interface StyleInterface * * @param array List of styles names */ - public static function availableStyles(); + public static function getAvailableStyles(); /** * Builds base path for style files. This path is relative to Mibew root and diff --git a/src/mibew/operator/getcode.php b/src/mibew/operator/getcode.php index 07018a28..27911c59 100644 --- a/src/mibew/operator/getcode.php +++ b/src/mibew/operator/getcode.php @@ -43,14 +43,14 @@ if (!isset($image_locales_map[$image])) { } $image_locales = $image_locales_map[$image]; -$style_list = ChatStyle::availableStyles(); +$style_list = ChatStyle::getAvailableStyles(); $style_list[""] = getlocal("page.preview.style_default"); $style = verify_param("style", "/^\w*$/", ""); if ($style && !in_array($style, $style_list)) { $style = ""; } -$invitation_style_list = InvitationStyle::availableStyles(); +$invitation_style_list = InvitationStyle::getAvailableStyles(); $invitation_style_list[""] = getlocal("page.preview.style_default"); $invitation_style = verify_param("invitationstyle", "/^\w*$/", ""); if ($invitation_style && !in_array($invitation_style, $invitation_style_list)) { diff --git a/src/mibew/operator/invitationthemes.php b/src/mibew/operator/invitationthemes.php index 2eb97c7f..c4c759c6 100644 --- a/src/mibew/operator/invitationthemes.php +++ b/src/mibew/operator/invitationthemes.php @@ -28,7 +28,7 @@ require_once(MIBEW_FS_ROOT . '/libs/settings.php'); $operator = check_login(); -$style_list = InvitationStyle::availableStyles(); +$style_list = InvitationStyle::getAvailableStyles(); $preview = verify_param("preview", "/^\w+$/", "default"); if (!in_array($preview, $style_list)) { diff --git a/src/mibew/operator/page_themes.php b/src/mibew/operator/page_themes.php index 31edd8f7..9dbd759a 100644 --- a/src/mibew/operator/page_themes.php +++ b/src/mibew/operator/page_themes.php @@ -25,7 +25,7 @@ require_once(MIBEW_FS_ROOT . '/libs/settings.php'); $operator = check_login(); -$style_list = PageStyle::availableStyles(); +$style_list = PageStyle::getAvailableStyles(); $preview = verify_param("preview", "/^\w+$/", "default"); if (!in_array($preview, $style_list)) { diff --git a/src/mibew/operator/settings.php b/src/mibew/operator/settings.php index f6cc608c..66161c23 100644 --- a/src/mibew/operator/settings.php +++ b/src/mibew/operator/settings.php @@ -61,12 +61,12 @@ $styles_params = array( 'page_style' => PageStyle::defaultStyle(), ); -$chat_style_list = ChatStyle::availableStyles(); -$page_style_list = PageStyle::availableStyles(); +$chat_style_list = ChatStyle::getAvailableStyles(); +$page_style_list = PageStyle::getAvailableStyles(); if (Settings::get('enabletracking')) { $styles_params['invitation_style'] = InvitationStyle::defaultStyle(); - $invitation_style_list = InvitationStyle::availableStyles(); + $invitation_style_list = InvitationStyle::getAvailableStyles(); } if (isset($_POST['email']) && isset($_POST['title']) && isset($_POST['logo'])) { diff --git a/src/mibew/operator/themes.php b/src/mibew/operator/themes.php index 10669567..9ca3ed95 100644 --- a/src/mibew/operator/themes.php +++ b/src/mibew/operator/themes.php @@ -30,7 +30,7 @@ require_once(MIBEW_FS_ROOT . '/libs/track.php'); $operator = check_login(); -$style_list = ChatStyle::availableStyles(); +$style_list = ChatStyle::getAvailableStyles(); $preview = verify_param("preview", "/^\w+$/", "default"); if (!in_array($preview, $style_list)) {