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

Usersettings LAN cleanup. Legacy fpw template added.

Browse Source
This commit is contained in:
Cameron 2021-01-12 06:15:24 -08:00
parent 56f8389417
commit 3bae6306b7
3 changed files with 111 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
e107_core/templates/legacy/fpw_template.php Normal file
View File

@ -0,0 +1,77 @@
<?php
if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:70%"); }
// ##### FPW TABLE -----------------------------------------------------------------------------
if(!isset($FPW_TABLE))
{
$FPW_TABLE = "
<div style='text-align:center'>
<form method='post' action='".SITEURL."fpw.php' autocomplete='off'>
<table style='".USER_WIDTH."' class='table fborder'>
<tr>
<td class='fcaption' colspan='2'>".LAN_05."</td>
</tr>";
if($pref['allowEmailLogin']==0)
{
$FPW_TABLE .= "
<tr>
<td class='forumheader3' style='width:70%'>".LAN_FPW1.":</td>
<td class='forumheader3' style='width:30%;text-align:center'>
{FPW_USERNAME}
</td>
</tr>";
}
$FPW_TABLE .="
<tr>
<td class='forumheader3' style='width:70%'>".LAN_112.":</td>
<td class='forumheader3 text-left' style='width:30%'>
{FPW_USEREMAIL}
</td>
</tr>";
if(deftrue('USE_IMAGECODE'))
{
$FPW_TABLE .= "
<tr>
<td class='forumheader3' style='width:70%'>{FPW_TABLE_SECIMG_LAN}</td>
<td class='forumheader3 text-left' style='width:30%;'>{FPW_TABLE_SECIMG_HIDDEN} {FPW_TABLE_SECIMG_SECIMG}<br />
{FPW_TABLE_SECIMG_TEXTBOC}<br />
</td>
</tr>";
}
$FPW_TABLE .="
<tr style='vertical-align:top'>
<td class='forumheader' colspan='2' style='text-align:center'>
{FPW_SUBMIT}
</td>
</tr>
</table>
</form>
</div>";
}
// ##### ------------------------------------------------------------------------------------------
// ##### FPW HEADER TABLE -------------------------------------------------------------------------
if(!isset($FPW_TABLE_HEADER))
{
$FPW_TABLE_HEADER = "
<div style='width:100%;text-align:center;margin-left:auto;margin-right:auto'>
<div><br />
{FPW_LOGIN_LOGO}
<br />";
}
// ##### ------------------------------------------------------------------------------------------
// ##### FPW FOOTER TABLE -------------------------------------------------------------------------
if(!isset($FPW_TABLE_FOOTER))
{
$FPW_TABLE_FOOTER = "</div></div>";
}
// ##### ------------------------------------------------------------------------------------------

82
e107_languages/English/lan_usersettings.php
View File

@ -14,55 +14,6 @@ if(!defined('PAGE_NAME'))
define("PAGE_NAME", "User Settings");
}
/*
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_106", "That doesn"t appear to be a valid email address");
//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_151", "OK");
define("LAN_185", "You left the password field blank ");
//define("LAN_308", "Real Name: ");
define("LAN_402", "Type path or choose avatar");
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_416", "Yes");
//define("LAN_417", "No");
define("LAN_419", "Personal / Contact Information");
//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_435", "XML User Protocol file"); // LAN_USER_11
//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
//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");
@ -114,40 +65,8 @@ define("LAN_USET_41", "Settings updated and saved into database."); // LAN_150 /
define("LAN_USET_42", "Mismatch on validation key");
define("LAN_USET_43", "Error updating user data");
// BC for v1.x template
//TODO Move to usersettings.php with bcDefs() method.
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");
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_120", "Signature: ");
define("LAN_122", "Time zone:");
define("LAN_152", "New password: ");
define("LAN_153", "Re-type new password: ");
define("LAN_154", "Save settings");
define("LAN_308", "Real name: ");
define("LAN_401", "Leave blank to keep existing password");
define("LAN_404", "Please note: Any image uploaded to this server that is deemed inappropriate by the administrators will be deleted immediately.");
define("LAN_414", "Upload your photograph");
define("LAN_415", "Upload your avatar");
// define("LAN_418", "Registration 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_433", "URL to your XUP file");
define("LAN_434", "What's this?");
define("LAN_435", "XML User Protocol file");
define("LAN_CUSTOMTITLE", "Custom title");
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_8", "Signature / Time zone");
define("LAN_USET_50", "Delete Account");
define("LAN_USET_51", "Are you sure? This procedure cannot be reversed! Once completed, your account and any personal data that you have entered on this site will be permanently lost and you will no longer be able to login.");
@ -157,4 +76,3 @@ define("LAN_USET_54", "Confirmation Email Sent");
define("LAN_USET_55", "Please click the following link to complete the deletion of your account.");
define("LAN_USET_56", "Your account has been successfully deleted.");

38
usersettings.php
View File

@ -26,9 +26,6 @@ require_once ('class2.php');
// TODO - Remove all the adminEdit stuff.
e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
define("US_DEBUG",FALSE);
//define('US_DEBUG', false);
@ -88,7 +85,40 @@ class usersettings_front // Begin Usersettings rewrite.
}
else
{
$bcDefs = array('LAN_418'=>'LAN_USET_31');
$bcDefs = array(
'LAN_418' => 'LAN_USET_31',
'LAN_7' => 'LAN_USER_01',
'LAN_8' => 'LAN_USER_80',
'LAN_9' => 'LAN_USER_81',
'LAN_10' => 'LAN_USER_82',
'LAN_112' => 'LAN_USER_60',
'LAN_113' => 'LAN_USER_83',
'LAN_114' => 'LAN_USER_84',
'LAN_120' => 'LAN_USER_71', // Signature
'LAN_152' => 'LAN_USET_24',
'LAN_153' => 'LAN_USET_25',
'LAN_154' => 'LAN_USET_37',
'LAN_308' => 'LAN_USER_63',
'LAN_401' => 'LAN_USET_23',
'LAN_404' => 'LAN_USET_32',
'LAN_414' => 'LAN_USET_27',
'LAN_415' => 'LAN_USET_26',
'LAN_420' => 'LAN_USER_07', // Avatar
'LAN_421' => 'LAN_USET_33',
'LAN_422' => 'LAN_USET_34',
'LAN_423' => 'LAN_USET_35',
'LAN_424' => 'LAN_USET_36',
'LAN_425' => 'LAN_USER_06',
'LAN_426' => 'LAN_USET_28',
'LAN_433' => '',
'LAN_434' => '',
'LAN_435' => '',
'LAN_122' => 'UE_LAN_TIMEZONE',
'LAN_CUSTOMTITLE' => 'LAN_USER_04'
);
e107::getLanguage()->bcDefs($bcDefs);
global $sc_style;