fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix backward compatibility with admin module

Browse source
This commit is contained in:
Kijin Sung 2022-12-27 11:06:28 +09:00
parent 9c424f2d6f
commit a95ef14b8d
5 changed files with 46 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/module/ModuleHandler.class.php
View file

@ -581,8 +581,7 @@ class ModuleHandler extends Handler
// Admin page layout
if($this->module == 'admin' && $type == 'view' && $this->act != 'dispLayoutAdminLayoutModify')
{
$oAdminView = getAdminView('admin');
$oAdminView->makeGnbUrl($forward->module);
Rhymix\Modules\Admin\Controllers\Base::getInstance()->loadAdminMenu($forward->module);
$oModule->setLayoutPath("./modules/admin/tpl");
$oModule->setLayoutFile("layout.html");
}

32
modules/admin/admin.admin.model.php
View file

@ -136,79 +136,79 @@ class AdminAdminModel extends Admin
}
/**
* Deprecated aliases to model methods
* Aliases for backward compatibility.
*/
public function getAdminMenuName()
public static function getAdminMenuName()
{
return Rhymix\Modules\Admin\Models\AdminMenu::getAdminMenuName();
}
public function getAdminMenuLang()
public static function getAdminMenuLang()
{
return Rhymix\Modules\Admin\Models\AdminMenu::getAdminMenuLang();
}
public function getFavoriteList($site_srl = 0, $add_module_info = false)
public static function getFavoriteList($site_srl = 0, $add_module_info = false)
{
return Rhymix\Modules\Admin\Models\Favorite::getFavorites($add_module_info);
}
public function isExistsFavorite($site_srl, $module)
public static function isExistsFavorite($site_srl, $module)
{
return Rhymix\Modules\Admin\Models\Favorite::isFavorite($module);
}
public function getFaviconUrl($domain_srl = 0)
public static function getFaviconUrl($domain_srl = 0)
{
return Rhymix\Modules\Admin\Models\Icon::getFaviconUrl($domain_srl);
}
public function getMobileIconUrl($domain_srl = 0)
public static function getMobileIconUrl($domain_srl = 0)
{
return Rhymix\Modules\Admin\Models\Icon::getMobiconUrl($domain_srl);
}
public function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0)
public static function getSiteDefaultImageUrl($domain_srl = 0, &$width = 0, &$height = 0)
{
return Rhymix\Modules\Admin\Models\Icon::getDefaultImageUrl($domain_srl, $width, $height);
}
public function iconUrlCheck($iconname, $default_icon_name, $domain_srl)
public static function iconUrlCheck($iconname, $default_icon_name, $domain_srl)
{
return Rhymix\Modules\Admin\Models\Icon::getIconUrl($domain_srl, $iconname);
}
public function getSFTPPath()
public static function getSFTPPath()
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
}
public function getFTPPath()
public static function getFTPPath()
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
}
public function getAdminFTPPath()
public static function getAdminFTPPath()
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
}
public function getSFTPList()
public static function getSFTPList()
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
}
public function getAdminFTPList()
public static function getAdminFTPList()
{
return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
}
public function getThemeList()
public static function getThemeList()
{
return [];
}
public function getThemeInfo($theme_name, $layout_list = [])
public static function getThemeInfo($theme_name, $layout_list = [])
{
}

8
modules/admin/admin.admin.view.php
View file

@ -11,6 +11,14 @@
*/
class AdminAdminView extends Admin
{
/**
* Make the admin menu.
*/
public function makeGnbUrl($module = 'admin')
{
Rhymix\Modules\Admin\Controllers\Base::getInstance()->loadAdminMenu($module);
}
/**
* Display General Settings page
* @return void

20
modules/admin/controllers/Base.php
View file

@ -147,4 +147,24 @@ class Base extends \ModuleObject
Context::set('gnb_title_info', $gnbTitleInfo ?? null);
Context::addBrowserTitle($subMenuTitle ? $subMenuTitle : 'Dashboard');
}
/**
* Alias for backward compatibility.
*
* @deprecated
*/
public static function getAdminMenuName()
{
return AdminMenuModel::getAdminMenuName();
}
/**
* Alias for backward compatibility.
*
* @deprecated
*/
public static function getAdminMenuLang()
{
return AdminMenuModel::getAdminMenuLang();
}
}

3
modules/menu/menu.admin.model.php
View file

@ -542,10 +542,9 @@ class menuAdminModel extends menu
$menuListFromDB = $this->getMenus();
if(is_array($menuListFromDB))
{
$oAdmin = getClass('admin');
foreach($menuListFromDB AS $key=>$value)
{
if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
if($value->title === Rhymix\Modules\Admin\Models\AdminMenu::getAdminMenuName()) unset($output[$key]);
else
{
unset($menu);