mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Bugtracker #3791, #4034 - no error message if display name already used

Browse Source
This commit is contained in:
e107steved 2007-08-07 19:27:18 +00:00
parent 0473995438
commit d11a5bea8e
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
e107_languages/English/lan_usersettings.php
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.7 $
| $Date: 2007-07-23 20:06:00 $
| $Revision: 1.8 $
| $Date: 2007-08-07 19:27:18 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -89,13 +89,13 @@ define("LAN_USET_4", "Maximum allowable height is");
// v.616
define("LAN_CUSTOMTITLE", "Custom Title");
define("LAN_ICQNUMBER", "ICQ number must contain only numbers");
//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("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.");
// v0.7
@ -111,5 +111,6 @@ define("LAN_USET_13", "Invalid characters in Username. Please choose another");
define("LAN_USET_14", "Login name too long. Please choose another");
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");
?>

14
usersettings.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/usersettings.php,v $
| $Revision: 1.11 $
| $Date: 2007-07-23 20:05:46 $
| $Revision: 1.12 $
| $Date: 2007-08-07 19:27:18 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -198,7 +198,7 @@ if (isset($_POST['updatesettings']))
}
// Check for duplicate of email address
if ($sql->db_Select("user", "user_name, user_email", "user_email='".$tp -> toDB($_POST['email'])."' AND user_id !='".$inp."' "))
if ($sql->db_Select("user", "user_name, user_email", "user_email='".$tp -> toDB($_POST['email'])."' AND user_id !='".intval($inp)."' "))
{
$error .= LAN_408."\\n";
}
@ -217,6 +217,12 @@ if (isset($_POST['updatesettings']))
{
$error .= LAN_USET_15."\\n";
}
// Display Name exists.
if ($sql->db_Count("user", "(*)", "WHERE user_name='".$username."'"))
{
$error .= LAN_USET_17;
}
}
@ -393,7 +399,7 @@ if (isset($_POST['updatesettings']))
$ue_fields .= ", user_hidden_fields = '".$hidden_fields."'";
}
$sql->db_Update("user", "{$new_username} {$pwreset} {$sesschange} user_email='".$tp -> toDB($_POST['email'])."', user_signature='".$_POST['signature']."', user_image='".$tp -> toDB($_POST['image'])."', user_timezone='".$tp -> toDB($_POST['timezone'])."', user_hideemail='".$tp -> toDB($_POST['hideemail'])."', user_login='".$_POST['realname']."' {$new_customtitle}, user_xup='".$tp -> toDB($_POST['user_xup'])."' WHERE user_id='".intval($inp)."' ");
$sql->db_Update("user", "{$new_username} {$pwreset} {$sesschange} user_email='".$tp -> toDB($_POST['email'])."', user_signature='".$_POST['signature']."', user_image='".$tp -> toDB($_POST['image'])."', user_timezone='".$tp -> toDB($_POST['timezone'])."', user_hideemail='".intval($tp -> toDB($_POST['hideemail']))."', user_login='".$_POST['realname']."' {$new_customtitle}, user_xup='".$tp -> toDB($_POST['user_xup'])."' WHERE user_id='".intval($inp)."' ");
if ($photo_to_delete)
{ // Photo may be a flat file, or in the database
delete_file($photo_to_delete);