diff --git a/e107_admin/cron.php b/e107_admin/cron.php index a9d295427..227be0589 100644 --- a/e107_admin/cron.php +++ b/e107_admin/cron.php @@ -46,7 +46,7 @@ class cron_admin extends e_admin_dispatcher protected $adminMenu = array( - 'main/list' => array('caption'=> LAN_CRON_M_01, 'perm' => '0'), + 'main/list' => array('caption'=> LAN_MANAGE, 'perm' => '0'), 'main/refresh' => array('caption'=> LAN_CRON_M_02, 'perm' => '0','url'=>'cron.php'), // 'main/prefs' => array('caption'=> 'Settings', 'perm' => '0'), // 'main/custom' => array('caption'=> 'Custom Page', 'perm' => '0') @@ -74,12 +74,12 @@ class cron_admin_ui extends e_admin_ui 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), 'cron_id' => array('title'=> LAN_ID, 'type' => 'number', 'width' =>'5%', 'forced'=> FALSE, 'nolist'=>TRUE), 'cron_category' => array('title'=> LAN_CATEGORY, 'type' => 'method', 'data' => 'str', 'width'=>'auto','readonly' => 1, 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), - 'cron_name' => array('title'=> LAN_CRON_1, 'type' => 'text', 'width' => 'auto', 'readonly' => 1), + 'cron_name' => array('title'=> LAN_NAME, 'type' => 'text', 'width' => 'auto', 'readonly' => 1), 'cron_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'text', 'width' => '35%', 'readonly' => 1), 'cron_function' => array('title'=> LAN_CRON_2, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first', 'readonly' => 1), 'cron_tab' => array('title'=> LAN_CRON_3, 'type' => 'method', 'width' => 'auto'), // Display name 'cron_lastrun' => array('title'=> LAN_CRON_4, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'readonly' => 2), - 'cron_active' => array('title'=> LAN_CRON_5, 'type' => 'boolean', 'data'=> 'int', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true, 'width' => 'auto'), + 'cron_active' => array('title'=> LAN_ACTIVE, 'type' => 'boolean', 'data'=> 'int', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true, 'width' => 'auto'), 'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'data'=> null, 'noedit'=>TRUE, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center') ); @@ -1028,7 +1028,7 @@ class cron " - .LAN_CRON_1." + .LAN_CRON_1XXX." " .LAN_CRON_2." " @@ -1036,7 +1036,7 @@ class cron " .LAN_CRON_4." " - .LAN_CRON_5." + .LAN_CRON_5XXXX." " .LAN_CRON_6." " diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 94027f5b5..fb1bf4e50 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -398,7 +398,7 @@ class frontpage ".LAN_ORDER." - ".FRTLAN_53." + ".LAN_USERCLASS." ".FRTLAN_49." ".FRTLAN_35." ".LAN_OPTIONS." diff --git a/e107_admin/language.php b/e107_admin/language.php index 8ee9909b6..a6f360472 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -1082,10 +1082,7 @@ class lanDeveloper // $lanfile = $_POST['deprecatedLans']; $script = $_POST['deprecatedLans']; - - - - foreach($_POST['deprecatedLans'] as $k=>$scr) + foreach($script as $k=>$scr) { if(strpos($scr,e_ADMIN)!==false) // CORE { @@ -1103,11 +1100,6 @@ class lanDeveloper //$lanfile = $this->findIncludedFiles($script,vartrue($_POST['deprecatedLansReverse'])); } - - } - - foreach($script as $scr) - { if(!is_readable($scr)) { $mes->addError("Not Readable: ".$scr); @@ -1116,22 +1108,23 @@ class lanDeveloper } - // $found = $this->findIncludedFiles($script,vartrue($_POST['deprecatedLansReverse'])); // print_a($found); // Exceptions - same language loaded by several scripts. - if($lanfile == e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_e107_update.php") - { - $script = e_ADMIN."update_routines.php,".e_ADMIN."e107_update.php"; - } + // if($lanfile == e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_e107_update.php") + // { + // $script = e_ADMIN."update_routines.php,".e_ADMIN."e107_update.php"; + // } - if(vartrue($_POST['deprecatedLanFile'])) //override. + if($_POST['deprecatedLanFile'][0] !='auto') //override. { $lanfile = $_POST['deprecatedLanFile']; } + + $this->lanFile = $lanfile; $this->scriptFile = $script; $this->commonPhrases = $this->getCommon(); @@ -1297,7 +1290,8 @@ class lanDeveloper "; - $text .= "\n"; + $selected = ($_POST['deprecatedLanFile'][0] == 'auto') ? "selected='selected'" :""; + $text .= "\n"; foreach($_SESSION['languageTools_lanFileList'] as $val) { diff --git a/e107_languages/English/admin/lan_administrator.php b/e107_languages/English/admin/lan_administrator.php index a4755ecdf..7d9f7876c 100644 --- a/e107_languages/English/admin/lan_administrator.php +++ b/e107_languages/English/admin/lan_administrator.php @@ -24,13 +24,13 @@ define("ADMSLAN_18", "Permissions"); define("ADMSLAN_21", "Modify administrator permissions"); //define("ADMSLAN_22", "Moderate users/bans etc");//ADLAN_34 //define("ADMSLAN_23", "Create/edit custom pages"); //ADLAN_42 -define("ADMSLAN_24", "Manage download categories"); +// define("ADMSLAN_24", "Manage download categories"); define("ADMSLAN_25", "Upload /manage files"); -define("ADMSLAN_26", "Oversee news categories"); +// define("ADMSLAN_26", "Oversee news categories"); define("ADMSLAN_27", "Oversee link categories"); //define("ADMSLAN_28", "Take site down for maintenance");//ADLAN_40 -define("ADMSLAN_29", "Manage banners"); -define("ADMSLAN_30", "Configure news feed headlines"); +// define("ADMSLAN_29", "Manage banners"); +// define("ADMSLAN_30", "Configure news feed headlines"); //define("ADMSLAN_31", "Configure emoticons");//ADLAN_58 //define("ADMSLAN_32", "Configure front page content");//ADLAN_60 //define("ADMSLAN_33", "Configure system logging");//ADLAN_155 @@ -44,7 +44,7 @@ define("ADMSLAN_30", "Configure news feed headlines"); define("ADMSLAN_41", "Create/edit custom menus"); define("ADMSLAN_42", "Post reviews"); // - NOW PLUGIN //define("ADMSLAN_43", "Configure URLs");//ADLAN_159 -define("ADMSLAN_44", "Post downloads"); +// define("ADMSLAN_44", "Post downloads"); //define("ADMSLAN_45", "Schedule Tasks");//ADLAN_157 //define("ADMSLAN_46", "Welcome message");//ADLAN_28 //define("ADMSLAN_47", "Moderate submitted news");//LAN_SUBMITTED diff --git a/e107_languages/English/admin/lan_cpage.php b/e107_languages/English/admin/lan_cpage.php index 85275c4db..a8c8754ed 100644 --- a/e107_languages/English/admin/lan_cpage.php +++ b/e107_languages/English/admin/lan_cpage.php @@ -18,7 +18,7 @@ define("CUSLAN_50", "List Books/Chapters"); define("CUSLAN_51", "Add Book/Chapter"); define("CUSLAN_52", "Book"); define("CUSLAN_53", "Book or Chapter Title"); -//define("CUSLAN_54", "Meta Keywords");//LAN_KEYWORDS + define("CUSLAN_55", "Can be edited by"); define("CUSLAN_56", "Parent"); define("CUSLAN_57", "Please choose unique SEF URL string for this entry."); @@ -44,6 +44,7 @@ define("CUSLAN_76", "Menu with path #"); define("CUSLAN_77", "deleted"); define("CUSLAN_78", "Couldn't delete menu with path "); +// define("CUSLAN_54", "Meta Keywords"); //LAN_KEYWORDS // define("CUSLAN_1", "Title"); // define("CUSLAN_2", "Type"); // define("CUSLAN_3", "Search engine friendly string"); @@ -87,8 +88,6 @@ define("CUSLAN_78", "Couldn't delete menu with path "); // define("CUSLAN_46", "Nothing changed - not saved"); // define("CUSLAN_47", "General Information"); -// define("CUSLAN_50", "Existing Menus"); -// define("CUSLAN_51", "Menu saved to database."); -// define("CUSLAN_52", "Menu added to menus."); + ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_cron.php b/e107_languages/English/admin/lan_cron.php index c6da67b0f..54c23c985 100644 --- a/e107_languages/English/admin/lan_cron.php +++ b/e107_languages/English/admin/lan_cron.php @@ -9,15 +9,13 @@ if (!defined("PAGE_NAME")) { define("PAGE_NAME", "Schedule Tasks"); } // Menu -define("LAN_CRON_M_01", "Manage"); -define("LAN_CRON_M_02", "Refresh"); +define("LAN_CRON_M_02", "Refresh"); // Table heading -define("LAN_CRON_1", "Name"); + define("LAN_CRON_2", "Function"); define("LAN_CRON_3", "Tab"); define("LAN_CRON_4", "Last-run"); -define("LAN_CRON_5", "Active"); // Default crons define("LAN_CRON_01_1", "Test Email"); diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php index f8d6af6a9..9166c803a 100644 --- a/e107_languages/English/admin/lan_frontpage.php +++ b/e107_languages/English/admin/lan_frontpage.php @@ -7,42 +7,37 @@ */ + +define("FRTLAN_13", "Current Front Page Settings"); +define("FRTLAN_30", "Custom Page"); +define("FRTLAN_35", "Post-login page"); +define("FRTLAN_42", "Add new rule"); +define("FRTLAN_43", "Class"); +define("FRTLAN_46", "Edit existing rule"); +define("FRTLAN_49", "Home Page"); +define("FRTLAN_51", "Other"); +define("FRTLAN_PAGE_TITLE", "Front Page"); +define("FRTLAN_56", "duplicate definition for class:"); +define("FRTLAN_57", "Software error"); + +// define("FRTLAN_53", "User Class"); //define("FRTLAN_1", "Front Page settings updated."); //define("FRTLAN_12", "Update Front Page Settings"); -define("FRTLAN_13", "Current Front Page Settings"); -define("FRTLAN_15", "Other (enter url)"); - -define("FRTLAN_30", "Custom Page"); - +// define("FRTLAN_15", "Other (enter url)"); //define("FRTLAN_33", "Current Settings"); - // New language defs for 0.8 -define("FRTLAN_35", "Post-login page"); -/* moved to the admin help file //define("FRTLAN_38", "The rules are searched in order, to find the first where the current user belongs to the class specified in the rule. That rule then determines the front (home) page and any specific post-login page."); //define("FRTLAN_39", "If no rule matches, news.php is set as the home page"); //define("FRTLAN_41", "The user is sent to the specified "Post-login page" (if specified) immediately following a login"); -*/ //define("FRTLAN_40", "Order"); -define("FRTLAN_42", "Add new rule"); -define("FRTLAN_43", "Class"); +// define("FRTLAN_47", "Move up"); +// define("FRTLAN_48", "Move down"); +// define("FRTLAN_50", "(To disable, select "Other" with a blank URL)"); +//define("FRTLAN_52", "None"); +// define("FRTLAN_60", "Front"); // define("FRTLAN_44", "Go to this page after login"); //define("FRTLAN_45", "Values not changed"); -define("FRTLAN_46", "Edit existing rule"); -define("FRTLAN_47", "Move up"); -define("FRTLAN_48", "Move down"); -define("FRTLAN_49", "Home Page"); -define("FRTLAN_50", "(To disable, select "Other" with a blank URL)"); -define("FRTLAN_51", "Other"); -//define("FRTLAN_52", "None"); -define("FRTLAN_53", "User Class"); - -// 2.0 -define("FRTLAN_PAGE_TITLE", "Front Page"); //define("FRTLAN_54", "Are you sure?"); //define("FRTLAN_55", "Confirm delete rule?"); -define("FRTLAN_56", "duplicate definition for class:"); -define("FRTLAN_57", "Software error"); -define("FRTLAN_60", "Front"); ?> \ No newline at end of file