Changeset 1056 in ExiteCMS

Timestamp:

11/04/07 13:31:01 (4 years ago)

Author:

root

Message:

Merged trunk revision 1031:1055 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• administration/members.php (modified) (1 diff)
• forum/post.php (modified) (1 diff)
• includes/templates/forum.post.tpl (modified) (1 diff)
• register.php (modified) (1 diff)

branches/PLi-Fusion/administration/members.php

@@ -202 +202 @@
     $variables['rowstart'] = $rowstart;
     $variables['items_per_page'] = ITEMS_PER_PAGE;
-    $variables['pagenav_url'] = FUSION_SELF."?sortby=$sortby&".($country==""?"":"country=$country&");
+    $variables['pagenav_url'] = FUSION_SELF.$aidlink."&sortby=$sortby&".($country==""?"":"country=$country&");
 }
 

branches/PLi-Fusion/forum/post.php

@@ -479 +479 @@
             $preview['group_names'] = array();
             $preview['group_names'][] = array('type' => 'U', 'level' => $userdata['user_level'], 'name' => getuserlevel($userdata['user_level']));
-            if ($userdata['user_groups'] != "") {
+            if (!empty($userdata['user_groups'])) {
                 $gresult = dbquery("SELECT group_name, group_forumname, group_color FROM ".$db_prefix."user_groups WHERE group_id IN (".str_replace('.', ',', substr($userdata['user_groups'],1)).") AND group_visible & 2");
                 $grecs = dbrows($gresult);

branches/PLi-Fusion/includes/templates/forum.post.tpl

@@ -138 +138 @@
                         {/section}
                         <td class='tbl1'>
+                            <input type='submit' name='upload' value='{$locale.471}' class='button' />
                             <input type='file' name='attach' class='textbox' style='width:200px;' />
-                            <input type='submit' name='upload' value='{$locale.471}' class='button' />
                             <br /><br />
                             <span class='small2'>{ssprintf format=$locale.466 var1=$attachmax var2=$attachtypes}</span>

branches/PLi-Fusion/register.php

@@ -134 +134 @@
 
         if ($settings['display_validation'] == "1") {
-            if (!check_captcha($_POST['captcha_encode'], $_POST['captcha_code'])) {
+            if (!isset($_POST['captcha_encode']) || !isset($_POST['captcha_code']) || !check_captcha($_POST['captcha_encode'], $_POST['captcha_code'])) {
                 $error .= $locale['410']."<br />\n";
             }