1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00

First cut of mods to signup to share validation with other user-centric modules

This commit is contained in:
e107steved
2008-12-21 22:17:05 +00:00
parent 1c428e1d5a
commit 0c5462b757
13 changed files with 460 additions and 613 deletions

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/class2.php,v $
| $Revision: 1.87 $
| $Date: 2008-12-21 11:07:58 $
| $Revision: 1.88 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -638,7 +638,6 @@ $e107->override = new override;
$override = &$e107->override;
e107_require_once(e_HANDLER.'userclass_class.php');
$e107->e_userclass = new e_userclass;
$e107->user_class = new user_class;
$e_userclass = &$e107->user_class;

View File

@@ -9,8 +9,8 @@
* Administration Area - Users
*
* $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
* $Revision: 1.19 $
* $Date: 2008-12-21 16:19:29 $
* $Revision: 1.20 $
* $Date: 2008-12-21 22:17:05 $
* $Author: e107steved $
*
*/
@@ -609,14 +609,6 @@ class users
$search_display = explode("|",$pref['admin_user_disp']);
}
if ($sql->db_Select("userclass_classes"))
{
while ($row = $sql->db_Fetch())
{
$class[$row['userclass_id']] = $tp->toHTML($row['userclass_name'],"","defs,emotes_off, no_make_clickable");
}
}
$text = "<div style='text-align:center'>";
if (isset($_POST['searchquery']) && $_POST['searchquery'] != "")
@@ -721,7 +713,7 @@ class users
$tmp = explode(",", $user_class);
while (list($key, $class_id) = each($tmp))
{
$text .= ($class[$class_id] ? $class[$class_id]."<br />\n" : "");
$text .= $e107->user_class->uc_get_classname($class_id)."<br />\n";
}
}
else

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/signup_shortcodes.php,v $
| $Revision: 1.12 $
| $Date: 2008-12-21 10:54:31 $
| $Revision: 1.13 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
|
| Mods to show extended field categories
@@ -24,7 +24,7 @@ $signup_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
/*
SC_BEGIN SIGNUP_COPPA_FORM
if (strpos(LAN_109, "stage") !== FALSE)
if (strpos(LAN_SIGNUP_77, "stage") !== FALSE)
{
return "";
}
@@ -33,10 +33,10 @@ else
return "
<form method='post' action='".e_SELF."?stage1' >\n
<div><br />
<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_200."
<input type='radio' name='coppa' value='1' /> ".LAN_201."<br />
<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_NO."
<input type='radio' name='coppa' value='1' /> ".LAN_YES."<br />
<br />
<input class='button' type='submit' name='newver' value=\"".LAN_399."\" />
<input class='button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
</div></form>
";
}
@@ -84,7 +84,7 @@ global $pref, $rs;
if (check_class($pref['displayname_class']))
{
$dis_name_len = varset($pref['displayname_maxlength'],15);
return $rs->form_text("name", $dis_name_len+5, ($_POST['name'] ? $_POST['name'] : $name), $dis_name_len);
return $rs->form_text('username', $dis_name_len+5, ($_POST['username'] ? $_POST['username'] : $username), $dis_name_len);
}
SC_END
@@ -139,12 +139,12 @@ SC_END
SC_BEGIN SIGNUP_HIDE_EMAIL
global $rs;
$default_email_setting = 1; // Gives option of turning into a pref later if wanted
return $rs->form_radio("hideemail", 1, $default_email_setting==1)." ".LAN_SIGNUP_10."&nbsp;&nbsp;".$rs->form_radio("hideemail", 0,$default_email_setting==0)." ".LAN_200;
return $rs->form_radio("hideemail", 1, $default_email_setting==1)." ".LAN_YES."&nbsp;&nbsp;".$rs->form_radio("hideemail", 0,$default_email_setting==0)." ".LAN_NO;
SC_END
SC_BEGIN SIGNUP_USERCLASS_SUBSCRIBE
global $pref, $e_userclass, $USERCLASS_SUBSCRIBE_START, $USERCLASS_SUBSCRIBE_END;
global $pref, $e_userclass, $USERCLASS_SUBSCRIBE_START, $USERCLASS_SUBSCRIBE_END, $signupData;
$ret = "";
if($pref['signup_option_class'])
{
@@ -160,13 +160,15 @@ if($pref['signup_option_class'])
function show_signup_class($treename, $classnum, $current_value, $nest_level)
{
global $USERCLASS_SUBSCRIBE_ROW, $e_userclass, $tp;
$search = array('{USERCLASS_ID}', '{USERCLASS_NAME}', '{USERCLASS_DESCRIPTION}', '{USERCLASS_INDENT}');
$tmp = explode(',',$current_value);
$search = array('{USERCLASS_ID}', '{USERCLASS_NAME}', '{USERCLASS_DESCRIPTION}', '{USERCLASS_INDENT}', '{USERCLASS_CHECKED}');
$replace = array($classnum, $tp->toHTML($e_userclass->uc_get_classname($classnum), FALSE, 'defs'),
$tp->toHTML($e_userclass->uc_get_classdescription($classnum), FALSE, 'defs'), " style='text-indent:".(1.2*$nest_level)."em'");
$tp->toHTML($e_userclass->uc_get_classdescription($classnum), FALSE, 'defs'), " style='text-indent:".(1.2*$nest_level)."em'",
( in_array($classnum, $tmp) ? " checked='checked'" : ''));
return str_replace($search, $replace, $USERCLASS_SUBSCRIBE_ROW);
}
$ret = $USERCLASS_SUBSCRIBE_START;
$ret .= $e_userclass->vetted_tree('class',show_signup_class,'','editable');
$ret .= $e_userclass->vetted_tree('class',show_signup_class,varset($signupData['user_class'],''),'editable');
$ret .= $USERCLASS_SUBSCRIBE_END;
return $ret;
}

View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/admin_log_class.php,v $
| $Revision: 1.13 $
| $Date: 2008-12-07 11:45:02 $
| $Revision: 1.14 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
To do:
@@ -161,6 +161,19 @@ Generic log entry point
$importance = $tp->toDB($importance,true,false,'no_html');
$eventcode = $tp->toDB($eventcode,true,false,'no_html');
if (is_array($explain))
{
$line = '';
$spacer = '';
foreach ($explain as $k => $v)
{
$line .= $spacer.$k.'=>'.$v;
$spacer = '[!br!]';
}
$explain = $line;
unset($line);
}
$explain = mysql_real_escape_string($tp->toDB($explain,true,false,'no_html'));
$event_title = $tp->toDB($event_title,true,false,'no_html');
@@ -211,10 +224,10 @@ Generic log entry point
$tmp = $source_call[$i]['file']."|".$source_call[$i]['class'].$source_call[$i]['type'].$source_call[$i]['function']."@".$source_call[$i]['line'];
foreach ($source_call[$i]['args'] as $k => $v)
{ // Add in the arguments
$explain .= "<br />".$k."=".$v;
$explain .= "[!br!]".$k."=".$v;
}
$i++;
if ($i < $back_count) $explain .= "<br />-------------------";
if ($i < $back_count) $explain .= "[!br!]-------------------";
if (!isset($tmp1)) $tmp1 = $tmp; // Pick off the immediate caller as the source
}
if (isset($tmp1)) $source_call = $tmp1; else $source_call = 'Root level';
@@ -226,7 +239,7 @@ Generic log entry point
$source_call = $tp->toDB($source_call,true,false,'no_html');
}
// else $source_call is a string
// Save new rolling log record
$this->rldb->db_Insert("dblog","0, ".intval($time_sec).', '.intval($time_usec).", '{$importance}', '{$eventcode}', {$userid}, '{$userstring}', '{$userIP}', '{$source_call}', '{$event_title}', '{$explain}' ");

View File

@@ -9,8 +9,8 @@
* Handler - user-related functions
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/user_handler.php,v $
* $Revision: 1.3 $
* $Date: 2008-12-21 11:07:58 $
* $Revision: 1.4 $
* $Date: 2008-12-21 22:17:05 $
* $Author: e107steved $
*
*/
@@ -89,7 +89,7 @@ class UserHandler
'user_password' => array('niceName'=> LAN_USER_05, 'vetMethod' => '0', 'vetParam' => '', 'srcName' => 'password1', 'minLength' => varset($pref['signup_pass_len'],1)),
'user_sess' => array('niceName'=> LAN_USER_06, 'vetMethod' => '0', 'vetParam' => '', 'dbClean' => 'toDB'), // Photo
'user_image' => array('niceName'=> LAN_USER_07, 'vetMethod' => '0', 'vetParam' => '', 'srcName' => 'image', 'dbClean' => 'toDB'), // Avatar
'user_email' => array('niceName'=> LAN_USER_08, 'vetMethod' => '1', 'vetParam' => '', 'srcName' => 'email', 'dbClean' => 'toDB'),
'user_email' => array('niceName'=> LAN_USER_08, 'vetMethod' => '1,3', 'vetParam' => '', 'srcName' => 'email', 'dbClean' => 'toDB'),
'user_signature' => array('niceName'=> LAN_USER_09, 'vetMethod' => '0', 'vetParam' => '', 'srcName' => 'signature', 'dbClean' => 'toDB'),
'user_hideemail' => array('niceName'=> LAN_USER_10, 'vetMethod' => '0', 'vetParam' => '', 'srcName' => 'hideemail', 'dbClean' => 'intval'),
'user_xup' => array('niceName'=> LAN_USER_11, 'vetMethod' => '0', 'vetParam' => '', 'srcName' => 'user_xup', 'dbClean' => 'toDB'),
@@ -414,7 +414,7 @@ class UserHandler
DB signup usersettings quick add function
------------------------------------------------------------------------------
user_id - user_id - Unique user ID
user_name name username username Display name
user_name name$ username username Display name
user_loginname loginname loginname loginname User name (login name)
user_customtitle - customtitle - Custom title
user_password password1 password1 password1 Password (prior to encoding)
@@ -426,11 +426,12 @@ class UserHandler
user_image image image* - Avatar (may be external URL or file on server)
user_hideemail hideemail hideemail - Flag to hide user's email address
user_login realname realname realname User Real name
user_xup xupexist user_xup - XUP file link
user_xup xupexist$ user_xup - XUP file link
user_class class class userclass User class (array on form)
user_loginname may be auto-generated
* avatar (user_image) and photo (user_sess) may be uploaded files
$changed to match the majority vote
Following fields auto-filled in code as required:
user_join

View File

@@ -9,8 +9,8 @@
* Handler - general purpose validation functions
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/validator_class.php,v $
* $Revision: 1.1 $
* $Date: 2008-12-21 11:07:58 $
* $Revision: 1.2 $
* $Date: 2008-12-21 22:17:05 $
* $Author: e107steved $
*
*/
@@ -34,6 +34,7 @@ define('ERR_FIELDS_DIFFERENT', '15');
define('ERR_CODE_ERROR', '16');
define('ERR_TOO_LOW', '17');
define('ERR_TOO_HIGH', '18');
define('ERR_GENERIC', '19'); // This requires coder-defined error text
/*
@@ -177,6 +178,7 @@ class validatorClass
{
$errNum = ERR_ARRAY_EXPECTED;
}
break;
default :
$errNum = ERR_CODE_ERROR; // Pick up bad values
}
@@ -230,6 +232,7 @@ class validatorClass
0 - Null method
1 - Check for duplicates - field name in table must be the same as array index unless 'dbFieldName' specifies otherwise
2 - Check against the comma-separated wordlist in the $pref named in vetParam['signup_disallow_text']
3 - Check email address against remote server, only if option enabled
*/
function dbValidateArray(&$targetData, &$definitions, $targetTable, $userID = 0)
@@ -281,8 +284,25 @@ class validatorClass
unset($tmp);
}
break;
default :
echo 'Invalid vetMethod: '.$options['vetMethod'].'<br />'; // Really a debug aid - should never get here
case 3 : // Check email address against remote server
if (varsettrue($pref['signup_remote_emailcheck']))
{
require_once(e_HANDLER."mail_validation_class.php");
list($adminuser,$adminhost) = split ("@", SITEADMINEMAIL);
$validator = new email_validation_class;
$validator->localuser= $adminuser;
$validator->localhost= $adminhost;
$validator->timeout=3;
// $validator->debug=1;
// $validator->html_debug=1;
if($validator->ValidateEmailBox(trim($v)) != 1)
{
$errMsg = ERR_INVALID_EMAIL;
}
}
break;
default :
echo 'Invalid vetMethod: '.$options['vetMethod'].'<br />'; // Really a debug aid - should never get here
}
if ($errMsg) { break; } // Just trap first error
}
@@ -356,7 +376,14 @@ class validatorClass
{
$curLine = $format;
$curLine = str_replace('%n', $n, $curLine);
$curLine = str_replace('%t', constant($constPrefix.$n), $curLine);
if (($n == ERR_GENERIC) && isset($vars['errortext'][$f]))
{
$curLine = str_replace('%t', $vars['errortext'][$f], $curLine); // Coder-defined specific error text
}
else
{
$curLine = str_replace('%t', constant($constPrefix.$n), $curLine); // Standard messages
}
$curLine = str_replace('%v', $vars['failed'][$f],$curLine); // Possibly this should have some protection added
$curLine = str_replace('%f', $f, $curLine);
if ($checkNice & isset($niceNames[$f]['niceName']))

View File

@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/English.php,v $
| $Revision: 1.7 $
| $Date: 2008-11-09 18:00:32 $
| $Revision: 1.8 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -50,11 +50,12 @@ define("CORE_LAN_GB", "GB");
define("CORE_LAN_TB", "TB");
define("LAN_WARNING", "Warning!");
define("LAN_ERROR", "Error");
define("LAN_ANONYMOUS", "Anonymous");
define("LAN_EMAIL_SUBS", "-email-");
define('LAN_WARNING', 'Warning!');
define('LAN_ERROR', 'Error');
define('LAN_ANONYMOUS', 'Anonymous');
define('LAN_EMAIL_SUBS', '-email-');
define('LAN_YES', 'Yes');
define('LAN_NO', 'No');
define('LAN_CONTINUE', 'Continue');
?>

View File

@@ -9,51 +9,29 @@
* Language file - User signup
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_signup.php,v $
* $Revision: 1.13 $
* $Date: 2008-12-21 11:07:58 $
* $Revision: 1.14 $
* $Date: 2008-12-21 22:17:05 $
* $Author: e107steved $
*
*/
define("PAGE_NAME", "Register");
define("LAN_7", "Display Name: ");
define("LAN_8", "the name that will be displayed on site");
define("LAN_9", "Username: ");
define("LAN_10", "the name that you use to login");
define("LAN_17", "Password: ");
define("LAN_103", "That username cannot be accepted as valid, please choose a different user name");
define("LAN_104", "That username already exists in the database, please choose a different username");
define("LAN_105", "The two passwords do not match");
define("LAN_106", "That doesn't appear to be a valid email address");
define("LAN_107", "Thank you! You are now a registered member of");
/*
//define("LAN_103", "That username cannot be accepted as valid, please choose a different user name");
//define("LAN_104", "That username already exists in the database, please choose a different username");
//define("LAN_105", "The two passwords do not match");
//define("LAN_106", "That doesn't appear to be a valid email address");
define("LAN_108", "Registration complete");
define("LAN_109", "This site complies with The Children's Online Privacy Protection Act of 1998 (COPPA) and as such cannot accept registrations from users under the age of 13 without a written permission document from their parent or guardian. For more information you can read the legislation");
define("LAN_110", "Registration");
define("LAN_111", "Re-type Password: ");
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_123", "Register");
define("LAN_185", "You left required field(s) blank");
define("LAN_201", "Yes");
define("LAN_200", "No");
define("LAN_202", "You have reached the site limit for account registrations. Please login using one of your other accounts.");
define("LAN_309", "Please enter your details below.");
define("LAN_310", "your real name, including first and last name");
define("LAN_399", "Continue");
define("LAN_400", "Usernames and passwords are <b>case-sensitive</b>.");
define("LAN_401", "Your account has now been activated, please");
define("LAN_402", "Registration activated");
define("LAN_403", "Welcome to");
define("LAN_404", "Registration details for");
define("LAN_405", "This stage of registration is complete. You will receive a confirmation email containing your login details. Please follow the link in the email to complete the signup process and activate your account.");
define("LAN_406", "Thank you!");
define("LAN_407", "Please keep this email for your own information. Your password has been encrypted and cannot be retrieved if you misplace or forget it. You can however request a new password if this happens.\n\nThanks for your registration.\n\nFrom");
define("LAN_408", "A user with that email address already exists. Please use the 'forgot password' screen to retrieve your password.");
define("LAN_409", "Invalid characters in username");
define("LAN_410", "Enter code visible in the image");
define("LAN_411", "That display name already exists in the database, please choose a different display name");
//define("LAN_408", "A user with that email address already exists. Please use the 'forgot password' screen to retrieve your password.");
//define("LAN_409", "Invalid characters in username");
//define("LAN_411", "That display name already exists in the database, please choose a different display name");
*/
define("LAN_EMAIL_01", "Dear");
define("LAN_EMAIL_04", "Please keep this email for your own information.");
@@ -70,7 +48,7 @@ define("LAN_SIGNUP_6", "Your ");
define("LAN_SIGNUP_7", " is required");
define("LAN_SIGNUP_8", "Thank you!");
define("LAN_SIGNUP_9", "Unable to proceed.");
define("LAN_SIGNUP_10", "Yes");
//define("LAN_SIGNUP_10", "Yes");
define("LAN_SIGNUP_11", ".");
define("LAN_SIGNUP_12", "please keep your username and password written down in a safe place as if lost they cannot be retrieved.");
define("LAN_SIGNUP_13", "You can now log in from the Login box, or from <a href='".e_BASE."login.php'>here</a>.");
@@ -114,9 +92,9 @@ define("LAN_SIGNUP_51", "Old Password");
define("LAN_SIGNUP_52", "Incorrect Password");
define("LAN_SIGNUP_53", "field failed validation test");
define("LAN_SIGNUP_54", "Click here to fill in your details to register");
define("LAN_SIGNUP_55", "That display name is too long. Please choose another");
define("LAN_SIGNUP_56", "That display name is too short. Please choose another");
define("LAN_SIGNUP_57", "That login name is too long. Please choose another");
//define("LAN_SIGNUP_55", "That display name is too long. Please choose another");
//define("LAN_SIGNUP_56", "That display name is too short. Please choose another");
//define("LAN_SIGNUP_57", "That login name is too long. Please choose another");
define("LAN_SIGNUP_58", "Signup Preview");
define("LAN_SIGNUP_59","**** If the link doesn't work, please check that part of it has not overflowed onto the next line. ****");
define('LAN_SIGNUP_60','Signup email resend requested');
@@ -127,9 +105,38 @@ 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.');
define('LAN_SIGNUP_67','This will be assigned by the system after signup');
define('LAN_SIGNUP_68','');
define('LAN_SIGNUP_68','Error: Unable to open remote XUP file');
define('LAN_SIGNUP_69','');
define('LAN_SIGNUP_70','');
define('LAN_SIGNUP_71', 'You have reached the site limit for account registrations. Please login using one of your other accounts.'); // LAN_202
define('LAN_SIGNUP_72', "This stage of registration is complete. You will receive a confirmation email containing your login details. Please follow the link in the email to complete the signup process and activate your account."); // LAN_405
define('LAN_SIGNUP_73', 'Thank you!'); // LAN_406
define('LAN_SIGNUP_74', 'Your account has now been activated, please'); // LAN_401
define('LAN_SIGNUP_75', 'Registration activated'); // LAN_402
define('LAN_SIGNUP_76', 'Thank you! You are now a registered member of'); // LAN_107
define('LAN_SIGNUP_77', "This site complies with The Children's Online Privacy Protection Act of 1998 (COPPA) and as such cannot accept registrations from users under the age of 13 without a written permission document from their parent or guardian. For more information you can read the legislation"); // LAN_109
define('LAN_SIGNUP_78', 'Registration'); // LAN_110
define('LAN_SIGNUP_79', 'Register'); // LAN_123
define('LAN_SIGNUP_80', 'Please enter your details below.'); // LAN_309
define('LAN_SIGNUP_81', 'Username: '); // LAN_9
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_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
define('LAN_SIGNUP_91', 'Real Name: '); // LAN_308
define('LAN_SIGNUP_92', 'your real name, including first and last name'); // LAN_310
define('LAN_SIGNUP_93', 'Signature: '); // LAN_120
define('LAN_SIGNUP_94', 'Avatar: '); // LAN_121
define('LAN_SIGNUP_95', 'Enter code visible in the image'); // LAN_410
define('LAN_SIGNUP_96', 'Registration details for'); // LAN_404 (used in email)
define('LAN_SIGNUP_97', 'Welcome to'); // LAN_403 (used in email)
define("LAN_LOGINNAME", "Username");
define("LAN_PASSWORD", "Password");

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.2 $
* $Date: 2008-12-20 20:19:05 $
* $Revision: 1.3 $
* $Date: 2008-12-21 22:17:05 $
* $Author: e107steved $
*
*/
@@ -21,7 +21,6 @@ define("LAN_116", "AIM Address");
define("LAN_117", "MSN Messenger");
define("LAN_118", "Birthday");
define("LAN_119", "Location");
define("LAN_120", "Signature");
define("LAN_144", "Website URL");
define("LAN_405", "days ago");
define("LAN_407", "none");
@@ -92,32 +91,38 @@ 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_64', 'Site Stats'); // LAN_403
define('LAN_USER_65', 'Last visit'); // LAN_404
define('LAN_USER_66', 'Visits to site since registration'); // LAN_146
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_64', 'Site Stats'); // LAN_403
define('LAN_USER_65', 'Last visit'); // LAN_404
define('LAN_USER_66', 'Visits to site since registration'); // LAN_146
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_72', 'Avatar: '); // LAN_121
// Error messages for when user data is missing
define('USER_ERR_01','Missing value');
define('USER_ERR_02','Unexpected value');
define('USER_ERR_03','Value contains invalid characters');
define('USER_ERR_04','Value too short');
define('USER_ERR_05','Value too long');
define('USER_ERR_06','Duplicate value');
define('USER_ERR_07','Value not allowed');
define('USER_ERR_08','Entry disabled');
define('USER_ERR_09','Invalid word');
define('USER_ERR_10','Password fields different');
define('USER_ERR_11','Banned email address');
define('USER_ERR_12','Invalid format for email address');
define('USER_ERR_13','Data error');
define('USER_ERR_14','Banned user');
define('USER_ERR_15','User name and display name cannot be different');
// Error messages for when user data is missing. Done this way so that other code can override the default messages
if (!defined('USER_ERR_01')) { define('USER_ERR_01','Missing value'); }
if (!defined('USER_ERR_02')) { define('USER_ERR_02','Unexpected value'); }
if (!defined('USER_ERR_03')) { define('USER_ERR_03','Value contains invalid characters'); }
if (!defined('USER_ERR_04')) { define('USER_ERR_04','Value too short'); }
if (!defined('USER_ERR_05')) { define('USER_ERR_05','Value too long'); }
if (!defined('USER_ERR_06')) { define('USER_ERR_06','Duplicate value'); }
if (!defined('USER_ERR_07')) { define('USER_ERR_07','Value not allowed'); }
if (!defined('USER_ERR_08')) { define('USER_ERR_08','Entry disabled'); }
if (!defined('USER_ERR_09')) { define('USER_ERR_09','Invalid word'); }
if (!defined('USER_ERR_10')) { define('USER_ERR_10','Password fields different'); }
if (!defined('USER_ERR_11')) { define('USER_ERR_11','Banned email address'); }
if (!defined('USER_ERR_12')) { define('USER_ERR_12','Invalid format for email address'); }
if (!defined('USER_ERR_13')) { define('USER_ERR_13','Data error'); }
if (!defined('USER_ERR_14')) { define('USER_ERR_14','Banned user'); }
if (!defined('USER_ERR_15')) { define('USER_ERR_15','User name and display name cannot be different'); }
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'); }
?>

View File

@@ -4,8 +4,8 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_usersettings.php,v $
| $Revision: 1.13 $
| $Date: 2008-06-13 20:20:22 $
| $Revision: 1.14 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -24,8 +24,8 @@ 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_119", "Location: ");
define("LAN_120", "Signature: ");
define("LAN_121", "Avatar: ");
//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");

View File

@@ -11,15 +11,15 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/email_template.php,v $
| $Revision: 1.4 $
| $Date: 2008-07-17 19:24:46 $
| $Revision: 1.5 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
if (!defined('e107_INIT')) { exit; }
global $pref;
$SIGNUPEMAIL_SUBJECT = LAN_404." {SITENAME}";
$SIGNUPEMAIL_SUBJECT = LAN_SIGNUP_96." {SITENAME}";
$SIGNUPEMAIL_USETHEME = 1; // Use CSS STYLE from THEME: 0 = Off, 1 = external, 2 = embedded
$SIGNUPEMAIL_LINKSTYLE = ""; // css to use on links eg. color:red;
$SIGNUPEMAIL_IMAGES = e_IMAGE.$pref['sitebutton']; // comma separated paths to image to embed. referenced below with {IMAGE1} (IMAGE2} etc.
@@ -64,7 +64,7 @@ $SIGNUPEMAIL_TEMPLATE = "
<div style='text-align:left; width:90%'>
".LAN_EMAIL_01." {USERNAME},<br />
<br />".
LAN_403." {SITENAME}<br />
LAN_SIGNUP_97." {SITENAME}<br />
".LAN_SIGNUP_21.":<br />
<br />
{ACTIVATION_LINK}<br />

View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/signup_template.php,v $
| $Revision: 1.10 $
| $Date: 2008-10-30 22:42:41 $
| $Revision: 1.11 $
| $Date: 2008-12-21 22:17:05 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -27,7 +27,7 @@ define("REQUIRED_FIELD_MARKER", "<span style='text-align:right;font-size:15px; c
$sc_style['SIGNUP_DISPLAYNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_7."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_8."</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_SIGNUP_89."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_90."</span></td>
<td class='forumheader3' style='width:70%'>
";
$sc_style['SIGNUP_DISPLAYNAME']['post'] = "
@@ -37,7 +37,7 @@ $sc_style['SIGNUP_DISPLAYNAME']['post'] = "
$sc_style['SIGNUP_REALNAME']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_308."".req($pref['signup_option_realname'])."<br /><span class='smalltext'>".LAN_310."</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_91."".req($pref['signup_option_realname'])."<br /><span class='smalltext'>".LAN_SIGNUP_92."</span></td>
<td class='forumheader3' style='width:70%' >
";
$sc_style['SIGNUP_REALNAME']['post'] = "
@@ -66,7 +66,7 @@ $USERCLASS_SUBSCRIBE_ROW = "
<tr>
<td class='defaulttext' style='width:10%;vertical-align:top'>
<div {USERCLASS_INDENT}>
<input type='checkbox' name='class[]' value='{USERCLASS_ID}' />
<input type='checkbox' name='class[]' value='{USERCLASS_ID}' {USERCLASS_CHECKED} />
</div>
</td>
<td class='defaulttext' style='text-align:left;margin-left:0px;width:90%;padding-top:3px;vertical-align:top'>{USERCLASS_NAME}<br />
@@ -115,7 +115,7 @@ if(!defined($EXTENDED_USER_FIELD_REQUIRED))
$SIGNUP_SIGNATURE_START = "
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' >".LAN_120." ".req($pref['signup_option_signature'])."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap;vertical-align:top' >".LAN_SIGNUP_93." ".req($pref['signup_option_signature'])."</td>
<td class='forumheader3' style='width:70%' >
<textarea class='tbox' style='width:99%' name='signature' cols='10' rows='4' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>";
@@ -128,7 +128,7 @@ $SIGNUP_SIGNATURE_END = "
$sc_style['SIGNUP_IMAGES']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' >".LAN_121.req($pref['signup_option_image'])."<br /><span class='smalltext'>(".LAN_SIGNUP_33.")</span></td>
<td class='forumheader3' style='width:30%; vertical-align:top;white-space:nowrap' >".LAN_SIGNUP_94.req($pref['signup_option_image'])."<br /><span class='smalltext'>(".LAN_SIGNUP_33.")</span></td>
<td class='forumheader3' style='width:70%;vertical-align:top' >
";
$sc_style['SIGNUP_IMAGES']['post'] = "
@@ -139,7 +139,7 @@ $sc_style['SIGNUP_IMAGES']['post'] = "
$sc_style['SIGNUP_IMAGECODE']['pre'] = "
<tr>
<td class='forumheader3' style='width:30%'>".LAN_410.req(2)."</td>
<td class='forumheader3' style='width:30%'>".LAN_SIGNUP_95.req(2)."</td>
<td class='forumheader3' style='width:70%'>
";
$sc_style['SIGNUP_IMAGECODE']['post'] = "
@@ -150,7 +150,7 @@ $sc_style['SIGNUP_IMAGECODE']['post'] = "
if(!defined($COPPA_TEMPLATE))
{
$COPPA_TEMPLATE = LAN_109." <a href='http://www.cdt.org/legislation/105th/privacy/coppa.html'>".LAN_SIGNUP_14."</a>. ".LAN_SIGNUP_15." ".$tp->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."
$COPPA_TEMPLATE = LAN_SIGNUP_77." <a href='http://www.cdt.org/legislation/105th/privacy/coppa.html'>".LAN_SIGNUP_14."</a>. ".LAN_SIGNUP_15." ".$tp->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."
<br />
<br />
<div style='text-align:center'><b>".LAN_SIGNUP_17."</b>
@@ -167,7 +167,7 @@ $COPPA_FAIL = "<div style='text-align:center'>".LAN_SIGNUP_9."</div>";
if(!defined($SIGNUP_TEXT))
{
$SIGNUP_TEXT =
LAN_309." <b>".LAN_SIGNUP_29."</b><br /><br />".LAN_SIGNUP_30."<br />
LAN_SIGNUP_80." <b>".LAN_SIGNUP_29."</b><br /><br />".LAN_SIGNUP_30."<br />
";
}
@@ -185,26 +185,26 @@ $SIGNUP_XUP_FORM = "
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_31."
</td>
<td class='forumheader3' style='width:70%'>
<input class='tbox' type='text' name='xupexist' size='50' value='' maxlength='100' />
<input class='tbox' type='text' name='user_xup' size='50' value='' maxlength='100' />
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_9."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_10."</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_SIGNUP_81."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_82."</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_XUP_LOGINNAME}
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_17."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_83."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_XUP_PASSWORD1}
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_111."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_84."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_XUP_PASSWORD2}
</td>
@@ -218,7 +218,7 @@ $SIGNUP_XUP_FORM = "
<tr>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button' type='submit' name='register' value=\"".LAN_123."\" />
<input class='button' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
</td>
</tr>
@@ -243,7 +243,7 @@ $SIGNUP_BEGIN = "
<div style='text-align:center;".USER_WIDTH."'>
{SIGNUP_SIGNUP_TEXT}
<br />
".LAN_400."<br /><br /></div>";
".LAN_SIGNUP_85."<br /><br /></div>";
}
if(!defined($SIGNUP_BODY))
@@ -255,28 +255,28 @@ $SIGNUP_BODY = "
<table class='fborder' style='".USER_WIDTH."'>
{SIGNUP_DISPLAYNAME}
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_9."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_10."</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap' >".LAN_SIGNUP_81."<span style='font-size:15px; color:red'> *</span><br /><span class='smalltext'>".LAN_SIGNUP_82."</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_LOGINNAME}
</td>
</tr>
{SIGNUP_REALNAME}
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_17."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_83."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_PASSWORD1}
{SIGNUP_PASSWORD_LEN}
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_111."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_84."<span style='font-size:15px; color:red'> *</span></td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_PASSWORD2}
</td>
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_112."{SIGNUP_IS_MANDATORY=email}</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_86."{SIGNUP_IS_MANDATORY=email}</td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_EMAIL}
</td>
@@ -290,7 +290,7 @@ $SIGNUP_BODY = "
</tr>
<tr>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_113."</td>
<td class='forumheader3' style='width:30%;white-space:nowrap'>".LAN_SIGNUP_87."</td>
<td class='forumheader3' style='width:70%'>
{SIGNUP_HIDE_EMAIL}
</td>
@@ -302,7 +302,7 @@ $SIGNUP_BODY = "
{SIGNUP_IMAGECODE}
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
<input class='button' type='submit' name='register' value=\"".LAN_123."\" />
<input class='button' type='submit' name='register' value=\"".LAN_SIGNUP_79."\" />
<br />
</td>
</tr>

File diff suppressed because it is too large Load Diff