mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

First cut of usersettings changes using common validation routines; more shared LANs, eliminate unused LANs

Browse Source
This commit is contained in:
e107steved
2008-12-28 22:37:43 +00:00
parent 641dba3b2e
commit 5d25c47657
15 changed files with 844 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
e107_languages/English/English.php
View File

@@ -4,50 +4,44 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/English.php,v $
| $Revision: 1.8 $
| $Date: 2008-12-21 22:17:05 $
| $Revision: 1.9 $
| $Date: 2008-12-28 22:37:43 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
setlocale(LC_ALL, 'en');
define("CORE_LC", 'en');
define("CORE_LC2", 'gb');
define('CORE_LC', 'en');
define('CORE_LC2', 'gb');
// define("TEXTDIRECTION","rtl");
define("CHARSET", "utf-8"); // for a true multi-language site. :)
define("CORE_LAN1","Error : theme is missing.\\n\\nChange the used themes in your preferences (admin area) or upload files of the current theme on the server.");
//v.616
define("CORE_LAN2"," \\1 wrote:");// "\\1" represents the username.
define("CORE_LAN3","file attachment disabled");
//v0.7+
define("CORE_LAN4", "Please delete install.php from your server");
define("CORE_LAN5", "if you do not there is a potential security risk to your website");
// v0.7.6
define("CORE_LAN6", "The flood protection on this site has been activated and you are warned that if you carry on requesting pages you could be banned.");
define("CORE_LAN7", "Core is attempting to restore prefs from automatic backup.");
define("CORE_LAN8", "Core Prefs Error");
define("CORE_LAN9", "Core could not restore from automatic backup. Execution halted.");
define("CORE_LAN10", "Corrupted cookie detected - logged out.");
define('CHARSET', 'utf-8'); // for a true multi-language site. :)
define('CORE_LAN1',"Error : theme is missing.\\n\\nChange the used themes in your preferences (admin area) or upload files for the current theme to the server.");
define('CORE_LAN2'," \\1 wrote:");// "\\1" represents the username.
define('CORE_LAN3', 'file attachment disabled'); // Not used in 0.8
define('CORE_LAN4', 'Please delete install.php from your server');
define('CORE_LAN5', 'if you do not there is a potential security risk to your website');
define('CORE_LAN6', 'The flood protection on this site has been activated and you are warned that if you carry on requesting pages you could be banned.');
define('CORE_LAN7', 'Core is attempting to restore prefs from automatic backup.');
define('CORE_LAN8', 'Core Prefs Error');
define('CORE_LAN9', 'Core could not restore from automatic backup. Execution halted.');
define('CORE_LAN10', 'Corrupted cookie detected - logged out.');
// Footer
define("CORE_LAN11", "Render time: ");
define("CORE_LAN12", " sec (");
define("CORE_LAN13", "% of that for queries) ");
define("CORE_LAN14", "%2.3f cpu sec (%2.2f%% load, %2.3f startup). Clock: ");
define("CORE_LAN15", "DB queries: ");
define("CORE_LAN16", "Memory: ");
define('CORE_LAN11', 'Render time: ');
define('CORE_LAN12', ' sec (');
define('CORE_LAN13', '% of that for queries) ');
define('CORE_LAN14', '%2.3f cpu sec (%2.2f%% load, %2.3f startup). Clock: ');
define('CORE_LAN15', 'DB queries: ');
define('CORE_LAN16', 'Memory: ');
// img.bb
define('CORE_LAN17', '[ image disabled ]');
define('CORE_LAN18', 'Image: ');
define("CORE_LAN_B", "B");
define("CORE_LAN_KB", "kB");
define("CORE_LAN_MB", "MB");
define("CORE_LAN_GB", "GB");
define("CORE_LAN_TB", "TB");
define('CORE_LAN_B', 'B');
define('CORE_LAN_KB', 'kB');
define('CORE_LAN_MB', 'MB');
define('CORE_LAN_GB', 'GB');
define('CORE_LAN_TB', 'TB');
define('LAN_WARNING', 'Warning!');
@@ -56,6 +50,8 @@ define('LAN_ANONYMOUS', 'Anonymous');
define('LAN_EMAIL_SUBS', '-email-');
define('LAN_YES', 'Yes');
define('LAN_NO', 'No');
define('LAN_OK', 'OK');
define('LAN_CONTINUE', 'Continue');
define('LAN_ENTER', 'Enter');
?>

16
e107_languages/English/lan_signup.php
View File

@@ -9,8 +9,8 @@
* Language file - User signup
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_signup.php,v $
* $Revision: 1.14 $
* $Date: 2008-12-21 22:17:05 $
* $Revision: 1.15 $
* $Date: 2008-12-28 22:37:43 $
* $Author: e107steved $
*
*/
@@ -44,8 +44,8 @@ define("LAN_SIGNUP_2", "chars.");
define("LAN_SIGNUP_3", "Code verification failed.");
define("LAN_SIGNUP_4", "Your password must be at least ");
define("LAN_SIGNUP_5", " characters long.");
define("LAN_SIGNUP_6", "Your ");
define("LAN_SIGNUP_7", " is required");
//define("LAN_SIGNUP_6", "Your "); See LAN_USER_75
//define("LAN_SIGNUP_7", " is required"); See LAN_USER_75
define("LAN_SIGNUP_8", "Thank you!");
define("LAN_SIGNUP_9", "Unable to proceed.");
//define("LAN_SIGNUP_10", "Yes");
@@ -66,7 +66,7 @@ define("LAN_SIGNUP_24", "Thank you for registering at");
define("LAN_SIGNUP_25", "Upload your avatar");
define("LAN_SIGNUP_26", "Upload your photograph");
define("LAN_SIGNUP_27", "Show");
define("LAN_SIGNUP_28", "choice of Content/Mail-lists");
//define("LAN_SIGNUP_28", "choice of Content/Mail-lists"); Now LAN_USER_73
define("LAN_SIGNUP_29", "A verification email will be sent to the email address you enter here so it must be valid.");
define("LAN_SIGNUP_30", "If you do not wish to display your email address on this site, please select 'Yes' for the 'Hide email address?' option.");
define("LAN_SIGNUP_31", "URL to your XUP file");
@@ -100,7 +100,7 @@ define("LAN_SIGNUP_59","**** If the link doesn't work, please check that part of
define('LAN_SIGNUP_60','Signup email resend requested');
define('LAN_SIGNUP_61','Send succeeded');
define('LAN_SIGNUP_62','Send failed');
define('LAN_SIGNUP_63','Password reset email resent requested');
define('LAN_SIGNUP_63','Password reset email resend requested');
define('LAN_SIGNUP_64','That doesn\'t appear to be valid user information');
define('LAN_SIGNUP_65','You have been assigned the following login name');
define('LAN_SIGNUP_66','Please make a note of it.');
@@ -123,8 +123,8 @@ define('LAN_SIGNUP_82', 'the name that you use to login'); // LAN_10
define('LAN_SIGNUP_83', 'Password: '); // LAN_17
define('LAN_SIGNUP_84', 'Re-type Password: '); // LAN_111
define('LAN_SIGNUP_85', 'Usernames and passwords are <b>case-sensitive</b>.'); // LAN_400
define('LAN_SIGNUP_86', 'Email Address: '); // LAN_112
define('LAN_SIGNUP_87', 'Hide email address?: '); // LAN_113
//define('LAN_SIGNUP_86', 'Email Address: '); // LAN_112 = LAN_USER_60
//define('LAN_SIGNUP_87', 'Hide email address?: '); // LAN_113 = LAN_USER_83
//define('LAN_SIGNUP_88', 'This will prevent your email address from being displayed on site'); // LAN_114
define('LAN_SIGNUP_89', 'Display Name: '); // LAN_7
define('LAN_SIGNUP_90', 'the name that will be displayed on site'); // LAN_8

30
e107_languages/English/lan_user.php
View File

@@ -9,8 +9,8 @@
* Language file - user-related (many generic definitions)
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_user.php,v $
* $Revision: 1.3 $
* $Date: 2008-12-21 22:17:05 $
* $Revision: 1.4 $
* $Date: 2008-12-28 22:37:43 $
* $Author: e107steved $
*
*/
@@ -36,7 +36,7 @@ define('LAN_USER_02','Login Name');
define('LAN_USER_03','Real Name');
define('LAN_USER_04','Custom title');
define('LAN_USER_05','Password');
define('LAN_USER_06','Photo');
define('LAN_USER_06','Photograph');
define('LAN_USER_07','Avatar');
define('LAN_USER_08','Email address');
define('LAN_USER_09','Signature');
@@ -87,10 +87,10 @@ define('LAN_USER_56', 'Registered members: '); // LAN_138
define('LAN_USER_57', 'Order: '); // LAN_139
define('LAN_USER_58', 'Member'); // LAN_142
define('LAN_USER_59', 'Joined'); // LAN_145
define('LAN_USER_60', 'Email Address'); // LAN_112
define('LAN_USER_60', 'Email Address: '); // LAN_112
define('LAN_USER_61', 'Rating'); // LAN_406
define('LAN_USER_62', 'Send Private Message'); // LAN_425
define('LAN_USER_63', 'Real Name'); // LAN_308
define('LAN_USER_63', 'Real Name: '); // LAN_308
define('LAN_USER_64', 'Site Stats'); // LAN_403
define('LAN_USER_65', 'Last visit'); // LAN_404
define('LAN_USER_66', 'Visits to site since registration'); // LAN_146
@@ -98,8 +98,22 @@ define('LAN_USER_67', 'Chatbox posts'); // LAN_147
define('LAN_USER_68', 'Comments posted'); // LAN_148
define('LAN_USER_69', 'Forum posts'); // LAN_149
define('LAN_USER_70', 'Show'); // LAN_419
define('LAN_USER_71', 'Signature'); // LAN_120
define('LAN_USER_71', 'Signature: '); // LAN_120
define('LAN_USER_72', 'Avatar: '); // LAN_121
define('LAN_USER_73', 'choice of Content/Mail-lists');
define('LAN_USER_74', 'Custom Title');
define('LAN_USER_75', 'Your --SOMETHING-- is required'); // Replaces LAN_SIGNUP_6, LAN_SIGNUP_7 combination
define('LAN_USER_76', 'Subscribed to'); // LAN_USET_5
define('LAN_USER_77', 'Your password must be at least --COUNT-- characters long.'); // Replaces LAN_SIGNUP_4, LAN_SIGNUP_5 combination
define('LAN_USER_78', 'Min.'); // LAN_SIGNUP_1
define('LAN_USER_79', 'chars.'); // LAN_SIGNUP_2
define('LAN_USER_80', 'the name displayed on site'); // LAN_8
define('LAN_USER_81', 'Username: '); // LAN_9
define('LAN_USER_82', 'the name you use to login to the site'); // LAN_10
define('LAN_USER_83', 'Hide email address?: '); // LAN_113
define('LAN_USER_84', 'This will prevent your email address from being displayed on site'); // LAN_114
define('LAN_USER_85', 'If you want to change your user name, you must ask a site administrator');
define('LAN_USER_86', 'Maximum avatar size is --WIDTH-- x --HEIGHT-- pixels');
// Error messages for when user data is missing. Done this way so that other code can override the default messages
@@ -122,7 +136,9 @@ if (!defined('USER_ERR_16')) { define('USER_ERR_16','Software error'); }
if (!defined('USER_ERR_17')) { define('USER_ERR_17','Value too low'); }
if (!defined('USER_ERR_18')) { define('USER_ERR_18','Value too high'); }
if (!defined('USER_ERR_19')) { define('USER_ERR_19','General error'); }
if (!defined('USER_ERR_20')) { define('USER_ERR_20','Unspecified error'); }
if (!defined('USER_ERR_20')) { define('USER_ERR_20','Image too wide'); }
if (!defined('USER_ERR_21')) { define('USER_ERR_21','Image too high'); }
if (!defined('USER_ERR_22')) { define('USER_ERR_22','Unspecified error'); }
?>

113
e107_languages/English/lan_usersettings.php
View File

@@ -4,98 +4,75 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_usersettings.php,v $
| $Revision: 1.14 $
| $Date: 2008-12-21 22:17:05 $
| $Revision: 1.15 $
| $Date: 2008-12-28 22:37:43 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
define("PAGE_NAME", "User Settings");
define("LAN_7", "Display Name: ");
define("LAN_8", "the name displayed on site");
define("LAN_9", "Username: ");
define("LAN_10", "the name you use to login to the site");
/*
LANs rationalised - some common ones now in lan_user.php. Old numbers generally cross-referenced
// define("LAN_7", "Display Name: "); See LAN_USER_01
define("LAN_11", "the name you use to login to the site - this cannot be changed, please contact an administrator if it needs to be changed for security purposes");
define("LAN_20", "Error");
define("LAN_105", "The two passwords do not match");
//define("LAN_20", "Error");
define("LAN_106", "That doesn't appear to be a valid email address");
define("LAN_112", "Email Address: ");
define("LAN_113", "Hide email address?: ");
define("LAN_114", "This will prevent your email address from being displayed on site");
//define("LAN_112", "Email Address: "); see LAN_USER_60
define("LAN_119", "Location: ");
//define("LAN_120", "Signature: ");
//define("LAN_121", "Avatar: ");
define("LAN_144", "Website URL: ");
define("LAN_150", "Settings updated and saved into database.");
define("LAN_151", "OK");
define("LAN_152", "New Password: ");
define("LAN_153", "Re-type New Password: ");
define("LAN_154", "Save Settings");
define("LAN_155", "Update User Settings");
//define("LAN_151", "OK");
define("LAN_185", "You left the password field blank ");
define("LAN_308", "Real Name: ");
define("LAN_401", "Leave blank to keep existing password");
//define("LAN_308", "Real Name: ");
define("LAN_402", "Type path or choose avatar");
define("LAN_403", "Choose avatar");
define("LAN_404", "Please note: Any image uploaded to this server that is deemed inappropriate by the administrators will be deleted immediately.");
define("LAN_410", "Settings for");
define("LAN_411", "Update Your Settings");
define("LAN_412", "Change Your Password");
define("LAN_413", "Choose An Avatar");
define("LAN_414", "Upload Your Photograph");
define("LAN_415", "Upload your Avatar");
define("LAN_416", "Yes");
define("LAN_417", "No");
define("LAN_418", "Registration Information");
//define("LAN_416", "Yes");
//define("LAN_417", "No");
define("LAN_419", "Personal / Contact Information");
define("LAN_420", "Avatar");
define("LAN_421", "Choose site-stored avatar");
define("LAN_422", "Use remote avatar");
define("LAN_423", "Please type full address to image");
define("LAN_424", "Click button to see avatars stored on this site");
define("LAN_425", "Photograph");
define("LAN_426", "This will be shown on your profile page");
define("LAN_427", "Submit ...");
define("LAN_428", "News Item");
define("LAN_429", "Link");
define("LAN_430", "Download");
define("LAN_431", "Article");
define("LAN_432", "Review");
//define("LAN_420", "Avatar"); LAN_USER_07
//define("LAN_425", "Photograph"); LAN_USER_06
//define("LAN_427", "Submit ...");
//define("LAN_428", "News Item");
//define("LAN_429", "Link");
//define("LAN_430", "Download");
//define("LAN_431", "Article");
//define("LAN_432", "Review");
define("LAN_433", "URL to your XUP file");
define("LAN_434", "what's this?");
define("LAN_435", "XML User Protocol file");
//define("LAN_435", "XML User Protocol file"); // LAN_USER_11
define("LAN_SIGNUP_1", "Min.");
define("LAN_SIGNUP_2", "chars.");
define("LAN_SIGNUP_4", "Your password must be at least ");
define("LAN_SIGNUP_5", " characters long.");
define("LAN_SIGNUP_6", "Your ");
define("LAN_SIGNUP_7", " is required");
//define("LAN_SIGNUP_1", "Min."); See LAN_USER_78
//define("LAN_SIGNUP_2", "chars."); See LAN_USER_79
//define("LAN_SIGNUP_4", "Your password must be at least "); See LAN_USER_77
//define("LAN_SIGNUP_5", " characters long."); See LAN_USER_77
//define("LAN_SIGNUP_6", "Your "); See LAN_USER_75
//define("LAN_SIGNUP_7", " is required"); See LAN_USER_75
// v.616
define("LAN_CUSTOMTITLE", "Custom Title");
//define("LAN_CUSTOMTITLE", "Custom Title"); See LAN_USER_04
//define("LAN_ICQNUMBER", "ICQ number must contain only numbers");
//v.617
define("LAN_408", "A user with that email address already exists. ");
*/
define("MAX_AVWIDTH", "Maximum avatar size (wxh) is ");
define("MAX_AVHEIGHT", " x ");
// define("GIF_RESIZE", "Please resize gif image or convert to different format");
define("RESIZE_NOT_SUPPORTED", "Resize method not supported by this server. Please resize image or choose another. File has been deleted.");
//define("RESIZE_NOT_SUPPORTED", "Resize method not supported by this server. Please resize image or choose another. File has been deleted.");
// v0.7
define("LAN_USET_1", "Your avatar is too wide");
define("LAN_USET_2", "Maximum allowable width is");
define("LAN_USET_3", "Your avatar is too high");
define("LAN_USET_4", "Maximum allowable height is");
define("LAN_USET_5", "Subscribed to");
define("LAN_USET_6", "Subscribe to our mailing-list(s) and/or sections of this site.");
//define("LAN_USET_5", "Subscribed to"); // Now LAN_USER_76
//define("LAN_USET_6", "Subscribe to our mailing-list(s) and/or sections of this site."); Now LAN_USER_73
define("LAN_USET_7", "Miscellaneous");
define("LAN_USET_8", "User Signature");
define("LAN_USET_9", "Some of the required fields (marked with a *) are missing from your settings.");
@@ -108,14 +85,30 @@ define("LAN_USET_15", "Display name too long. Please choose another");
define("LAN_USET_16", "Tick box to delete existing photo without uploading another");
define("LAN_USET_17", "Display name already used. Please choose another");
define('LAN_USET_18', 'User data changed by admin: --ID--, login name: --LOGNAME--');
define('LAN_USET_19', 'Custom Title');
//define('LAN_USET_19', 'Custom Title'); Now LAN_USER_74
define('LAN_USET_20', 'You must also change the user\'s password if you are changing their login name or email address');
define('LAN_USET_21', 'Please validate the changes by re-entering your password: ');
define('LAN_USET_22', 'Invalid password!');
define('LAN_USET_23', '');
define('LAN_USET_24', '');
define('LAN_USET_25', '');
define('LAN_USET_23', 'Leave blank to keep existing password'); // LAN_401
define('LAN_USET_24', 'New Password: '); // LAN_152
define('LAN_USET_25', 'Re-type New Password: '); // LAN_153
define('LAN_USET_26', 'Upload your Avatar'); // LAN_415
define('LAN_USET_27', 'Upload Your Photograph'); // LAN_414
define('LAN_USET_28', 'This will be shown on your profile page'); // LAN_426
define('LAN_USET_29', 'URL to your XUP file'); // LAN_433
define('LAN_USET_30', 'what\'s this?'); // LAN_434
define('LAN_USET_31', 'Registration Information'); // LAN_418
define('LAN_USET_32', 'Please note: Any image uploaded to this server that is deemed inappropriate by the administrators will be deleted immediately.'); // LAN_404
define('LAN_USET_33', 'Choose site-stored avatar'); // LAN_421
define('LAN_USET_34', 'Use remote avatar'); // LAN_422
define('LAN_USET_35', 'Please type full address to image'); // LAN_423
define('LAN_USET_36', 'Click button to see avatars stored on this site'); // LAN_424
define('LAN_USET_37', 'Save Settings'); // LAN_154
define('LAN_USET_38', 'Choose avatar'); // LAN_403
define('LAN_USET_39', 'Update User Settings'); // LAN_155
define('LAN_USET_40', 'The two passwords do not match'); // LAN_105
define('LAN_USET_41', 'Settings updated and saved into database.'); // LAN_150
define('LAN_USET_42', '');
define('LAN_ENTER', 'Enter');
?>