Changeset 2079 in ExiteCMS

Timestamp:

11/29/08 11:47:50 (3 years ago)

Author:

WanWizard

Message:

fixed display of a login panel with http even when ssl was set as required

Location:

trunk

Files:

• modules/user_info_panel/templates/modules.user_info_panel.tpl (modified) (1 diff)
• modules/user_info_panel/user_info_panel.php (modified) (1 diff)
• register.php (modified) (4 diffs)

trunk/modules/user_info_panel/templates/modules.user_info_panel.tpl

@@ -59 +59 @@
     </div>
     {include file="_closeside_x.tpl"}
-{elseif $settings.auth_ssl == 0 || $_SERVER.HTTPS|default:"" == "on"}
+{elseif $show_login}
     {include file="_openside.tpl" name=$_name title=$locale.060 state=$_state style=$_style}
     <div style='text-align:center'>

trunk/modules/user_info_panel/user_info_panel.php

@@ -111 +111 @@
 $variables['show_passlink'] = 1;
 
+// can we show the login panel?
+$variables['show_login'] = $settings['auth_ssl'] == 0 || ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" );
+if (!iMEMBER && !$variables['show_login']) $no_panel_displayed = true;
+
 $template_variables['modules.user_info_panel'] = $variables;
 ?>

trunk/register.php

@@ -62 +62 @@
     } else if (isset($_POST['register'])) {
         $error = "";
-        $username = stripinput(trim(eregi_replace(" +", " ", $_POST['username'])));
-        $fullname = $_POST['fullname'];
+        $username = stripinput(trim(eregi_replace(" +", "", $_POST['username'])));
+        $fullname = eregi_replace("\"|'", "", $_POST['fullname']);
         $email = stripinput(trim(eregi_replace(" +", "", $_POST['email'])));
         $password1 = stripinput(trim(eregi_replace(" +", "", $_POST['password1'])));
@@ -71 +71 @@
     //  if (!preg_match("/^[-0-9A-Z_@\s]+$/i", $username)) $error .= $locale['403']."<br /><br />\n";
         
-        if (preg_match("/^[0-9A-Z@]{6,20}$/i", $password1)) {
+        if (preg_match("/^[0-9A-Z_@!\.\?]{6,20}$/i", $password1)) {
             if ($password1 != $_POST['password2']) $error .= $locale['404']."<br /><br />\n";
         } else {
@@ -84 +84 @@
         if (CHECK_EMAIL) {
             if (CMS_getmxrr($email_domain, $mxhosts)) {
-                // Get the hostname the MX record points to
+                // Get the hostnamxe the MX record points to
                 $mailhost = $mxhosts[0];
             } else {
@@ -170 +170 @@
             $user_sig = isset($_POST['user_sig']) ? stripinput(trim($_POST['user_sig'])) : "";
         }
-        error_reporting(E_ALL);
+
         if ($error == "") {
             if ($settings['email_verification'] == "1") {