mirror of
				https://github.com/Mibew/mibew.git
				synced 2025-10-28 09:15:31 +03:00 
			
		
		
		
	Use "get" prefix for StyleInterface::currentStyle
This commit is contained in:
		
							parent
							
								
									db710b9e06
								
							
						
					
					
						commit
						8fe93ec779
					
				| @ -42,7 +42,7 @@ if (Settings::get('enablessl') == "1" && Settings::get('forcessl') == "1") { | ||||
| } | ||||
| 
 | ||||
| // Initialize chat style which is currently used in system
 | ||||
| $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
| $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
| 
 | ||||
| // Do not support old browsers at all
 | ||||
| if (get_remote_level($_SERVER['HTTP_USER_AGENT']) == 'old') { | ||||
|  | ||||
| @ -441,13 +441,13 @@ function setup_chatview(Thread $thread) | ||||
|     $data['neediframesrc'] = needs_frame_src(); | ||||
| 
 | ||||
|     // Load dialogs style options
 | ||||
|     $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
|     $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
|     $style_config = $chat_style->getConfigurations(); | ||||
|     $data['chat']['windowsParams']['mail'] | ||||
|         = $style_config['mail']['window_params']; | ||||
| 
 | ||||
|     // Load core style options
 | ||||
|     $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
|     $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
|     $style_config = $page_style->getConfigurations(); | ||||
|     $data['chat']['windowsParams']['history'] | ||||
|         = $style_config['history']['window_params']; | ||||
|  | ||||
| @ -100,7 +100,7 @@ class ChatStyle extends AbstractStyle implements StyleInterface | ||||
|      * @return string Name of a style | ||||
|      * @throws \RuntimeException | ||||
|      */ | ||||
|     public static function currentStyle() | ||||
|     public static function getCurrentStyle() | ||||
|     { | ||||
|         // Ceck if request contains chat style
 | ||||
|         $style_name = verify_param("style", "/^\w+$/", ""); | ||||
|  | ||||
| @ -65,7 +65,7 @@ class InvitationStyle extends AbstractStyle implements StyleInterface | ||||
|      * | ||||
|      * @return string Name of a style | ||||
|      */ | ||||
|     public static function currentStyle() | ||||
|     public static function getCurrentStyle() | ||||
|     { | ||||
|         // Just use the default style
 | ||||
|         return self::defaultStyle(); | ||||
|  | ||||
| @ -100,7 +100,7 @@ class PageStyle extends AbstractStyle implements StyleInterface | ||||
|      * | ||||
|      * @return string Name of a style | ||||
|      */ | ||||
|     public static function currentStyle() | ||||
|     public static function getCurrentStyle() | ||||
|     { | ||||
|         // Just use the default style
 | ||||
|         return self::defaultStyle(); | ||||
|  | ||||
| @ -31,7 +31,7 @@ interface StyleInterface | ||||
|      * | ||||
|      * @return string Name of a style | ||||
|      */ | ||||
|     public static function currentStyle(); | ||||
|     public static function getCurrentStyle(); | ||||
| 
 | ||||
|     /** | ||||
|      * Returns name of the style which is used in the system by default. | ||||
|  | ||||
| @ -79,7 +79,7 @@ function generate_button( | ||||
| 
 | ||||
|         // Get actual invitation style instance
 | ||||
|         if (!$invitation_style_name) { | ||||
|             $invitation_style_name = InvitationStyle::currentStyle(); | ||||
|             $invitation_style_name = InvitationStyle::getCurrentStyle(); | ||||
|         } | ||||
|         $invitation_style = new InvitationStyle($invitation_style_name); | ||||
| 
 | ||||
|  | ||||
| @ -27,5 +27,5 @@ $page['no_right_menu'] = true; | ||||
| $page['fixedwrap'] = true; | ||||
| $page['show_small_login'] = false; | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('license', $page); | ||||
|  | ||||
| @ -40,7 +40,7 @@ if (!$thread) { | ||||
| } | ||||
| 
 | ||||
| // Initialize chat style which is currently used in system
 | ||||
| $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
| $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
| 
 | ||||
| $email = get_param('email'); | ||||
| $page['email'] = $email; | ||||
|  | ||||
| @ -50,9 +50,9 @@ $page = array( | ||||
| ); | ||||
| 
 | ||||
| // Initialize chat style which is currently used in system
 | ||||
| $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
| $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| 
 | ||||
| if (!isset($_GET['token'])) { | ||||
| 
 | ||||
|  | ||||
| @ -104,5 +104,5 @@ $page['menuid'] = ($operator['operatorid'] == $op_id) ? "profile" : "operators"; | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| $page['tabs'] = setup_operator_settings_tabs($op_id, 1); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('avatar', $page); | ||||
|  | ||||
| @ -134,5 +134,5 @@ $page['title'] = getlocal("page_ban.title"); | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator, false)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('ban', $page); | ||||
|  | ||||
| @ -71,5 +71,5 @@ $page['pagination.items'] = $pagination['items']; | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('blocked_visitors', $page); | ||||
|  | ||||
| @ -112,5 +112,5 @@ $page['menuid'] = "canned"; | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('canned', $page); | ||||
|  | ||||
| @ -33,7 +33,7 @@ $page = array( | ||||
|     'errors' => array(), | ||||
| ); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| 
 | ||||
| if ($string_id) { | ||||
|     $canned_message = load_canned_message($string_id); | ||||
|  | ||||
| @ -85,5 +85,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(1); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('features', $page); | ||||
|  | ||||
| @ -120,5 +120,5 @@ $page['menuid'] = "getcode"; | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('get_code', $page); | ||||
|  | ||||
| @ -156,5 +156,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_group_settings_tabs($group_id, 0); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('group', $page); | ||||
|  | ||||
| @ -76,5 +76,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_group_settings_tabs($group_id, 1); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('group_members', $page); | ||||
|  | ||||
| @ -87,5 +87,5 @@ $page['menuid'] = "groups"; | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('groups', $page); | ||||
|  | ||||
| @ -157,5 +157,5 @@ $page['canSearchInSystemMessages'] = ($search_type != 'all') | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('history', $page); | ||||
|  | ||||
| @ -45,5 +45,5 @@ $page = array( | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('index', $page); | ||||
|  | ||||
| @ -48,5 +48,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(5); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('invitation_themes', $page); | ||||
|  | ||||
| @ -68,5 +68,5 @@ $page['headertitle'] = getlocal("app.title"); | ||||
| $page['show_small_login'] = false; | ||||
| $page['fixedwrap'] = true; | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('login', $page); | ||||
|  | ||||
| @ -173,5 +173,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_operator_settings_tabs($op_id, 0); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('operator', $page); | ||||
|  | ||||
| @ -139,5 +139,5 @@ setlocale(LC_TIME, getstring("time.locale")); | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('operators', $page); | ||||
|  | ||||
| @ -93,5 +93,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_operator_settings_tabs($op_id, 2); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('operator_groups', $page); | ||||
|  | ||||
| @ -56,5 +56,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(3); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('page_themes', $page); | ||||
|  | ||||
| @ -139,5 +139,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(2); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('performance', $page); | ||||
|  | ||||
| @ -89,5 +89,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_operator_settings_tabs($op_id, 3); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('permissions', $page); | ||||
|  | ||||
| @ -42,7 +42,7 @@ $page = array( | ||||
| ); | ||||
| 
 | ||||
| // Initialize chat style which is currently used in system
 | ||||
| $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
| $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
| 
 | ||||
| if (isset($_GET['nextGroup'])) { | ||||
|     $next_id = verify_param("nextGroup", "/^\d{1,8}$/"); | ||||
|  | ||||
| @ -34,7 +34,7 @@ $page = array( | ||||
|     'errors' => array(), | ||||
| ); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| 
 | ||||
| $op_id = verify_param("id", "/^\d{1,9}$/"); | ||||
| $token = verify_param("token", "/^[\dabcdef]+$/"); | ||||
|  | ||||
| @ -36,7 +36,7 @@ $page = array( | ||||
| 
 | ||||
| $login_or_email = ""; | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| 
 | ||||
| if (isset($_POST['loginoremail'])) { | ||||
|     $login_or_email = get_param("loginoremail"); | ||||
|  | ||||
| @ -175,5 +175,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(0); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('settings', $page); | ||||
|  | ||||
| @ -201,5 +201,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_statistics_tabs($active_tab); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('statistics', $page); | ||||
|  | ||||
| @ -62,5 +62,5 @@ $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page['tabs'] = setup_settings_tabs(4); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('themes', $page); | ||||
|  | ||||
| @ -60,5 +60,5 @@ $page['title'] = getlocal("thread.chat_log"); | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator, false)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('thread_log', $page); | ||||
|  | ||||
| @ -65,5 +65,5 @@ foreach ($path as $k => $v) { | ||||
| $page['title'] = getlocal("tracked.path"); | ||||
| $page['show_small_login'] = false; | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('tracked', $page); | ||||
|  | ||||
| @ -48,7 +48,7 @@ $page = array( | ||||
|     'errors' => array(), | ||||
| ); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| 
 | ||||
| if ($string_id) { | ||||
|     $translation = isset($lang2[$string_id]) ? $lang2[$string_id] : ""; | ||||
|  | ||||
| @ -48,5 +48,5 @@ foreach ($default_extensions as $ext) { | ||||
| 
 | ||||
| $page = array_merge($page, prepare_menu($operator)); | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('updates', $page); | ||||
|  | ||||
| @ -85,5 +85,5 @@ foreach ($page['pagination.items'] as $key => $item) { | ||||
| $page['title'] = getlocal("page.analysis.userhistory.title"); | ||||
| $page['menuid'] = "history"; | ||||
| 
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $page_style->render('user_history', $page); | ||||
|  | ||||
| @ -46,13 +46,13 @@ $page['geoLink'] = Settings::get('geolink'); | ||||
| $page['geoWindowParams'] = Settings::get('geolinkparams'); | ||||
| 
 | ||||
| // Load dialogs style options
 | ||||
| $chat_style = new ChatStyle(ChatStyle::currentStyle()); | ||||
| $chat_style = new ChatStyle(ChatStyle::getCurrentStyle()); | ||||
| $style_config = $chat_style->getConfigurations(); | ||||
| $page['chatStyles.chatWindowParams'] = $style_config['chat']['window_params']; | ||||
| $page['coreStyles.inviteWindowParams'] = $style_config['chat']['window_params']; | ||||
| 
 | ||||
| // Load page style options
 | ||||
| $page_style = new PageStyle(PageStyle::currentStyle()); | ||||
| $page_style = new PageStyle(PageStyle::getCurrentStyle()); | ||||
| $style_config = $page_style->getConfigurations(); | ||||
| $page['coreStyles.threadTag'] = $style_config['users']['thread_tag']; | ||||
| $page['coreStyles.visitorTag'] = $style_config['users']['visitor_tag']; | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user