Changeset 1064 in ExiteCMS

Timestamp:

11/05/07 22:12:46 (4 years ago)

Author:

hverton

Message:

Simplified the setuser template, removed more html from the code.
Removed the word 'Ban', replaced by 'Suspended'

Location:

trunk

Files:

• includes/templates/main.setuser.tpl (modified) (1 diff)
• locale/English/global.php (modified) (1 diff)
• setuser.php (modified) (4 diffs)

trunk/includes/templates/main.setuser.tpl

@@ -29 +29 @@
             <div class='splashscreen-v'>
                 <center>
+                <br />
+                {if $settings.sitebanner|default:"" != ""}
+                    <img src='{$smarty.const.THEME}images/{$settings.sitebanner}' alt='{$settings.sitename}' width='400'/>
+                {else}
+                    <br /><br />
+                {/if}
                 <br /><br />
-                {if $settings.sitebanner|default:"" != ""}
-                    <img src='{$smarty.const.THEME}images/{$settings.sitebanner}' alt='{$settings.sitename}' width='400'/><br /><br />
-                {/if}
-                {$message}
-                {$error}
+                {$message.line1|default:""}<br />
+                {$message.line2|default:""}<br />
+                {$message.line3|default:""}<br />
+                {$message.line4|default:""}<br />
+                <br />
                 {$locale.183}
-                {if $error != ""}<br /><br />[ <a href='{$url}'>{$locale.184}</a> ]{/if}
+                <br />
+                {if $error != 0}[ <a href='{$url}'>{$locale.184}</a> ]{/if}
                 <br /><br />
                 </center>

trunk/locale/English/global.php

@@ -152 +152 @@
 // Login 
 $locale['180'] = "Reason";
-$locale['181'] = "This ban wil expire on";
+$locale['181'] = "This suspension wil expire on";
 $locale['182'] = "<h1><br /><br /><br /></h1><center><b>We have detected that you have disabled Javascript.</b><br /><br />
 This website uses javascript to create an enhanced experience.<br />Some features might not work (correctly) if you <a href='%s'>continue</a>...</center>";
-$locale['183'] = "Please wait while we transfer you...";
+$locale['183'] = "Please wait while we redirect you...";
 $locale['184'] = "Or click here if you do not wish to wait";
 // Maintenance

trunk/setuser.php

@@ -28 +28 @@
 }
 
+// array to store the lines of the setuser message
+$message = array();
+
+// make sure the error parameter has a value
+if (!isset($error) || !isNum($error)) $error = 0;
+
 if (isset($_REQUEST['logout']) && $_REQUEST['logout'] == "yes") {
     header("P3P: CP='NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM'");
@@ -34 +40 @@
     setcookie("lastvisit", "", time() - 7200, "/", "", "0");
     $result = dbquery("DELETE FROM ".$db_prefix."online WHERE online_ip='".USER_IP."'");
-    if (isset($userdata['user_name'])) $message = "<b>".$locale['192'].$userdata['user_name']."</b><br /><br />\n";
-    $error = "";
+    if (isset($userdata['user_name'])) {
+        $message['line2'] =  "<b>".$locale['192'].$userdata['user_name']."</b>";
+    }
 } else {
-    if (!isset($error)) $error = "";
     if ($error == 1) {
-        $error = "<b>".$locale['194']."</b><br /><br />\n";
+        $message['line1'] = "<b>".$locale['194']."</b>";
         $data = dbarray(dbquery("SELECT user_ban_reason, user_ban_expire FROM ".$db_prefix."users WHERE user_id='$user_id'"));
         if (is_array($data)) {
-            if ($data['user_ban_reason'] != "") $error .= "<b>".$locale['180']." : ".$data['user_ban_reason']."</b><br />\n";
-            if ($data['user_ban_expire'] > 0) $error .= "<b>".$locale['181']." ".showdate('forumdate', $data['user_ban_expire'])."</b><br />\n";
-            $error .= "<br / >";
+            if ($data['user_ban_reason'] != "") $message['line2'] = "<b>".$locale['180']." : ".$data['user_ban_reason']."</b>";
+            if ($data['user_ban_expire'] > 0) $message['line4']  = "<b>".$locale['181']." ".showdate('forumdate', $data['user_ban_expire'])."</b>";
         }
     } elseif ($error == 2) {
-        $error = "<b>".$locale['195']."</b><br /><br />\n";
+        $message['line2'] =  "<b>".$locale['195']."</b>";
     } elseif ($error == 3) {
-        $error = "<b>".$locale['196']."</b><br /><br />\n";
+        $message['line2'] =  "<b>".$locale['196']."</b>";
     } else {
         if (isset($_COOKIE['userinfo'])) {
@@ -61 +66 @@
                 }
                 $result = dbquery("DELETE FROM ".$db_prefix."online WHERE online_user='0' AND online_ip='".USER_IP."'");
-                $message = "<b>".$locale['193'].$user."</b><br /><br />\n";
+                $message['line2'] =  "<b>".$locale['193'].$user."</b>";
             } else {
-                $message = "<b>".$locale['196']."</b><br /><br />\n";
+                $message['line2'] =  "<b>".$locale['196']."</b>";
             }
         }
@@ -69 +74 @@
 }
 
-$variables['message'] = isset($message)?$message:"";
+// store the message for use in the template
+$variables['message'] = $message;
+
+// auto-redirect counter (in seconds)
 $variables['error'] = $error;
-$variables['refresh'] = $error==""?1:10;
+$variables['refresh'] = $error==0 ? 1 : 10;
 
 // define the first body panel variables