Changeset 2087 in ExiteCMS

Timestamp:

12/01/08 12:12:32 (3 years ago)

Author:

WanWizard

Message:

fixed bug in registration when using single quotes in the user fullname when registering
fixed several bugs in user activation

Location:

trunk

Files:

• administration/activation.php (modified) (1 diff)
• administration/tools/language_pack_English.php (modified) (1 diff)
• administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• edit_profile.php (modified) (2 diffs)
• files/locales/en.main.global.php (modified) (1 diff)
• files/locales/en.main.setup.php (modified) (1 diff)
• files/locales/nl.main.setup.php (modified) (1 diff)
• includes/templates/admin.activation.tpl (modified) (1 diff)
• register.php (modified) (3 diffs)

trunk/administration/activation.php

@@ -57 +57 @@
 // delete a user registeration
 if ($step == "delete") {
-    $usercode = stripinput($_GET['user_code']);
-    $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
+    if (isset($_GET['user_code'])) {
+        $usercode = stripinput($_GET['user_code']);
+        $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
+    } elseif (isset($_GET['user_id'])) {
+        $user_id = stripinput($_GET['user_id']);
+        if (isNum($user_id)) {
+            $result = dbquery("DELETE FROM ".$db_prefix."users WHERE user_status = '2' AND user_id = '$user_id'");
+        }
+    }
 }
 

trunk/administration/tools/language_pack_English.php

@@ -3768 +3768 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1226762356");
+if (!defined('LP_DATE')) define('LP_DATE', "1227998521");
 $lp_date = LP_DATE;
 

trunk/administration/tools/language_pack_Nederlands.php

@@ -2828 +2828 @@
         $localestrings['428'] = "Blog aanpassen";
         $localestrings['429'] = "Blog index";
-        $localestrings['493'] = "Are you sure you want to delete this blog entry?";
-        $localestrings['494'] = "The blog entry has been succesfully deleted";
-        $localestrings['495'] = "The blog update has been succesfully saved";
-        $localestrings['496'] = "The new blog entry has been succesfully saved";
-        $localestrings['497'] = "The blog entry may not be left empty";
-        $localestrings['498'] = "Please fill in a subject for this blog entry";
-        $localestrings['499'] = "There are no blog entries available for display";
+        $localestrings['493'] = "Weet u zeker dat u dit blog bericht wilt verwijderen?";
+        $localestrings['494'] = "Het blog bericht is succesvol verwijderd";
+        $localestrings['495'] = "De aanpassingen aan de blog zijn bewaard";
+        $localestrings['496'] = "Het nieuwe blog bericht is succesvol opgeslagen";
+        $localestrings['497'] = "Het bericht mag niet leeg gelaten worden";
+        $localestrings['498'] = "Geef a.u.b. een onderwerp voor dit blog bericht";
+        $localestrings['499'] = "Er zijn geen blog berichten gevonden om te tonen";
         load_localestrings($localestrings, LP_LOCALE, "main.blogs", $step);
 
@@ -3768 +3768 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.20");
-if (!defined('LP_DATE')) define('LP_DATE', "1226762359");
+if (!defined('LP_DATE')) define('LP_DATE', "1227998517");
 $lp_date = LP_DATE;
 

trunk/edit_profile.php

@@ -200 +200 @@
         if ($user_newpassword != "") { $newpass = " user_password=md5(md5('$user_newpassword')), "; } else { $newpass = " "; }
         $result = dbquery("UPDATE ".$db_prefix."users SET user_name='$username', user_fullname='$user_fullname', ".$newpass."user_email='".$_POST['user_email']."', user_bad_email = '0', user_hide_email='$user_hide_email', user_location='$user_location', user_birthdate='$user_birthdate', user_gender='$user_gender', user_aim='$user_aim', user_icq='$user_icq', user_msn='$user_msn', user_yahoo='$user_yahoo', user_web='$user_web', user_forum_fullscreen='$user_forum_fullscreen', user_posts_unread='$user_posts_unread', user_newsletters='$user_newsletters', user_theme='$user_theme', user_offset='$user_offset', ".$set_avatar."user_sig='$user_sig', user_locale='".$_POST['user_locale']."', user_openid_url='$user_openid_url', user_hoteditor=".$user_hoteditor." WHERE user_id='".$this_userdata['user_id']."'");
-        if ($user_theme != $userdata['user_theme']) {
-            if (isset($_SESSION['set_theme'])) unset($_SESSION['set_theme']);
-            if ($variables['is_admin']) {
-                redirect(FUSION_SELF."?status=1&user_id=".$this_userdata['user_id']);
-            } else {
-                redirect(FUSION_SELF."?status=1");
-            }
-        }
         $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_id='".$this_userdata['user_id']."'");
         if (dbrows($result) != 0) {
@@ -218 +210 @@
             }
             fallback(FUSION_SELF);
+        }
+        if ($user_theme != $userdata['user_theme']) {
+            if (isset($_SESSION['set_theme'])) unset($_SESSION['set_theme']);
+            if ($variables['is_admin']) {
+                redirect(FUSION_SELF."?status=1&user_id=".$this_userdata['user_id']);
+            } else {
+                redirect(FUSION_SELF."?status=1");
+            }
         }
     } else {

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Sat Nov 15 2008, 16:19:22 CET
+// generated on : Sat Nov 29 2008, 23:48:23 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/en.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sat Nov 15 2008, 16:15:47 CET
+// generated on : Sat Nov 29 2008, 23:42:01 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Sat Nov 15 2008, 16:15:50 CET
+// generated on : Sat Nov 29 2008, 23:41:57 CET
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/includes/templates/admin.activation.tpl

@@ -48 +48 @@
             </td>
             <td class='{cycle values='tbl1,tbl2'}' style='text-align:center;width:1%;white-space:nowrap;'>
-                {if $settings.email_activation == 1}
-                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_xcode="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;
-                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_xcode="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407}
+                {if $settings.email_verification == 1}
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_code="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_code="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407}
                 {else}
                     {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_id="|cat:$newusers[id].user_id image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;

trunk/register.php

@@ -22 +22 @@
 
 // do we want extensive email checks?
-define('CHECK_EMAIL', true);
+define('CHECK_EMAIL', false);
 
 // temp storage for template variables
@@ -191 +191 @@
                         "user_hide_email" => isNum($_POST['user_hide_email']) ? $_POST['user_hide_email'] : "1"
                     ));
-                    $result = dbquery("INSERT INTO ".$db_prefix."new_users (user_code, user_email, user_datestamp, user_info) VALUES('$user_code', '".$email."', '".time()."', '$user_info')");
+                    $result = dbquery("INSERT INTO ".$db_prefix."new_users (user_code, user_email, user_datestamp, user_info) VALUES('$user_code', '".$email."', '".time()."', '".mysql_real_escape_string($user_info)."')");
                     $variables['message'] = $locale['454'];
                     $title = $locale['400'];
@@ -207 +207 @@
                     $variables['message'] = $locale['453'];
                     // send the webmaster a PM that an account needs to be activated
-                    $result = dbquery("INSERT INTO ".$db_prefix."pm (pm_subject, pm_message, pm_recipients, pm_size, pm_datestamp) VALUES ('".$locale['509']."', '".mysql_escape_string(sprintf($locale['510'], $username))."', '1', '100', '".time()."')");
+                    $result = dbquery("INSERT INTO ".$db_prefix."pm (pm_subject, pm_message, pm_recipients, pm_size, pm_datestamp) VALUES ('".$locale['509']."', '".mysql_real_escape_string(sprintf($locale['510'], $username))."', '1', '100', '".time()."')");
                     if ($result) {
                         $pm_id = mysql_insert_id();