diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index 0610763fe..4062b7bea 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -87,7 +87,7 @@ class banlist_admin extends e_admin_dispatcher class banlist_ui extends e_admin_ui { - protected $pluginTitle = 'Ban'; + protected $pluginTitle = BANLAN_16; // protected $pluginName = 'myplugin'; protected $table = 'banlist'; protected $pid = 'banlist_ip'; @@ -641,7 +641,7 @@ switch ($action) $text .= "   ".str_replace('--NUM--', $num_entry, BANLAN_87); } - e107::getRender()->tablerender("
".BANLAN_86.'
', $text); + e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_86, $text); break; @@ -748,7 +748,7 @@ switch ($action) "; - e107::getRender()->tablerender(BANLAN_72, $emessage->render().$text); + e107::getRender()->tablerender(BANLAN_16.SEP.LAN_OPTIONS, $emessage->render().$text); break; case 'times' : @@ -816,7 +816,7 @@ switch ($action) "; - e107::getRender()->tablerender(BANLAN_77, $emessage->render().$text); + e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_77, $emessage->render().$text); break; case 'edit' : // Edit an existing ban @@ -1067,7 +1067,7 @@ switch ($action) "; - e107::getRender()->tablerender(BANLAN_35, $emessage->render().$text); + e107::getRender()->tablerender(BANLAN_16.SEP.BANLAN_35, $emessage->render().$text); break; // End case 'transfer' case 'list' : diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 102731fea..8b5a0676f 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -198,7 +198,7 @@ class page_admin_form_ui extends e_admin_form_ui class page_chapters_ui extends e_admin_ui { - protected $pluginTitle = 'Page Chapters'; + protected $pluginTitle = 'Page'; protected $pluginName = 'core'; protected $table = "page_chapters"; protected $pid = "chapter_id"; diff --git a/e107_admin/cron.php b/e107_admin/cron.php index daa1acb29..1e9401552 100644 --- a/e107_admin/cron.php +++ b/e107_admin/cron.php @@ -56,7 +56,7 @@ class cron_admin extends e_admin_dispatcher 'main/edit' => 'main/list' ); - protected $menuTitle = 'Comments'; + protected $menuTitle = PAGE_NAME; } class cron_admin_ui extends e_admin_ui diff --git a/e107_admin/db.php b/e107_admin/db.php index ec0460827..523fc8a32 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -241,7 +241,7 @@ class system_tools $mes->addSuccess("Folder and File permissions have been updated"); } - e107::getRender()->tablerender("Correcting File and Directory Permissions", $mes->render()); + e107::getRender()->tablerender(DBLAN_10.SEP."Correcting File and Directory Permissions", $mes->render()); } @@ -294,7 +294,7 @@ class system_tools "; - e107::getRender()->tablerender("Convert Database to UTF-8", $mes->render().$text); + e107::getRender()->tablerender(DBLAN_10.SEP."Convert Database to UTF-8", $mes->render().$text); } @@ -563,7 +563,7 @@ class system_tools \n"; - e107::getRender()->tablerender(DBLAN_59, $mes->render().$text); + e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_59, $mes->render().$text); } @@ -678,7 +678,7 @@ class system_tools "; - e107::getRender()->tablerender("Export Options",$mes->render(). $text); + e107::getRender()->tablerender(DBLAN_10.SEP."Export Options",$mes->render(). $text); } @@ -716,7 +716,7 @@ class system_tools } // $mes->add(DBLAN_11." $mySQLdefaultdb ".DBLAN_12, E_MESSAGE_SUCCESS); - e107::getRender()->tablerender(DBLAN_7, DBLAN_11." $mySQLdefaultdb ".DBLAN_12); + e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_7, DBLAN_11." $mySQLdefaultdb ".DBLAN_12); } /** @@ -804,7 +804,7 @@ class system_tools \n\n"; - e107::getRender()->tablerender(DBLAN_10.' :: '.DBLAN_20." :: ".ucwords($type), $mes->render().$text); + e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_20.SEP.ucwords($type), $mes->render().$text); return $text; } @@ -979,7 +979,7 @@ class system_tools "; - e107::getRender()->tablerender(DBLAN_10.' - '.DBLAN_22, $mes->render().$text); + e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_22, $mes->render().$text); } } @@ -1211,7 +1211,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). "; - $e107->ns->tablerender(DBLAN_10.' - '.DBLAN_39, $mes->render().$text); + $e107->ns->tablerender(DBLAN_10.SEP.DBLAN_39, $mes->render().$text); } else { @@ -1518,7 +1518,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). "; - $e107->ns->tablerender(DBLAN_10.' - '.DBLAN_50, $mes->render().$text); + $e107->ns->tablerender(DBLAN_10.SEP.DBLAN_50, $mes->render().$text); } } diff --git a/e107_admin/menus.php b/e107_admin/menus.php index f829d985b..c52e3ccc7 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -135,7 +135,7 @@ if($_POST) $text .= $men->menuVisibilityOptions(); $text .= $men->menuInstanceParameters(); $text .= $men->menuRenderIframe(); - $ns -> tablerender(ADLAN_6." :: ".LAN_MENULAYOUT, $text, 'menus_config'); + $ns -> tablerender(ADLAN_6.SEP.LAN_MENULAYOUT, $text, 'menus_config'); } else // Within the IFrame. { diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index ead2814e1..bf20687ce 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -62,10 +62,10 @@ class news_admin extends e_admin_dispatcher protected $adminMenu = array( - 'main/list' => array('caption'=> NWSLAN_44, 'perm' => 'H'), + 'main/list' => array('caption'=> LAN_LIST, 'perm' => 'H'), 'main/create' => array('caption'=> NWSLAN_45, 'perm' => 'H'), // Create/Edit News Item // 'cat/list' => array('caption'=> NWSLAN_46, 'perm' => '7'), // Category List - 'cat/list' => array('caption'=> NWSLAN_46, 'perm' => 'H'), // Create Category. + 'cat/list' => array('caption'=> LAN_CATEGORIES, 'perm' => 'H'), // Create Category. 'cat/create' => array('caption'=> "Create Category", 'perm' => 'H'), // Category List 'main/settings' => array('caption'=> LAN_PREFS, 'perm' => '0'), // Preferences // 'main/submitted' => array('caption'=> "Old Submitted ", 'perm' => 'N'), // Submitted News @@ -86,7 +86,7 @@ class news_admin extends e_admin_dispatcher class news_cat_ui extends e_admin_ui { - protected $pluginTitle = 'News Categories'; + protected $pluginTitle = ADLAN_0; // "News" protected $pluginName = 'core'; protected $table = "news_category"; protected $pid = "category_id"; @@ -180,7 +180,7 @@ class news_cat_form_ui extends e_admin_form_ui class news_sub_ui extends e_admin_ui { - protected $pluginTitle = NWSLAN_47; + protected $pluginTitle = ADLAN_0; // "News" protected $pluginName = 'core'; protected $table = "submitnews"; protected $pid = "submitnews_id"; @@ -333,15 +333,15 @@ class news_admin_ui extends e_admin_ui 'news_meta_keywords' => array('title' => LAN_KEYWORDS, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_meta_description' => array('title' => LAN_DESCRIPTION,'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), - 'news_sef' => array('title' => 'SEF URL', 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), - 'user_name' => array('title' => LAN_NEWS_50, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), + 'news_sef' => array('title' => LAN_SEFURL, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), + 'user_name' => array('title' => LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_datestamp' => array('title' => LAN_NEWS_32, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y', 'filter'=>true), 'news_category' => array('title' => NWSLAN_6, 'type' => 'dropdown', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_start' => array('title' => "Start", 'type' => 'datestamp', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), 'news_end' => array('title' => "End", 'type' => 'datestamp', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), - 'news_class' => array('title' => NWSLAN_22, 'type' => 'userclasses', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), + 'news_class' => array('title' => LAN_VISIBILITY, 'type' => 'userclasses', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_render_type' => array('title' => LAN_TEMPLATE, 'type' => 'comma', 'width' => 'auto', 'thclass' => 'center', 'class' => null, 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'data' => 'int' , 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'reverse=1'), @@ -824,8 +824,8 @@ class admin_newspost 'news_meta_keywords' => array('title' => LAN_KEYWORDS, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_meta_description' => array('title' => LAN_DESCRIPTION,'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), - 'news_sef' => array('title' => 'SEF URL', 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), - 'user_name' => array('title' => LAN_NEWS_50, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), + 'news_sef' => array('title' => LAN_SEFURL, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), + 'user_name' => array('title' => LAN_AUTHOR, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_datestamp' => array('title' => LAN_NEWS_32, 'type' => 'datestamp', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), 'category_name' => array('title' => NWSLAN_6, 'type' => 'text', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), @@ -833,7 +833,7 @@ class admin_newspost 'news_end' => array('title' => "End", 'type' => 'datestamp', 'data'=> 'str','width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false, 'parms' => 'mask=%A %d %B %Y'), - 'news_class' => array('title' => NWSLAN_22, 'type' => 'userclass', 'data'=> 'str', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), + 'news_class' => array('title' => LAN_VISIBILITY, 'type' => 'userclass', 'data'=> 'str', 'width' => 'auto', 'thclass' => '', 'class' => null, 'nosort' => false), 'news_render_type' => array('title' => LAN_NEWS_49, 'type' => 'dropdown', 'data'=> 'comma', 'width' => 'auto', 'thclass' => 'center', 'class' => null, 'nosort' => false), 'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'data'=> 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false), 'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'data'=> 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false), @@ -1511,7 +1511,7 @@ class admin_newspost { e107::getAdminLog()->logArrayDiffs($temp, e107::getPref(), 'NEWS_06'); $this->clear_cache(); - //$this->show_message(NWSLAN_119, E_MESSAGE_SUCCESS); + } } @@ -2035,7 +2035,7 @@ class admin_newspost // -------- News Author --------------------- $text .=" - ".LAN_NEWS_50.": + ".LAN_AUTHOR.": "; @@ -2290,7 +2290,7 @@ class admin_newspost $text .= " - ".NWSLAN_22.": + ".LAN_VISIBILITY.": ".$frm->uc_select('news_userclass[]', vartrue($_POST['news_class'],0), 'nobody,public,guest,member,admin,classes,language', 'description=1&multiple=1')."
@@ -2666,7 +2666,7 @@ class admin_newspost ".LAN_NEWS_45." - ".NWSLAN_122." + ".LAN_ICON." ".NWSLAN_6." Manage Permissions ".LAN_OPTIONS." @@ -2675,10 +2675,10 @@ class admin_newspost "; - if ($category_total = e107::getDb()->db_Select_gen("SELECT ncat.* FROM #news_category AS ncat ORDER BY ncat.category_order ASC")) + if ($category_total = e107::getDb()->gen("SELECT ncat.* FROM #news_category AS ncat ORDER BY ncat.category_order ASC")) { $tindex = 100; - while ($category = e107::getDb()->db_Fetch()) { + while ($category = e107::getDb()->fetch()) { $icon = ''; if ($category['category_icon']) @@ -2760,6 +2760,8 @@ class admin_newspost $pref = e107::getPref(); $frm = e107::getForm(); + $sefbaseDiz = str_replace(array("[br]","[","]"), array("
","",""), NWSLAN_128 ); + $text = "
@@ -2774,7 +2776,7 @@ class admin_newspost ".NWSLAN_127." ".$frm->text('news_sefbase', $pref['news_sefbase'])." -
".sprintf(NWSLAN_128, e_ADMIN_ABS.'eurl.php').''.SITEURL.($pref['news_sefbase'] ? $pref['news_sefbase'].'/' : '')."
+
".$sefbaseDiz.''.SITEURL.($pref['news_sefbase'] ? $pref['news_sefbase'].'/' : '')."
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 207f8206b..6c5434f72 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -390,7 +390,7 @@ class pluginManager{ $text .= "
".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."
"; } - e107::getRender()->tablerender(ADLAN_98." :: ".$caption, $mes->render(). $text); + e107::getRender()->tablerender(ADLAN_98.SEP.$caption, $mes->render(). $text); } @@ -827,7 +827,7 @@ class pluginManager{ \n"; } - e107::getRender()->tablerender(ADLAN_98." :: ".EPL_ADLAN_38, $text); + e107::getRender()->tablerender(ADLAN_98.SEP.EPL_ADLAN_38, $text); } // ----------------------------------------------------------------------------- @@ -893,7 +893,7 @@ class pluginManager{ "; $emessage = &eMessage::getInstance(); - e107::getRender()->tablerender(ADLAN_98." :: ".$caption, $emessage->render(). $text); + e107::getRender()->tablerender(ADLAN_98.SEP.$caption, $emessage->render(). $text); } @@ -1248,7 +1248,7 @@ class pluginManager{
"; - e107::getRender()->tablerender(EPL_ADLAN_63." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text); + e107::getRender()->tablerender(EPL_ADLAN_63.SEP.$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"),$mes->render(). $text); } @@ -1406,18 +1406,10 @@ class pluginBuilder
".$frm->admin_button('step', 2,'other','Go')."
"; - - - - - - - - - + $text .= $frm->close(); - $ns->tablerender("Plugin Builder", $mes->render() . $text); + $ns->tablerender(ADLAN_98.SEP."Plugin Builder", $mes->render() . $text); } @@ -1511,7 +1503,7 @@ class pluginBuilder $mes->addInfo("Review ALL tabs before clicking 'Generate'."); - $ns->tablerender("Plugin Builder", $mes->render() . $text); + $ns->tablerender(ADLAN_98.SEP."Plugin Builder".SEP."Step 2", $mes->render() . $text); } @@ -2427,7 +2419,7 @@ exit; echo $mes->render(); - $ns->tablerender(LAN_CREATED.": plugin.xml", "
".$xmlText."
"); + $ns->tablerender(LADLAN_98.SEP."Plugin Builder".SEP.LAN_CREATED.": plugin.xml", "
".$xmlText."
"); $ns->tablerender(LAN_CREATED.": admin_config.php", "
".$text."
"); diff --git a/e107_admin/theme.php b/e107_admin/theme.php index e70a31ae7..7a52b42b0 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -290,7 +290,7 @@ class theme_builder $mes->addInfo("This Wizard will build a theme.xml meta file for your theme.
Before you start: "); @@ -302,17 +302,17 @@ class theme_builder - Select your plugin's folder + Select your theme's folder ".$frm->selectbox("newtheme",$newDir)." "; - + /* $text .= " Create Files ".$frm->checkbox('createFiles',1,1)." "; - + */ $text .= " @@ -322,7 +322,7 @@ class theme_builder $text .= $frm->close(); - $ns->tablerender("Theme Converter", $mes->render() . $text); + $ns->tablerender("Converter".SEP."Step 1", $mes->render() . $text); } @@ -410,7 +410,7 @@ class theme_builder $text .= $frm->close(); - $ns->tablerender("Theme Converter", $mes->render() . $text); + $ns->tablerender("Converter".SEP."Step 2", $mes->render() . $text); } diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 9c970886f..875980449 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -560,7 +560,7 @@ $text .= "


"; $text .= $e_userclass->show_graphical_tree(); -$ns->tablerender(UCSLAN_21, $text); +$ns->tablerender(ADLAN_38.SEP.LAN_CREATE, $text); break; // End of 'config' option @@ -621,7 +621,7 @@ $ns->tablerender(UCSLAN_21, $text); $text .= UCSLAN_39; } $text .= ""; - $ns->tablerender(UCSLAN_40, $mes->render() . $text); + $ns->tablerender(ADLAN_38.SEP.UCSLAN_40, $mes->render() . $text); break; // End of 'initial' @@ -730,7 +730,7 @@ $ns->tablerender(UCSLAN_21, $text); } $text .= ""; - $ns->tablerender(UCSLAN_61, $mes->render().$text); + $ns->tablerender(ADLAN_38.SEP.LAN_PREFS, $mes->render().$text); $text = "
@@ -906,7 +906,7 @@ function userclass2_adminmenu() $var['list']['link'] = 'userclass2.php'; - $var['config']['text'] = UCSLAN_25; + $var['config']['text'] = LAN_CREATE; // UCSLAN_25; $var['config']['link'] = 'userclass2.php?config'; //DEPRECATED - use admin->users instead. @@ -920,7 +920,7 @@ function userclass2_adminmenu() if (check_class(e_UC_MAINADMIN)) { - $var['options']['text'] = UCSLAN_50; + $var['options']['text'] = LAN_PREFS; // UCSLAN_50; $var['options']['link'] ='userclass2.php?options'; if (defined('UC_DEBUG_OPTS')) @@ -935,7 +935,7 @@ function userclass2_adminmenu() $var['specials']['link'] ="userclass2.php?special"; } } - show_admin_menu(UCSLAN_51, $action, $var); + show_admin_menu(ADLAN_38, $action, $var); } diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 966c15820..87a5668fe 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -521,7 +521,7 @@ class users_ext } - function show_extended($current = '') // Show existing fields List. + function show_extended($current = '') // Show Add fields List. { global $ue, $curtype,$mySQLdefaultdb, $action, $sub_action; @@ -830,7 +830,7 @@ class users_ext // $text .= ""; $emessage = e107::getMessage(); - $ns->tablerender(EXTLAN_9,$emessage->render().$text); + $ns->tablerender(EXTLAN_9.SEP.LAN_ADD,$emessage->render().$text); } @@ -986,7 +986,7 @@ class users_ext // ======= end added by Cam. $text .= "
"; $emessage = e107::getMessage(); - $ns->tablerender(EXTLAN_9, $emessage->render().$text); + $ns->tablerender(EXTLAN_9.SEP.LAN_CATEGORIES, $emessage->render().$text); } @@ -1089,7 +1089,7 @@ class users_ext $emessage = e107::getMessage(); - $ns->tablerender(EXTLAN_56,$emessage->render(). $txt); + $ns->tablerender(EXTLAN_9.SEP.EXTLAN_56,$emessage->render(). $txt); } diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php index 351e06a59..0e0f5b2c6 100644 --- a/e107_admin/wmessage.php +++ b/e107_admin/wmessage.php @@ -21,17 +21,16 @@ if (!getperms("M")) exit; } -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); +// include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); +e107::lan('core','wmessage',true); $e_sub_cat = 'wmessage'; require_once("auth.php"); -require_once(e_HANDLER.'form_handler.php'); + require_once(e_HANDLER.'userclass_class.php'); require_once(e_HANDLER."ren_help.php"); -require_once(e_HANDLER.'message_handler.php'); -$rs = new form; $frm = e107::getForm(); $mes = e107::getMessage(); @@ -136,7 +135,8 @@ if ($action == "main" || $action == "") if ($wm_total = $sql->db_Select("generic", "*", "gen_type='wmessage' ORDER BY gen_id ASC")) { $wmList = $sql->db_getList(); - $text = $rs->form_open('post', e_SELF, 'myform_wmessage', '', ''); + // $text = $rs->form_open('post', e_SELF, 'myform_wmessage', '', ''); + $text = $frm->open('myform_wmessage','post',e_SELF); $text .= " @@ -170,12 +170,14 @@ if ($action == "main" || $action == "") } $text .= "
"; - $text .= $rs->form_close(); + $text .= $frm->close(); + } else { //$text .= "
".WMLAN_09."
"; $mes->addInfo(WMLAN_09); } - $ns->tablerender(WMLAN_00, $mes->render() . $text); + + $ns->tablerender(WMLAN_00.SEP.LAN_MANAGE, $mes->render() . $text); } // Create and Edit @@ -212,7 +214,7 @@ if ($action == "create" || $action == "edit")
"; - $text .= display_help("helpb", "admin"); + $text .= display_help("helpb", "admin"); //XXX Serves as BC Check $text .= " @@ -239,7 +241,8 @@ if ($action == "create" || $action == "edit") "; - $ns->tablerender(WMLAN_01, $mes->render() . $text); + + $ns->tablerender(WMLAN_01.SEP.LAN_CREATE, $mes->render() . $text); } @@ -281,7 +284,7 @@ if ($action == "opt") { "; - $ns->tablerender(WMLAN_00.": ".LAN_PREFS, $mes->render() . $text); + $ns->tablerender(WMLAN_00.SEP.LAN_PREFS, $mes->render() . $text); } @@ -292,14 +295,14 @@ function wmessage_adminmenu() $act = e_QUERY; $action = vartrue($act,'main'); - $var['main']['text'] = WMLAN_00; + $var['main']['text'] = LAN_MANAGE; $var['main']['link'] = e_SELF; - $var['create']['text'] = WMLAN_01; + $var['create']['text'] = LAN_CREATE; $var['create']['link'] = e_SELF."?create"; $var['opt']['text'] = LAN_PREFS; $var['opt']['link'] = e_SELF."?opt"; - show_admin_menu(LAN_OPTIONS, $action, $var); + show_admin_menu(WMLAN_00, $action, $var); } require_once("footer.php"); diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 77162dfda..93dd5614d 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -2236,6 +2236,7 @@ class e107 * @param string $type : 'theme' or plugin name * @param $string $fname (optional): relative path to the theme or plugin language folder. (same as in the other functions) * when missing, [e_LANGUAGE].php will be used. + * @param $options : Set to True for admin. * @example e107::lan('theme'); // Loads THEME."languages/English.php (if English is the current language) * @example e107::lan('gallery'); // Loads e_PLUGIN."gallery/languages/English.php (if English is the current language) * @example e107::lan('gallery',e_LANGUAGE."_something.php"); // Loads e_PLUGIN."gallery/languages/English_something.php (if English is the current language) @@ -2320,9 +2321,13 @@ class e107 $searchPath[3] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'.php'; // menu language file. break; case 'admin' : - $searchPath[1] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'_admin_'.$unitName.'.php'; - $searchPath[2] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/'.'admin_'.$unitName.'.php'; + + $searchPath[1] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'_admin_'.$unitName.'.php'; + $searchPath[2] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/'.'admin_'.$unitName.'.php'; $searchPath[3] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/admin/'.e_LANGUAGE.'.php'; + $searchPath[4] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'/'.e_LANGUAGE.'_admin.php'; // Preferred. + $searchPath[5] = e_PLUGIN.$unitName.'/languages/'.e_LANGUAGE.'_admin.php'; // consistent with English_global.php, English_log.php etc. + break; case 'theme' : $searchPath[1] = e_THEME.$unitName.'/languages/'.e_LANGUAGE.'_'.$unitName.'.php'; diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 6ce14d38d..642ea49c1 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -433,7 +433,7 @@ class themeHandler } } - $ns->tablerender(TPVLAN_26." :: ".TPVLAN_33, $mes->render().$text); + $ns->tablerender(TPVLAN_26.SEP.TPVLAN_33, $mes->render().$text); } // Show Admin Configuration @@ -447,7 +447,7 @@ class themeHandler $text = $this->renderTheme(2, $theme); } } - $ns->tablerender(TPVLAN_26." :: ".TPVLAN_34, $mes->render().$text); + $ns->tablerender(TPVLAN_26.SEP.TPVLAN_34, $mes->render().$text); } // Show Upload Form @@ -466,7 +466,7 @@ class themeHandler // print_a($theme); } $text .= "
 
"; - $ns->tablerender(TPVLAN_26." :: ".TPVLAN_39, $mes->render().$text); + $ns->tablerender(TPVLAN_26.SEP.TPVLAN_39, $mes->render().$text); } @@ -566,7 +566,7 @@ class themeHandler $text .= "
".$tp->parseTemplate("{NEXTPREV=$parms}",TRUE)."
"; } - $ns->tablerender(TPVLAN_26." :: Available for Download", $mes->render().$text); + $ns->tablerender(TPVLAN_26.SEP."Available for Download", $mes->render().$text); } @@ -630,7 +630,7 @@ class themeHandler \n"; } - $ns->tablerender(TPVLAN_26." :: ".TPVLAN_38, $mes->render().$text); + $ns->tablerender(TPVLAN_26.SEP.TPVLAN_38, $mes->render().$text); } diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 728761489..168607e29 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -334,6 +334,7 @@ define("LAN_KEYWORDS","Keywords"); define("LAN_IMAGE","Image"); define("LAN_TEMPLATE","Template"); define("LAN_TYPE", "Type"); +define("LAN_CATEGORIES", "Categories"); define("LAN_SECURITYL_0", "Looking for trouble (none)"); diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index 692e9e1dd..30d085c9e 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -9,16 +9,16 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("NWSLAN_1", "News story deleted."); -define("NWSLAN_2", "Please tick the confirm box to delete this news item."); -define("NWSLAN_3", "No news items yet."); +// define("NWSLAN_1", "News story deleted."); +// define("NWSLAN_2", "Please tick the confirm box to delete this news item."); +// define("NWSLAN_3", "No news items yet."); define("NWSLAN_4", "News - Existing News"); -define("NWSLAN_5", "Open HTML Editor"); +// define("NWSLAN_5", "Open HTML Editor"); define("NWSLAN_6", "Category"); -define("NWSLAN_9", "tick to confirm"); +// define("NWSLAN_9", "tick to confirm"); define("NWSLAN_10", "No news categories"); -define("NWSLAN_11", "Add/Edit Categories"); +// define("NWSLAN_11", "Add/Edit Categories"); define("NWSLAN_12", "Title"); define("NWSLAN_13", "Body"); define("NWSLAN_14", "Extended"); @@ -29,7 +29,7 @@ define("NWSLAN_18", "Allow comments to be posted to this news item"); define("NWSLAN_19", "Activation"); define("NWSLAN_21", "Activate between"); -define("NWSLAN_22", "Visibility"); +// define("NWSLAN_22", "Visibility"); define("NWSLAN_24", "Preview again"); define("NWSLAN_25", "Update news in database"); @@ -71,17 +71,17 @@ define("NWSLAN_58", "Post"); define("NWSLAN_59", "No submitted news"); // define("NWSLAN_60", "Submitted News"); //already defined above. -define("NWSLAN_62", "Go to page: "); +// define("NWSLAN_62", "Go to page: "); define("NWSLAN_63", "Search newsposts"); define("NWSLAN_66", "Upload"); define("NWSLAN_67", "Image"); -define("NWSLAN_68", "File"); +// define("NWSLAN_68", "File"); define("NWSLAN_69", "Upload an image or file for use in the news item"); // define("NWSLAN_70", "The ".e_FILE."downloads folder is not writable, you need to CHMOD 777 the folder before uploading and files."); // deprecated see lan_admin.php // define("NWSLAN_71", "The ".e_IMAGE."newspost_images folder is not writable. You need to CHMOD 777 the folder before uploading any images."); // deprecated see lan_admin.php define("NWSLAN_72", "Only show news item between certain dates"); -define("NWSLAN_73", "Render type"); +// define("NWSLAN_73", "Render type"); define("NWSLAN_74", "Select how and where news item is posted"); define("NWSLAN_75", "Default - post to front page"); define("NWSLAN_76", "Title only - post to front page"); @@ -121,66 +121,66 @@ define("NWSLAN_117", "Set the title for the news archive"); //define("NWSLAN_119", "Settings Saved"); - already done in pref handler define("NWSLAN_120", "Text to show at the top of Submit News"); define("NWSLAN_121", "Nothing found for %s"); -define("NWSLAN_122", "Icon"); +// define("NWSLAN_122", "Icon"); //sn define("NWSLAN_123", "Posted"); -define("NWSLAN_124", "User"); -define("NWSLAN_125", "Email"); -define("NWSLAN_126", "IP"); +// define("NWSLAN_124", "User"); +// define("NWSLAN_125", "Email"); +// define("NWSLAN_126", "IP"); define("NWSLAN_127", "URL identifier"); define("NWSLAN_128", "Set a string to be used in news pages URL. This will only work proper .htaccess rules and eURL config
Resolved URL based on current value: "); -define("LAN_NEWS_5", "Error! - Was unable to update news item into database!"); -define("LAN_NEWS_6", "News entered into database."); -define("LAN_NEWS_7", "Error! - Was unable to enter news item into database!"); -define("LAN_NEWS_9", "Title only is set - only the news title will be shown"); -define("LAN_NEWS_10", "This news post is inactive (It will be not shown on front page). "); -define("LAN_NEWS_11", "This news post is active (it will be shown on front page). "); -define("LAN_NEWS_12", "Comments are turned on."); -define("LAN_NEWS_13", "Comments are turned off."); -define("LAN_NEWS_14", "
Activation period: "); -define("LAN_NEWS_15", "Body length: "); -define("LAN_NEWS_16", "b. Extended length: "); -define("LAN_NEWS_17", "b."); -define("LAN_NEWS_18", "Info"); -define("LAN_NEWS_19", "Now"); -define("LAN_NEWS_21", "News updated in database."); +// define("LAN_NEWS_5", "Error! - Was unable to update news item into database!"); +// define("LAN_NEWS_6", "News entered into database."); +// define("LAN_NEWS_7", "Error! - Was unable to enter news item into database!"); +// define("LAN_NEWS_9", "Title only is set - only the news title will be shown"); +// define("LAN_NEWS_10", "This news post is inactive (It will be not shown on front page). "); +// define("LAN_NEWS_11", "This news post is active (it will be shown on front page). "); +// define("LAN_NEWS_12", "Comments are turned on."); +// define("LAN_NEWS_13", "Comments are turned off."); +// define("LAN_NEWS_14", "
Activation period: "); +// define("LAN_NEWS_15", "Body length: "); +// define("LAN_NEWS_16", "b. Extended length: "); +// define("LAN_NEWS_17", "b."); +// define("LAN_NEWS_18", "Info"); +// define("LAN_NEWS_19", "Now"); +// define("LAN_NEWS_21", "News updated in database."); -define("LAN_NEWS_22", "Thumbnail"); +// define("LAN_NEWS_22", "Thumbnail"); define("LAN_NEWS_23", "Choose an image for this news item"); -define("LAN_NEWS_24", "Image + Auto-Thumbnail"); -define("LAN_NEWS_25", "Auto-Thumbnail size"); -define("LAN_NEWS_26", "add new upload field"); +// define("LAN_NEWS_24", "Image + Auto-Thumbnail"); +// define("LAN_NEWS_25", "Auto-Thumbnail size"); +// define("LAN_NEWS_26", "add new upload field"); define("LAN_NEWS_27", "Summary"); define("LAN_NEWS_28", "Sticky"); define("LAN_NEWS_29", "Select if news item will be sticky"); define("LAN_NEWS_30", "If selected, news item will appear above all others"); -define("LAN_NEWS_31", "This news post is sticky (it will be shown above all other items). "); +// define("LAN_NEWS_31", "This news post is sticky (it will be shown above all other items). "); define("LAN_NEWS_32", "Date stamp"); define("LAN_NEWS_33", "Set the date stamp for the current news item"); define("LAN_NEWS_34", "Trackback"); define("LAN_NEWS_35", "Add trackback URLs"); -define("LAN_NEWS_36", "Pingback (send a pingback to all URLs in this post)"); +// define("LAN_NEWS_36", "Pingback (send a pingback to all URLs in this post)"); define("LAN_NEWS_37", "Trackback URLs: (one URL per line)"); -define("LAN_NEWS_38", "Insert images"); +// define("LAN_NEWS_38", "Insert images"); -define("LAN_NEWS_39", "click on file to insert at cursor position"); -define("LAN_NEWS_40", "Insert download links"); +// define("LAN_NEWS_39", "click on file to insert at cursor position"); +// define("LAN_NEWS_40", "Insert download links"); -define("LAN_NEWS_42", "Files"); +// define("LAN_NEWS_42", "Files"); // define("LAN_NEWS_43", "(no images in /e107_images/newspost_images)"); // deprecated see lan_admin.php -define("LAN_NEWS_44", "Trackback not enabled."); +// define("LAN_NEWS_44", "Trackback not enabled."); define("LAN_NEWS_45", "ID"); -define("LAN_NEWS_46", "News item not updated as no changes were made."); -define('LAN_NEWS_47', 'Nothing changed - not updated'); -define("LAN_NEWS_48", "No Image"); +// define("LAN_NEWS_46", "News item not updated as no changes were made."); +// define('LAN_NEWS_47', 'Nothing changed - not updated'); +// define("LAN_NEWS_48", "No Image"); define("LAN_NEWS_49", "Render-type"); -define("LAN_NEWS_50", "Author"); +// define("LAN_NEWS_50", "Author"); define("LAN_NEWS_51", "Modification of the news-item author can be done by:"); define("LAN_NEWS_52", "General Information"); diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index 92b49f810..cba25bd32 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -4,6 +4,7 @@ if ( ! defined('e107_INIT')) { exit(); } define('STANDARDS_MODE', TRUE); // define("VIEWPORT","width=device-width, initial-scale=1.0"); define("VIEWPORT","width=1080"); +define("SEP"," "); e107::lan('theme'); e107::js('core','bootstrap/js/bootstrap.min.js'); @@ -632,6 +633,7 @@ function tablestyle($caption, $text, $mode) $HEADER = ''; $FOOTER = ''; + define('ICONMAIL', 'email_16.png'); define('ICONPRINT', 'print_16.png'); define('ICONSTYLE', 'border: 0px');