diff --git a/e107_admin/image.php b/e107_admin/image.php index 505143a9f..5f54d18e3 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -136,16 +136,16 @@ class media_admin extends e_admin_dispatcher protected $adminMenu = array( - 'main/grid' => array('caption'=> LAN_IMA_M_01, 'perm' => 'A'), + 'main/grid' => array('caption'=> 'LAN_IMA_M_01', 'perm' => 'A', 'icon'=>'fas-grip'), // 'main/create' => array('caption'=> "Add New Media", 'perm' => 'A'), // Should be handled in Media-Import. - 'main/import' => array('caption'=> LAN_IMA_M_02, 'perm' => 'A|A1'), + 'main/import' => array('caption'=> 'LAN_IMA_M_02', 'perm' => 'A|A1', 'icon'=>'fa-upload'), 'divider/01' => array('divider'=>true), - 'cat/list' => array('caption'=> LAN_IMA_M_03, 'perm' => 'A|A2'), - 'cat/create' => array('caption'=> LAN_IMA_M_04, 'perm' => 'A|A2'), // is automatic. - // 'main/settings' => array('caption'=> LAN_PREFS, 'perm' => 'A'), // legacy + 'cat/list' => array('caption'=> 'LAN_IMA_M_03', 'perm' => 'A|A2'), + 'cat/create' => array('caption'=> 'LAN_IMA_M_04', 'perm' => 'A|A2'), // is automatic. + // 'main/settings' => array('caption'=> 'LAN_PREFS', 'perm' => 'A'), // legacy 'divider/02' => array('divider'=>true), - 'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'A'), - 'main/avatar' => array('caption'=> LAN_IMA_M_05, 'perm' => 'A') + 'main/prefs' => array('caption'=> 'LAN_PREFS', 'perm' => 'A'), + 'main/avatar' => array('caption'=> 'LAN_IMA_M_05', 'perm' => 'A') ); protected $adminMenuIcon = 'e-images-24'; diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 77b1d3b37..ca5347dd2 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -78,15 +78,15 @@ class news_admin extends e_admin_dispatcher protected $adminMenu = array( 'main/list' => array('caption'=> LAN_LIST, 'icon'=>'fa-list'), - 'main/create' => array('caption'=> NWSLAN_45, 'icon'=> 'fa-plus'), // Create/Edit News Item - // 'cat/list' => array('caption'=> NWSLAN_46, 'perm' => '7'), // Category List + 'main/create' => array('caption'=> 'NWSLAN_45', 'icon'=> 'fa-plus'), // Create/Edit News Item + // 'cat/list' => array('caption'=> 'NWSLAN_46', 'perm' => '7'), // Category List 'other' => array('divider'=> true), - 'cat/list' => array('caption'=> LAN_CATEGORIES, 'icon'=> 'folder'), // Create Category. - 'cat/create' => array('caption'=> LAN_NEWS_63, 'icon'=> 'fas-folder-plus'), // Category List + 'cat/list' => array('caption'=> 'LAN_CATEGORIES', 'icon'=> 'folder'), // Create Category. + 'cat/create' => array('caption'=> 'LAN_NEWS_63', 'icon'=> 'fas-folder-plus'), // Category List 'other2' => array('divider'=> true), - 'main/prefs' => array('caption'=> LAN_PREFS, 'icon'=>'fa-cog'), // Preferences - // 'main/submitted' => array('caption'=> LAN_NEWS_64, 'perm' => 'N'), // Submitted News - 'sub/list' => array('caption'=> NWSLAN_47, 'icon'=>'fa-user-edit'), // Submitted News + 'main/prefs' => array('caption'=> 'LAN_PREFS', 'icon'=>'fa-cog'), // Preferences + // 'main/submitted' => array('caption'=> 'LAN_NEWS_64', 'perm' => 'N'), // Submitted News + 'sub/list' => array('caption'=> 'NWSLAN_47', 'icon'=>'fa-upload'), // Submitted News // 'main/maint' => array('caption'=> LAN_NEWS_55, 'perm' => '0') // Maintenance ); @@ -98,7 +98,7 @@ class news_admin extends e_admin_dispatcher 'cat/edit' => 'cat/list' ); - protected $menuTitle = ADLAN_0; + protected $menuTitle = 'ADLAN_0'; function init() { diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index a62167009..549237a81 100755 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -94,11 +94,11 @@ class plugman_adminArea extends e_admin_dispatcher protected $adminMenu = array( - 'installed/list' => array('caption'=> EPL_ADLAN_22, 'perm' => 'Z'), - 'avail/list' => array('caption'=> EPL_ADLAN_23, 'perm' => 'Z'), - 'online/grid' => array('caption'=> EPL_ADLAN_220, 'perm' => 'Z', 'icon'=>'fas-search'), - 'avail/upload' => array('caption'=>EPL_ADLAN_38, 'perm' => '0'), - 'create/build' => array('caption'=>EPL_ADLAN_114, 'perm' => '0', 'icon'=>'fas-toolbox'), + 'installed/list' => array('caption'=> 'EPL_ADLAN_22', 'perm' => 'Z', 'icon'=>'fa-plug-circle-check'), + 'avail/list' => array('caption'=> 'EPL_ADLAN_23', 'perm' => 'Z', 'icon'=>'fa-plug-circle-xmark'), + 'online/grid' => array('caption'=> 'EPL_ADLAN_220', 'perm' => 'Z', 'icon'=>'fas-search'), + 'avail/upload' => array('caption'=>'EPL_ADLAN_38', 'perm' => '0'), + 'create/build' => array('caption'=>'EPL_ADLAN_114', 'perm' => '0', 'icon'=>'fas-toolbox'), // 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'P'), @@ -518,7 +518,8 @@ class plugin_ui extends e_admin_ui return false; } - e107::getSingleton('e107plugin')->refresh($id); + ; + e107::getPlugin()->refresh($id); e107::getLog()->add('PLUGMAN_04', $id); e107::getMessage()->addSuccess("Repair Complete (".$id.")"); // Repair Complete ([x]) diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 53beb471f..4bea8d0bd 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -293,7 +293,7 @@ e107::js('footer-inline', js()); 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => '0|4'), 'main/add' => array('caption'=> EXTLAN_45, 'perm' => '0|4', 'icon'=>'fa-plus'), - 'main/create' => array('caption'=> EXTLAN_81, 'perm' => '0|4', 'icon'=>'fa-user-edit'), + 'main/create' => array('caption'=> EXTLAN_81, 'perm' => '0|4', 'icon'=>'fa-user-pen'), 'cat/list' => array('caption'=> LAN_CATEGORIES, 'perm' => '0|4'), 'cat/create' => array('caption'=> LAN_CREATE_CATEGORY, 'perm' => '0|4'), diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index e2e40fb74..433b9b066 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -4568,7 +4568,7 @@ var_dump($select_options);*/ // navbar-header nav-header // navbar-header nav-header $text = '
- +