Changeset 2364 in ExiteCMS

Timestamp:

07/29/10 17:16:11 (22 months ago)

Author:

root

Message:

merged trunk into branches PLi-Fusion and ITXP

Location:

branches

Files:

• ITXP/administration/forums.php (modified) (6 diffs)
• ITXP/administration/tools/language_pack_English.php (modified) (5 diffs)
• ITXP/administration/tools/language_pack_Nederlands.php (modified) (2 diffs)
• ITXP/administration/upgrade/rev02360.php (copied) (copied from trunk/administration/upgrade/rev02360.php)
• ITXP/files/locales/en.main.global.php (modified) (1 diff)
• ITXP/files/locales/en.main.setup.php (modified) (1 diff)
• ITXP/files/locales/nl.main.global.php (modified) (1 diff)
• ITXP/files/locales/nl.main.setup.php (modified) (1 diff)
• ITXP/forum/post.php (modified) (10 diffs)
• ITXP/includes/ajax.response.php (modified) (3 diffs)
• ITXP/includes/jscripts/core_functions.js (modified) (1 diff)
• ITXP/includes/secureimage-1.0.3/securimage.php (modified) (14 diffs)
• ITXP/includes/session_functions.php (modified) (1 diff)
• ITXP/includes/templates/admin.forums.tpl (modified) (4 diffs)
• ITXP/includes/templates/forum.index.tpl (modified) (1 diff)
• ITXP/includes/templates/forum.post.tpl (modified) (7 diffs)
• ITXP/themes/ExiteCMS/templates/templates/_header.tpl (modified) (3 diffs)
• PLi-Fusion/administration/forums.php (modified) (6 diffs)
• PLi-Fusion/administration/tools/language_pack_English.php (modified) (5 diffs)
• PLi-Fusion/administration/tools/language_pack_Nederlands.php (modified) (5 diffs)
• PLi-Fusion/administration/upgrade/rev02360.php (copied) (copied from trunk/administration/upgrade/rev02360.php)
• PLi-Fusion/files/locales/en.main.global.php (modified) (1 diff)
• PLi-Fusion/files/locales/en.main.setup.php (modified) (1 diff)
• PLi-Fusion/files/locales/nl.main.global.php (modified) (1 diff)
• PLi-Fusion/files/locales/nl.main.setup.php (modified) (1 diff)
• PLi-Fusion/forum/post.php (modified) (10 diffs)
• PLi-Fusion/includes/ajax.response.php (modified) (3 diffs)
• PLi-Fusion/includes/jscripts/core_functions.js (modified) (1 diff)
• PLi-Fusion/includes/secureimage-1.0.3/securimage.php (modified) (14 diffs)
• PLi-Fusion/includes/session_functions.php (modified) (1 diff)
• PLi-Fusion/includes/templates/admin.forums.tpl (modified) (4 diffs)
• PLi-Fusion/includes/templates/forum.index.tpl (modified) (1 diff)
• PLi-Fusion/includes/templates/forum.post.tpl (modified) (7 diffs)

branches/ITXP/administration/forums.php

@@ -215 +215 @@
     $forum_attach = isset($_POST['forum_attach'])?"1":"0";
     $forum_attachtypes = stripinput($_POST['forum_attachtypes']);
+    $forum_prefix = isset($_POST['forum_prefix'])?"1":"0";
     $forum_prefixes = stripinput($_POST['forum_prefixes']);
     if ($action == "edit" && $t == "forum") {
@@ -240 +241 @@
         }
         // update the forum record
-        $result = dbquery("UPDATE ".$db_prefix."forums SET forum_name='".mysql_real_escape_string($forum_name)."', forum_cat='$forum_cat', forum_description='".mysql_real_escape_string($forum_description)."', forum_access='$forum_access', forum_posting='$forum_posting', forum_modgroup='$forum_modgroup', forum_attach='$forum_attach', forum_attachtypes='$forum_attachtypes', forum_prefixes='".mysql_real_escape_string($forum_prefixes)."', forum_rulespage='$forum_rulespage', forum_banners='$forum_banners' WHERE forum_id='$forum_id'");
+        $result = dbquery("UPDATE ".$db_prefix."forums SET forum_name='".mysql_real_escape_string($forum_name)."', forum_cat='$forum_cat', forum_description='".mysql_real_escape_string($forum_description)."', forum_access='$forum_access', forum_posting='$forum_posting', forum_modgroup='$forum_modgroup', forum_attach='$forum_attach', forum_attachtypes='$forum_attachtypes', forum_prefix='$forum_prefix', forum_prefixes='".mysql_real_escape_string($forum_prefixes)."', forum_rulespage='$forum_rulespage', forum_banners='$forum_banners' WHERE forum_id='$forum_id'");
         redirect(FUSION_SELF.$aidlink."&status=savefe");
     } else {
@@ -248 +249 @@
             if(!$forum_order) $forum_order=dbfunction("MAX(forum_order)", "forums", "forum_cat='$forum_cat'")+1;
             $result = dbquery("UPDATE ".$db_prefix."forums SET forum_order=forum_order+1 WHERE forum_cat='$forum_cat' AND forum_order>='$forum_order'");
-            $result = dbquery("INSERT INTO ".$db_prefix."forums (forum_cat, forum_name, forum_order, forum_description, forum_moderators, forum_access, forum_posting, forum_modgroup, forum_attach, forum_attachtypes, forum_prefixes, forum_rulespage, forum_banners, forum_lastpost, forum_lastuser) VALUES ('$forum_cat', '$forum_name', '$forum_order', '$forum_description', '$forum_mods', '$forum_access', '$forum_posting', '$forum_modgroup', '$forum_attach', '$forum_attachtypes', '".mysql_real_escape_string($forum_prefixes)."', '$forum_rulespage', '$forum_banners', '0', '0')");
+            $result = dbquery("INSERT INTO ".$db_prefix."forums (forum_cat, forum_name, forum_order, forum_description, forum_moderators, forum_access, forum_posting, forum_modgroup, forum_attach, forum_attachtypes, forum_prefix, forum_prefixes, forum_rulespage, forum_banners, forum_lastpost, forum_lastuser) VALUES ('$forum_cat', '$forum_name', '$forum_order', '$forum_description', '$forum_mods', '$forum_access', '$forum_posting', '$forum_modgroup', '$forum_attach', '$forum_attachtypes', '$forum_prefix', '".mysql_real_escape_string($forum_prefixes)."', '$forum_rulespage', '$forum_banners', '0', '0')");
             redirect(FUSION_SELF.$aidlink."&status=savefu");
         }
@@ -321 +322 @@
             $forum_attach = $data['forum_attach']?true:false;
             $forum_attachtypes = $data['forum_attachtypes'];
+            $forum_prefix = $data['forum_prefix'];
             $forum_prefixes = $data['forum_prefixes'];
             $forum_title = $locale['422'];
@@ -346 +348 @@
         $forum_attach = ($settings['attachments'] == 1);
         $forum_attachtypes = $settings['attachtypes'];
+        $forum_prefix = 0;
         $forum_prefixes = "";
         $forum_title = $locale['421'];
@@ -420 +423 @@
         $variables['forum_attach'] = $forum_attach;
         $variables['forum_attachtypes'] = $forum_attachtypes;
+        $variables['forum_prefix'] = $forum_prefix;
         $variables['forum_prefixes'] = $forum_prefixes;
         $variables['forum_rulespage'] = $forum_rulespage;

branches/ITXP/administration/tools/language_pack_English.php

@@ -368 +368 @@
         $localestrings['493'] = "Refresh Forum Ordering";
         $localestrings['494'] = "Subject prefix list:";
+        $localestrings['495'] = "Use subject prefixes in this forum";
         load_localestrings($localestrings, LP_LOCALE, "admin.forums", $step);
 
@@ -2579 +2580 @@
         $localestrings['473'] = "Comments (Max.length: 255 characters):";
         $localestrings['474'] = "Toggle Message";
+        $localestrings['475'] = "Error: Your are required to select a prefix when posting in this forum";
         $localestrings['480'] = " Make this Thread Sticky";
         $localestrings['481'] = " Show My Signature in this Post";
@@ -2590 +2592 @@
         $localestrings['500'] = "You cannot edit this post.";
         $localestrings['501'] = "You cannot move a post that has a poll attached to it.";
-        $localestrings['502'] = "You cannot edit this post. The thread has been locked by a moderator";
         $localestrings['530'] = "Search Forum";
         $localestrings['531'] = "Search Keyword(s)";
@@ -2599 +2600 @@
         $localestrings['550'] = "Thread Reply Notification - {THREAD_SUBJECT}";
         $localestrings['551'] = "Hello {USERNAME},\n\nA reply has been posted in the forum thread '{THREAD_SUBJECT}' which you are tracking at {SITE_NAME}. You can use the following link to view the reply:\n\n{THREAD_URL}\n\nIf you no longer wish to watch this thread you can click the 'Tracking Off' button located at the bottom of the thread.\n\nRegards,\n{SITE_WEBMASTER}.";
+        $localestrings['552'] = "You cannot edit this post. The thread has been locked by a moderator";
         load_localestrings($localestrings, LP_LOCALE, "forum.post", $step);
 
@@ -3846 +3848 @@
 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.30");
-if (!defined('LP_DATE')) define('LP_DATE', time());
+if (!defined('LP_DATE')) define('LP_DATE', "1280139239");
 $lp_date = LP_DATE;
 

branches/ITXP/administration/tools/language_pack_Nederlands.php

@@ -368 +368 @@
         $localestrings['493'] = "Volgorde herrekenen";
         $localestrings['494'] = "Topic prefix lijst:";
+        $localestrings['495'] = "Gebruik topic prefixen voor dit forum";
         load_localestrings($localestrings, LP_LOCALE, "admin.forums", $step);
 
@@ -3846 +3847 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.30");
-if (!defined('LP_DATE')) define('LP_DATE', time());
+if (!defined('LP_DATE')) define('LP_DATE', "1280139245");
 $lp_date = LP_DATE;
 

branches/ITXP/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Wed Jun 9 2010, 17:36:48 CEST
+// generated on : Mon Jul 26 2010, 12:14:21 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

branches/ITXP/files/locales/en.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Tue Jun 8 2010, 22:35:58 CEST
-// translators  : ExiteCMS team
+// generated on : Wed Jun 16 2010, 19:48:07 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['400'] = "Select your default locale";

branches/ITXP/files/locales/nl.main.global.php

@@ -3 +3 @@
 // locale       : Nederlands
 // locale name  : main.global
-// generated on : Wed Jun 9 2010, 17:37:56 CEST
+// generated on : Wed Jun 16 2010, 19:48:12 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

branches/ITXP/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Tue Jun 8 2010, 22:36:03 CEST
-// translators  : ExiteCMS team
+// generated on : Wed Jun 16 2010, 19:48:12 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['400'] = "Selecteer de standaard taal voor uw site";

branches/ITXP/forum/post.php

@@ -62 +62 @@
 // function to validate the contents of the $_POST array
 function validatepost() {
-    global $locale;
+    global $locale, $fdata;
 
     // we need both a subject and a message body
@@ -71 +71 @@
     if ($_POST['new_prefix'] == '[?]') $_POST['new_prefix'] = '';
 
+    // is a prefix required?
+    if ($fdata['forum_prefix'] && !empty($fdata['forum_prefixes']) && empty($_POST['new_prefix'])) {
+        return $locale['475'];
+    }
+
     return "";
 }
 
 // function to add or replace the prefix in the subject
-function subject_prefix($subject, $prefix) {
+function strip_prefix($subject) {
+
+    $result = array('subject' => '', 'prefix' => '');
+
+    // check for a reply, and strip the reply prefix
+    if (strtolower(substr($subject,0,3))=="re:") {
+        $result['subject'] = "Re: ";
+        $subject = trim(substr($subject,3));
+    }
+
+    // split the subject to check for a prefix
+    if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+        // a match must be at the beginning
+        if (empty($matches[1])) {
+            $result['prefix'] .= $matches[2];
+            $result['subject'] .= trim($matches[3]);
+        } else {
+            $result['subject'] .= $matches[0];
+        }
+    } else {
+        $result['subject'] .= $subject;
+    }
+
+    return $result;
+}
+
+// function to add or replace the prefix in the subject
+function add_prefix($subject, $prefix) {
 
     // was a prefix defined
@@ -83 +115 @@
 
         // split the subject to check for a prefix
-        if (!preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-        {
-            // was this a reply?
-            if (strtolower(substr($subject,0,3)) == 're:') {
-                $subject = 'Re: [' . $prefix . '] ' . substr($subject,4);
+        if (!preg_match('~(re:)(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+
+            if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+                if (empty($matches[1])) {
+                    $subject = '[' . $prefix . '] ' . trim($matches[3]);
             } else {
                 $subject = '[' . $prefix . '] ' . $subject;
             }
         } else {
-            // remove spaces from the matches
-            foreach($matches as $key => $value) {
-                $matches[$key] = trim($value);
-            }
-            unset($matches[0]);
-            $matches[2] = '[' . trim($prefix) . ']';
-            $subject = trim(implode(' ', $matches));
-        }
+                if (preg_match('~(re:)(.*)~i', $subject, $matches)) {
+                    $subject = 'Re: [' . $prefix . '] ' . trim($matches[2]);
+                } else {
+                    $subject = '[' . $prefix . '] ' . $subject;
+            }
+        }
+        } else {
+            $subject = 'Re: [' . $prefix . '] ' . trim($matches[4]);
+    }
     }
 
@@ -490 +523 @@
             $preview['post_subject'] = trim(stripinput(censorwords($_POST['subject'])));;
             if ($preview['post_subject'] == "" && isset($tdata) && is_array($tdata)) {
-                $preview['post_subject'] = "Re: ".$tdata['thread_subject'];
+                $preview['post_subject'] = add_prefix("Re: ".$tdata['thread_subject'], trim(stripinput($_POST['new_prefix'])));
             } else {
-                $preview['post_subject'] = subject_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
+                $preview['post_subject'] = add_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
             }
             $preview['post_message'] = trim(stripmessageinput(censorwords($_POST['message'])));
@@ -614 +647 @@
 // bail out if an edit is requested, but no edit rights have been detected
 if ($action == "edit" && !$user_can_edit) {
-    resultdialog($locale['408'], $locale['502']);
+    resultdialog($locale['408'], $locale['552']);
 } elseif (isset($_POST["cancel"])) {
     // post cancelled?
@@ -649 +682 @@
                     $smileys = isset($_POST['disable_smileys']) ? "0" : "1";
                     $subject = trim(stripinput(censorwords($_POST['subject'])));
+                    if (isset($tdata) && strtolower(substr($subject,0,3)) != "re:") {
                     if ($subject == "") {
                         $subject = "Re: ".$tdata['thread_subject'];
+                        } else {
+                            if ($action != "edit") {
+                                $subject = "Re: ".$subject;
                     }
-                    $subject = subject_prefix($subject, stripinput($_POST['new_prefix']));
+                        }
+                    }
+                    if ($fdata['forum_prefix']) {
+                        $subject = add_prefix($subject, stripinput($_POST['new_prefix']));
+                    }
                     $message = trim(stripmessageinput(censorwords($_POST['message'])));
                     if ($action == 'edit') {
                         // update the post record
                         if ($_POST['message'] == $_POST['org_message'])
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_smileys='$smileys' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_smileys='$smileys' WHERE post_id='$post_id'");
                         else {
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_message='$message', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_message='".mysql_real_escape_string($message)."', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
                         }
                         $data = dbarray(dbquery("SELECT * FROM ".$db_prefix."posts WHERE thread_id='$thread_id' ORDER BY post_datestamp ASC LIMIT 1"));
                         if ($data['post_id'] == $post_id) {
-                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='$subject' WHERE thread_id='$thread_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='".mysql_real_escape_string($subject)."' WHERE thread_id='$thread_id'");
                         }
                         // flag the forum and the thread as updated
@@ -808 +849 @@
                         rename(PATH_ATTACHMENTS.$attachment['attach_tmp'], PATH_ATTACHMENTS.$attachname);
                         chmod(PATH_ATTACHMENTS.$attachname,0664);
-                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '$attachname', '".$attachment['attach_name']."', '".$attachment['attach_comment']."', '$attachext', '".$attachment['attach_size']."')");
+                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '".mysql_real_escape_string($attachname)."', '".mysql_real_escape_string($attachment['attach_name'])."', '".mysql_real_escape_string($attachment['attach_comment'])."', '$attachext', '".$attachment['attach_size']."')");
                     }
                 }
@@ -1020 +1061 @@
             $variables['prefixes'] = array();
             foreach ($prefixes as $prefix) {
-                if (!empty($prefix)) $variables['prefixes'][] = trim($prefix);
+                $prefix = trim($prefix);
+                if (!empty($prefix)) $variables['prefixes'][] = $prefix;
             }
             if (!isset($title)) $title = $locale['415']." #".$reply_id;
@@ -1044 +1086 @@
             } elseif ($post_id > 0 || $reply_id > 0) {
                 $subject = $pdata['post_subject'];
-                // split the subject to check for a prefix
-                if (preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-                {
-                    // update the subject, set the prefixes
-                    $subject = trim($matches[3]);
-                    $variables['prefix'] = $matches[2];
-                    $variables['new_prefix'] = '['.$matches[2].']';
-                }
-                if ($action != "newthread" && strtolower(substr($subject,0,3)) != "re:") {
+                if (!in_array($action, array("edit","newthread")) && strtolower(substr($subject,0,3)) != "re:") {
                     $variables['subject'] = 'Re: '.$subject;
                 } else {
@@ -1088 +1122 @@
                 $bbcolor = "";
             }
+            // do we need to deal with a subject prefix
+            if (!isset($variables['prefix'])) {
+                $sparray = strip_prefix($variables['subject']);
+
+                $variables['subject'] = $sparray['subject'];
+                // check if it's a custom prefix
+                if (in_array($sparray['prefix'],$variables['prefixes'])) {
+                    $variables['prefix'] = $sparray['prefix'];
+                    $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                } else {
+                    if (empty($sparray['prefix'])) {
+                        $variables['prefix'] = '';
+                        $variables['new_prefix'] = '[?]';
+                    } else {
+                        $variables['prefix'] = '?';
+                        $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                    }
+                }
+            }
+
             // process attachments
             if ($settings['attachments'] == "1" && $fdata['forum_attach'] == "1") {

branches/ITXP/includes/ajax.response.php

@@ -89 +89 @@
         // make sure we have json_encode and json_decode available
         require_once "json_include.php";
+        header("Content-Type:application/json; charset=utf-8");
         if (iMEMBER) {
             // return the user record datastore
@@ -104 +105 @@
             }
         }
+        break;
+    case "counters":
+        if (!iMEMBER) {
+            $pms = $posts = 0;
+            $pmtext = $posttext = "";
+        } else {
+            $pms = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id='".$userdata['user_id']."' AND pmindex_to_id='".$userdata['user_id']."' AND pmindex_read_datestamp = '0'");
+            if ($pms == 1) {
+                $pmtext = sprintf($locale['085'], $pms);
+            } else {
+                $pmtext = sprintf($locale['086'], $pms);
+            }
+            if ($userdata['user_posts_unread']) {
+                $result = dbquery("
+                    SELECT count(*) as unread
+                        FROM ".$db_prefix."posts p
+                            INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                        WHERE ".groupaccess('f.forum_access')."
+                            AND tr.user_id = '".$userdata['user_id']."'
+                            AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                            AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                                OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                    );
+            } else {
+                $result = dbquery("
+                    SELECT count(*) as unread
+                        FROM ".$db_prefix."posts p
+                            INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                        WHERE ".groupaccess('f.forum_access')."
+                            AND tr.user_id = '".$userdata['user_id']."'
+                            AND p.post_author != '".$userdata['user_id']."'
+                            AND p.post_edituser != '".$userdata['user_id']."'
+                            AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                            AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                                OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                    );
+            }
+            $posts = ($result ? mysql_result($result, 0) : 0);
+            if ($posts == 1) {
+                $posttext = sprintf($locale['088'], $posts);
+            } else {
+                $posttext = sprintf($locale['089'], $posts);
+            }
+        }
+        // make sure we have json_encode and json_decode available
+        require_once "json_include.php";
+        // send the results back
+        header("Content-Type:application/json; charset=utf-8");
+        echo json_encode(array('pmcount' => $pms, 'pmtext' => $pmtext, 'postcount' => $posts, 'posttext' => $posttext));
         break;
     case "pm":
@@ -211 +263 @@
     mysql_close();
 }
-?>

branches/ITXP/includes/jscripts/core_functions.js

@@ -104 +104 @@
         }
     }
+}
+
+// return a new AJAX object
+function asyncajaxcall() {
+    var result = false;
+    if (window.XMLHttpRequest) {
+        // For Safari, Firefox, and other non-MS browsers
+        try {
+            result = new XMLHttpRequest();
+        } catch (e) {
+            result = false;
+        }
+    } else if (window.ActiveXObject) {
+        // For Internet Explorer on Windows
+        try {
+            result = new ActiveXObject("Msxml2.XMLHTTP");
+        } catch (e) {
+            try {
+                result = new ActiveXObject("Microsoft.XMLHTTP");
+            } catch (e) {
+                result = false;
+            }
+        }
+    }
+    return result;
 }
 

branches/ITXP/includes/secureimage-1.0.3/securimage.php

@@ -18 +18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br /><br />
- * 
- * Any modifications to the library should be indicated clearly in the source code 
+ *
+ * Any modifications to the library should be indicated clearly in the source code
  * to inform users that the changes are not a part of the original software.<br /><br />
  *
@@ -121 +121 @@
   var $charset = 'ABCDEFGHKLMNPRSTUVWYZ23456789';
   //var $charset = '0123456789';
-  
+
   /**
    * Create codes using this word list
@@ -128 +128 @@
    */
   var $wordlist_file = '';
-  
+
   /**
    * True to use a word list file instead of a random code
@@ -363 +363 @@
   var $audio_path = './audio/';
 
+  /**
+   * Captcha expiry timeout in seconds.
+   *
+   * @since 1.0.3
+   * @var string
+   */
+  var $timeout = 300;
+
+
 
   //END USER CONFIGURATION
@@ -423 +432 @@
       die('no session available!');
     }
-    
+
     // we use random colors to make it even more difficult
     $this->image_bg_color = $this->getHexColor();
@@ -445 +454 @@
     return $clr;
   }
-   
+
   /**
    * Generate a code and output the image to the browser.
@@ -693 +702 @@
   {
     $this->code = false;
-    
+
     if ($this->use_wordlist && is_readable($this->wordlist_file)) {
       $this->code = $this->readCodeFromFile();
     }
-    
+
     if ($this->code == false) {
       $this->code = $this->generateCode($this->code_length);
     }
-    
+
     $this->saveData();
   }
@@ -721 +730 @@
     return $code;
   }
-  
+
   /**
    * Reads a word list file to get a code
@@ -733 +742 @@
     $fp = @fopen($this->wordlist_file, 'r');
     if (!$fp) return false;
-    
+
     $fsize = filesize($this->wordlist_file);
     if ($fsize < 32) return false; // too small of a list to be effective
-    
+
     if ($fsize < 128) {
       $max = $fsize; // still pretty small but changes the range of seeking
@@ -742 +751 @@
       $max = 128;
     }
-    
+
     fseek($fp, rand(0, $fsize - $max), SEEK_SET);
     $data = fread($fp, 128); // read a random 128 bytes from file
     fclose($fp);
-    
+
     $start = strpos($data, "\n", rand(0, 100)) + 1; // random start position
     $end   = strpos($data, "\n", $start) - 1; // find end of word
-    
+
     return strtolower(substr($data, $start, $end - $start)); // return substring in 128 bytes
   }
@@ -822 +831 @@
   {
     $_SESSION['securimage_code_value'] = strtolower($this->code);
+    $_SESSION['securimage_code_timestamp'] = time();
   }
 
@@ -834 +844 @@
     if ( isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value']) ) {
       if ( $_SESSION['securimage_code_value'] == strtolower(trim($this->code_entered)) ) {
-        $this->correct_code = true;
-        $_SESSION['securimage_code_value'] = '';
+        if (isset($_SESSION['securimage_code_timestamp']) && (time() - $_SESSION['securimage_code_timestamp']) < $this->timeout) {
+          $this->correct_code = true;
+          $_SESSION['securimage_code_value'] = '';
+        } else {
+          $this->correct_code = false;
+        }
       } else {
         $this->correct_code = false;
@@ -906 +920 @@
       $file['size']            = $data['ChunkSize'] + 8;
       $file['data']            = $body;
-      
+
       if ( ($p = strpos($file['data'], 'LIST')) !== false) {
         // If the LIST data is not at the end of the file, this will probably break your sound file
@@ -914 +928 @@
         $file['size'] = $file['size'] - (strlen($file['data']) - $p);
       }
-      
+
       $files[] = $file;
       $data    = null;

branches/ITXP/includes/session_functions.php

@@ -48 +48 @@
 
 // update the timestamp of the session cookie, we want expiry after the last page load, not after the session has started!
-setcookie(ini_get("session.name"), session_id(), time()+ini_get("session.gc_maxlifetime"), "/");
+setcookie(ini_get("session.name"), session_id(), time()+$settings['session_gc_maxlifetime'], "/");
 
 // store the last_url cookie if found

branches/ITXP/includes/templates/admin.forums.tpl

@@ -65 +65 @@
             <tr>
                 <td colspan='2' class='tbl'>
+                    <input type='checkbox' name='forum_prefix' value='1' onchange='togglefields("prefixes");'{if $forum_prefix} checked="checked"{/if} /> {$locale.495}
+                </td>
+            </tr>
+            <tr id='prefixes'{if !$forum_prefix} style='display:none'{/if}>
+                <td colspan='2' class='tbl'>
                     {$locale.494}
                     <br />
@@ -145 +150 @@
             <tr>
                 <td colspan='2' class='tbl'>
-                    <input type='checkbox' name='forum_attach' value='1' onchange='togglefields();'{if $forum_attach} checked="checked"{/if} /> {$locale.469}
+                    <input type='checkbox' name='forum_attach' value='1' onchange='togglefields("attachtypes");'{if $forum_attach} checked="checked"{/if} /> {$locale.469}
                 </td>
             </tr>
@@ -167 +172 @@
     </form>
 {literal}<script type='text/javascript'>
-function togglefields() {
+function togglefields(name) {
     if(navigator.appName.indexOf('Microsoft') > -1) {
         state = 'block';
@@ -173 +178 @@
         state = 'table-row';
     }
-    if (document.getElementById('attachtypes').style.display == 'none') {
-        document.getElementById('attachtypes').style.display = state;
+    if (document.getElementById(name).style.display == 'none') {
+        document.getElementById(name).style.display = state;
     } else {
-        document.getElementById('attachtypes').style.display = 'none';
+        document.getElementById(name).style.display = 'none';
     }
 }

branches/ITXP/includes/templates/forum.index.tpl

@@ -151 +151 @@
             {buttonlink name=$locale.415 link="tracking.php"}
             {buttonlink name=$locale.414 link="viewposts.php"}<br />
-            <form name='searchform' method='post' style="margin-top:2px;" action='{$smarty.const.BASEDIR}search.php?stype=f'>
+            <form name='searchform' method='post' style="margin-top:2px;" action='{$smarty.const.BASEDIR}search.php?action=search'>
                 <input type='text' name='stext' class='textbox' style='width:150px' />
+                <input type='hidden' name='boolean' value='1' />
+                <input type='hidden' name='qtype' value='AND' />
+                <input type='hidden' name='search_id' value='3.2' />
+                <input type='hidden' name='sortby' value='datestamp' />
+                <input type='hidden' name='order' value='0' />
+                <input type='hidden' name='limit' value='0' />
+                <input type='hidden' name='datelimit' value='0' />
+                <input type='hidden' name='contentfilter_users' value='0' />
+                <input type='hidden' name='contentfilter_forums' value='0' />
                 <input type='submit' name='search' value='{$locale.550}' class='button' />
             </form>

branches/ITXP/includes/templates/forum.post.tpl

@@ -124 +124 @@
             <td>
                 <table width='100%' border='0' cellspacing='1' cellpadding='0'>
-                    <tr>
+                    <tr {if $forum.forum_prefix == 0}style="display:none;"{/if}>
                         <td align='right' width='145' valign='top' class='tbl2'>
                             {$locale.533}:
                         </td>
                         <td class='tbl1'>
-                            <select name="prefix" class="textbox" style="width:125px;" onChange="javascript:update_prefix(this);">
-                                <option value="">{$locale.534}</option>
+                            {assign var=show_prefix value=0}
+                            <select name="prefix" class="textbox" style="width:125px;" onChange="update_prefix(this);">
+                                <option value="" {if $prefix == ""}selected="selected"{/if}>{$locale.534}</option>
                             {foreach from=$prefixes item=post_prefix}
                                 <option value="{$post_prefix}" {if $prefix == $post_prefix}selected="selected"{/if}>{$post_prefix}</option>
                             {/foreach}
-                                <option value="?">{$locale.535}</option>
+                                <option value="?" {if $prefix == "?"}selected="selected"{assign var=show_prefix value=1}{/if}>{$locale.535}</option>
                             </select>
-                            <input type='text' id="new_prefix" name='new_prefix' value='{$new_prefix}' class='textbox' maxlength='255' style='width: 250px' disabled="disabled" />
+                            <input type='text' id="new_prefix" name='new_prefix' value='{$new_prefix}' class='textbox' maxlength='255' style='width: 250px;{if $show_prefix ==0}display:none;{/if}' />
                         </td>
                     </tr>
@@ -150 +151 @@
                     <tr>
                         <td align='right' width='145' class='tbl2' valign='top' style='white-space:nowrap'>
-                            <input type='submit' class='button' name='toggle_msg' value='{$locale.474}' onclick='javascript:flipDiv("org_message");return false;' />
+                            <input type='submit' class='button' name='toggle_msg' value='{$locale.474}' onclick='flipDiv("org_message");return false;' />
                         </td>
                         <td class='tbl1'>
@@ -194 +195 @@
                     <tr>
                         <td align='right' width='145' valign='top' class='tbl2'>
-                            <input type='button' name='toggle' class='button' value='{$locale.467}' onclick='javascript:loadSmileys("smileys", "smileys_loaded", "{$smarty.const.BASEDIR}includes/ajax.response.php?request=smileys&parms=message");return false;' />
+                            <input type='button' name='toggle' class='button' value='{$locale.467}' onclick='loadSmileys("smileys", "smileys_loaded", "{$smarty.const.BASEDIR}includes/ajax.response.php?request=smileys&parms=message");return false;' />
                         </td>
                         <td class='tbl1'>
@@ -266 +267 @@
                                 <input type='submit' name='upload' value='{$locale.471}' class='button' />
                             {else}
-                                <input type='submit' name='upload' value='{$locale.471}' class='button' onclick='javascript:get_hoteditor_data("message");' />
+                                <input type='submit' name='upload' value='{$locale.471}' class='button' onclick='get_hoteditor_data("message");' />
                             {/if}
                         </td>
@@ -309 +310 @@
                                 <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' />
                             {else}
-                                <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' onclick='javascript:get_hoteditor_data("message");' />
+                                <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' onclick='get_hoteditor_data("message");' />
                             {/if}
                         {/if}
@@ -380 +381 @@
                     <input type='submit' name='save' value='{$button_save}' class='button' />
                 {else}
-                    <input type='submit' name='preview' value='{$button_preview}' class='button' onclick='javascript:document.getElementById("new_prefix").disabled = false;get_hoteditor_data("message");' />
-                    <input type='submit' name='save' value='{$button_save}' class='button' onclick='javascript:document.getElementById("new_prefix").disabled = false;get_hoteditor_data("message");' />
+                    <input type='submit' name='preview' value='{$button_preview}' class='button' onclick='get_hoteditor_data("message");' />
+                    <input type='submit' name='save' value='{$button_save}' class='button' onclick='get_hoteditor_data("message");' />
                 {/if}
                 <input type='hidden' name='post_author' value='{$post_author}' />
@@ -413 +414 @@
     if ( el.value == "?") {
         document.getElementById('new_prefix').value = "[?]";
-        document.getElementById('new_prefix').disabled = false;
+        document.getElementById('new_prefix').style.display = 'inline';
         document.getElementById('new_prefix').focus = true;
     }   else {
-        document.getElementById('new_prefix').disabled = true;
+        document.getElementById('new_prefix').style.display = 'none';
         if ( el.value == "") {
             document.getElementById('new_prefix').value = "";

branches/ITXP/themes/ExiteCMS/templates/templates/_header.tpl

@@ -38 +38 @@
     {/literal}
     {if $favicon|default:false != false}<link rel='shortcut icon' href='{$favicon}' />{/if}
-    <script type='text/javascript' src='{$smarty.const.INCLUDES}jscripts/core_functions.js?version=3'></script>
+    <script type='text/javascript' src='{$smarty.const.INCLUDES}jscripts/core_functions.js?version=4'></script>
     {if $smarty.const.LOAD_TINYMCE}
         {include file="_load_tinymce.tpl"}
@@ -88 +88 @@
 createCookie('width', myWidth, 0);
 createCookie('height', myHeight, 0);
-
+//
+// Dynamic fontsize
+//
 var fontGrootte = 0.7;
 var pliCookie = readCookie('pliFontSize');
@@ -117 +119 @@
 
 fontReset(fontGrootte);
-
+{/literal}
+{if iMEMBER}
+{literal}
+//
+// PM and forum post counter checks
+//
 function checkMessages() {
-    // check for new forum messages
-    var newmsg = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=posts");
-    if (newmsg != null && document.getElementById("new_posts_header")) {
-        if (newmsg > 0) {
-            document.getElementById("new_posts_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}modules/forum_threads_list_panel/new_posts.php'><img src='{/literal}{$smarty.const.THEME}{literal}images/newposts.gif' height='9' alt='{/literal}{$locale.028}{literal}' /></a>&nbsp;";
-        } else {
-            document.getElementById("new_posts_header").innerHTML = "";
+    // check for new pm messages
+    var asyncajax = asyncajaxcall();
+    if (asyncajax) {
+        try {
+            // Asynchronous request, wait till we have it all
+            asyncajax.open('GET', exitecms_basedir + "includes/ajax.response.php?request=counters", true);
+            asyncajax.onreadystatechange = function() {
+                if(asyncajax.readyState == 4) {
+                    if (asyncajax.status == 200) {
+                        try {
+                            // update the new message indicator
+                            newmsg = eval('('+asyncajax.responseText+')');
+                            if (document.getElementById("new_pm_header")) {
+                                if (parseInt(newmsg.pmcount) > 0) {
+                                    document.getElementById("new_pm_header").innerHTML = "<a href='" + exitecms_basedir + "pm.php?action=show_new'><img src='" + exitecms_themedir + "images/newmsgs.gif' height='9' alt='' /></a>&nbsp;";
+                                } else {
+                                    document.getElementById("new_pm_header").innerHTML = '';
+                                }
+                            }
+                            if (document.getElementById("new_pm_panel")) {
+                                if (parseInt(newmsg.pmcount) > 0) {
+                                    document.getElementById("new_pm_panel_value").innerHTML = newmsg.pmtext;
+                                    document.getElementById("new_pm_panel").style.display = 'inline';
+                                } else {
+                                    document.getElementById("new_pm_panel").style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById("new_posts_header")) {
+                                if (parseInt(newmsg.postcount) > 0) {
+                                    document.getElementById("new_posts_header").innerHTML = "<a href='" + exitecms_basedir + "modules/forum_threads_list_panel/new_posts.php'><img src='" + exitecms_themedir + "images/newposts.gif' height='9' alt='" + locale_028 + "' /></a>&nbsp;";
+                                } else {
+                                    document.getElementById("new_posts_header").innerHTML = '';
+                                }
+                            }
+                            if (document.getElementById("new_posts_panel")) {
+                                if (parseInt(newmsg.postcount) > 0) {
+                                    document.getElementById("new_posts_panel_value").innerHTML = newmsg.posttext;
+                                    document.getElementById("new_posts_panel").style.display = 'inline';
+                                } else {
+                                    document.getElementById("new_posts_panel").style.display = 'none';
+                                }
+                            }
+                            // set a timer for the next check
+                            msgtimerid = setTimeout("checkMessages()", 60000);
+                        }
+                        catch (e) {
+                            // catch the error
+                        }
+                    }
+                }
+            };
+            asyncajax.send(null);
+        } catch (e) {
+            return null;
         }
+    } else {
+        return null;
     }
-    if (newmsg != null && document.getElementById("new_posts_panel")) {
-        if (newmsg > 0) {
-            document.getElementById("new_posts_panel_value").innerHTML = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=posts&parms=text");
-            document.getElementById("new_posts_panel").style.display = 'inline';
-        } else {
-            document.getElementById("new_posts_panel").style.display = 'none';
-        }
-    }
-    // check for new pm messages
-    var newpm = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=pm");
-    if (newpm != null && document.getElementById("new_pm_header")) {
-        if (newpm > 0) {
-            document.getElementById("new_pm_header").innerHTML = "<a href='{/literal}{$smarty.const.BASEDIR}{literal}pm.php?action=show_new'><img src='{/literal}{$smarty.const.THEME}{literal}images/newmsgs.gif' height='9' alt='' /></a>&nbsp;";
-        } else {
-            document.getElementById("new_pm_header").innerHTML = "";
-        }
-    }
-    if (newpm != null && document.getElementById("new_pm_panel")) {
-        if (newpm > 0) {
-            document.getElementById("new_pm_panel_value").innerHTML = AjaxCall("{/literal}{$smarty.const.BASEDIR}{literal}includes/ajax.response.php?request=pm&parms=text");
-            document.getElementById("new_pm_panel").style.display = 'inline';
-        } else {
-            document.getElementById("new_pm_panel").style.display = 'none';
-        }
-    }
-    // restart the timer for the next check, in 5 minutes
-    msgtimerid = setTimeout("checkMessages()", 300000);
 }
 {/literal}
-{if iMEMBER}
-// start the timer for the first check, in 5 minutes
-msgtimerid = setTimeout("checkMessages()", 300000);
+var locale_028 = "{$locale.028}";
+var exitecms_basedir = "{$smarty.const.BASEDIR}";
+var exitecms_themedir = "{$smarty.const.THEME}";
+// start the timer for the first check, in 1 minute
+msgtimerid = setTimeout("checkMessages()", 60000);
 {/if}
 /* ]]> */

branches/PLi-Fusion/administration/forums.php

@@ -215 +215 @@
     $forum_attach = isset($_POST['forum_attach'])?"1":"0";
     $forum_attachtypes = stripinput($_POST['forum_attachtypes']);
+    $forum_prefix = isset($_POST['forum_prefix'])?"1":"0";
     $forum_prefixes = stripinput($_POST['forum_prefixes']);
     if ($action == "edit" && $t == "forum") {
@@ -240 +241 @@
         }
         // update the forum record
-        $result = dbquery("UPDATE ".$db_prefix."forums SET forum_name='".mysql_real_escape_string($forum_name)."', forum_cat='$forum_cat', forum_description='".mysql_real_escape_string($forum_description)."', forum_access='$forum_access', forum_posting='$forum_posting', forum_modgroup='$forum_modgroup', forum_attach='$forum_attach', forum_attachtypes='$forum_attachtypes', forum_prefixes='".mysql_real_escape_string($forum_prefixes)."', forum_rulespage='$forum_rulespage', forum_banners='$forum_banners' WHERE forum_id='$forum_id'");
+        $result = dbquery("UPDATE ".$db_prefix."forums SET forum_name='".mysql_real_escape_string($forum_name)."', forum_cat='$forum_cat', forum_description='".mysql_real_escape_string($forum_description)."', forum_access='$forum_access', forum_posting='$forum_posting', forum_modgroup='$forum_modgroup', forum_attach='$forum_attach', forum_attachtypes='$forum_attachtypes', forum_prefix='$forum_prefix', forum_prefixes='".mysql_real_escape_string($forum_prefixes)."', forum_rulespage='$forum_rulespage', forum_banners='$forum_banners' WHERE forum_id='$forum_id'");
         redirect(FUSION_SELF.$aidlink."&status=savefe");
     } else {
@@ -248 +249 @@
             if(!$forum_order) $forum_order=dbfunction("MAX(forum_order)", "forums", "forum_cat='$forum_cat'")+1;
             $result = dbquery("UPDATE ".$db_prefix."forums SET forum_order=forum_order+1 WHERE forum_cat='$forum_cat' AND forum_order>='$forum_order'");
-            $result = dbquery("INSERT INTO ".$db_prefix."forums (forum_cat, forum_name, forum_order, forum_description, forum_moderators, forum_access, forum_posting, forum_modgroup, forum_attach, forum_attachtypes, forum_prefixes, forum_rulespage, forum_banners, forum_lastpost, forum_lastuser) VALUES ('$forum_cat', '$forum_name', '$forum_order', '$forum_description', '$forum_mods', '$forum_access', '$forum_posting', '$forum_modgroup', '$forum_attach', '$forum_attachtypes', '".mysql_real_escape_string($forum_prefixes)."', '$forum_rulespage', '$forum_banners', '0', '0')");
+            $result = dbquery("INSERT INTO ".$db_prefix."forums (forum_cat, forum_name, forum_order, forum_description, forum_moderators, forum_access, forum_posting, forum_modgroup, forum_attach, forum_attachtypes, forum_prefix, forum_prefixes, forum_rulespage, forum_banners, forum_lastpost, forum_lastuser) VALUES ('$forum_cat', '$forum_name', '$forum_order', '$forum_description', '$forum_mods', '$forum_access', '$forum_posting', '$forum_modgroup', '$forum_attach', '$forum_attachtypes', '$forum_prefix', '".mysql_real_escape_string($forum_prefixes)."', '$forum_rulespage', '$forum_banners', '0', '0')");
             redirect(FUSION_SELF.$aidlink."&status=savefu");
         }
@@ -321 +322 @@
             $forum_attach = $data['forum_attach']?true:false;
             $forum_attachtypes = $data['forum_attachtypes'];
+            $forum_prefix = $data['forum_prefix'];
             $forum_prefixes = $data['forum_prefixes'];
             $forum_title = $locale['422'];
@@ -346 +348 @@
         $forum_attach = ($settings['attachments'] == 1);
         $forum_attachtypes = $settings['attachtypes'];
+        $forum_prefix = 0;
         $forum_prefixes = "";
         $forum_title = $locale['421'];
@@ -420 +423 @@
         $variables['forum_attach'] = $forum_attach;
         $variables['forum_attachtypes'] = $forum_attachtypes;
+        $variables['forum_prefix'] = $forum_prefix;
         $variables['forum_prefixes'] = $forum_prefixes;
         $variables['forum_rulespage'] = $forum_rulespage;

branches/PLi-Fusion/administration/tools/language_pack_English.php

@@ -368 +368 @@
         $localestrings['493'] = "Refresh Forum Ordering";
         $localestrings['494'] = "Subject prefix list:";
+        $localestrings['495'] = "Use subject prefixes in this forum";
         load_localestrings($localestrings, LP_LOCALE, "admin.forums", $step);
 
@@ -2579 +2580 @@
         $localestrings['473'] = "Comments (Max.length: 255 characters):";
         $localestrings['474'] = "Toggle Message";
+        $localestrings['475'] = "Error: Your are required to select a prefix when posting in this forum";
         $localestrings['480'] = " Make this Thread Sticky";
         $localestrings['481'] = " Show My Signature in this Post";
@@ -2590 +2592 @@
         $localestrings['500'] = "You cannot edit this post.";
         $localestrings['501'] = "You cannot move a post that has a poll attached to it.";
-        $localestrings['502'] = "You cannot edit this post. The thread has been locked by a moderator";
         $localestrings['530'] = "Search Forum";
         $localestrings['531'] = "Search Keyword(s)";
@@ -2599 +2600 @@
         $localestrings['550'] = "Thread Reply Notification - {THREAD_SUBJECT}";
         $localestrings['551'] = "Hello {USERNAME},\n\nA reply has been posted in the forum thread '{THREAD_SUBJECT}' which you are tracking at {SITE_NAME}. You can use the following link to view the reply:\n\n{THREAD_URL}\n\nIf you no longer wish to watch this thread you can click the 'Tracking Off' button located at the bottom of the thread.\n\nRegards,\n{SITE_WEBMASTER}.";
+        $localestrings['552'] = "You cannot edit this post. The thread has been locked by a moderator";
         load_localestrings($localestrings, LP_LOCALE, "forum.post", $step);
 
@@ -3846 +3848 @@
 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.30");
-if (!defined('LP_DATE')) define('LP_DATE', time());
+if (!defined('LP_DATE')) define('LP_DATE', "1280139239");
 $lp_date = LP_DATE;
 

branches/PLi-Fusion/administration/tools/language_pack_Nederlands.php

@@ -368 +368 @@
         $localestrings['493'] = "Volgorde herrekenen";
         $localestrings['494'] = "Topic prefix lijst:";
+        $localestrings['495'] = "Gebruik topic prefixen voor dit forum";
         load_localestrings($localestrings, LP_LOCALE, "admin.forums", $step);
 
@@ -2579 +2580 @@
         $localestrings['473'] = "Commentaar (Max.lengte: 255 tekens):";
         $localestrings['474'] = "Orgineel bericht";
+        $localestrings['475'] = "Fout: U bent verplicht een prefix te kiezen als u een bericht in dit forum wilt plaatsen";
         $localestrings['480'] = " Maak deze topic belangrijk";
         $localestrings['481'] = " Toon mijn handtekening onder dit bericht";
@@ -2590 +2592 @@
         $localestrings['500'] = "U kunt dit bericht niet wijzigen.";
         $localestrings['501'] = "U kunt geen bericht verplaatsen waaraan een poll is gekoppeld.";
-        $localestrings['502'] = "U kunt dit bericht niet wijzigen. Deze topic is gesloten door een moderator.";
         $localestrings['530'] = "Zoeken";
         $localestrings['531'] = "Zoekwoord(en)";
@@ -2599 +2600 @@
         $localestrings['550'] = "Notificatie van anwoord op topic - {THREAD_SUBJECT}";
         $localestrings['551'] = "Hallo {USERNAME},\n\nEr is een antwoord geplaatst in de forum topic '{THREAD_SUBJECT}' welke u volgt op {SITE_NAME}. U kunt de volgende link gebruiken om het antwoord te lezen:\n\n{THREAD_URL}\n\nAls u dit topic niet langer wil volgen, klik dan op de 'Stop het volgen van dit topic' knop die u onderaan het topic scherm kunt vinden.\n\nMet vriendelijke groeten,\n{SITE_WEBMASTER}.";
+        $localestrings['552'] = "U kunt dit bericht niet wijzigen. Deze topic is gesloten door een moderator.";
         load_localestrings($localestrings, LP_LOCALE, "forum.post", $step);
 
@@ -3846 +3848 @@
 if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.30");
-if (!defined('LP_DATE')) define('LP_DATE', time());
+if (!defined('LP_DATE')) define('LP_DATE', "1280139245");
 $lp_date = LP_DATE;
 

branches/PLi-Fusion/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Wed Jun 9 2010, 17:36:48 CEST
+// generated on : Mon Jul 26 2010, 12:14:21 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

branches/PLi-Fusion/files/locales/en.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Tue Jun 8 2010, 22:35:58 CEST
-// translators  : ExiteCMS team
+// generated on : Wed Jun 16 2010, 19:48:07 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['400'] = "Select your default locale";

branches/PLi-Fusion/files/locales/nl.main.global.php

@@ -3 +3 @@
 // locale       : Nederlands
 // locale name  : main.global
-// generated on : Wed Jun 9 2010, 17:37:56 CEST
+// generated on : Wed Jun 16 2010, 19:48:12 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

branches/PLi-Fusion/files/locales/nl.main.setup.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Tue Jun 8 2010, 22:36:03 CEST
-// translators  : ExiteCMS team
+// generated on : Wed Jun 16 2010, 19:48:12 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['400'] = "Selecteer de standaard taal voor uw site";

branches/PLi-Fusion/forum/post.php

@@ -62 +62 @@
 // function to validate the contents of the $_POST array
 function validatepost() {
-    global $locale;
+    global $locale, $fdata;
 
     // we need both a subject and a message body
@@ -71 +71 @@
     if ($_POST['new_prefix'] == '[?]') $_POST['new_prefix'] = '';
 
+    // is a prefix required?
+    if ($fdata['forum_prefix'] && !empty($fdata['forum_prefixes']) && empty($_POST['new_prefix'])) {
+        return $locale['475'];
+    }
+
     return "";
 }
 
 // function to add or replace the prefix in the subject
-function subject_prefix($subject, $prefix) {
+function strip_prefix($subject) {
+
+    $result = array('subject' => '', 'prefix' => '');
+
+    // check for a reply, and strip the reply prefix
+    if (strtolower(substr($subject,0,3))=="re:") {
+        $result['subject'] = "Re: ";
+        $subject = trim(substr($subject,3));
+    }
+
+    // split the subject to check for a prefix
+    if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+        // a match must be at the beginning
+        if (empty($matches[1])) {
+            $result['prefix'] .= $matches[2];
+            $result['subject'] .= trim($matches[3]);
+        } else {
+            $result['subject'] .= $matches[0];
+        }
+    } else {
+        $result['subject'] .= $subject;
+    }
+
+    return $result;
+}
+
+// function to add or replace the prefix in the subject
+function add_prefix($subject, $prefix) {
 
     // was a prefix defined
@@ -83 +115 @@
 
         // split the subject to check for a prefix
-        if (!preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-        {
-            // was this a reply?
-            if (strtolower(substr($subject,0,3)) == 're:') {
-                $subject = 'Re: [' . $prefix . '] ' . substr($subject,4);
+        if (!preg_match('~(re:)(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+
+            if (preg_match('~(.*?)\[(.*?)\](.*)~i', $subject, $matches)) {
+                if (empty($matches[1])) {
+                    $subject = '[' . $prefix . '] ' . trim($matches[3]);
             } else {
                 $subject = '[' . $prefix . '] ' . $subject;
             }
         } else {
-            // remove spaces from the matches
-            foreach($matches as $key => $value) {
-                $matches[$key] = trim($value);
-            }
-            unset($matches[0]);
-            $matches[2] = '[' . trim($prefix) . ']';
-            $subject = trim(implode(' ', $matches));
-        }
+                if (preg_match('~(re:)(.*)~i', $subject, $matches)) {
+                    $subject = 'Re: [' . $prefix . '] ' . trim($matches[2]);
+                } else {
+                    $subject = '[' . $prefix . '] ' . $subject;
+            }
+        }
+        } else {
+            $subject = 'Re: [' . $prefix . '] ' . trim($matches[4]);
+    }
     }
 
@@ -490 +523 @@
             $preview['post_subject'] = trim(stripinput(censorwords($_POST['subject'])));;
             if ($preview['post_subject'] == "" && isset($tdata) && is_array($tdata)) {
-                $preview['post_subject'] = "Re: ".$tdata['thread_subject'];
+                $preview['post_subject'] = add_prefix("Re: ".$tdata['thread_subject'], trim(stripinput($_POST['new_prefix'])));
             } else {
-                $preview['post_subject'] = subject_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
+                $preview['post_subject'] = add_prefix($preview['post_subject'], trim(stripinput($_POST['new_prefix'])));
             }
             $preview['post_message'] = trim(stripmessageinput(censorwords($_POST['message'])));
@@ -614 +647 @@
 // bail out if an edit is requested, but no edit rights have been detected
 if ($action == "edit" && !$user_can_edit) {
-    resultdialog($locale['408'], $locale['502']);
+    resultdialog($locale['408'], $locale['552']);
 } elseif (isset($_POST["cancel"])) {
     // post cancelled?
@@ -649 +682 @@
                     $smileys = isset($_POST['disable_smileys']) ? "0" : "1";
                     $subject = trim(stripinput(censorwords($_POST['subject'])));
+                    if (isset($tdata) && strtolower(substr($subject,0,3)) != "re:") {
                     if ($subject == "") {
                         $subject = "Re: ".$tdata['thread_subject'];
+                        } else {
+                            if ($action != "edit") {
+                                $subject = "Re: ".$subject;
                     }
-                    $subject = subject_prefix($subject, stripinput($_POST['new_prefix']));
+                        }
+                    }
+                    if ($fdata['forum_prefix']) {
+                        $subject = add_prefix($subject, stripinput($_POST['new_prefix']));
+                    }
                     $message = trim(stripmessageinput(censorwords($_POST['message'])));
                     if ($action == 'edit') {
                         // update the post record
                         if ($_POST['message'] == $_POST['org_message'])
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_smileys='$smileys' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_smileys='$smileys' WHERE post_id='$post_id'");
                         else {
-                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='$subject', post_message='$message', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."posts SET post_subject='".mysql_real_escape_string($subject)."', post_message='".mysql_real_escape_string($message)."', post_smileys='$smileys', post_edituser='".$userdata['user_id']."', post_edittime='".time()."' WHERE post_id='$post_id'");
                         }
                         $data = dbarray(dbquery("SELECT * FROM ".$db_prefix."posts WHERE thread_id='$thread_id' ORDER BY post_datestamp ASC LIMIT 1"));
                         if ($data['post_id'] == $post_id) {
-                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='$subject' WHERE thread_id='$thread_id'");
+                            $result = dbquery("UPDATE ".$db_prefix."threads SET thread_subject='".mysql_real_escape_string($subject)."' WHERE thread_id='$thread_id'");
                         }
                         // flag the forum and the thread as updated
@@ -808 +849 @@
                         rename(PATH_ATTACHMENTS.$attachment['attach_tmp'], PATH_ATTACHMENTS.$attachname);
                         chmod(PATH_ATTACHMENTS.$attachname,0664);
-                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '$attachname', '".$attachment['attach_name']."', '".$attachment['attach_comment']."', '$attachext', '".$attachment['attach_size']."')");
+                        $result = dbquery("INSERT INTO ".$db_prefix."forum_attachments (thread_id, post_id, attach_name, attach_realname, attach_comment, attach_ext, attach_size) VALUES ('$thread_id', '$post_id', '".mysql_real_escape_string($attachname)."', '".mysql_real_escape_string($attachment['attach_name'])."', '".mysql_real_escape_string($attachment['attach_comment'])."', '$attachext', '".$attachment['attach_size']."')");
                     }
                 }
@@ -1020 +1061 @@
             $variables['prefixes'] = array();
             foreach ($prefixes as $prefix) {
-                if (!empty($prefix)) $variables['prefixes'][] = trim($prefix);
+                $prefix = trim($prefix);
+                if (!empty($prefix)) $variables['prefixes'][] = $prefix;
             }
             if (!isset($title)) $title = $locale['415']." #".$reply_id;
@@ -1044 +1086 @@
             } elseif ($post_id > 0 || $reply_id > 0) {
                 $subject = $pdata['post_subject'];
-                // split the subject to check for a prefix
-                if (preg_match('~(.*)\[(.*)\](.*)~', $subject, $matches))
-                {
-                    // update the subject, set the prefixes
-                    $subject = trim($matches[3]);
-                    $variables['prefix'] = $matches[2];
-                    $variables['new_prefix'] = '['.$matches[2].']';
-                }
-                if ($action != "newthread" && strtolower(substr($subject,0,3)) != "re:") {
+                if (!in_array($action, array("edit","newthread")) && strtolower(substr($subject,0,3)) != "re:") {
                     $variables['subject'] = 'Re: '.$subject;
                 } else {
@@ -1088 +1122 @@
                 $bbcolor = "";
             }
+            // do we need to deal with a subject prefix
+            if (!isset($variables['prefix'])) {
+                $sparray = strip_prefix($variables['subject']);
+
+                $variables['subject'] = $sparray['subject'];
+                // check if it's a custom prefix
+                if (in_array($sparray['prefix'],$variables['prefixes'])) {
+                    $variables['prefix'] = $sparray['prefix'];
+                    $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                } else {
+                    if (empty($sparray['prefix'])) {
+                        $variables['prefix'] = '';
+                        $variables['new_prefix'] = '[?]';
+                    } else {
+                        $variables['prefix'] = '?';
+                        $variables['new_prefix'] = '['.$sparray['prefix'].']';
+                    }
+                }
+            }
+
             // process attachments
             if ($settings['attachments'] == "1" && $fdata['forum_attach'] == "1") {

branches/PLi-Fusion/includes/ajax.response.php

@@ -89 +89 @@
         // make sure we have json_encode and json_decode available
         require_once "json_include.php";
+        header("Content-Type:application/json; charset=utf-8");
         if (iMEMBER) {
             // return the user record datastore
@@ -104 +105 @@
             }
         }
+        break;
+    case "counters":
+        if (!iMEMBER) {
+            $pms = $posts = 0;
+            $pmtext = $posttext = "";
+        } else {
+            $pms = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id='".$userdata['user_id']."' AND pmindex_to_id='".$userdata['user_id']."' AND pmindex_read_datestamp = '0'");
+            if ($pms == 1) {
+                $pmtext = sprintf($locale['085'], $pms);
+            } else {
+                $pmtext = sprintf($locale['086'], $pms);
+            }
+            if ($userdata['user_posts_unread']) {
+                $result = dbquery("
+                    SELECT count(*) as unread
+                        FROM ".$db_prefix."posts p
+                            INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                        WHERE ".groupaccess('f.forum_access')."
+                            AND tr.user_id = '".$userdata['user_id']."'
+                            AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                            AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                                OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                    );
+            } else {
+                $result = dbquery("
+                    SELECT count(*) as unread
+                        FROM ".$db_prefix."posts p
+                            INNER JOIN ".$db_prefix."forums f ON p.forum_id = f.forum_id
+                            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                        WHERE ".groupaccess('f.forum_access')."
+                            AND tr.user_id = '".$userdata['user_id']."'
+                            AND p.post_author != '".$userdata['user_id']."'
+                            AND p.post_edituser != '".$userdata['user_id']."'
+                            AND (p.post_datestamp > ".$settings['unread_threshold']." OR p.post_edittime > ".$settings['unread_threshold'].")
+                            AND ((p.post_datestamp > tr.thread_last_read OR p.post_edittime > tr.thread_last_read)
+                                OR (p.post_datestamp < tr.thread_first_read OR (p.post_edittime != 0 AND p.post_edittime < tr.thread_first_read)))"
+                    );
+            }
+            $posts = ($result ? mysql_result($result, 0) : 0);
+            if ($posts == 1) {
+                $posttext = sprintf($locale['088'], $posts);
+            } else {
+                $posttext = sprintf($locale['089'], $posts);
+            }
+        }
+        // make sure we have json_encode and json_decode available
+        require_once "json_include.php";
+        // send the results back
+        header("Content-Type:application/json; charset=utf-8");
+        echo json_encode(array('pmcount' => $pms, 'pmtext' => $pmtext, 'postcount' => $posts, 'posttext' => $posttext));
         break;
     case "pm":
@@ -211 +263 @@
     mysql_close();
 }
-?>

branches/PLi-Fusion/includes/jscripts/core_functions.js

@@ -104 +104 @@
         }
     }
+}
+
+// return a new AJAX object
+function asyncajaxcall() {
+    var result = false;
+    if (window.XMLHttpRequest) {
+        // For Safari, Firefox, and other non-MS browsers
+        try {
+            result = new XMLHttpRequest();
+        } catch (e) {
+            result = false;
+        }
+    } else if (window.ActiveXObject) {
+        // For Internet Explorer on Windows
+        try {
+            result = new ActiveXObject("Msxml2.XMLHTTP");
+        } catch (e) {
+            try {
+                result = new ActiveXObject("Microsoft.XMLHTTP");
+            } catch (e) {
+                result = false;
+            }
+        }
+    }
+    return result;
 }
 

branches/PLi-Fusion/includes/secureimage-1.0.3/securimage.php

@@ -18 +18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA<br /><br />
- * 
- * Any modifications to the library should be indicated clearly in the source code 
+ *
+ * Any modifications to the library should be indicated clearly in the source code
  * to inform users that the changes are not a part of the original software.<br /><br />
  *
@@ -121 +121 @@
   var $charset = 'ABCDEFGHKLMNPRSTUVWYZ23456789';
   //var $charset = '0123456789';
-  
+
   /**
    * Create codes using this word list
@@ -128 +128 @@
    */
   var $wordlist_file = '';
-  
+
   /**
    * True to use a word list file instead of a random code
@@ -363 +363 @@
   var $audio_path = './audio/';
 
+  /**
+   * Captcha expiry timeout in seconds.
+   *
+   * @since 1.0.3
+   * @var string
+   */
+  var $timeout = 300;
+
+
 
   //END USER CONFIGURATION
@@ -423 +432 @@
       die('no session available!');
     }
-    
+
     // we use random colors to make it even more difficult
     $this->image_bg_color = $this->getHexColor();
@@ -445 +454 @@
     return $clr;
   }
-   
+
   /**
    * Generate a code and output the image to the browser.
@@ -693 +702 @@
   {
     $this->code = false;
-    
+
     if ($this->use_wordlist && is_readable($this->wordlist_file)) {
       $this->code = $this->readCodeFromFile();
     }
-    
+
     if ($this->code == false) {
       $this->code = $this->generateCode($this->code_length);
     }
-    
+
     $this->saveData();
   }
@@ -721 +730 @@
     return $code;
   }
-  
+
   /**
    * Reads a word list file to get a code
@@ -733 +742 @@
     $fp = @fopen($this->wordlist_file, 'r');
     if (!$fp) return false;
-    
+
     $fsize = filesize($this->wordlist_file);
     if ($fsize < 32) return false; // too small of a list to be effective
-    
+
     if ($fsize < 128) {
       $max = $fsize; // still pretty small but changes the range of seeking
@@ -742 +751 @@
       $max = 128;
     }
-    
+
     fseek($fp, rand(0, $fsize - $max), SEEK_SET);
     $data = fread($fp, 128); // read a random 128 bytes from file
     fclose($fp);
-    
+
     $start = strpos($data, "\n", rand(0, 100)) + 1; // random start position
     $end   = strpos($data, "\n", $start) - 1; // find end of word
-    
+
     return strtolower(substr($data, $start, $end - $start)); // return substring in 128 bytes
   }
@@ -822 +831 @@
   {
     $_SESSION['securimage_code_value'] = strtolower($this->code);
+    $_SESSION['securimage_code_timestamp'] = time();
   }
 
@@ -834 +844 @@
     if ( isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value']) ) {
       if ( $_SESSION['securimage_code_value'] == strtolower(trim($this->code_entered)) ) {
-        $this->correct_code = true;
-        $_SESSION['securimage_code_value'] = '';
+        if (isset($_SESSION['securimage_code_timestamp']) && (time() - $_SESSION['securimage_code_timestamp']) < $this->timeout) {
+          $this->correct_code = true;
+          $_SESSION['securimage_code_value'] = '';
+        } else {
+          $this->correct_code = false;
+        }
       } else {
         $this->correct_code = false;
@@ -906 +920 @@
       $file['size']            = $data['ChunkSize'] + 8;
       $file['data']            = $body;
-      
+
       if ( ($p = strpos($file['data'], 'LIST')) !== false) {
         // If the LIST data is not at the end of the file, this will probably break your sound file
@@ -914 +928 @@
         $file['size'] = $file['size'] - (strlen($file['data']) - $p);
       }
-      
+
       $files[] = $file;
       $data    = null;

branches/PLi-Fusion/includes/session_functions.php

@@ -48 +48 @@
 
 // update the timestamp of the session cookie, we want expiry after the last page load, not after the session has started!
-setcookie(ini_get("session.name"), session_id(), time()+ini_get("session.gc_maxlifetime"), "/");
+setcookie(ini_get("session.name"), session_id(), time()+$settings['session_gc_maxlifetime'], "/");
 
 // store the last_url cookie if found

branches/PLi-Fusion/includes/templates/admin.forums.tpl

@@ -65 +65 @@
             <tr>
                 <td colspan='2' class='tbl'>
+                    <input type='checkbox' name='forum_prefix' value='1' onchange='togglefields("prefixes");'{if $forum_prefix} checked="checked"{/if} /> {$locale.495}
+                </td>
+            </tr>
+            <tr id='prefixes'{if !$forum_prefix} style='display:none'{/if}>
+                <td colspan='2' class='tbl'>
                     {$locale.494}
                     <br />
@@ -145 +150 @@
             <tr>
                 <td colspan='2' class='tbl'>
-                    <input type='checkbox' name='forum_attach' value='1' onchange='togglefields();'{if $forum_attach} checked="checked"{/if} /> {$locale.469}
+                    <input type='checkbox' name='forum_attach' value='1' onchange='togglefields("attachtypes");'{if $forum_attach} checked="checked"{/if} /> {$locale.469}
                 </td>
             </tr>
@@ -167 +172 @@
     </form>
 {literal}<script type='text/javascript'>
-function togglefields() {
+function togglefields(name) {
     if(navigator.appName.indexOf('Microsoft') > -1) {
         state = 'block';
@@ -173 +178 @@
         state = 'table-row';
     }
-    if (document.getElementById('attachtypes').style.display == 'none') {
-        document.getElementById('attachtypes').style.display = state;
+    if (document.getElementById(name).style.display == 'none') {
+        document.getElementById(name).style.display = state;
     } else {
-        document.getElementById('attachtypes').style.display = 'none';
+        document.getElementById(name).style.display = 'none';
     }
 }

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

@@ -151 +151 @@
             {buttonlink name=$locale.415 link="tracking.php"}
             {buttonlink name=$locale.414 link="viewposts.php"}<br />
-            <form name='searchform' method='post' style="margin-top:2px;" action='{$smarty.const.BASEDIR}search.php?stype=f'>
+            <form name='searchform' method='post' style="margin-top:2px;" action='{$smarty.const.BASEDIR}search.php?action=search'>
                 <input type='text' name='stext' class='textbox' style='width:150px' />
+                <input type='hidden' name='boolean' value='1' />
+                <input type='hidden' name='qtype' value='AND' />
+                <input type='hidden' name='search_id' value='3.2' />
+                <input type='hidden' name='sortby' value='datestamp' />
+                <input type='hidden' name='order' value='0' />
+                <input type='hidden' name='limit' value='0' />
+                <input type='hidden' name='datelimit' value='0' />
+                <input type='hidden' name='contentfilter_users' value='0' />
+                <input type='hidden' name='contentfilter_forums' value='0' />
                 <input type='submit' name='search' value='{$locale.550}' class='button' />
             </form>

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

@@ -124 +124 @@
             <td>
                 <table width='100%' border='0' cellspacing='1' cellpadding='0'>
-                    <tr>
+                    <tr {if $forum.forum_prefix == 0}style="display:none;"{/if}>
                         <td align='right' width='145' valign='top' class='tbl2'>
                             {$locale.533}:
                         </td>
                         <td class='tbl1'>
-                            <select name="prefix" class="textbox" style="width:125px;" onChange="javascript:update_prefix(this);">
-                                <option value="">{$locale.534}</option>
+                            {assign var=show_prefix value=0}
+                            <select name="prefix" class="textbox" style="width:125px;" onChange="update_prefix(this);">
+                                <option value="" {if $prefix == ""}selected="selected"{/if}>{$locale.534}</option>
                             {foreach from=$prefixes item=post_prefix}
                                 <option value="{$post_prefix}" {if $prefix == $post_prefix}selected="selected"{/if}>{$post_prefix}</option>
                             {/foreach}
-                                <option value="?">{$locale.535}</option>
+                                <option value="?" {if $prefix == "?"}selected="selected"{assign var=show_prefix value=1}{/if}>{$locale.535}</option>
                             </select>
-                            <input type='text' id="new_prefix" name='new_prefix' value='{$new_prefix}' class='textbox' maxlength='255' style='width: 250px' disabled="disabled" />
+                            <input type='text' id="new_prefix" name='new_prefix' value='{$new_prefix}' class='textbox' maxlength='255' style='width: 250px;{if $show_prefix ==0}display:none;{/if}' />
                         </td>
                     </tr>
@@ -150 +151 @@
                     <tr>
                         <td align='right' width='145' class='tbl2' valign='top' style='white-space:nowrap'>
-                            <input type='submit' class='button' name='toggle_msg' value='{$locale.474}' onclick='javascript:flipDiv("org_message");return false;' />
+                            <input type='submit' class='button' name='toggle_msg' value='{$locale.474}' onclick='flipDiv("org_message");return false;' />
                         </td>
                         <td class='tbl1'>
@@ -194 +195 @@
                     <tr>
                         <td align='right' width='145' valign='top' class='tbl2'>
-                            <input type='button' name='toggle' class='button' value='{$locale.467}' onclick='javascript:loadSmileys("smileys", "smileys_loaded", "{$smarty.const.BASEDIR}includes/ajax.response.php?request=smileys&parms=message");return false;' />
+                            <input type='button' name='toggle' class='button' value='{$locale.467}' onclick='loadSmileys("smileys", "smileys_loaded", "{$smarty.const.BASEDIR}includes/ajax.response.php?request=smileys&parms=message");return false;' />
                         </td>
                         <td class='tbl1'>
@@ -266 +267 @@
                                 <input type='submit' name='upload' value='{$locale.471}' class='button' />
                             {else}
-                                <input type='submit' name='upload' value='{$locale.471}' class='button' onclick='javascript:get_hoteditor_data("message");' />
+                                <input type='submit' name='upload' value='{$locale.471}' class='button' onclick='get_hoteditor_data("message");' />
                             {/if}
                         </td>
@@ -309 +310 @@
                                 <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' />
                             {else}
-                                <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' onclick='javascript:get_hoteditor_data("message");' />
+                                <input type='submit' name='fpm[add_options]' class='button' value='{$locale.FPM_104}' onclick='get_hoteditor_data("message");' />
                             {/if}
                         {/if}
@@ -380 +381 @@
                     <input type='submit' name='save' value='{$button_save}' class='button' />
                 {else}
-                    <input type='submit' name='preview' value='{$button_preview}' class='button' onclick='javascript:document.getElementById("new_prefix").disabled = false;get_hoteditor_data("message");' />
-                    <input type='submit' name='save' value='{$button_save}' class='button' onclick='javascript:document.getElementById("new_prefix").disabled = false;get_hoteditor_data("message");' />
+                    <input type='submit' name='preview' value='{$button_preview}' class='button' onclick='get_hoteditor_data("message");' />
+                    <input type='submit' name='save' value='{$button_save}' class='button' onclick='get_hoteditor_data("message");' />
                 {/if}
                 <input type='hidden' name='post_author' value='{$post_author}' />
@@ -413 +414 @@
     if ( el.value == "?") {
         document.getElementById('new_prefix').value = "[?]";
-        document.getElementById('new_prefix').disabled = false;
+        document.getElementById('new_prefix').style.display = 'inline';
         document.getElementById('new_prefix').focus = true;
     }   else {
-        document.getElementById('new_prefix').disabled = true;
+        document.getElementById('new_prefix').style.display = 'none';
         if ( el.value == "") {
             document.getElementById('new_prefix').value = "";