mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Language file optimization and Gui fixes.

Browse Source
This commit is contained in:
Cameron
2013-02-22 22:35:15 -08:00
parent 5b7fed3bef
commit 76ac4b39d5
7 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/language.php
View File

@@ -262,6 +262,11 @@ if(vartrue($_POST['disabled-unused']) && vartrue($_POST['disable-unused-lanfile'
function disableUnused($data) function disableUnused($data)
{ {
$data = str_replace("2008-2010","2008-2013", $data);
$data = str_replace(' * $URL$
* $Revision$
* $Id$
* $Author$',"",$data);
$tmp = explode("\n",$data); $tmp = explode("\n",$data);
foreach($tmp as $line) foreach($tmp as $line)
@@ -1084,7 +1089,7 @@ function unused($lanfile,$script)
if(count($_SESSION['language-tools-unused'])>0) if(count($_SESSION['language-tools-unused'])>0)
{ {
$text .= "<div class='buttons-bar center'>".$frm->admin_button('disabled-unused','Disable All Unused','submit'). $text .= "<div class='buttons-bar center'>".$frm->admin_button('disabled-unused','Disable All Unused','delete').
$frm->hidden('disable-unused-lanfile',$lanfile)."</div>"; $frm->hidden('disable-unused-lanfile',$lanfile)."</div>";
} }
@@ -1219,7 +1224,7 @@ function compareit($needle,$haystack,$value='',$disabled=FALSE){
if($disabled == " (disabled)") if($disabled == " (disabled)")
{ {
$color = "background-color:#DFFFDF"; $color = "background-color:#DFFFDF";
} }
if(!$found) if(!$found)

2
e107_admin/plugin.php
View File

@@ -850,7 +850,7 @@ class pluginManager{
} }
if($this->action == "avail") if($this->action == "avail")
{ {
$uninstalled = $plugin->getall(0); $uninstalled = $plugin->getall(0);
$caption = EPL_ADLAN_23; $caption = EPL_ADLAN_23;
$pluginRenderPlugin = $this->pluginRenderPlugin($uninstalled); $pluginRenderPlugin = $this->pluginRenderPlugin($uninstalled);
$button_mode = "install-selected"; $button_mode = "install-selected";

39
e107_admin/theme.php
View File

@@ -322,7 +322,7 @@ class theme_builder
$text .= $frm->close(); $text .= $frm->close();
$ns->tablerender("Converter".SEP."Step 1", $mes->render() . $text); $ns->tablerender(TPVLAN_26.SEP."Converter".SEP."Step 1", $mes->render() . $text);
} }
@@ -409,8 +409,8 @@ class theme_builder
</div>"; </div>";
$text .= $frm->close(); $text .= $frm->close();
$ns->tablerender("Converter".SEP."Step 2", $mes->render() . $text); $ns->tablerender(TPVLAN_26.SEP."Converter".SEP."Step 2", $mes->render() . $text);
} }
@@ -557,27 +557,27 @@ TEMPLATE;
{ {
case 'main-name': case 'main-name':
$help = "The name of your plugin. (Must be written in English)"; $help = "The name of your theme. (Must be written in English)";
$required = true; $required = true;
$pattern = "[A-Za-z ]*"; $pattern = "[A-Za-z ]*";
break; break;
case 'main-lang': case 'main-lang':
$help = "If you have a language file, enter the LAN_XXX value for the plugin's name"; $help = "If you have a language file, enter the LAN_XXX value for the theme's name";
$required = false; $required = false;
$placeholder= " "; $placeholder= " ";
$pattern = "[A-Z0-9_]*"; $pattern = "[A-Z0-9_]*";
break; break;
case 'main-date': case 'main-date':
$help = "Creation date of your plugin"; $help = "Creation date of your theme";
$required = true; $required = true;
break; break;
case 'main-version': case 'main-version':
$default = '1.0'; $default = '1.0';
$required = true; $required = true;
$help = "The version of your plugin. Format: x.x"; $help = "The version of your theme. Format: x.x";
$pattern = "^[\d]{1,2}\.[\d]{1,2}$"; $pattern = "^[\d]{1,2}\.[\d]{1,2}$";
break; break;
@@ -615,7 +615,7 @@ TEMPLATE;
case 'keywords-one': case 'keywords-one':
case 'keywords-two': case 'keywords-two':
$help = "Keyword/Tag for this plugin<br />(Must be written in English)"; $help = "Keyword/Tag for this theme<br />(Must be written in English)";
$required = true; $required = true;
$size = 20; $size = 20;
$placeholder= " "; $placeholder= " ";
@@ -623,7 +623,7 @@ TEMPLATE;
break; break;
case 'description-description': case 'description-description':
$help = "A full description of the plugin<br />(Must be written in English)"; $help = "A full description of the theme<br />(Must be written in English)";
$required = true; $required = true;
$size = 100; $size = 100;
$placeholder = " "; $placeholder = " ";
@@ -632,7 +632,7 @@ TEMPLATE;
case 'category-category': case 'category-category':
$help = "What category of plugin is this?"; $help = "What category of theme is this?";
$required = true; $required = true;
$size = 20; $size = 20;
break; break;
@@ -658,18 +658,15 @@ TEMPLATE;
case 'category': case 'category':
$options = array(
'settings' => 'settings', $allowedCategories = array(
'users' => 'users', 'generic', 'adult', 'blog', 'clan', 'children',
'content' => 'content', 'corporate', 'forum', 'gaming', 'gallery', 'news',
'tools' => 'tools', 'social', 'video', 'multimedia');
'manage' => 'manage',
'misc' => 'misc', sort($allowedCategories);
'menu' => 'menu',
'about' => 'about'
);
$text = $frm->selectbox($name, $options,'','required=1', true); $text = $frm->selectbox($name, $allowedCategories,'','useValues=1&required=1', true);
break; break;

2
e107_admin/wmessage.php
View File

@@ -214,7 +214,7 @@ if ($action == "create" || $action == "edit")
<textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm(vartrue($row['gen_chardata']))."</textarea> <textarea class='e-wysiwyg tbox' id='data' name='data' cols='70' rows='15' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm(vartrue($row['gen_chardata']))."</textarea>
<br />"; <br />";
$text .= display_help("helpb", "admin"); //XXX Serves as BC Check // $text .= display_help("helpb", "admin"); //XXX Serves as BC Check
$text .= " $text .= "

6
e107_handlers/plugin_class.php
View File

@@ -127,11 +127,11 @@ class e107plugin
* make sure the table is up to date. (Primarily called from plugin manager to get lists of installed and uninstalled plugins. * make sure the table is up to date. (Primarily called from plugin manager to get lists of installed and uninstalled plugins.
* @return array plugin details * @return array plugin details
*/ */
function getall($flag='all') function getall($flag)
{ {
$sql = e107::getDb(); $sql = e107::getDb();
if($flag == 'all') if($flag === 'all')
{ {
$qry = "SELECT * FROM #plugin ORDER BY plugin_path ASC"; $qry = "SELECT * FROM #plugin ORDER BY plugin_path ASC";
} }
@@ -140,7 +140,7 @@ class e107plugin
$qry = "SELECT * FROM #plugin WHERE plugin_installflag = ".(int) $flag." ORDER BY plugin_path ASC"; $qry = "SELECT * FROM #plugin WHERE plugin_installflag = ".(int) $flag." ORDER BY plugin_path ASC";
} }
if ($sql->gen($qry)) if ($sql->db_Select_gen($qry))
{ {
$ret = $sql->db_getList(); $ret = $sql->db_getList();
return $ret; return $ret;

82
e107_languages/English/admin/lan_links.php
View File

@@ -7,67 +7,67 @@
* *
*/ */
define("LCLAN_1", "Options Saved"); // define("LCLAN_1", "Options Saved");
define("LCLAN_2", "Saving link to database."); // define("LCLAN_2", "Saving link to database.");
define("LCLAN_3", "Updating link in database."); // define("LCLAN_3", "Updating link in database.");
// define("LCLAN_4", "Link deleted."); // define("LCLAN_4", "Link deleted.");
define("LCLAN_6", "Order updated."); // define("LCLAN_6", "Order updated.");
define("LCLAN_8", "Site Navigation Links"); // define("LCLAN_8", "Site Navigation Links");
define("LCLAN_12", "Link Rendertype"); // define("LCLAN_12", "Link Rendertype");
define("LCLAN_13", "Render"); // define("LCLAN_13", "Render");
define("LCLAN_15", "Link Name"); define("LCLAN_15", "Link Name");
define("LCLAN_16", "Link URL"); // define("LCLAN_16", "Link URL");
define("LCLAN_17", "Link Description"); // define("LCLAN_17", "Link Description");
define("LCLAN_18", "Link Button / Icon"); // define("LCLAN_18", "Link Button / Icon");
define("LCLAN_19", "Link Open Type"); define("LCLAN_19", "Link Open Type");
define("LCLAN_20", "Opens in same window"); define("LCLAN_20", "Opens in same window");
define("LCLAN_23", "Opens in new window"); define("LCLAN_23", "Opens in new window");
define("LCLAN_24", "Opens in 600x400 mini-window"); define("LCLAN_24", "Opens in 600x400 mini-window");
define("LCLAN_25", "Link Class"); // define("LCLAN_25", "Link Class");
define("LCLAN_26", "Ticking will make the link visible to only users in that class"); // define("LCLAN_26", "Ticking will make the link visible to only users in that class");
define("LCLAN_27", "Update Link"); // define("LCLAN_27", "Update Link");
define("LCLAN_28", "Create link"); // define("LCLAN_28", "Create link");
define("LCLAN_29", "Links"); // define("LCLAN_29", "Links");
define("LCLAN_30", "move up"); // define("LCLAN_30", "move up");
define("LCLAN_31", "move down"); // define("LCLAN_31", "move down");
define("LCLAN_39", "View Images"); // define("LCLAN_39", "View Images");
define("LCLAN_53", "Link"); // define("LCLAN_53", "Link");
define("LCLAN_54", "deleted"); // define("LCLAN_54", "deleted");
define("LCLAN_58", "Are you sure you want to delete this link?"); // define("LCLAN_58", "Are you sure you want to delete this link?");
define("LCLAN_61", "No links"); // define("LCLAN_61", "No links");
define("LCLAN_62", "Links Front Page"); // define("LCLAN_62", "Links Front Page");
define("LCLAN_63", "Create New Link"); // define("LCLAN_63", "Create New Link");
define("LCLAN_68", "Links Options"); // define("LCLAN_68", "Links Options");
define("LCLAN_78", "Show Description as Screen-Tip"); define("LCLAN_78", "Show Description as Screen-Tip");
define("LCLAN_79", "Description will be shown when the mouse hovers over the link"); define("LCLAN_79", "Description will be shown when the mouse hovers over the link");
define("LCLAN_80", "Activate expanding sub-menus"); define("LCLAN_80", "Activate expanding sub-menus");
define("LCLAN_81", "Sub-menus will display only after clicking their parent. (Link parent is disabled)"); define("LCLAN_81", "Sub-menus will display only after clicking their parent. (Link parent is disabled)");
define("LCLAN_83", "Submenus Generator"); // define("LCLAN_83", "Submenus Generator");
define("LCLAN_88", "Site Links Options"); // define("LCLAN_88", "Site Links Options");
define("LCLAN_89", "Image"); // define("LCLAN_89", "Image");
define("LCLAN_91", "Move"); // define("LCLAN_91", "Move");
define("LCLAN_92", "Open"); // define("LCLAN_92", "Open");
define("LCLAN_93", "URL"); // define("LCLAN_93", "URL");
define("LCLAN_95", "Class"); // define("LCLAN_95", "Class");
define("LCLAN_96", "Shown in your theme as"); // define("LCLAN_96", "Shown in your theme as");
define("LCLAN_100", "Same window"); // Short version for column display // define("LCLAN_100", "Same window"); // Short version for column display
define("LCLAN_101", "New window"); // define("LCLAN_101", "New window");
define("LCLAN_102", "New 600x400"); // define("LCLAN_102", "New 600x400");
define("LCLAN_103", "New 800x600"); // define("LCLAN_103", "New 800x600");
define("LINKLAN_1", "Opens in 800x600 window"); define("LINKLAN_1", "Opens in 800x600 window");
define("LINKLAN_2", "Parent"); // define("LINKLAN_2", "Parent");
define("LINKLAN_3", "No Parent (Normal Link)"); // define("LINKLAN_3", "No Parent (Normal Link)");
define("LINKLAN_4", "Sublink Generator"); define("LINKLAN_4", "Sublink Generator");
define("LINKLAN_5", "Generate Sublinks"); define("LINKLAN_5", "Generate Sublinks");
define("LINKLAN_6", "Create sublinks from:"); define("LINKLAN_6", "Create sublinks from:");
define("LINKLAN_7", "Create sublinks under which link?"); define("LINKLAN_7", "Create sublinks under which link?");
define("LINKLAN_8", "News Categories"); define("LINKLAN_8", "News Categories");
define("LINKLAN_9", "Download Categories"); define("LINKLAN_9", "Download Categories");
define("LINKLAN_10", "Create Sublink"); // define("LINKLAN_10", "Create Sublink");
define('LINKLAN_11', 'Nothing changed - not updated'); // define('LINKLAN_11', 'Nothing changed - not updated');
?> ?>

45
e107_languages/English/admin/lan_prefs.php
View File

@@ -3,16 +3,13 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2010 e107 Inc (e107.org) * Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Administration - Language file for Site Preferences * Administration - Language file for Site Preferences
* *
* $URL$
* $Revision$
* $Id$
* $Author$
*/ */
define("PRFLAN_1", "Site Information"); define("PRFLAN_1", "Site Information");
@@ -24,9 +21,9 @@ define("PRFLAN_6", "Site Description");
define("PRFLAN_7", "Main site admin"); define("PRFLAN_7", "Main site admin");
define("PRFLAN_8", "Main site admin email"); define("PRFLAN_8", "Main site admin email");
define("PRFLAN_9", "Site Disclaimer"); define("PRFLAN_9", "Site Disclaimer");
define("PRFLAN_10", "Theme"); // define("PRFLAN_10", "Theme");
define("PRFLAN_11", "Site Theme"); // define("PRFLAN_11", "Site Theme");
define("PRFLAN_12", "Click here to preview themes"); // define("PRFLAN_12", "Click here to preview themes");
define("PRFLAN_13", "Display Information"); define("PRFLAN_13", "Display Information");
define("PRFLAN_14", "Display theme information?"); define("PRFLAN_14", "Display theme information?");
define("PRFLAN_15", "Display render time?"); define("PRFLAN_15", "Display render time?");
@@ -72,7 +69,7 @@ define("PRFLAN_61", "Only enable SSL if <span class='error'>you are sure you kno
define("PRFLAN_76", "Enable Image-code verification during signup."); define("PRFLAN_76", "Enable Image-code verification during signup.");
define("PRFLAN_77", "Admin Display Options "); define("PRFLAN_77", "Admin Display Options ");
define("PRFLAN_78", "Leave blank to disable"); define("PRFLAN_78", "Leave blank to disable");
define("PRFLAN_80", "Click here to view"); // define("PRFLAN_80", "Click here to view");
define("PRFLAN_81", "Enable Image-code verification during login."); define("PRFLAN_81", "Enable Image-code verification during login.");
define("PRFLAN_83", "example"); define("PRFLAN_83", "example");
define("PRFLAN_87", "Comments/Posting"); define("PRFLAN_87", "Comments/Posting");
@@ -80,14 +77,14 @@ define("PRFLAN_88", "Turn on nested comments");
define("PRFLAN_89", "Display new comment icon"); define("PRFLAN_89", "Display new comment icon");
define("PRFLAN_90", "Allow posters to edit their comments"); define("PRFLAN_90", "Allow posters to edit their comments");
define("CUSTSIG_1", "Settings Saved!"); // define("CUSTSIG_1", "Settings Saved!");
define("CUSTSIG_2", "Real Name:"); define("CUSTSIG_2", "Real Name:");
define("CUSTSIG_3", "Website:"); // define("CUSTSIG_3", "Website:");
define("CUSTSIG_4", "Birthday:"); // define("CUSTSIG_4", "Birthday:");
define("CUSTSIG_5", "Location:"); // define("CUSTSIG_5", "Location:");
define("CUSTSIG_6", "Signature:"); define("CUSTSIG_6", "Signature:");
define("CUSTSIG_7", "Avatar:"); define("CUSTSIG_7", "Avatar:");
define("CUSTSIG_8", "Time-Zone:"); // define("CUSTSIG_8", "Time-Zone:");
define("CUSTSIG_12", "Hide"); define("CUSTSIG_12", "Hide");
define("CUSTSIG_13", "Fields"); define("CUSTSIG_13", "Fields");
define("CUSTSIG_14", "Display"); define("CUSTSIG_14", "Display");
@@ -117,7 +114,7 @@ define("PRFLAN_108", "text to replace email links with, image can be used by usi
define("PRFLAN_109", "Wrap long words in main text"); define("PRFLAN_109", "Wrap long words in main text");
define("PRFLAN_110", "words longer than the length entered will be wrapped onto a new line"); define("PRFLAN_110", "words longer than the length entered will be wrapped onto a new line");
define("PRFLAN_111", "Wrap long words in menu text"); define("PRFLAN_111", "Wrap long words in menu text");
define("PRFLAN_112", "On"); // define("PRFLAN_112", "On");
define("PRFLAN_113", "Off"); define("PRFLAN_113", "Off");
define("PRFLAN_116", "Class which can post HTML"); define("PRFLAN_116", "Class which can post HTML");
define("PRFLAN_117", "This will allow users to post most HTML code anywhere on the site, select the userclass to allow this."); define("PRFLAN_117", "This will allow users to post most HTML code anywhere on the site, select the userclass to allow this.");
@@ -134,8 +131,8 @@ define("PRFLAN_127", "Make URLs clickable");
define("PRFLAN_128", "Turning this on will convert posted URLs or Email addresses to hyperlinks"); define("PRFLAN_128", "Turning this on will convert posted URLs or Email addresses to hyperlinks");
define("PRFLAN_129", "Disallow multiple logins"); define("PRFLAN_129", "Disallow multiple logins");
define("PRFLAN_130", "Activating this will prevent more than one person logging in with the same username/password (login detail sharing)"); define("PRFLAN_130", "Activating this will prevent more than one person logging in with the same username/password (login detail sharing)");
define("PRFLAN_131", "Activate use of [php] bbcode"); // define("PRFLAN_131", "Activate use of [php] bbcode");
define("PRFLAN_132", "Activating this will allow authorized users to post [php] code in certain areas"); // define("PRFLAN_132", "Activating this will allow authorized users to post [php] code in certain areas");
define("PRFLAN_133", "GD extension required, not found"); define("PRFLAN_133", "GD extension required, not found");
define("PRFLAN_134", "Redirect all requests to site URL"); define("PRFLAN_134", "Redirect all requests to site URL");
define("PRFLAN_135", "for example, if your site URL above is set http://foo.com, anyone requesting http://www.foo.com will be redirected to http://foo.com"); define("PRFLAN_135", "for example, if your site URL above is set http://foo.com, anyone requesting http://www.foo.com will be redirected to http://foo.com");
@@ -166,7 +163,7 @@ define("PRFLAN_157", "All Display Names have been reset to the Username");
define("PRFLAN_158", "Display Name maximum length (5..100)"); define("PRFLAN_158", "Display Name maximum length (5..100)");
define("PRFLAN_159", "viewing this page with"); define("PRFLAN_159", "viewing this page with");
define("PRFLAN_160", "Check remote servers when validating email addresses."); define("PRFLAN_160", "Check remote servers when validating email addresses.");
define("PRFLAN_161", "Disable all comments on the site"); // define("PRFLAN_161", "Disable all comments on the site");
define("PRFLAN_162", "Site Contact Information"); define("PRFLAN_162", "Site Contact Information");
define("PRFLAN_163", "e.g. Company Name, Address, Phone, etc."); define("PRFLAN_163", "e.g. Company Name, Address, Phone, etc.");
define("PRFLAN_164", "Allow users to email copy of contact email to self"); define("PRFLAN_164", "Allow users to email copy of contact email to self");
@@ -190,9 +187,9 @@ define('PRFLAN_181', 'CHAP, plaintext fallback');
define('PRFLAN_182', 'CHAP only'); define('PRFLAN_182', 'CHAP only');
define('PRFLAN_183', ' CHAP requires JS enabled in user\'s browser'); define('PRFLAN_183', ' CHAP requires JS enabled in user\'s browser');
define('PRFLAN_184', 'User login method'); define('PRFLAN_184', 'User login method');
define('PRFLAN_185', '(as well as login name)'); // define('PRFLAN_185', '(as well as login name)');
define('PRFLAN_186', 'Yes'); // define('PRFLAN_186', 'Yes');
define('PRFLAN_187', 'No'); // define('PRFLAN_187', 'No');
define('PRFLAN_188', 'Password encoding'); define('PRFLAN_188', 'Password encoding');
define('PRFLAN_189', 'md5 (Legacy)'); define('PRFLAN_189', 'md5 (Legacy)');
define('PRFLAN_190', 'Salted'); define('PRFLAN_190', 'Salted');
@@ -200,7 +197,7 @@ define('PRFLAN_191', '(md5 is usually adequate for an Intranet, and often for ot
define('PRFLAN_192', 'Generate random predefined login names according to a pattern'); define('PRFLAN_192', 'Generate random predefined login names according to a pattern');
define('PRFLAN_193', 'To allow users to set their own login names, leave blank'); define('PRFLAN_193', 'To allow users to set their own login names, leave blank');
define('PRFLAN_194', '# alpha[br]. numeric[br]* alphanumeric[br]Other chars used as entered.'); define('PRFLAN_194', '# alpha[br]. numeric[br]* alphanumeric[br]Other chars used as entered.');
define('PRFLAN_195', 'Changed values:'); // define('PRFLAN_195', 'Changed values:');
define('PRFLAN_196', 'Log all page accesses'); define('PRFLAN_196', 'Log all page accesses');
define('PRFLAN_197', 'Auto-login new user after clicking on signup link'); define('PRFLAN_197', 'Auto-login new user after clicking on signup link');
define('PRFLAN_198', 'If disabled, user has to explicitly log in after signup'); define('PRFLAN_198', 'If disabled, user has to explicitly log in after signup');
@@ -234,7 +231,7 @@ define('PRFLAN_218', 'If \'off\', puts users at increased risk of XSS exploits p
define('PRFLAN_219', 'Not allowed characters found in Cookie name (alphanumeric characters allowed only). Cookie name not saved.'); define('PRFLAN_219', 'Not allowed characters found in Cookie name (alphanumeric characters allowed only). Cookie name not saved.');
define('PRFLAN_220', 'HTML Abuse filter (experimental)'); define('PRFLAN_220', 'HTML Abuse filter (experimental)');
define('PRFLAN_221', 'Blocks some unmatched tags for those allowed to post HTML'); define('PRFLAN_221', 'Blocks some unmatched tags for those allowed to post HTML');
define('PRFLAN_222', 'Moderate Comments made by'); // define('PRFLAN_222', 'Moderate Comments made by');
define('PRFLAN_223', 'Comments will require manual approval by an admin prior to being visible to other users'); // define('PRFLAN_223', 'Comments will require manual approval by an admin prior to being visible to other users');
?> ?>