diff --git a/objects/user.php b/objects/user.php index 4a86be2ff3..9ccbac6948 100644 --- a/objects/user.php +++ b/objects/user.php @@ -1001,9 +1001,15 @@ if (typeof gtag !== \"function\") { } } - public static function isLogged() { + public static function isLogged($checkForRequestLogin=false) { self::recreateLoginFromCookie(); - return !empty($_SESSION['user']['id']); + $isLogged = !empty($_SESSION['user']['id']); + if(empty($isLogged) && $checkForRequestLogin){ + self::loginFromRequest(); + return !empty($_SESSION['user']['id']); + }else{ + return $isLogged; + } } public static function isVerified() { diff --git a/plugin/Live/view/extraitems_templates/extraItem.html b/plugin/Live/view/extraitems_templates/extraItem.html index 3a06a0cae3..3eb685346f 100644 --- a/plugin/Live/view/extraitems_templates/extraItem.html +++ b/plugin/Live/view/extraitems_templates/extraItem.html @@ -6,7 +6,7 @@ LIVE NOW - + _title_ diff --git a/plugin/LiveLinks/view/menuItem.html b/plugin/LiveLinks/view/menuItem.html index 922812925a..f8eb0fc457 100644 --- a/plugin/LiveLinks/view/menuItem.html +++ b/plugin/LiveLinks/view/menuItem.html @@ -11,6 +11,6 @@ \ No newline at end of file diff --git a/plugin/Meet/meet_scheduled.php b/plugin/Meet/meet_scheduled.php index 6138fad2a2..458879d3d5 100644 --- a/plugin/Meet/meet_scheduled.php +++ b/plugin/Meet/meet_scheduled.php @@ -213,7 +213,7 @@ if (!User::canCreateMeet()) { ], select: true, "initComplete": function (settings, json) { - $('[data-toggle="tooltip"]').tooltip({container: 'body'}); + $('[data-toggle="tooltip"]').tooltip({container: 'body', html:true}); } }); \ No newline at end of file diff --git a/plugin/MobileManager/getConfiguration.json.php b/plugin/MobileManager/getConfiguration.json.php index 621eae5c97..bedf26eba7 100644 --- a/plugin/MobileManager/getConfiguration.json.php +++ b/plugin/MobileManager/getConfiguration.json.php @@ -15,4 +15,25 @@ if(!empty($obj->YPTSocket)){ $obj->webSocketTypes = json_encode($refl->getConstants()); $obj->webSocketURL = addQueryStringParameter(YPTSocket::getWebSocketURL(true), 'page_title', 'Mobile APP'); } +if(AVideoPlugin::isEnabledByName("TopMenu")){ + $obj->tabMenuItems = array(); + $obj->leftMenuItems = array(); + if(empty($_POST['sort'])){ + $_POST['sort'] = array('item_order'=>"ASC"); + } + $tabMenu = Menu::getAllActive(Menu::$typeMobileTabMenu); + foreach ($tabMenu as $key => $value) { + $menuItems = MenuItem::getAllFromMenu($value['id'], true); + foreach ($menuItems as $value2) { + $obj->tabMenuItems[] = $value2; + } + } + $tabMenu = Menu::getAllActive(Menu::$typeMobileLeftMenu); + foreach ($tabMenu as $key => $value) { + $menuItems = MenuItem::getAllFromMenu($value['id'], true); + foreach ($menuItems as $value2) { + $obj->leftMenuItems[] = $value2; + } + } +} echo json_encode($obj); diff --git a/plugin/PlayLists/epg.template.html b/plugin/PlayLists/epg.template.html index 2d6ee268dc..57316637f2 100644 --- a/plugin/PlayLists/epg.template.html +++ b/plugin/PlayLists/epg.template.html @@ -24,6 +24,6 @@ currentTime{uid}++; {implode} }, 1000); - $('div[data-toggle="tooltip"]').tooltip({container: '#EPGProgress{uid}'}); + $('div[data-toggle="tooltip"]').tooltip({container: '#EPGProgress{uid}', html:true}); }); \ No newline at end of file diff --git a/plugin/PlayLists/playLiveButton.html b/plugin/PlayLists/playLiveButton.html index 516510eaaf..9cca082ced 100644 --- a/plugin/PlayLists/playLiveButton.html +++ b/plugin/PlayLists/playLiveButton.html @@ -23,7 +23,7 @@ }); return false; }); - $('#{btnId},#{btnId}Live').tooltip(); + $('#{btnId},#{btnId}Live').tooltip({html:true}); }); function toogle{btnId}isLive(){ if({btnId}isLive){ diff --git a/plugin/TopMenu/Objects/Menu.php b/plugin/TopMenu/Objects/Menu.php index cf7672ab15..de22bb6a40 100644 --- a/plugin/TopMenu/Objects/Menu.php +++ b/plugin/TopMenu/Objects/Menu.php @@ -13,6 +13,8 @@ class Menu extends ObjectYPT { static $typeActionMenuCustomURLForLoggedUsers = 5; static $typeActionMenuCustomURLForUsersThatCanWatchVideo = 6; static $typeActionMenuCustomURLForUsersThatCanNotWatchVideo = 7; + static $typeMobileTabMenu = 8; + static $typeMobileLeftMenu = 9; static $typeName = array( 1=>'Left', @@ -21,7 +23,9 @@ class Menu extends ObjectYPT { 4=>'Action Per Video', 5=>'Action Per Video For Logged Users Only', 6=>'Action Per Video For Users That can Watch Video', - 7=>'Action Per Video For Users That can NOT Watch Video'); + 7=>'Action Per Video For Users That can NOT Watch Video', + 8=>'Mobile Tab Menu', + 9=>'Mobile Left Menu'); protected $id, $menuName, $categories_id, $users_groups_id, $menu_order, $status, $position, $type, $icon, $menuSeoUrl; diff --git a/plugin/TopMenu/menuItemSave.json.php b/plugin/TopMenu/menuItemSave.json.php index bf9352d3a3..7b9a03ef11 100644 --- a/plugin/TopMenu/menuItemSave.json.php +++ b/plugin/TopMenu/menuItemSave.json.php @@ -25,6 +25,10 @@ $menu->setUrl($_POST['url']); $menu->setIcon($_POST['icon']); $menu->setMenuSeoUrlItem($_POST['menuSeoUrlItem']); +if(!empty($_POST['mobileicon'])){ + $menu->setIcon($_POST['mobileicon']); +} + $obj->error = $menu->save(); echo json_encode($obj); ?> diff --git a/plugin/TopMenu/page/editor.php b/plugin/TopMenu/page/editor.php index 131e01d9b6..6d82f5323c 100644 --- a/plugin/TopMenu/page/editor.php +++ b/plugin/TopMenu/page/editor.php @@ -199,7 +199,7 @@ $groups = UserGroups::getAllUsersGroups(); -
+ +
- objects/userSavePhoto.php", data: { - imgBase64: resp + imgBase64: resp, }, success: function (response) { modal.hidePleaseWait();