Changeset 1509 in ExiteCMS

Timestamp:

07/02/08 18:27:06 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1408:1508 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• 404handler.php (modified) (1 diff)
• administration/forums.php (modified) (3 diffs)
• administration/modules.php (modified) (7 diffs)
• administration/settings_forum.php (modified) (1 diff)
• administration/settings_misc.php (modified) (2 diffs)
• administration/site_links.php (modified) (4 diffs)
• administration/tools/language_pack_English.php (modified) (21 diffs)
• administration/tools/update_geoip_database.php (modified) (3 diffs)
• administration/upgrade.php (modified) (1 diff)
• administration/upgrade/rev00730.php (modified) (1 diff)
• administration/upgrade/rev00740.php (modified) (5 diffs)
• administration/upgrade/rev00760.php (modified) (1 diff)
• administration/upgrade/rev00780.php (modified) (1 diff)
• administration/upgrade/rev00800.php (modified) (1 diff)
• administration/upgrade/rev00850.php (modified) (1 diff)
• administration/upgrade/rev00858.php (modified) (1 diff)
• administration/upgrade/rev00909.php (modified) (1 diff)
• administration/upgrade/rev00954.php (modified) (1 diff)
• administration/upgrade/rev01060.php (modified) (1 diff)
• administration/upgrade/rev01070.php (modified) (1 diff)
• administration/upgrade/rev01091.php (modified) (1 diff)
• administration/upgrade/rev01190.php (modified) (1 diff)
• administration/upgrade/rev01193.php (modified) (1 diff)
• administration/upgrade/rev01201.php (modified) (1 diff)
• administration/upgrade/rev01214.php (modified) (1 diff)
• administration/upgrade/rev01280.php (modified) (1 diff)
• blogs.php (modified) (2 diffs)
• config.def (deleted)
• contact.php (modified) (2 diffs)
• downloads.php (modified) (4 diffs)
• edit_profile.php (modified) (1 diff)
• feeds.php (modified) (1 diff)
• files/locales/en.main.global.php (modified) (1 diff)
• files/locales/en.main.setup.php (modified) (1 diff)
• forum/index.php (modified) (3 diffs)
• forum/post.php (modified) (6 diffs)
• forum/viewforum.php (modified) (7 diffs)
• forum/viewthread.php (modified) (10 diffs)
• getfile.php (modified) (5 diffs)
• images/cms-logo-big.png (modified) (previous)
• images/cms-logo-small.png (modified) (previous)
• includes/core_functions.php (modified) (14 diffs)
• includes/db_functions.php (modified) (8 diffs)
• includes/dbsetup_include.php (modified) (51 diffs)
• includes/dns_functions.php (modified) (1 diff)
• includes/forum_functions_include.php (modified) (2 diffs)
• includes/geoip_include.php (modified) (3 diffs)
• includes/jscripts/tiny_mce/plugins/save/images/cancel.gif (copied) (copied from trunk/includes/jscripts/tiny_mce/plugins/save/images/cancel.gif)
• includes/photo_functions_include.php (modified) (2 diffs)
• includes/smtp_include.php (modified) (1 diff)
• includes/template-plugins/function.displaysmileys.php (modified) (1 diff)
• includes/templates/_query_debug.tpl (modified) (2 diffs)
• includes/templates/admin.forums.tpl (modified) (1 diff)
• includes/templates/admin.modules.tpl (modified) (4 diffs)
• includes/templates/admin.news.tpl (modified) (21 diffs)
• includes/templates/admin.settings_forum.tpl (modified) (1 diff)
• includes/templates/admin.settings_misc.tpl (modified) (2 diffs)
• includes/templates/admin.tools.tpl (modified) (1 diff)
• includes/templates/forum.index.tpl (modified) (2 diffs)
• includes/templates/forum.post.tpl (modified) (2 diffs)
• includes/templates/forum.renderpost.tpl (modified) (1 diff)
• includes/templates/forum.resultdialog.tpl (modified) (1 diff)
• includes/templates/main.downloads.tpl (modified) (2 diffs)
• includes/templates/main.register.tpl (modified) (1 diff)
• includes/theme_functions.php (modified) (2 diffs)
• includes/user_functions.php (modified) (3 diffs)
• profile.php (modified) (2 diffs)
• register.php (modified) (2 diffs)
• setup.php (modified) (7 diffs)
• setuser.php (modified) (1 diff)

branches/PLi-Fusion/404handler.php

@@ -109 +109 @@
             break;
         } else {
-            die("<div style='font-family:Verdana;text-align:center;'><font size=6>404 - PAGE NOT FOUND</font></br /></br /><b>And the '404 page not found' page can not be loaded from the database...</b></div>");
+            terminate("<font size=6>404 - PAGE NOT FOUND</font></br /></br /><b>And the '404 page not found' page can not be loaded from the database...</b>");
         }
     }

branches/PLi-Fusion/administration/forums.php

@@ -194 +194 @@
         if ($cat_name != "") {
             $cat_order = isNum($_POST['cat_order']) ? $_POST['cat_order'] : "";
-            if(!$cat_order) $cat_order=dbresult(dbquery("SELECT MAX(forum_order) FROM ".$db_prefix."forums WHERE forum_cat='0'"),0)+1;
+            if(!$cat_order) $cat_order=dbfunction("MAX(forum_order)", "forums", "forum_cat='0'")+1;
             $result = dbquery("UPDATE ".$db_prefix."forums SET forum_order=forum_order+1 WHERE forum_cat='0' AND forum_order>='$cat_order'");   
             $result = dbquery("INSERT INTO ".$db_prefix."forums (forum_cat, forum_name, forum_order, forum_description, forum_moderators, forum_access, forum_posting, forum_lastpost, forum_lastuser) VALUES ('0', '$cat_name', '$cat_order', '', '', '0', '0', '0', '0')");
@@ -222 +222 @@
                 SELECT DISTINCT u.user_id, u.user_level, u.user_groups 
                 FROM ".$db_prefix."threads_read tr
-                LEFT JOIN ".$db_prefix."users u ON u.user_id = tr.user_id
+                INNER JOIN ".$db_prefix."users u ON u.user_id = tr.user_id
                 WHERE tr.thread_id = '".$thread_id."'
                 ");
@@ -241 +241 @@
             $forum_mods = "";
             $forum_order = isNum($_POST['forum_order']) ? $_POST['forum_order'] : "";
-            if(!$forum_order) $forum_order=dbresult(dbquery("SELECT MAX(forum_order) FROM ".$db_prefix."forums WHERE forum_cat='$forum_cat'"),0)+1;
+            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_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_rulespage', '$forum_banners', '0', '0')");

branches/PLi-Fusion/administration/modules.php

@@ -110 +110 @@
 
             // determine the next order in the menu for this link
-            $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$link_panel'"),0) + 1;
+            $link_order = dbfunction("MAX(link_order)", "site_links", "panel_name = '$link_panel'") + 1;
 
             // add the new link
@@ -171 +171 @@
     // register the installation of this module
     $result = dbquery("INSERT INTO ".$db_prefix."modules (mod_title, mod_folder, mod_version) VALUES ('$mod_title', '$mod_folder', '$mod_version')");
+    // save the key, we might need it later
+    $mod_id = mysql_insert_id();
+
+    // if a module is installed, and if reports are defined, install the report links for this module
+    if ($mod_id && isset($mod_report_links) && is_array($mod_report_links) && count($mod_report_links)) {
+
+        // loop through the defined reports
+        foreach ($mod_report_links as $mod_report) {
+
+            // check if the code exists for this report
+            if (isset($mod_report['name']) && file_exists(PATH_MODULES.$mod_folder."/report.".$mod_report['name'].".php")) {
+                // check if the template exists for this report
+                if (file_exists(PATH_MODULES.$mod_folder."/templates/modules.".$mod_folder.".report.".$mod_report['name'].".tpl")) {
+                    // verify the other fields
+                    $mod_report['visibility'] = (isset($mod_report['visibility']) && isNum($mod_report['visibility']) ? $mod_report['visibility'] : 103);
+                    $mod_report['title'] = isset($mod_report['title']) ? $mod_report['title'] : ("Report: ".$mod_report['name']);
+                    $mod_report['version'] = isset($mod_report['version']) ? $mod_report['version'] : $mod_version;
+                    // add it to the report table
+                    $result = dbquery("INSERT INTO ".$db_prefix."reports (report_mod_id, report_name, report_title, report_version, report_visibility) 
+                        VALUES ('".$mod_id."', '".$mod_report['name']."', '".$mod_report['title']."', '".$mod_report['version']."', '".$mod_report['visibility']."')");
+                }
+            }
+        }
+    }
+
+    // if a module is installed, and if searches are defined, install the search links for this module
+    if ($mod_id && isset($mod_search_links) && is_array($mod_search_links) && count($mod_search_links)) {
+
+        // loop through the defined reports
+        foreach ($mod_search_links as $mod_search) {
+
+            // check if the code exists for this search
+            if (isset($mod_search['name']) && file_exists(PATH_MODULES.$mod_folder."/search.".$mod_search['name'].".php")) {
+                // check if the template exists for this search
+                if (file_exists(PATH_MODULES.$mod_folder."/templates/modules.".$mod_folder.".search.".$mod_search['name'].".tpl")) {
+                    // verify the other fields
+                    $mod_search['visibility'] = (isset($mod_search['visibility']) && isNum($mod_search['visibility']) ? $mod_search['visibility'] : 103);
+                    $mod_search['title'] = isset($mod_search['title']) ? $mod_search['title'] : ("Search: ".$mod_search['name']);
+                    $mod_search['version'] = isset($mod_search['version']) ? $mod_search['version'] : $mod_version;
+                    // add it to the search table
+                    $result = dbquery("INSERT INTO ".$db_prefix."searches (search_mod_id, search_name, search_title, search_version, search_visibility) 
+                        VALUES ('".$mod_id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."', '".$mod_search['visibility']."')");
+                }
+            }
+        }
+    }
 
     // update the access rights of the site administrators to include this new module
@@ -303 +349 @@
     // remove the module from the installed modules list
     $result = dbquery("DELETE FROM ".$db_prefix."modules WHERE mod_id='$id'");
+
+    // remove any reports associated with this module
+    $result = dbquery("DELETE FROM ".$db_prefix."reports WHERE report_mod_id='$id'");
+
+    // remove any searches associated with this module
+    $result = dbquery("DELETE FROM ".$db_prefix."searches WHERE search_mod_id='$id'");
+}
+
+if ($action == 'locales' && isset($id)) {
+
+    // make sure the ID passed is numeric
+    if (!isNum($id)) fallback(FUSION_SELF.$aidlink);
+    
+    // check if it exists
+    $result = dbquery("SELECT * FROM ".$db_prefix."modules WHERE mod_id='$id'");
+    if (!$result)  fallback(FUSION_SELF.$aidlink);
+
+    // get the module data
+    $data = dbarray($result);
+
+    // load the module installer to start the upgrade
+    include PATH_MODULES.$data['mod_folder']."/module_installer.php";
+
+    // if locale strings are defined, load them into the database
+    if (isset($localestrings) && is_array($localestrings)) {
+        foreach($localestrings as $locales_code => $locales_strings) {
+            load_localestrings($locales_strings, $locales_code, "modules.".$mod_folder);
+        }
+    }
+
 }
 
@@ -393 +469 @@
             if (dbrows($result) == 0) {
                 // determine the next order in the menu for this link
-                $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$link_panel'"),0) + 1;
+                $link_order = dbfunction("MAX(link_order)", "site_links", "panel_name = '$link_panel'") + 1;
 
                 // add the new link
@@ -419 +495 @@
         foreach($localestrings as $locales_code => $locales_strings) {
             load_localestrings($locales_strings, $locales_code, "modules.".$mod_folder);
+        }
+    }
+
+    // remove any reports associated with this module
+    $result = dbquery("DELETE FROM ".$db_prefix."reports WHERE report_mod_id='$id'");
+
+    // if a module is installed, and if reports are defined, (re)install the report links for this module
+    if (isset($mod_report_links) && is_array($mod_report_links) && count($mod_report_links)) {
+
+        // loop through the defined reports
+        foreach ($mod_report_links as $mod_report) {
+
+            // check if the code exists for this report
+            if (isset($mod_report['name']) && file_exists(PATH_MODULES.$mod_folder."/report.".$mod_report['name'].".php")) {
+                // check if the template exists for this report
+                if (file_exists(PATH_MODULES.$mod_folder."/templates/modules.".$mod_folder.".report.".$mod_report['name'].".tpl")) {
+                    // verify the other fields
+                    $mod_report['visibility'] = (isset($mod_report['visibility']) && isNum($mod_report['visibility']) ? $mod_report['visibility'] : 103);
+                    $mod_report['title'] = isset($mod_report['title']) ? $mod_report['title'] : ("Report: ".$mod_report['name']);
+                    $mod_report['version'] = isset($mod_report['version']) ? $mod_report['version'] : $mod_version;
+                    // add it to the report table
+                    $result = dbquery("INSERT INTO ".$db_prefix."reports (report_mod_id, report_name, report_title, report_version, report_visibility) 
+                        VALUES ('".$id."', '".$mod_report['name']."', '".$mod_report['title']."', '".$mod_report['version']."', '".$mod_report['visibility']."')");
+                }
+            }
+        }
+
+    }
+
+    // remove any searches associated with this module
+    $result = dbquery("DELETE FROM ".$db_prefix."searches WHERE search_mod_id='$id'");
+
+    // if a module is installed, and if searches are defined, install the search links for this module
+    if (isset($mod_search_links) && is_array($mod_search_links) && count($mod_search_links)) {
+
+        // loop through the defined reports
+        foreach ($mod_search_links as $mod_search) {
+
+            // check if the code exists for this search
+            if (isset($mod_search['name']) && file_exists(PATH_MODULES.$mod_folder."/search.".$mod_search['name'].".php")) {
+                // check if the template exists for this search
+                if (file_exists(PATH_MODULES.$mod_folder."/templates/modules.".$mod_folder.".search.".$mod_search['name'].".tpl")) {
+                    // verify the other fields
+                    $mod_search['visibility'] = (isset($mod_search['visibility']) && isNum($mod_search['visibility']) ? $mod_search['visibility'] : 103);
+                    $mod_search['title'] = isset($mod_search['title']) ? $mod_search['title'] : ("Search: ".$mod_search['name']);
+                    $mod_search['version'] = isset($mod_search['version']) ? $mod_search['version'] : $mod_version;
+                    // add it to the search table
+                    $result = dbquery("INSERT INTO ".$db_prefix."searches (search_mod_id, search_name, search_title, search_version, search_visibility) 
+                        VALUES ('".$id."', '".$mod_search['name']."', '".$mod_search['title']."', '".$mod_search['version']."', '".$mod_search['visibility']."')");
+                }
+            }
         }
     }
@@ -452 +579 @@
             $mod_check = (isset($mod_title) && $mod_title != "");
             $mod_check = $mod_check && (isset($mod_version) && $mod_version!= "");
-            $mod_check = $mod_check && (isset($mod_developer) && $mod_developer!= "");
-            $mod_check = $mod_check && (isset($mod_email) && $mod_email!= "");
             if (!$mod_check) {
                 $mod_errors .= $locale['mod004'];
@@ -460 +585 @@
                 $this_module['description'] = isset($mod_description) ? $mod_description : "";
                 $this_module['version'] = $mod_version;
-                $this_module['developer'] = $mod_developer;
-                $this_module['email'] = $mod_email;
+                $this_module['developer'] = isset($mod_developer) ? $mod_developer : "";
+                $this_module['email'] = isset($mod_email) ? $mod_email : "";
                 $this_module['url'] = isset($mod_weburl) ? $mod_weburl : "";
                 $this_module['type'] = isset($mod_type) ? $mod_type : "M";

branches/PLi-Fusion/administration/settings_forum.php

@@ -38 +38 @@
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['thread_notify']) ? $_POST['thread_notify'] : "0")."' WHERE cfg_name = 'thread_notify'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['unread_threshold']) ? $_POST['unread_threshold'] : "0")."' WHERE cfg_name = 'unread_threshold'");
+    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['forum_edit_timeout']) ? $_POST['forum_edit_timeout'] : "0")."' WHERE cfg_name = 'forum_edit_timeout'");
 }
 

branches/PLi-Fusion/administration/settings_misc.php

@@ -37 +37 @@
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".stripinput($_POST['bad_word_replace'])."' WHERE cfg_name = 'bad_words_replace'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['guestposts']) ? $_POST['guestposts'] : "0")."' WHERE cfg_name = 'guestposts'");
-    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['remote_stats']) ? $_POST['remote_stats'] : "0")."' WHERE cfg_name = 'remote_stats'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['numofshouts']) ? $_POST['numofshouts'] : "10")."' WHERE cfg_name = 'numofshouts'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['flood_interval']) ? $_POST['flood_interval'] : "15")."' WHERE cfg_name = 'flood_interval'");
@@ -45 +44 @@
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".stripinput($_POST['maintenance_color'])."' WHERE cfg_name = 'maintenance_color'");
     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".stripinput($_POST['debug_querylog'])."' WHERE cfg_name = 'debug_querylog'");
+    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".(isNum($_POST['debug_sql_explain']) ? $_POST['debug_sql_explain'] : "0")."' WHERE cfg_name = 'debug_sql_explain'");
 }
 

branches/PLi-Fusion/administration/site_links.php

@@ -128 +128 @@
 +----------------------------------------------------*/
 
+// display a status panel
+if (isset($status)) {
+    if ($status == "del") {
+        $variables['message'] = $locale['401'];
+    } else {
+        $variables['message'] = "UNKNOWN STATUS PASSED!";
+    }
+    // define the message panel variables
+    $variables['bold'] = true;
+    $template_panels[] = array('type' => 'body', 'name' => 'admin.site_links.status', 'title' => $locale['400'], 'template' => '_message_table_panel.tpl');
+    $template_variables['admin.site_links.status'] = $variables;
+    $variables = array();
+}
+
 // generate the list of installed menu panels
 $variables['panel_list'] = array();
@@ -137 +151 @@
 }
 sort($variables['panel_list']);
-
-// display a status panel
-if (isset($status)) {
-    if ($status == "del") {
-        $variables['message'] = $locale['401'];
-    } else {
-        $variables['message'] = "UNKNOWN STATUS PASSED!";
-    }
-    // define the message panel variables
-    $variables['bold'] = true;
-    $template_panels[] = array('type' => 'body', 'name' => 'admin.site_links.status', 'title' => $locale['400'], 'template' => '_message_table_panel.tpl');
-    $template_variables['admin.site_links.status'] = $variables;
-    $variables = array();
-}
 
 // default panel title
@@ -209 +209 @@
             // if the parent has changed, calculate a new link order
             if ($data['link_parent'] != $link_parent) {
-                $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where)).""),0)+1;
+                $link_order = dbfunction("MAX(link_order)", "site_links", "panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where))."")+1;
             } else {
                 // link changed?
@@ -222 +222 @@
             // get a linkorder if none given
             if (!$link_order) {
-                $link_order = dbresult(dbquery("SELECT MAX(link_order) FROM ".$db_prefix."site_links WHERE panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where)).""),0)+1;
+                $link_order = dbfunction("MAX(link_order)","site_links","panel_name = '$panel_filename' AND link_parent='$link_parent'".($where==""?"":(" AND ".$where))."")+1;
             }
             $result = dbquery("UPDATE ".$db_prefix."site_links SET link_order=link_order+1 WHERE panel_name = '$panel_filename' AND link_parent='$link_parent' AND link_order >= '$link_order'".($where==""?"":(" AND ".$where))."");   

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

@@ -491 +491 @@
         $localestrings['236'] = "Language Settings";
         $localestrings['237'] = "Webmaster Toolbox for";
+        $localestrings['238'] = "Forum Ranking";
         $localestrings['250'] = "Website Statistics";
         $localestrings['251'] = "Registered Members:";
@@ -496 +497 @@
         $localestrings['253'] = "Suspended Members:";
         $localestrings['255'] = "Deleted Members:";
-        $localestrings['256'] = "x";
+        $localestrings['256'] = "Reports";
         $localestrings['257'] = "Comments:";
         $localestrings['258'] = "Shoutbox Posts:";
         $localestrings['259'] = "Forum Posts:";
-        $localestrings['260'] = "x";
+        $localestrings['260'] = "Searches";
         $localestrings['261'] = "x";
         $localestrings['262'] = "Unread Posts:";
@@ -600 +601 @@
         $localestrings['424'] = "There are no modules and plugins available for installation";
         $localestrings['425'] = "There are no modules and plugins available that match your filter";
+        $localestrings['426'] = "Refresh the locale strings";
         $localestrings['mod001'] = "This module requires at least version %s of ExiteCMS.<br />";
         $localestrings['mod002'] = "This module is written for version %s of ExiteCMS. Please ask the author for an upgrade.<br />";
@@ -787 +789 @@
 
         $localestrings = array();
+        $localestrings['400'] = "Forum Rankings";
+        $localestrings['401'] = "Add a new ranking";
+        $localestrings['402'] = "Edit a ranking";
+        $localestrings['408'] = "There are no forum rankings defined";
+        $localestrings['409'] = "Note: The rankings are processed in the order shown here. Comparison stops at the first hit. If you use group membership filtering, and you have duplicate post ranges, make sure that the order is correct!";
+        $localestrings['411'] = "Posts range";
+        $localestrings['412'] = "Rank title";
+        $localestrings['413'] = "Rank image";
+        $localestrings['414'] = "Only for members of";
+        $localestrings['415'] = "Order";
+        $localestrings['416'] = "Options";
+        $localestrings['417'] = "Move this rank up";
+        $localestrings['418'] = "Move this rank down";
+        $localestrings['419'] = "Edit this rank";
+        $localestrings['420'] = "Delete this rank";
+        $localestrings['421'] = "Posts selection range:";
+        $localestrings['422'] = "From";
+        $localestrings['423'] = "To";
+        $localestrings['424'] = "Posts";
+        $localestrings['425'] = "Rank title:";
+        $localestrings['426'] = "Rank image:";
+        $localestrings['427'] = "- none -";
+        $localestrings['428'] = "Repeat this image:";
+        $localestrings['429'] = "Times";
+        $localestrings['430'] = "Available groups:";
+        $localestrings['431'] = "Selected groups:";
+        $localestrings['432'] = "Save this ranking";
+        $localestrings['433'] = "Apply this ranking to the following user groups only:";
+        $localestrings['434'] = "Rank order:";
+        $localestrings['435'] = "Rank group comparison using:";
+        $localestrings['436'] = " and ";
+        $localestrings['437'] = " or ";
+        $localestrings['438'] = "Rank title color:";
+        $localestrings['439'] = "Show title as tooltip:";
+        $localestrings['440'] = "No";
+        $localestrings['441'] = "Yes";
+        $localestrings['490'] = "The Post selection range must be filled in, and both values most be positive integers!";
+        $localestrings['491'] = "The Post selection range must be filled in, and From must be lower than To!";
+        $localestrings['492'] = "Ranking succesfully deleted";
+        load_localestrings($localestrings, LP_LOCALE, "admin.ranking", $step);
+
+        $localestrings = array();
         $localestrings['400'] = "Add new redirect URL";
         $localestrings['401'] = "Edit redirect URL";
@@ -817 +861 @@
         $localestrings['492'] = "If checked, the site will redirect to the exact URL given";
         load_localestrings($localestrings, LP_LOCALE, "admin.redirects", $step);
+
+        $localestrings = array();
+        $localestrings['400'] = "Reporting";
+        $localestrings['401'] = "Install";
+        $localestrings['403'] = "Filter on status";
+        $localestrings['404'] = "x";
+        $localestrings['405'] = "x";
+        $localestrings['406'] = "Version";
+        $localestrings['407'] = "Developer";
+        $localestrings['408'] = "Contact";
+        $localestrings['409'] = "Email";
+        $localestrings['410'] = "Web";
+        $localestrings['411'] = "Uninstall";
+        $localestrings['412'] = "Uninstall this report?";
+        $localestrings['413'] = "x";
+        $localestrings['414'] = "Not Installed";
+        $localestrings['415'] = "Installed";
+        $localestrings['416'] = "Upgrade Available";
+        $localestrings['417'] = "Error executing installation function: ";
+        $localestrings['418'] = "Not compatible";
+        $localestrings['419'] = "Error. Unknown command type: ";
+        $localestrings['420'] = "Status";
+        $localestrings['421'] = "Options";
+        $localestrings['422'] = "Upgrade";
+        $localestrings['423'] = "Go";
+        $localestrings['424'] = "There are no reports available for installation";
+        $localestrings['425'] = "There are no reports available that match your filter";
+        $localestrings['mod001'] = "This report requires at least version %s of ExiteCMS.<br />";
+        $localestrings['mod002'] = "This report is written for version %s of ExiteCMS. Please ask the author for an upgrade.<br />";
+        $localestrings['mod003'] = "This report requires a minumum ExiteCMS revision level of %s.<br />";
+        $localestrings['mod004'] = "This report can not be installed. Required information is missing from the report installer.<br />";
+        $localestrings['mod005'] = "This report does not function beyond ExiteCMS revision level %s.<br />";
+        load_localestrings($localestrings, LP_LOCALE, "admin.reporting", $step);
+
+        $localestrings = array();
+        $localestrings['400'] = "Reports";
+        $localestrings['401'] = "Report Title";
+        $localestrings['402'] = "Visibility";
+        $localestrings['403'] = "Options";
+        $localestrings['404'] = "Deactivate";
+        $localestrings['405'] = "Activate";
+        $localestrings['406'] = "Modify this report";
+        $localestrings['407'] = "Delete this report";
+        $localestrings['408'] = "Currently there are no reports defined";
+        $localestrings['409'] = "Add a Report";
+        $localestrings['410'] = "from";
+        $localestrings['411'] = "View this report";
+        load_localestrings($localestrings, LP_LOCALE, "admin.reports", $step);
 
         $localestrings = array();
@@ -889 +981 @@
         $localestrings['532'] = "Error: The session timeout value should be greater than the extended login timeout!";
         $localestrings['533'] = "Error: The extended login timeout should be greater than the standard login timeout!";
+        $localestrings['534'] = "Forum edit timeout:";
+        $localestrings['535'] = "Hour";
+        $localestrings['536'] = "Hours";
         $localestrings['550'] = "Security";
         $localestrings['551'] = "Enable registration system?";
@@ -944 +1039 @@
         $localestrings['666'] = "SMTP Username and Password:";
         $localestrings['667'] = "In seconds.Only one post per interval is allowed.";
-        $localestrings['668'] = "Use external download statistics:";
+        $localestrings['668'] = "Show results of the Query Optimizer as well:";
         $localestrings['669'] = "Maintenance mode background color:";
-        $localestrings['670'] = "If yes, an external program has to update the download counters.";
         $localestrings['671'] = "Activate SQL query debugging for:";
         $localestrings['672'] = "disabled";
@@ -1212 +1306 @@
         $localestrings['es'] = "Spain";
         $localestrings['et'] = "Ethiopia";
+        $localestrings['eu'] = "European Union";
         $localestrings['fi'] = "Finland";
         $localestrings['fj'] = "Fiji";
@@ -1288 +1383 @@
         $localestrings['mm'] = "Myanmar";
         $localestrings['mn'] = "Mongolia";
+        $localestrings['mo'] = "Macau";
         $localestrings['mp'] = "Northern Mariana Islands";
         $localestrings['mq'] = "Martinique";
@@ -1320 +1416 @@
         $localestrings['pl'] = "Poland";
         $localestrings['pm'] = "Saint Pierre And Miquelon";
-        $localestrings['pr'] = "Puerto Rico";
+        $localestrings['pr'] = "Palestinian Territories";
         $localestrings['pt'] = "Portugal";
         $localestrings['pw'] = "Palau";
@@ -1362 +1458 @@
         $localestrings['tv'] = "Tuvalu";
         $localestrings['tw'] = "Taiwan, Province Of China";
+        $localestrings['tz'] = "Tanzania";
         $localestrings['ua'] = "Ukraine";
         $localestrings['ug'] = "Uganda";
@@ -2162 +2259 @@
         $localestrings['517'] = "Toggle smileys";
         $localestrings['518'] = "pixels";
+        $localestrings['519'] = "";
         $localestrings['520'] = "Moderator Options:";
         $localestrings['521'] = "Delete Thread";
@@ -2324 +2422 @@
         $localestrings['472']['16'] = "white";
         $localestrings['473'] = "Comments (Max.length: 255 characters):";
+        $localestrings['474'] = "Toggle Message";
         $localestrings['480'] = " Make this Thread Sticky";
         $localestrings['481'] = " Show My Signature in this Post";
@@ -2471 +2570 @@
         $localestrings = array();
         $localestrings['400'] = "Forum:";
+        $localestrings['401'] = "writes:";
         load_localestrings($localestrings, LP_LOCALE, "main.feeds", $step);
 
@@ -2898 +2998 @@
 
         $localestrings = array();
+        $localestrings['rpt400'] = "Available Reports";
+        $localestrings['rpt401'] = "Report";
+        $localestrings['rpt402'] = "View";
+        $localestrings['rpt403'] = "Currently there are no reports defined";
+        $localestrings['rpt404'] = "Result for the requested report";
+        $localestrings['rpt405'] = "Report List";
+        load_localestrings($localestrings, LP_LOCALE, "main.reports", $step);
+
+        $localestrings = array();
         $localestrings['400'] = "Search";
         $localestrings['401'] = "Search for:";
@@ -3018 +3127 @@
         $localestrings['475'] = "News";
         $localestrings['476'] = "Panels";
-        $localestrings['477'] = "x";
+        $localestrings['477'] = "Reports";
         $localestrings['478'] = "PHP Info";
         $localestrings['479'] = "Polls";
-        $localestrings['480'] = "x";
+        $localestrings['480'] = "Searches";
         $localestrings['481'] = "Menu System";
         $localestrings['482'] = "x";
@@ -3047 +3156 @@
         $localestrings['507'] = "Search";
         $localestrings['508'] = "Register";
+        $localestrings['509'] = "Reports";
         $localestrings['520'] = "Main Menu";
         $localestrings['521'] = "Online Users";
@@ -3154 +3264 @@
 if (!function_exists('load_localestrings')) {
     function load_localestrings($localestrings, $locales_code, $locales_name, $step="") {
-        global $db_prefix;
+        global $db_prefix, $_db_log;
     
         // if this is an upgrade, remove the old locale strings first
@@ -3160 +3270 @@
             $result = dbquery("DELETE FROM ".$db_prefix."locales WHERE locales_code = '$locales_code' AND locales_name = '$locales_name'");
         }
-    
+
+        // temporary disable query logging
+        $dblog = $_db_log; $_db_log = false;
         // proces the imported locale strings
         foreach ($localestrings as $key => $value) {
@@ -3168 +3280 @@
             $result = dbquery("INSERT INTO ".$db_prefix."locales (locales_code, locales_name, locales_key, locales_value, locales_datestamp) VALUES ('$locales_code', '$locales_name', '".mysql_escape_string($key)."', '".mysql_escape_string($value)."', '".time()."')");
         }
+        $_db_log = $dblog;
         return true;
     }
@@ -3177 +3290 @@
 if (!defined('LP_CHARSET')) define('LP_CHARSET', "iso-8859-1");
 if (!defined('LP_VERSION')) define('LP_VERSION', "7.10");
-if (!defined('LP_DATE')) define('LP_DATE', "1210855263");
-$lp_date = "1210855263";
+if (!defined('LP_DATE')) define('LP_DATE', "1214934137");
+$lp_date = "1214934137";
 
 /*---------------------------------------------------+

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

@@ -42 +42 @@
 
 // load the theme functions when not in CLI mode
-if (!CMS_CLI) require_once PATH_INCLUDES."theme_functions.php";
+if (!CMS_CLI) {
+    require_once PATH_INCLUDES."theme_functions.php";
+} else {
+    echo "Running in CLI mode...\n";
+}
 
 // load the GeoIP include module
@@ -58 +62 @@
 // verify if the download succeeded
 if (file_exists('/tmp/GeoIPCountryCSV.zip')) {
+
+    // save the debug log setting, then disable it
+    $db_log = $_db_log;
+    $_db_log = false;
     
     // unzip the new file
@@ -139 +147 @@
 display("Update finished!");
 
+// restore the debug log status
+$_db_log = $db_log;
+
 // delete the download and temporary files
 if (file_exists('/tmp/GeoIPCountryWhois.csv')) unlink("/tmp/GeoIPCountryWhois.csv");

branches/PLi-Fusion/administration/upgrade.php

@@ -74 +74 @@
             // stage 2: perform the upgrades
             $variables['stage'] = 2;
+            // switch to MySQL4 mode to avoid errors
+            $result = dbquery("SET SESSION sql_mode='MYSQL40'");
             // start with the current revision number
             $new_revision = $settings['revision'];

branches/PLi-Fusion/administration/upgrade/rev00730.php

@@ -31 +31 @@
 
 // database changes
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_columns TINYINT UNSIGNED NOT NULL DEFAULT '1' AFTER news_style");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_items TINYINT UNSIGNED NOT NULL DEFAULT '4' AFTER news_columns");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##redirects ADD url_parms TINYINT(1) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_columns TINYINT UNSIGNED NOT NULL DEFAULT 1 AFTER news_style");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_items TINYINT UNSIGNED NOT NULL DEFAULT 4 AFTER news_columns");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##redirects ADD url_parms TINYINT(1) UNSIGNED NOT NULL DEFAULT 1");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings CHANGE version version DECIMAL(5,2) NOT NULL DEFAULT '7.00'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings CHANGE subversion revision SMALLINT UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings CHANGE news_style news_headline TINYINT UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings CHANGE subversion revision SMALLINT UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings CHANGE news_style news_headline TINYINT UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users CHANGE user_offset user_offset CHAR(6) NOT NULL DEFAULT ''");
 

branches/PLi-Fusion/administration/upgrade/rev00740.php

@@ -43 +43 @@
   pm_id smallint(5) unsigned NOT NULL auto_increment,
   pm_subject varchar(100) NOT NULL default '',
-  pm_message text NOT NULL default '',
-  pm_recipients text NOT NULL default '',
-  pm_smileys tinyint(1) unsigned NOT NULL default '1',
-  pm_size smallint(5) unsigned NOT NULL default '0',
-  pm_datestamp int(10) unsigned NOT NULL default '0',
+  pm_message text NOT NULL,
+  pm_recipients text NOT NULL,
+  pm_smileys tinyint(1) unsigned NOT NULL default 1,
+  pm_size smallint(5) unsigned NOT NULL default 0,
+  pm_datestamp int(10) unsigned NOT NULL default 0,
   PRIMARY KEY  (pm_id)
 ) ENGINE=MyISAM;");
@@ -53 +53 @@
   pmindex_id smallint(5) unsigned NOT NULL auto_increment,
   pm_id smallint(5) unsigned NOT NULL,
-  pmindex_user_id smallint(5) unsigned NOT NULL default '0',
-  pmindex_reply_id smallint(5) unsigned NOT NULL default '0',
-  pmindex_from_id smallint(5) unsigned NOT NULL default '0',
+  pmindex_user_id smallint(5) unsigned NOT NULL default 0,
+  pmindex_reply_id smallint(5) unsigned NOT NULL default 0,
+  pmindex_from_id smallint(5) unsigned NOT NULL default 0,
   pmindex_from_email varchar(100) NOT NULL default '',
-  pmindex_to_id smallint(5) unsigned NOT NULL default '0',
+  pmindex_to_id smallint(5) unsigned NOT NULL default 0,
   pmindex_to_email varchar(100) NOT NULL default '',
-  pmindex_to_group tinyint(1) unsigned NOT NULL default '0',
-  pmindex_read_datestamp int(10) unsigned NOT NULL default '0',
-  pmindex_read_requested tinyint(1) unsigned NOT NULL default '0',
-  pmindex_folder tinyint(1) unsigned NOT NULL default '0',
-  pmindex_locked tinyint(1) unsigned NOT NULL default '0',
+  pmindex_to_group tinyint(1) unsigned NOT NULL default 0,
+  pmindex_read_datestamp int(10) unsigned NOT NULL default 0,
+  pmindex_read_requested tinyint(1) unsigned NOT NULL default 0,
+  pmindex_folder tinyint(1) unsigned NOT NULL default 0,
+  pmindex_locked tinyint(1) unsigned NOT NULL default 0,
   PRIMARY KEY  (pmindex_id)
 ) ENGINE=MyISAM;");
@@ -69 +69 @@
   pmconfig_id smallint(5) unsigned NOT NULL auto_increment,
   user_id smallint(5) unsigned NOT NULL,
-  pmconfig_save_sent tinyint(1) unsigned NOT NULL default '1',
-  pmconfig_read_notify tinyint(1) unsigned NOT NULL default '1',
-  pmconfig_email_notify tinyint(1) unsigned NOT NULL default '0',
+  pmconfig_save_sent tinyint(1) unsigned NOT NULL default 0,
+  pmconfig_read_notify tinyint(1) unsigned NOT NULL default 0,
+  pmconfig_email_notify tinyint(1) unsigned NOT NULL default 0,
   pmconfig_auto_archive smallint(5) unsigned NOT NULL default '90',
-  pmconfig_view tinyint(1) unsigned NOT NULL default '0',
+  pmconfig_view tinyint(1) unsigned NOT NULL default 0,
   PRIMARY KEY  (pmconfig_id)
 ) ENGINE=MyISAM;");
@@ -79 +79 @@
   pmattach_id smallint(5) unsigned NOT NULL auto_increment,
   pm_id smallint(5) unsigned NOT NULL,
-  pmattach_name varchar(100) collate latin1_general_ci NOT NULL default '',
-  pmattach_realname varchar(100) collate latin1_general_ci NOT NULL default '',
-  pmattach_comment varchar(255) collate latin1_general_ci NOT NULL default '',
-  pmattach_ext varchar(5) collate latin1_general_ci NOT NULL default '',
-  pmattach_size int(20) unsigned NOT NULL default '0',
+  pmattach_name varchar(100) NOT NULL default '',
+  pmattach_realname varchar(100) NOT NULL default '',
+  pmattach_comment varchar(255) NOT NULL default '',
+  pmattach_ext varchar(5) NOT NULL default '',
+  pmattach_size int(20) unsigned NOT NULL default 0,
   PRIMARY KEY  (pmattach_id)
 ) ENGINE=MyISAM;");
@@ -93 +93 @@
 $commands[] = array('type' => 'db', 'value' => "UPDATE ##PREFIX##admin SET admin_image = 'images.gif', admin_title = 'Image Settings', admin_link = 'settings_image.php' WHERE admin_link = 'settings_photo.php' AND admin_page = '3'");
 $commands[] = array('type' => 'db', 'value' => "UPDATE ##PREFIX##admin SET admin_image = 'adverts.gif' WHERE admin_link = 'adverts.php' AND admin_page = '1'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_inbox SMALLINT(5) UNSIGNED NOT NULL DEFAULT '25'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_sentbox SMALLINT(5) UNSIGNED NOT NULL DEFAULT '25'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_savebox SMALLINT(5) UNSIGNED NOT NULL DEFAULT '25'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_send2group SMALLINT(5) UNSIGNED NOT NULL DEFAULT '103'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_hide_rcpts TINYINT(1) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_inbox SMALLINT(5) UNSIGNED NOT NULL DEFAULT 25");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_sentbox SMALLINT(5) UNSIGNED NOT NULL DEFAULT 25");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_savebox SMALLINT(5) UNSIGNED NOT NULL DEFAULT 25");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_send2group SMALLINT(5) UNSIGNED NOT NULL DEFAULT 103");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD pm_hide_rcpts TINYINT(1) UNSIGNED NOT NULL DEFAULT 0");
 
 $commands[] = array('type' => 'function', 'value' => "migrate_messages");

branches/PLi-Fusion/administration/upgrade/rev00760.php

@@ -44 +44 @@
 
 // added option to disable the display of banners on a per-forum basis
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##forums ADD forum_banners TINYINT(1) UNSIGNED NOT NULL DEFAULT '1'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##forums ADD forum_banners TINYINT(1) UNSIGNED NOT NULL DEFAULT 1");
 
 // support new homepage news assignments
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##news DROP news_latest_item");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##news CHANGE news_sticky news_headline TINYINT(1) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##news ADD news_latest_news TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER news_headline");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##news CHANGE news_sticky news_headline TINYINT(1) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##news ADD news_latest_news TINYINT(3) UNSIGNED NOT NULL DEFAULT 0 AFTER news_headline");
 
 // make more room to support timezones at half-hours or quaters

branches/PLi-Fusion/administration/upgrade/rev00780.php

@@ -39 +39 @@
 
 // add seperate max dimensions for images in the forum posts
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD forum_max_w SMALLINT(4) NOT NULL DEFAULT '600' AFTER forum_flags");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD forum_max_h SMALLINT(4) NOT NULL DEFAULT '600' AFTER forum_max_w");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD forum_max_w SMALLINT(4) NOT NULL DEFAULT 600 AFTER forum_flags");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD forum_max_h SMALLINT(4) NOT NULL DEFAULT 600 AFTER forum_max_w");
 
 // new user field to indicate that this user is a webmaster
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_webmaster TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER user_password");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_webmaster TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT 0 AFTER user_password");
 ?>

branches/PLi-Fusion/administration/upgrade/rev00800.php

@@ -38 +38 @@
 
 // add the aidlink switch to the site_links table
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##site_links ADD link_aid TINYINT(1) UNSIGNED DEFAULT '0' AFTER link_window");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##site_links ADD link_parent TINYINT(3) UNSIGNED DEFAULT '0' AFTER link_aid");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##site_links ADD link_aid TINYINT(1) UNSIGNED DEFAULT 0 AFTER link_window");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##site_links ADD link_parent TINYINT(3) UNSIGNED DEFAULT 0 AFTER link_aid");
 
 // add the news_latest switch to the settings table 
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_latest TINYINT(1) UNSIGNED DEFAULT '0' AFTER news_items");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##settings ADD news_latest TINYINT(1) UNSIGNED DEFAULT 0 AFTER news_items");
 
 // drop the panel_state table. Not needed anymore, replaced by cookies

branches/PLi-Fusion/administration/upgrade/rev00850.php

@@ -62 +62 @@
         $result = dbquery("UPDATE ".$db_prefix."user_groups SET group_ident = 'wE01' WHERE group_id = '".$data['group_id']."'");
     } else {
-        $result = dbquery("INSERT INTO ".$db_prefix."user_groups (group_ident, group_name, group_description, group_visible) VALUES ('wE01', 'Sponsors', 'Website Sponsors', '0'");
+        $result = dbquery("INSERT INTO ".$db_prefix."user_groups (group_ident, group_name, group_groups, group_rights, group_description, group_visible) VALUES ('wE01', 'Sponsors', '', '', 'Website Sponsors', '0'");
     }
 }

branches/PLi-Fusion/administration/upgrade/rev00858.php

@@ -1031 +1031 @@
   locale_code varchar(8) NOT NULL default '',
   locale_name varchar(50) NOT NULL default '',
-  locale_active tinyint(1) NOT NULL default '0',
+  locale_active tinyint(1) NOT NULL default 0,
   PRIMARY KEY  (locale_id)
 ) ENGINE=MyISAM;");

branches/PLi-Fusion/administration/upgrade/rev00909.php

@@ -36 +36 @@
   cfg_id smallint(5) unsigned NOT NULL auto_increment,
   cfg_name varchar(25) NOT NULL default '',
-  cfg_value TEXT NOT NULL default '',
+  cfg_value TEXT NOT NULL,
   PRIMARY KEY  (cfg_id)
 ) ENGINE=MyISAM;");

branches/PLi-Fusion/administration/upgrade/rev00954.php

@@ -33 +33 @@
 // create new captcha table
 $commands[] = array('type' => 'db', 'value' => "CREATE TABLE ##PREFIX##captcha (
-  captcha_datestamp INT(10) UNSIGNED NOT NULL default '0',
+  captcha_datestamp INT(10) UNSIGNED NOT NULL default 0,
   captcha_ip VARCHAR(20) NOT NULL,
   captcha_encode VARCHAR(32) NOT NULL default '',

branches/PLi-Fusion/administration/upgrade/rev01060.php

@@ -36 +36 @@
 
 // new user field to indicate that this user is a webmaster
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_bad_email INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER user_email");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_bad_email INT(10) UNSIGNED NOT NULL DEFAULT 0 AFTER user_email");
 ?>

branches/PLi-Fusion/administration/upgrade/rev01070.php

@@ -41 +41 @@
   locales_name varchar(50) NOT NULL default '',
   locales_key varchar(25) NOT NULL default '',
-  locales_value TEXT NOT NULL default '',
+  locales_value TEXT NOT NULL,
   locales_datestamp INT(10) UNSIGNED NOT NULL default 0,
   PRIMARY KEY  (locales_id)

branches/PLi-Fusion/administration/upgrade/rev01091.php

@@ -31 +31 @@
 
 // add the translator user_id to the locales table to track who changed what (we have the datestamp for the when)
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##locales ADD locales_translator SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER locales_value");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##locales ADD locales_translator SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0 AFTER locales_value");
 
 // add a locales key index to the locales table

branches/PLi-Fusion/administration/upgrade/rev01190.php

@@ -31 +31 @@
 // update the tables
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."admin CHANGE admin_id admin_id SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."articles CHANGE article_name article_name MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '1'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."articles CHANGE article_reads article_reads MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forums CHANGE forum_lastuser forum_lastuser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."articles CHANGE article_name article_name MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 1");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."articles CHANGE article_reads article_reads MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forums CHANGE forum_lastuser forum_lastuser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_attachments CHANGE attach_id attach_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_attachments CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_attachments CHANGE post_id post_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_attachments CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_attachments CHANGE post_id post_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_polls CHANGE poll_id poll_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_polls CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_polls CHANGE post_id post_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_polls CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_polls CHANGE post_id post_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_options CHANGE option_id option_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_options CHANGE poll_id poll_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_votes CHANGE poll_id poll_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_votes CHANGE user_id user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."news CHANGE news_name news_name MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '1'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_options CHANGE poll_id poll_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_votes CHANGE poll_id poll_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."forum_poll_votes CHANGE user_id user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."news CHANGE news_name news_name MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 1");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm CHANGE pm_id pm_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm CHANGE pm_size pm_size MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm CHANGE pm_size pm_size MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_attachments CHANGE pmattach_id pmattach_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_attachments CHANGE pm_id pm_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_attachments CHANGE pm_id pm_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_config CHANGE pmconfig_id pmconfig_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_config CHANGE user_id user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_config CHANGE user_id user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_id pmindex_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pm_id pm_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_user_id pmindex_user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_reply_id pmindex_reply_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_from_id pmindex_from_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_to_id pmindex_to_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pm_id pm_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_user_id pmindex_user_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_reply_id pmindex_reply_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_from_id pmindex_from_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."pm_index CHANGE pmindex_to_id pmindex_to_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_id post_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_reply_id post_reply_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_author post_author MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_edituser post_edituser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."ratings CHANGE rating_user rating_user MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_reply_id post_reply_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_author post_author MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."posts CHANGE post_edituser post_edituser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."ratings CHANGE rating_user rating_user MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_author thread_author MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_views thread_views MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_lastuser thread_lastuser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."thread_notify CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."thread_notify CHANGE notify_user notify_user MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_author thread_author MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_views thread_views MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads CHANGE thread_lastuser thread_lastuser MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."thread_notify CHANGE thread_id thread_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."thread_notify CHANGE notify_user notify_user MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."users CHANGE user_id user_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."users CHANGE user_posts user_posts MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'");
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."users CHANGE user_newsletters user_newsletters TINYINT(1) UNSIGNED NOT NULL DEFAULT '1'");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."users CHANGE user_posts user_posts MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."users CHANGE user_newsletters user_newsletters TINYINT(1) UNSIGNED NOT NULL DEFAULT 1");
 ?>

branches/PLi-Fusion/administration/upgrade/rev01193.php

@@ -30 +30 @@
 
 // add the user_forum_datestamp field to the users table
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_forum_datestamp INT(10) NOT NULL DEFAULT '0' AFTER user_forum_fullscreen");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_forum_datestamp INT(10) NOT NULL DEFAULT 0 AFTER user_forum_fullscreen");
 
 // create the threads_read table
 $commands[] = array('type' => 'db', 'value' => "CREATE TABLE ##PREFIX##threads_read (
-  user_id mediumint(8) NOT NULL default '0',
-  forum_id smallint(5) NOT NULL default '0',
-  thread_id mediumint(8) NOT NULL default '0',
-  thread_page smallint(5) NOT NULL default '0',
-  thread_last_read int(10) NOT NULL default '0',
+  user_id mediumint(8) NOT NULL default 0,
+  forum_id smallint(5) NOT NULL default 0,
+  thread_id mediumint(8) NOT NULL default 0,
+  thread_page smallint(5) NOT NULL default 0,
+  thread_last_read int(10) NOT NULL default 0,
   PRIMARY KEY  (user_id,forum_id,thread_id)
 ) ENGINE=MyISAM;");

branches/PLi-Fusion/administration/upgrade/rev01201.php

@@ -36 +36 @@
 
 // add the new user groups for the module "blogs"
-$commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##user_groups (group_ident, group_name, group_description, group_forumname, group_visible) VALUES ('BG01', 'Blog Editors', 'Blog Editors', 'Blog Editor', '1')");
-$commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##user_groups (group_ident, group_name, group_description, group_forumname, group_visible) VALUES ('BG02', 'Blog Moderators', 'Blog Moderators', 'Blog Moderator', '1')");
+$commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##user_groups (group_ident, group_name, group_groups, group_rights, group_description, group_forumname, group_visible) VALUES ('BG01', 'Blog Editors', '', '', 'Blog Editors', 'Blog Editor', '1')");
+$commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##user_groups (group_ident, group_name, group_groups, group_rights, group_description, group_forumname, group_visible) VALUES ('BG02', 'Blog Moderators', '', '', 'Blog Moderators', 'Blog Moderator', '1')");
 
 // add the tables for the new module "blogs"
 $commands[] = array('type' => 'db', 'value' => "CREATE TABLE ##PREFIX##blogs (
   blog_id mediumint(8) NOT NULL AUTO_INCREMENT,
-  blog_subject VARCHAR(50) NOT NULL default '',
-  blog_text TEXT NOT NULL default '',
-  blog_reads mediumint(8) NOT NULL default '0',
-  blog_breaks CHAR(1) NOT NULL,
-  blog_comments TINYINT(1) NOT NULL default '0',
-  blog_ratings TINYINT(1) NOT NULL default '0',
-  blog_author mediumint(8) NOT NULL default '0',
-  blog_datestamp int(10) NOT NULL default '0',
-  blog_editor mediumint(8) NOT NULL default '0',
-  blog_edittime int(10) NOT NULL default '0',
+  blog_subject varchar(50) NOT NULL default '',
+  blog_text text NOT NULL,
+  blog_reads mediumint(8) NOT NULL default 0,
+  blog_breaks char(1) NOT NULL default 'n',
+  blog_comments tinyint(1) NOT NULL default 0,
+  blog_ratings tinyint(1) NOT NULL default 0,
+  blog_author mediumint(8) NOT NULL default 0,
+  blog_datestamp int(10) NOT NULL default 0,
+  blog_editor mediumint(8) NOT NULL default 0,
+  blog_edittime int(10) NOT NULL default 0,
   PRIMARY KEY  (blog_id)
 ) ENGINE=MyISAM;");

branches/PLi-Fusion/administration/upgrade/rev01214.php

@@ -39 +39 @@
   session_id CHAR(50) NOT NULL default '',
   session_ua CHAR(32) NOT NULL default '',
-  session_started int(10) NOT NULL default '0',
-  session_expire int(10) NOT NULL default '0',
-  session_user_id mediumint(8) NOT NULL default '0',
+  session_started int(10) NOT NULL default 0,
+  session_expire int(10) NOT NULL default 0,
+  session_user_id mediumint(8) NOT NULL default 0,
   session_ip CHAR(15) NOT NULL default '',
-  session_data TEXT NOT NULL default '',
+  session_data TEXT,
   PRIMARY KEY  (session_id)
 ) ENGINE=MyISAM;");

branches/PLi-Fusion/administration/upgrade/rev01280.php

@@ -30 +30 @@
 
 // add an automatic timestamp to the configuration table
-$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_posts_unread TINYINT(1) NOT NULL DEFAULT '1' AFTER user_sponsor");
+$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ##PREFIX##users ADD user_posts_unread TINYINT(1) NOT NULL DEFAULT 1 AFTER user_sponsor");
 ?>

branches/PLi-Fusion/blogs.php

@@ -222 +222 @@
             $bloglimit = time() - $settings['blogs_indexage'] * 86400;
             // select all authors
-            $result = dbquery("SELECT DISTINCT b.blog_author, u.user_name, count(*) AS count FROM ".$db_prefix."blogs b, ".$db_prefix."users u WHERE b.blog_author = u.user_id AND (blog_datestamp > '".$bloglimit."' OR blog_edittime > '".$bloglimit."') GROUP BY blog_author ORDER BY count DESC, user_name ASC");
+            $result = dbquery("SELECT DISTINCT b.blog_author, u.user_name, count(*) AS count FROM ".$db_prefix."blogs b, ".$db_prefix."users u WHERE b.blog_author = u.user_id GROUP BY blog_author ORDER BY count DESC, user_name ASC");
         }
         $variables['list'] = array();
@@ -234 +234 @@
             $variables['list'][] = $data;
         }
-
         break;      
 }

branches/PLi-Fusion/contact.php

@@ -15 +15 @@
 require_once dirname(__FILE__)."/includes/core_functions.php";
 require_once PATH_ROOT."/includes/theme_functions.php";
-
-// include the secureimage class
-require_once PATH_INCLUDES."secureimage-1.0.3/securimage.php";
 
 // temp storage for template variables
@@ -44 +41 @@
     // error initialisation
     $errors = array();
+    // include the secureimage class
+    require_once PATH_INCLUDES."secureimage-1.0.3/securimage.php";
     // captcha check
     $securimage = new Securimage();

branches/PLi-Fusion/downloads.php

@@ -66 +66 @@
 // if a download ID is given...
 if (isset($download_id)) {
-    $res = 0;
     // and it exists ...
     if ($data = dbarray(dbquery("SELECT download_url,download_cat FROM ".$db_prefix."downloads WHERE download_id='$download_id'"))) {
@@ -72 +71 @@
         // and the user has access to it...
         if (checkgroup($cdata['download_cat_access'])) {
-            $res = 1;
             // update the download counter (if we're using internal statistics)
-            if (!isset($settings['remote_stats']) || !$settings['remote_stats']) $result = dbquery("UPDATE ".$db_prefix."downloads SET download_count=download_count+1 WHERE download_id='$download_id'");
+            if (!isset($settings['dlstats_remote']) || !$settings['dlstats_remote']) $result = dbquery("UPDATE ".$db_prefix."downloads SET download_count=download_count+1 WHERE download_id='$download_id'");
             // if a URL is given for the download, redirect to it, else fall back to the download category
             if ($data['download_url']) {
+                // download statistics plugin installed but no remote stats used? Then update the IP counters
+                if (isset($settings['dlstats_remote']) && !$settings['dlstats_remote']) {
+                    if (USER_IP != "0.0.0.0") {
+                        $result = dbquery("INSERT INTO ".$db_prefix."dlstats_ips (dlsi_ip, dlsi_ccode, dlsi_counter) VALUES ('".USER_IP."', '".USER_CC."', '1') ON DUPLICATE KEY UPDATE dlsi_counter = dlsi_counter + 1");
+                    }
+                }
                 redirect($data['download_url']);
                 exit;
@@ -107 +111 @@
     $variables['subcats'] = false;
     $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_parent='0' AND ".groupaccess('download_cat_access').($where==""?"":(" AND ".$where))." ORDER BY download_datestamp DESC");
-    if ($result) {
+    if (!$result) {
         // any downloads in the 'root' are public, and ordered by download_id DESC, by default!
         $variables['parent'] = array('download_cat_access' => 0, 'download_cat_sorting' => 'download_id DESC'); 
         $cat_id = 0;
-    } else {
-        die('oops');
     }
 }
@@ -139 +141 @@
 }
 
+// check if we have categories at all
+$variables['have_cats'] = dbfunction("COUNT(*)", "download_cats");
+
 // define the body panel variables
 $template_panels[] = array('type' => 'body', 'name' => 'downloads', 'template' => 'main.downloads.tpl', 'locale' => "main.downloads");

branches/PLi-Fusion/edit_profile.php

@@ -96 +96 @@
                                 $error .= sprintf($locale['489'], $email_domain)."<br><br>\n";
                             } else {
-                                if (!$mail->Recipient($email)) {
+                                if (!$mail->CheckRecipient($email)) {
                                     // mail server doesn't respond to RCPT TO message
                                     $error .= sprintf($locale['490'], $email, $mailhost)."<br><br>\n";

branches/PLi-Fusion/feeds.php

@@ -70 +70 @@
             $item['title'] = "<![CDATA[ ".$data['post_subject']." ]]>";
             $item['link'] = $settings['siteurl']."forum/viewthread.php?forum_id=".$data['forum_id']."&amp;thread_id=".$data['thread_id']."&amp;pid=".$data['post_id']."#post_".$data['post_id'];
-            $item['description'] = "<![CDATA[ ".(strlen($data['post_message']) > 500 ? (substr($data['post_message'],0,496)." ...") : $data['post_message'])." ]]>";
+            $item['description'] = "<![CDATA[ <b>".$data['user_name']." ".$locale['401']."</b> ".(strlen($data['post_message']) > 500 ? (substr($data['post_message'],0,496)." ...") : $data['post_message'])." ]]>";
+            // locale must be english for this to work!
+            $loc = setlocale("LC_TIME", "en_US");
             $item['pubDate'] = strftime("%a, %d %b %G %T %z", $data['post_datestamp']);
+            setlocale("LC_TIME", $loc);
             $item['guid'] = $item['link'];  // make the guid equal to the link, we don't have a need for permalinks
             $feed[] = $item;

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

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Thu May 15 2008, 22:16:36 CEST
+// generated on : Wed Jul 2 2008, 11:38:41 CEST
+// translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------
 $locale['001'] = "Navigation";

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

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.setup
-// generated on : Thu May 15 2008, 14:41:03 CEST
+// generated on : Tue Jul 1 2008, 19:42:17 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

branches/PLi-Fusion/forum/index.php

@@ -45 +45 @@
 $result = dbquery(
     "SELECT f.*, COUNT(t.thread_id) AS thread_count, MAX(t.thread_lastpost) AS last_post, f2.forum_name AS forum_cat_name, f2.forum_id as cat_id, u.user_id, u.user_name FROM ".$db_prefix."forums f
-    LEFT JOIN ".$db_prefix."threads t USING(forum_id)
-    LEFT JOIN ".$db_prefix."forums f2 ON f.forum_cat = f2.forum_id
-    LEFT JOIN ".$db_prefix."users u ON f.forum_lastuser = u.user_id
+    INNER JOIN ".$db_prefix."threads t USING(forum_id)
+    INNER JOIN ".$db_prefix."forums f2 ON f.forum_cat = f2.forum_id
+    INNER JOIN ".$db_prefix."users u ON f.forum_lastuser = u.user_id
     WHERE ".groupaccess('f.forum_access')." AND f.forum_cat != '0' GROUP BY forum_id ORDER BY f2.forum_order ASC, f.forum_order ASC"
 );
@@ -84 +84 @@
                 SELECT count(*) as unread 
                     FROM ".$db_prefix."posts p 
-                        LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                        INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                     WHERE tr.user_id = '".$userdata['user_id']."' 
                         AND tr.forum_id = '".$data['forum_id']."' 
@@ -95 +95 @@
                 SELECT count(*) as unread 
                     FROM ".$db_prefix."posts p 
-                        LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                        INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                     WHERE tr.user_id = '".$userdata['user_id']."' 
                         AND tr.forum_id = '".$data['forum_id']."' 

branches/PLi-Fusion/forum/post.php

@@ -122 +122 @@
         // if it's an image, see if we need to make a thumbnail
         if (in_array($attachext, $imagetypes)) {
-            if (@getimagesize($tmp_name) && @verify_image($tmp_name)) {
+            if (@verify_image($tmp_name)) {
                 // it's a valid image. See if we need to generate a thumbnail
                 $imagefile = @getimagesize($tmp_name);
@@ -424 +424 @@
                     $preview['cc_flag'] = GeoIP_Code2Flag($settings['country']);
                 } else {
-                    $preview['cc_flag'] = GeoIP_IP2Flag($userdata['user_ip']);
+                    $preview['cc_flag'] = !empty($userdata['user_cc']) ? GeoIP_Code2Flag($userdata['user_cc']) : GeoIP_IP2Flag($userdata['user_ip']);
                 }
             } else {
@@ -434 +434 @@
             $preview['post_edituser'] = 0;
             $preview['post_ip'] = $userdata['user_ip'];
+            $preview['post_cc'] = $userdata['user_cc'];
             $preview['group_names'] = array();
             $preview['group_names'][] = array('type' => 'U', 'level' => $userdata['user_level'], 'name' => getuserlevel($userdata['user_level']));
@@ -599 +600 @@
                         }
                         // check if this isn't a reload, back-post, or double submit
-                        if (isset($_COOKIE['post_'.$random_id])) {
+                        if (isset($_SESSION['posts'][$random_id])) {
                             $error = $locale['458'];
                         } else {
                             if (!$flood) {
-                                setcookie("post_".$random_id, "posted", time()+60*60, "/", "", "0");
+                                if (!isset($_SESSION['posts']) || !is_array($_SESSION['posts'])) $_SESSION['posts'] = array();
+                                $_SESSION['posts'][$random_id] = time()+60*60*12;
                                 $result = dbquery("UPDATE ".$db_prefix."forums SET forum_lastpost='".time()."', forum_lastuser='".$userdata['user_id']."' WHERE forum_id='$forum_id'");
                                 switch ($action) {
@@ -616 +618 @@
                                         break;
                                 }
-                                $result = dbquery("INSERT INTO ".$db_prefix."posts (forum_id, thread_id, post_reply_id, post_subject, post_message, post_showsig, post_smileys, post_author, post_datestamp, post_ip, post_edituser, post_edittime) VALUES ('$forum_id', '$thread_id', '$reply_id', '$subject', '$message', '$sig', '$smileys', '".$userdata['user_id']."', '".time()."', '".USER_IP."', '0', '0')");
+                                $result = dbquery("INSERT INTO ".$db_prefix."posts (forum_id, thread_id, post_reply_id, post_subject, post_message, post_showsig, post_smileys, post_author, post_datestamp, post_ip, post_cc, post_edituser, post_edittime) VALUES ('$forum_id', '$thread_id', '$reply_id', '$subject', '$message', '$sig', '$smileys', '".$userdata['user_id']."', '".time()."', '".USER_IP."', '".$userdata['user_cc']."', '0', '0')");
                                 $post_id = mysql_insert_id();
                                 $result = dbquery("UPDATE ".$db_prefix."users SET user_posts=user_posts+1 WHERE user_id='".$userdata['user_id']."'");
@@ -931 +933 @@
                     case "edit":
                         $variables['message'] = $pdata['post_message'];
-                        $variables['org_message'] = $pdata['post_message'];
                         break;
                     case "quote":
                         $variables['message'] = $variables['orgauthor'] == "" ? "[quote]" : "[quote=".$variables['orgauthor']."]";
                         $variables['message'] .= $pdata['post_message']."[/quote]";
-                        $variables['org_message'] = "";
                         break;
                     default:
                         $variables['message'] = "";
-                        $variables['org_message'] = "";
-                }
+                }
+                $variables['org_message'] = $pdata['post_message'];
                 $variables['post_author'] = $pdata['post_author'];
                 $variables['is_smiley_disabled'] = ($pdata['post_smileys'] == "0");

branches/PLi-Fusion/forum/viewforum.php

@@ -38 +38 @@
 if (file_exists(PATH_MODULES."advertising/get_ad.php")) {
     require_once PATH_MODULES."advertising/get_ad.php";
-    $variables['advert'] = get_ad(array(1,2));
+    $variables['ad1'] = get_ad(array(1,2,5));
+    $variables['ad1'] = get_ad(array(4,5));
 } else {
-    $variables['advert'] = "";
+    $variables['ad1'] = "";
+    $variables['ad2'] = "";
 }
 
@@ -50 +52 @@
     "SELECT f.*, f2.forum_name AS forum_cat_name, f2.forum_id as forum_cat_id
     FROM ".$db_prefix."forums f
-    LEFT JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
+    INNER JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
     WHERE f.forum_id='".$forum_id."'"
 );
@@ -90 +92 @@
         SELECT p.thread_id
             FROM ".$db_prefix."posts p
-            LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+            INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
             WHERE tr.user_id = '".$userdata['user_id']."'
                 AND tr.forum_id = '".$forum_id."'
@@ -110 +112 @@
             SELECT count(*) as unread 
                 FROM ".$db_prefix."posts p 
-                    LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.forum_id = '".$forum_id."'
@@ -121 +123 @@
             SELECT count(*) as unread 
                 FROM ".$db_prefix."posts p 
-                    LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                    INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.forum_id = '".$forum_id."'
@@ -148 +150 @@
     "SELECT t.*, MAX(p.post_id) AS last_post, COUNT(p.post_id) AS thread_replies, tu1.user_name AS user_author, tu1.user_ip AS user_ip, 
             tu2.user_name AS user_lastuser, tu1.user_cc_code AS user_cc_code FROM ".$db_prefix."threads t
-        LEFT JOIN ".$db_prefix."posts p USING ( thread_id )
-        LEFT JOIN ".$db_prefix."users tu1 ON t.thread_author = tu1.user_id
-        LEFT JOIN ".$db_prefix."users tu2 ON t.thread_lastuser = tu2.user_id
+        INNER JOIN ".$db_prefix."posts p USING ( thread_id )
+        INNER JOIN ".$db_prefix."users tu1 ON t.thread_author = tu1.user_id
+        INNER JOIN ".$db_prefix."users tu2 ON t.thread_lastuser = tu2.user_id
         WHERE t.forum_id = '".$forum_id."'
         GROUP BY thread_id
@@ -173 +175 @@
             SELECT count(*) as unread, MIN(p.post_id) as post_id
                 FROM ".$db_prefix."posts p 
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id 
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.thread_id = '".$data['thread_id']."'

branches/PLi-Fusion/forum/viewthread.php

@@ -86 +86 @@
     "SELECT f.*, f2.forum_name AS forum_cat_name
     FROM ".$db_prefix."forums f
-    LEFT JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
+    INNER JOIN ".$db_prefix."forums f2 ON f.forum_cat=f2.forum_id
     WHERE f.forum_id='".$forum_id."'"
 );
@@ -158 +158 @@
         }
         // check if this isn't a reload, back-post, or double submit
-        if (isset($_COOKIE['post_'.$random_id])) {
+        if (isset($_SESSION['posts'][$random_id])) {
             redirect("post.php?action=quickreply&forum_id=$forum_id&thread_id=$thread_id&post_id=0&errorcode=3");
         } else {
             if (!$flood) {
-                setcookie("post_".$random_id, "posted", time() + 60*60, "/", "", "0");
+                if (!isset($_SESSION['posts']) || !is_array($_SESSION['posts'])) $_SESSION['posts'] = array();
+                $_SESSION['posts'][$random_id] = time()+60*60*12;
                 $sig = ($userdata['user_sig'] ? '1' :'0');
                 $smileys = isset($_POST['disable_smileys']) ? "0" : "1";
@@ -199 +200 @@
             SELECT count(*) as unread, tr.thread_first_read, tr.thread_last_read
                 FROM ".$db_prefix."posts p
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
                 WHERE tr.user_id = '".$userdata['user_id']."' 
                     AND tr.thread_id = '".$thread_id."' 
@@ -212 +213 @@
             SELECT count(*) as unread, tr.thread_first_read, tr.thread_last_read
                 FROM ".$db_prefix."posts p
-                LEFT JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
+                INNER JOIN ".$db_prefix."threads_read tr ON p.thread_id = tr.thread_id
                 WHERE tr.user_id = '".$userdata['user_id']."'
                     AND p.post_author != '".$userdata['user_id']."'
@@ -261 +262 @@
     $result = dbquery(
         "SELECT p.*, u.*, u2.user_name AS edit_name, u2.user_status AS edit_status FROM ".$db_prefix."posts p
-        LEFT JOIN ".$db_prefix."users u ON p.post_author = u.user_id
+        INNER JOIN ".$db_prefix."users u ON p.post_author = u.user_id
         LEFT JOIN ".$db_prefix."users u2 ON p.post_edituser = u2.user_id AND post_edituser > '0'
         WHERE p.thread_id='$thread_id' ORDER BY post_sticky DESC, post_datestamp ASC LIMIT $rowstart,".$settings['numofthreads']
@@ -267 +268 @@
     $variables['posts'] = array();
     while ($data = dbarray($result)) {
+
+        // default, show no ranking information
+        $data['show_ranking'] = false;
 
         // check for a system-post (author = 0 ), use some of the webmasters details for this
@@ -278 +282 @@
             $data['user_sig'] = "";
             $data['user_status'] = "0";
+        } else {
+            // check if a ranking is defined for this poster
+            $result2 = dbquery("SELECT * FROM ".$db_prefix."forum_ranking WHERE rank_posts_from <= '".$data['user_posts']."' AND rank_posts_to >= '".$data['user_posts']."' ORDER BY rank_order");
+            while ($data2 = dbarray($result2)) {
+                // get the grouplist for this ranking
+                if (strpos($data2['rank_groups'], ",")) {
+                    $groups = explode(",", $data2['rank_groups']);
+                } else {
+                    if (empty($data2['rank_groups'])) {
+                        $groups = "";
+                    } else {
+                        $groups = array($data2['rank_groups']);
+                    }
+                }
+                if (is_array($groups)) {
+                    // check for group matching as well, assume a match will be found
+                    $ranking_match = true;
+                    foreach($groups as $group) {
+                        if ($data2['rank_groups_and']) {
+                            // all should match
+                            if (!checkusergroup($data['post_author'], $group)) {
+                                // bail out if a non-match has been found
+                                $ranking_match = false;
+                                break;
+                            }
+                        } else {
+                            // one match is sufficient
+                            if (checkusergroup($data['post_author'], $group)) {
+                                $ranking_match = true;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    // no groups to test, must be a match on posts range
+                    $ranking_match = true;
+                }
+                // if we had a match, add the ranking information to the post data
+                if ($ranking_match) {
+                    $data['ranking'] = $data2;
+                    $data['show_ranking'] = true;
+                    break;
+                }
+            }
         }
 
@@ -301 +349 @@
         $last_post_datestamp = max($data['post_datestamp'], $data['post_edittime'], $last_post_datestamp);
 
-        // check what options to show for this post
-        $data['user_can_edit'] = iMEMBER && $data['post_author'] != 0 && (iMOD || iSUPERADMIN || (!$tdata['thread_locked'] && $userdata['user_id'] == $data['post_author']));
+        // check if the user can edit this post. Assume the user can't
+        $data['user_can_edit'] = false;
+        if (iMEMBER) {
+            // webmasters and forum moderators may always edit
+            if (iSUPERADMIN || iMOD) {
+                $data['user_can_edit'] = true;
+            } else {
+                // check if this is not a system post
+                if ($data['post_author'] != 0) {
+                    // check if the thread is not locked
+                    if (!$tdata['thread_locked']) {
+                        // check if this is the users own post
+                        if ($userdata['user_id'] == $data['post_author']) {
+                            // check if the edit time is not expired
+                            if ($settings['forum_edit_timeout'] == 0 || ($data['post_datestamp'] + $settings['forum_edit_timeout'] * 3600) > time()) {
+                                $data['user_can_edit'] = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // check if we can show the poster's IP address
         $data['show_ip'] = (iMOD || iSUPERADMIN && ($data['post_ip'] != "0.0.0.0" && file_exists(PATH_THEME."images/ip.gif")));
     
@@ -311 +381 @@
                 $data['cc_flag'] = GeoIP_Code2Flag($settings['country']);
             } else {
-                $data['cc_flag'] = GeoIP_IP2Flag($data['post_ip']);
+                $data['cc_flag'] = !empty($data['post_cc']) ? GeoIP_Code2Flag($data['post_cc']) : GeoIP_IP2Flag($data['post_ip']);
             }
         } else {
@@ -324 +394 @@
         // user & group memberships
         $data['group_names'] = array();
+        // if a ranking is present, and a rank title is defined, display that first
+        if (isset($data['ranking']) && !empty($data['ranking']['rank_title']) && !$data['ranking']['rank_tooltip']) {
+            $data['group_names'][] = array('type' => 'R', 'color' => $data['ranking']['rank_color'], 'name' => $data['ranking']['rank_title']);
+        }
+        // display the standard user level next
         $data['group_names'][] = array('type' => 'U', 'level' => $data['user_level'], 'name' => getuserlevel($data['user_level']));
 

branches/PLi-Fusion/getfile.php

@@ -311 +311 @@
 // parameter validation
 if (!isset($file_id) || !isNum($file_id)) {
-    die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid or missing file ID.</b></div>");
+    terminate("<b>Invalid or missing file ID.</b>");
 }
 if (!isset($type)) {
-    die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Missing file type.</b></div>");
+    terminate("<b>Missing file type.</b>");
 }
 
@@ -330 +330 @@
         $attachment = dbarray(dbquery("SELECT * FROM ".$db_prefix."forum_attachments WHERE attach_id='$file_id'"));
         if (!is_array($attachment)) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid file ID.</b></div>");
+            terminate("<b>Invalid file ID.</b>");
         }
         // check if the post this attachment belongs to exists, if so retrieve the information
         $post = dbarray(dbquery("SELECT * FROM ".$db_prefix."posts WHERE thread_id = '".$attachment['thread_id']."' AND post_id='".$attachment['post_id']."'"));
         if (!is_array($post)) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid file ID.</b></div>");
+            terminate("<b>Invalid file ID.</b>");
         }
         $forum = dbarray(dbquery("SELECT * FROM ".$db_prefix."forums WHERE forum_id = '".$post['forum_id']."'"));
         if (!is_array($forum)) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid file ID.</b></div>");
+            terminate("<b>Invalid file ID.</b>");
         }
         // if logged in, check if the user has access to this file. if not, print an error and give up
         if (iMEMBER && !getfilegroup($forum['forum_access'], $userdata['user_level'])) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>You don't have access to the requested file ID.</b></div>");
+            terminate("<b>You don't have access to the requested file ID.</b>");
         }
         // if not logged in, and authorisation required, check if userid and password is given and valid
@@ -362 +362 @@
         $attachment = dbarray(dbquery("SELECT * FROM ".$db_prefix."pm_attachments WHERE pmattach_id='$file_id'"));
         if (!is_array($attachment)) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid file ID.</b></div>");
+            terminate("<b>Invalid file ID.</b>");
         }
         // if not logged in, check if userid and password is given and valid (authorisation is required!)
@@ -372 +372 @@
         $result = dbquery("SELECT * FROM ".$db_prefix."pm_index WHERE pm_id = '".$attachment['pm_id']."' AND pmindex_user_id = '".$userdata['user_id']."'");
         if (dbrows($result) == 0) {
-            die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>You don't have access to the requested file ID.</b></div>");
+            terminate("<b>You don't have access to the requested file ID.</b>");
         }
         // define the required parameters for the download
@@ -381 +381 @@
 
     default:
-        die("<div style='font-family:Verdana;font-size:11px;text-align:center;'><b>Invalid file type.</b></div>");
+        die("<b>Invalid file type.</b>");
 }
 

branches/PLi-Fusion/includes/core_functions.php

@@ -14 +14 @@
 +----------------------------------------------------*/
 if (eregi("core_functions.php", $_SERVER['PHP_SELF'])) die();
+
+// disable error reporting, we don't want to give anything away
+error_reporting(E_USER_ERROR);
 
 // code to calculate the page loading time, this can be used
@@ -80 +83 @@
 define("PATH_ADMIN", PATH_ROOT."administration/");
 define("PATH_THEMES", PATH_ROOT."themes/");
-define("PATH_PHOTOS", PATH_ROOT."images/photoalbum/");
+define("PATH_PHOTOS", PATH_ROOT."images/gallery/");
 define("PATH_IMAGES", PATH_ROOT."images/");
 define("PATH_IMAGES_A", PATH_IMAGES."articles/");
@@ -97 +100 @@
 
 // load the config file
-if (file_exists(PATH_ROOT."config.php")) {
-    @include_once PATH_ROOT."config.php";
+@include_once PATH_ROOT."configpath.php";
+if (substr(CONFIG_PATH,0,1) == "/") {
+    if(is_file(CONFIG_PATH."/config.php")) {
+        @include_once CONFIG_PATH."/config.php";
+    }
+} else {
+    if(is_file(PATH_ROOT.CONFIG_PATH."/config.php")) {
+        @include_once PATH_ROOT.CONFIG_PATH."/config.php";
+    }
 }
 
 // if config.php is absent or empty, bail out with an error
-if (!isset($db_name)) die('FATAL ERROR: config file is missing. Check the documentation on how to run the setup');
+if (!isset($db_name)) terminate('FATAL ERROR: config file is missing. Check our Wiki at http://exitecms.exite.eu on how to run the setup');
 
 // load the database functions, and establish a database connection
@@ -186 +196 @@
 require_once PATH_INCLUDES."user_functions.php";
 
-// activate query log debugging if set
-if ($settings['debug_querylog'] != "") {
-    $_db_log = checkgroup($settings['debug_querylog']);
+// set the query log debugging switch, enable error reporting if needed
+$_db_log = checkgroup($settings['debug_querylog'], false);
+// if debugging is requested, also activate some other debugging features
+if ($_db_log) {
+    error_reporting(E_ALL);
 }
 
@@ -221 +233 @@
 
 // image types we can generate a thumbnail from
-$thumbtypes = array(".gif",".jpg",".jpeg",".png",);
+$thumbtypes = array(".gif",".jpg",".jpeg",".png",".bmp", ".psd");
 
 // debug function, handy to print a standard debug text
@@ -227 +239 @@
 
     if (is_array($text)) {
+        echo "<br /><hr /><br /><pre>"; print_r($text); echo "</pre><br /><hr /><br />";
+    } elseif (is_object($text)) {
         echo "<br /><hr /><br /><pre>"; print_r($text); echo "</pre><br /><hr /><br />";
     } else {
@@ -352 +366 @@
 }
 
-// Parse smiley bbcode into HTML images
-function parsesmileys($message) {
-    $smiley = array(
-        "#\:oops\:#si" => "<img src='".IMAGES."smiley/more/redface.gif' alt='smiley' />",
-        "#\;\)#si" => "<img src='".IMAGES."smiley/wink.gif' alt='smiley' />",
-        "#\:\(#si" => "<img src='".IMAGES."smiley/sad.gif' alt='smiley' />",
-        "#\:\|#si" => "<img src='".IMAGES."smiley/frown.gif' alt='smiley' />",
-        "#\:o#si" => "<img src='".IMAGES."smiley/shock.gif' alt='smiley' />",
-        "#\:p#si" => "<img src='".IMAGES."smiley/pfft.gif' alt='smiley' />",
-        "#b\)#si" => "<img src='".IMAGES."smiley/cool.gif' alt='smiley' />",
-        "#\:d#si" => "<img src='".IMAGES."smiley/grin.gif' alt='smiley' />",
-        "#\:@#si" => "<img src='".IMAGES."smiley/angry.gif' alt='smiley' />",
-        "#\:thumbleft#si" => "<img src='".IMAGES."smiley/more/icon_thumleft.gif' alt='smiley' />",
-        "#\:thumbright#si" => "<img src='".IMAGES."smiley/more/icon_thumright.gif' alt='smiley' />",
-        "#=D&gt;#si" => "<img src='".IMAGES."smiley/more/eusa_clap.gif' alt='smiley' />",
-        "#\\\:D/#si" => "<img src='".IMAGES."smiley/more/eusa_dance.gif' alt='smiley' />",
-        "#\:D#si" => "<img src='".IMAGES."smiley/more/biggrin.gif' alt='smiley' />",
-        "#\:smt014#si" => "<img src='".IMAGES."smiley/more/014.gif' alt='smiley' />",
-        "#\:boring#si" => "<img src='".IMAGES."smiley/more/015.gif' alt='smiley' />",
-        "#\:smt018#si" => "<img src='".IMAGES."smiley/more/018.gif' alt='smiley' />",
-        "#\:smt022#si" => "<img src='".IMAGES."smiley/more/022.gif' alt='smiley' />",
-        "#\:smt071#si" => "<img src='".IMAGES."smiley/more/071.gif' alt='smiley' />",
-        "#\:smt102#si" => "<img src='".IMAGES."smiley/more/102.gif' alt='smiley' />",
-        "#\:smt100#si" => "<img src='".IMAGES."smiley/more/100.gif' alt='smiley' />",
-        "#\:\-D#si" => "<img src='".IMAGES."smiley/more/003.gif' alt='smiley' />",
-        "#\:\-\)#si" => "<img src='".IMAGES."smiley/more/001.gif' alt='smiley' />",
-        "#\:\(#si" => "<img src='".IMAGES."smiley/more/sad.gif' alt='smiley' />",
-        "#\:o#si" => "<img src='".IMAGES."smiley/more/surprised.gif' alt='smiley' />",
-        "#\:shock\:#si" => "<img src='".IMAGES."smiley/more/shock.gif' alt='smiley' />",
-        "#8\)#si" => "<img src='".IMAGES."smiley/more/cool.gif' alt='smiley' />",
-        "#\:lol\:#si" => "<img src='".IMAGES."smiley/more/lol.gif' alt='smiley' />",
-        "#\:x#si" => "<img src='".IMAGES."smiley/more/mad.gif' alt='smiley' />",
-        "#\:\-x#si" => "<img src='".IMAGES."smiley/more/icon_mad.gif' alt='smiley' />",
-        "#\:P#si" => "<img src='".IMAGES."smiley/more/icon_razz.gif' alt='smiley' />",
-        "#\:razz\:#si" => "<img src='".IMAGES."smiley/more/razz.gif' alt='smiley' />",
-        "#\:cry\:#si" => "<img src='".IMAGES."smiley/more/cry.gif' alt='smiley' />",
-        "#\:evil\:#si" => "<img src='".IMAGES."smiley/more/evil.gif' alt='smiley' />",
-        "#\:twisted\:#si" => "<img src='".IMAGES."smiley/more/icon_twisted.gif' alt='smiley' />",
-        "#\:roll\:#si" => "<img src='".IMAGES."smiley/more/rolleyes.gif' alt='smiley' />",
-        "#\:wink\:#si" => "<img src='".IMAGES."smiley/more/wink.gif' alt='smiley' />",
-        "#\;\-\)#si" => "<img src='".IMAGES."smiley/more/002.gif' alt='smiley' />",
-        "#\:\!\:#si" => "<img src='".IMAGES."smiley/more/exclaim.gif' alt='smiley' />",
-        "#\:\?\:#si" => "<img src='".IMAGES."smiley/more/question.gif' alt='smiley' />",
-        "#\:\?#si" => "<img src='".IMAGES."smiley/more/confused.gif' alt='smiley' />",
-        "#\:idea\:#si" => "<img src='".IMAGES."smiley/more/idea.gif' alt='smiley' />",
-        "#\:arrow\:#si" => "<img src='".IMAGES."smiley/more/arrow.gif' alt='smiley' />",
-        "#\:\|#si" => "<img src='".IMAGES."smiley/more/neutral.gif' alt='smiley' />",
-        "#\:mrgreen\:#si" => "<img src='".IMAGES."smiley/more/icon_mrgreen.gif' alt='smiley' />",
-        "#\:badgrin\:#si" => "<img src='".IMAGES."smiley/more/badgrin.gif' alt='smiley' />",
-        "#\:doubt\:#si" => "<img src='".IMAGES."smiley/more/doubt.gif' alt='smiley' />",
-        "#\#\-o#si" => "<img src='".IMAGES."smiley/more/eusa_doh.gif' alt='smiley' />",
-        "#\=P\~#si" => "<img src='".IMAGES."smiley/more/eusa_drool.gif' alt='smiley' />",
-        "#\:\^o#si" => "<img src='".IMAGES."smiley/more/eusa_liar.gif' alt='smiley' />",
-        "#\[\-X#si" => "<img src='".IMAGES."smiley/more/eusa_naughty.gif' alt='smiley' />",
-        "#\[\-o\<\;#si" => "<img src='".IMAGES."smiley/more/eusa_pray.gif' alt='smiley' />",
-        "#8\-\[#si" => "<img src='".IMAGES."smiley/more/eusa_shifty.gif' alt='smiley' />",
-        "#\[\-\(#si" => "<img src='".IMAGES."smiley/more/eusa_snooty.gif' alt='smiley' />",
-        "#\:\-k#si" => "<img src='".IMAGES."smiley/more/eusa_think.gif' alt='smiley' />",
-        "#\]\(\*\,\)#si" => "<img src='".IMAGES."smiley/more/eusa_wall.gif' alt='smiley' />",
-//      "#\:\-\"#si" => "<img src='".IMAGES."smiley/more/eusa_whistle.gif' alt='smiley' />",
-        "#O\:\)#si" => "<img src='".IMAGES."smiley/more/eusa_angel.gif' alt='smiley' />",
-        "#\=\;#si" => "<img src='".IMAGES."smiley/more/eusa_hand.gif' alt='smiley' />",
-        "#\:\-\&#si" => "<img src='".IMAGES."smiley/more/eusa_sick.gif' alt='smiley' />",
-        "#\:\-\(\{\|\=#si" => "<img src='".IMAGES."smiley/more/eusa_boohoo.gif' alt='smiley' />",
-        "#\:\-\$#si" => "<img src='".IMAGES."smiley/more/eusa_shhh.gif' alt='smiley' />",
-        "#\:\-s#si" => "<img src='".IMAGES."smiley/more/eusa_eh.gif' alt='smiley' />",
-        "#\:\-\##si" => "<img src='".IMAGES."smiley/more/eusa_silenced.gif' alt='smiley' />",
-        "#\:smt004#si" => "<img src='".IMAGES."smiley/more/004.gif' alt='smiley' />",
-        "#\:smt005#si" => "<img src='".IMAGES."smiley/more/005.gif' alt='smiley' />",
-        "#\:smt006#si" => "<img src='".IMAGES."smiley/more/006.gif' alt='smiley' />",
-        "#\:smt007#si" => "<img src='".IMAGES."smiley/more/007.gif' alt='smiley' />",
-        "#\:smt008#si" => "<img src='".IMAGES."smiley/more/008.gif' alt='smiley' />",
-        "#\:smt009#si" => "<img src='".IMAGES."smiley/more/009.gif' alt='smiley' />",
-        "#\:smt010#si" => "<img src='".IMAGES."smiley/more/010.gif' alt='smiley' />",
-        "#\:smt011#si" => "<img src='".IMAGES."smiley/more/011.gif' alt='smiley' />",
-        "#\:smt012#si" => "<img src='".IMAGES."smiley/more/012.gif' alt='smiley' />",
-        "#\:smt013#si" => "<img src='".IMAGES."smiley/more/013.gif' alt='smiley' />",
-        "#\:smt016#si" => "<img src='".IMAGES."smiley/more/016.gif' alt='smiley' />",
-        "#\:smt017#si" => "<img src='".IMAGES."smiley/more/017.gif' alt='smiley' />",
-        "#\:smt019#si" => "<img src='".IMAGES."smiley/more/019.gif' alt='smiley' />",
-        "#\:smt020#si" => "<img src='".IMAGES."smiley/more/020.gif' alt='smiley' />",
-        "#\:smt021#si" => "<img src='".IMAGES."smiley/more/021.gif' alt='smiley' />",
-        "#\:smt023#si" => "<img src='".IMAGES."smiley/more/023.gif' alt='smiley' />",
-        "#\:smt024#si" => "<img src='".IMAGES."smiley/more/024.gif' alt='smiley' />",
-        "#\:smt025#si" => "<img src='".IMAGES."smiley/more/025.gif' alt='smiley' />",
-        "#\:smt026#si" => "<img src='".IMAGES."smiley/more/026.gif' alt='smiley' />",
-        "#\:smt027#si" => "<img src='".IMAGES."smiley/more/027.gif' alt='smiley' />",
-        "#\:smt028#si" => "<img src='".IMAGES."smiley/more/028.gif' alt='smiley' />",
-        "#\:smt029#si" => "<img src='".IMAGES."smiley/more/029.gif' alt='smiley' />",
-        "#\:smt030#si" => "<img src='".IMAGES."smiley/more/030.gif' alt='smiley' />",
-        "#\:smt031#si" => "<img src='".IMAGES."smiley/more/031.gif' alt='smiley' />",
-        "#\:smt032#si" => "<img src='".IMAGES."smiley/more/032.gif' alt='smiley' />",
-        "#\:smt033#si" => "<img src='".IMAGES."smiley/more/033.gif' alt='smiley' />",
-        "#\:smt034#si" => "<img src='".IMAGES."smiley/more/034.gif' alt='smiley' />",
-        "#\:smt035#si" => "<img src='".IMAGES."smiley/more/035.gif' alt='smiley' />",
-        "#\:smt036#si" => "<img src='".IMAGES."smiley/more/036.gif' alt='smiley' />",
-        "#\:smt037#si" => "<img src='".IMAGES."smiley/more/037.gif' alt='smiley' />",
-        "#\:smt038#si" => "<img src='".IMAGES."smiley/more/038.gif' alt='smiley' />",
-        "#\:smt039#si" => "<img src='".IMAGES."smiley/more/039.gif' alt='smiley' />",
-        "#\:smt040#si" => "<img src='".IMAGES."smiley/more/040.gif' alt='smiley' />",
-        "#\:smt041#si" => "<img src='".IMAGES."smiley/more/041.gif' alt='smiley' />",
-        "#\:smt042#si" => "<img src='".IMAGES."smiley/more/042.gif' alt='smiley' />",
-        "#\:smt043#si" => "<img src='".IMAGES."smiley/more/043.gif' alt='smiley' />",
-        "#\:smt044#si" => "<img src='".IMAGES."smiley/more/044.gif' alt='smiley' />",
-        "#\:smt045#si" => "<img src='".IMAGES."smiley/more/045.gif' alt='smiley' />",
-        "#\:smt046#si" => "<img src='".IMAGES."smiley/more/046.gif' alt='smiley' />",
-        "#\:smt047#si" => "<img src='".IMAGES."smiley/more/047.gif' alt='smiley' />",
-        "#\:smt048#si" => "<img src='".IMAGES."smiley/more/048.gif' alt='smiley' />",
-        "#\:smt049#si" => "<img src='".IMAGES."smiley/more/049.gif' alt='smiley' />",
-        "#\:smt050#si" => "<img src='".IMAGES."smiley/more/050.gif' alt='smiley' />",
-        "#\:smt051#si" => "<img src='".IMAGES."smiley/more/051.gif' alt='smiley' />",
-        "#\:smt052#si" => "<img src='".IMAGES."smiley/more/052.gif' alt='smiley' />",
-        "#\:smt053#si" => "<img src='".IMAGES."smiley/more/053.gif' alt='smiley' />",
-        "#\:smt054#si" => "<img src='".IMAGES."smiley/more/054.gif' alt='smiley' />",
-        "#\:smt055#si" => "<img src='".IMAGES."smiley/more/055.gif' alt='smiley' />",
-        "#\:smt056#si" => "<img src='".IMAGES."smiley/more/056.gif' alt='smiley' />",
-        "#\:smt057#si" => "<img src='".IMAGES."smiley/more/057.gif' alt='smiley' />",
-        "#\:smt058#si" => "<img src='".IMAGES."smiley/more/058.gif' alt='smiley' />",
-        "#\:smt059#si" => "<img src='".IMAGES."smiley/more/059.gif' alt='smiley' />",
-        "#\:smt060#si" => "<img src='".IMAGES."smiley/more/060.gif' alt='smiley' />",
-        "#\:smt061#si" => "<img src='".IMAGES."smiley/more/061.gif' alt='smiley' />",
-        "#\:smt062#si" => "<img src='".IMAGES."smiley/more/062.gif' alt='smiley' />",
-        "#\:smt063#si" => "<img src='".IMAGES."smiley/more/063.gif' alt='smiley' />",
-        "#\:smt064#si" => "<img src='".IMAGES."smiley/more/064.gif' alt='smiley' />",
-        "#\:smt065#si" => "<img src='".IMAGES."smiley/more/065.gif' alt='smiley' />",
-        "#\:smt066#si" => "<img src='".IMAGES."smiley/more/066.gif' alt='smiley' />",
-        "#\:smt067#si" => "<img src='".IMAGES."smiley/more/067.gif' alt='smiley' />",
-        "#\:smt068#si" => "<img src='".IMAGES."smiley/more/068.gif' alt='smiley' />",
-        "#\:smt069#si" => "<img src='".IMAGES."smiley/more/069.gif' alt='smiley' />",
-        "#\:smt070#si" => "<img src='".IMAGES."smiley/more/070.gif' alt='smiley' />",
-        "#\:smt073#si" => "<img src='".IMAGES."smiley/more/073.gif' alt='smiley' />",
-        "#\:smt074#si" => "<img src='".IMAGES."smiley/more/074.gif' alt='smiley' />",
-        "#\:smt075#si" => "<img src='".IMAGES."smiley/more/075.gif' alt='smiley' />",
-        "#\:smt076#si" => "<img src='".IMAGES."smiley/more/076.gif' alt='smiley' />",
-        "#\:smt077#si" => "<img src='".IMAGES."smiley/more/077.gif' alt='smiley' />",
-        "#\:smt078#si" => "<img src='".IMAGES."smiley/more/078.gif' alt='smiley' />",
-        "#\:smt079#si" => "<img src='".IMAGES."smiley/more/079.gif' alt='smiley' />",
-        "#\:smt080#si" => "<img src='".IMAGES."smiley/more/080.gif' alt='smiley' />",
-        "#\:smt081#si" => "<img src='".IMAGES."smiley/more/081.gif' alt='smiley' />",
-        "#\:smt082#si" => "<img src='".IMAGES."smiley/more/082.gif' alt='smiley' />",
-        "#\:smt083#si" => "<img src='".IMAGES."smiley/more/083.gif' alt='smiley' />",
-        "#\:smt084#si" => "<img src='".IMAGES."smiley/more/084.gif' alt='smiley' />",
-        "#\:smt085#si" => "<img src='".IMAGES."smiley/more/085.gif' alt='smiley' />",
-        "#\:smt086#si" => "<img src='".IMAGES."smiley/more/086.gif' alt='smiley' />",
-        "#\:smt087#si" => "<img src='".IMAGES."smiley/more/087.gif' alt='smiley' />",
-        "#\:smt088#si" => "<img src='".IMAGES."smiley/more/088.gif' alt='smiley' />",
-        "#\:smt089#si" => "<img src='".IMAGES."smiley/more/089.gif' alt='smiley' />",
-        "#\:smt090#si" => "<img src='".IMAGES."smiley/more/090.gif' alt='smiley' />",
-        "#\:smt091#si" => "<img src='".IMAGES."smiley/more/091.gif' alt='smiley' />",
-        "#\:smt092#si" => "<img src='".IMAGES."smiley/more/092.gif' alt='smiley' />",
-        "#\:smt093#si" => "<img src='".IMAGES."smiley/more/093.gif' alt='smiley' />",
-        "#\:smt084#si" => "<img src='".IMAGES."smiley/more/094.gif' alt='smiley' />",
-        "#\:smt095#si" => "<img src='".IMAGES."smiley/more/095.gif' alt='smiley' />",
-        "#\:smt096#si" => "<img src='".IMAGES."smiley/more/096.gif' alt='smiley' />",
-        "#\:smt097#si" => "<img src='".IMAGES."smiley/more/097.gif' alt='smiley' />",
-        "#\:smt098#si" => "<img src='".IMAGES."smiley/more/098.gif' alt='smiley' />",
-        "#\:smt099#si" => "<img src='".IMAGES."smiley/more/099.gif' alt='smiley' />",
-        "#\:smt101#si" => "<img src='".IMAGES."smiley/more/101.gif' alt='smiley' />",
-        "#\:smt103#si" => "<img src='".IMAGES."smiley/more/103.gif' alt='smiley' />",
-        "#\:smt104#si" => "<img src='".IMAGES."smiley/more/104.gif' alt='smiley' />",
-        "#\:smt105#si" => "<img src='".IMAGES."smiley/more/105.gif' alt='smiley' />",
-        "#\:smt106#si" => "<img src='".IMAGES."smiley/more/106.gif' alt='smiley' />",
-        "#\:smt107#si" => "<img src='".IMAGES."smiley/more/107.gif' alt='smiley' />",
-        "#\:smt108#si" => "<img src='".IMAGES."smiley/more/108.gif' alt='smiley' />",
-        "#\:smt109#si" => "<img src='".IMAGES."smiley/more/109.gif' alt='smiley' />",
-        "#\:smt110#si" => "<img src='".IMAGES."smiley/more/110.gif' alt='smiley' />",
-        "#\:smt111#si" => "<img src='".IMAGES."smiley/more/111.gif' alt='smiley' />",
-        "#\:smt112#si" => "<img src='".IMAGES."smiley/more/112.gif' alt='smiley' />",
-        "#\:smt113#si" => "<img src='".IMAGES."smiley/more/113.gif' alt='smiley' />",
-        "#\:smt114#si" => "<img src='".IMAGES."smiley/more/114.gif' alt='smiley' />",
-        "#\:smt115#si" => "<img src='".IMAGES."smiley/more/115.gif' alt='smiley' />",
-        "#\:smt116#si" => "<img src='".IMAGES."smiley/more/116.gif' alt='smiley' />",
-        "#\:smt117#si" => "<img src='".IMAGES."smiley/more/117.gif' alt='smiley' />",
-        "#\:smt118#si" => "<img src='".IMAGES."smiley/more/118.gif' alt='smiley' />",
-        "#\:smt119#si" => "<img src='".IMAGES."smiley/more/119.gif' alt='smiley' />",
-        "#\:smt120#si" => "<img src='".IMAGES."smiley/more/120.gif' alt='smiley' />",
-        "#\:\)#si" => "<img src='".IMAGES."smiley/smile.gif' alt='smiley' />"
-    );
-    foreach($smiley as $key=>$smiley_img) {
-        $message = preg_replace($key, $smiley_img, $message);
-    }
-    return $message;
-}
-
-// internal function: preg_replace_callback for parseubb, to validate the URL found in [url]
-function _parseubb_checkurl($matches) {
-
-    // if it's a old-style bbcode (not [url=][/url] but [url][/url]), convert it before checking
-    if (empty($matches[2])) {
-        $matches[2] = $matches[3];
-    }
+// validate an IP address
+function isIP($value){
+    return preg_match("/^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$/", $value);
+}
+
+// validate an URL
+function isURL($value, $onlyhttp=false) {
 
     // Build the regex to check the URL
-    $scheme = "(https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/";           // SCHEMES supported
+    if ($onlyhttp) {
+        $scheme = "(https?)\:\/\/";                                             // HTTP SCHEMES supported
+    } else {
+        $scheme = "(https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/";       // ALL SCHEMES supported
+    }
     $urlregex = "^(".$scheme.")?";                                              // make the scheme optional
     $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?";   // USERID + PASSWORD (optional)
@@ -553 +387 @@
     $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@/&%=+\$_.-]*)?";                     // GET querystring (optional)
     $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)?\$";                               // ANCHOR (optional)
+    // validate the URL
+    return eregi($urlregex, $value);
+}
+
+// Parse smiley bbcode into HTML images
+function parsesmileys($message) {
+    $smiley = array(
+        "\:oops\:" => "<img src='".IMAGES."smiley/more/redface.gif' alt='smiley' />",
+        "\:doubt\:" => "<img src='".IMAGES."smiley/more/doubt.gif' alt='smiley' />",
+        "\:thumbleft" => "<img src='".IMAGES."smiley/more/icon_thumleft.gif' alt='smiley' />",
+        "\:thumbright" => "<img src='".IMAGES."smiley/more/icon_thumright.gif' alt='smiley' />",
+        "\:smt004" => "<img src='".IMAGES."smiley/more/004.gif' alt='smiley' />",
+        "\:smt005" => "<img src='".IMAGES."smiley/more/005.gif' alt='smiley' />",
+        "\:smt006" => "<img src='".IMAGES."smiley/more/006.gif' alt='smiley' />",
+        "\:smt007" => "<img src='".IMAGES."smiley/more/007.gif' alt='smiley' />",
+        "\:smt008" => "<img src='".IMAGES."smiley/more/008.gif' alt='smiley' />",
+        "\:smt009" => "<img src='".IMAGES."smiley/more/009.gif' alt='smiley' />",
+        "\:smt010" => "<img src='".IMAGES."smiley/more/010.gif' alt='smiley' />",
+        "\:smt011" => "<img src='".IMAGES."smiley/more/011.gif' alt='smiley' />",
+        "\:smt012" => "<img src='".IMAGES."smiley/more/012.gif' alt='smiley' />",
+        "\:smt013" => "<img src='".IMAGES."smiley/more/013.gif' alt='smiley' />",
+        "\:smt014" => "<img src='".IMAGES."smiley/more/014.gif' alt='smiley' />",
+        "\:smt016" => "<img src='".IMAGES."smiley/more/016.gif' alt='smiley' />",
+        "\:smt017" => "<img src='".IMAGES."smiley/more/017.gif' alt='smiley' />",
+        "\:smt018" => "<img src='".IMAGES."smiley/more/018.gif' alt='smiley' />",
+        "\:smt019" => "<img src='".IMAGES."smiley/more/019.gif' alt='smiley' />",
+        "\:smt020" => "<img src='".IMAGES."smiley/more/020.gif' alt='smiley' />",
+        "\:smt021" => "<img src='".IMAGES."smiley/more/021.gif' alt='smiley' />",
+        "\:smt022" => "<img src='".IMAGES."smiley/more/022.gif' alt='smiley' />",
+        "\:smt023" => "<img src='".IMAGES."smiley/more/023.gif' alt='smiley' />",
+        "\:smt024" => "<img src='".IMAGES."smiley/more/024.gif' alt='smiley' />",
+        "\:smt025" => "<img src='".IMAGES."smiley/more/025.gif' alt='smiley' />",
+        "\:smt026" => "<img src='".IMAGES."smiley/more/026.gif' alt='smiley' />",
+        "\:smt027" => "<img src='".IMAGES."smiley/more/027.gif' alt='smiley' />",
+        "\:smt028" => "<img src='".IMAGES."smiley/more/028.gif' alt='smiley' />",
+        "\:smt029" => "<img src='".IMAGES."smiley/more/029.gif' alt='smiley' />",
+        "\:smt030" => "<img src='".IMAGES."smiley/more/030.gif' alt='smiley' />",
+        "\:smt031" => "<img src='".IMAGES."smiley/more/031.gif' alt='smiley' />",
+        "\:smt032" => "<img src='".IMAGES."smiley/more/032.gif' alt='smiley' />",
+        "\:smt033" => "<img src='".IMAGES."smiley/more/033.gif' alt='smiley' />",
+        "\:smt034" => "<img src='".IMAGES."smiley/more/034.gif' alt='smiley' />",
+        "\:smt035" => "<img src='".IMAGES."smiley/more/035.gif' alt='smiley' />",
+        "\:smt036" => "<img src='".IMAGES."smiley/more/036.gif' alt='smiley' />",
+        "\:smt037" => "<img src='".IMAGES."smiley/more/037.gif' alt='smiley' />",
+        "\:smt038" => "<img src='".IMAGES."smiley/more/038.gif' alt='smiley' />",
+        "\:smt039" => "<img src='".IMAGES."smiley/more/039.gif' alt='smiley' />",
+        "\:smt040" => "<img src='".IMAGES."smiley/more/040.gif' alt='smiley' />",
+        "\:smt041" => "<img src='".IMAGES."smiley/more/041.gif' alt='smiley' />",
+        "\:smt042" => "<img src='".IMAGES."smiley/more/042.gif' alt='smiley' />",
+        "\:smt043" => "<img src='".IMAGES."smiley/more/043.gif' alt='smiley' />",
+        "\:smt044" => "<img src='".IMAGES."smiley/more/044.gif' alt='smiley' />",
+        "\:smt045" => "<img src='".IMAGES."smiley/more/045.gif' alt='smiley' />",
+        "\:smt046" => "<img src='".IMAGES."smiley/more/046.gif' alt='smiley' />",
+        "\:smt047" => "<img src='".IMAGES."smiley/more/047.gif' alt='smiley' />",
+        "\:smt048" => "<img src='".IMAGES."smiley/more/048.gif' alt='smiley' />",
+        "\:smt049" => "<img src='".IMAGES."smiley/more/049.gif' alt='smiley' />",
+        "\:smt050" => "<img src='".IMAGES."smiley/more/050.gif' alt='smiley' />",
+        "\:smt051" => "<img src='".IMAGES."smiley/more/051.gif' alt='smiley' />",
+        "\:smt052" => "<img src='".IMAGES."smiley/more/052.gif' alt='smiley' />",
+        "\:smt053" => "<img src='".IMAGES."smiley/more/053.gif' alt='smiley' />",
+        "\:smt054" => "<img src='".IMAGES."smiley/more/054.gif' alt='smiley' />",
+        "\:smt055" => "<img src='".IMAGES."smiley/more/055.gif' alt='smiley' />",
+        "\:smt056" => "<img src='".IMAGES."smiley/more/056.gif' alt='smiley' />",
+        "\:smt057" => "<img src='".IMAGES."smiley/more/057.gif' alt='smiley' />",
+        "\:smt058" => "<img src='".IMAGES."smiley/more/058.gif' alt='smiley' />",
+        "\:smt059" => "<img src='".IMAGES."smiley/more/059.gif' alt='smiley' />",
+        "\:smt060" => "<img src='".IMAGES."smiley/more/060.gif' alt='smiley' />",
+        "\:smt061" => "<img src='".IMAGES."smiley/more/061.gif' alt='smiley' />",
+        "\:smt062" => "<img src='".IMAGES."smiley/more/062.gif' alt='smiley' />",
+        "\:smt063" => "<img src='".IMAGES."smiley/more/063.gif' alt='smiley' />",
+        "\:smt064" => "<img src='".IMAGES."smiley/more/064.gif' alt='smiley' />",
+        "\:smt065" => "<img src='".IMAGES."smiley/more/065.gif' alt='smiley' />",
+        "\:smt066" => "<img src='".IMAGES."smiley/more/066.gif' alt='smiley' />",
+        "\:smt067" => "<img src='".IMAGES."smiley/more/067.gif' alt='smiley' />",
+        "\:smt068" => "<img src='".IMAGES."smiley/more/068.gif' alt='smiley' />",
+        "\:smt069" => "<img src='".IMAGES."smiley/more/069.gif' alt='smiley' />",
+        "\:smt070" => "<img src='".IMAGES."smiley/more/070.gif' alt='smiley' />",
+        "\:smt073" => "<img src='".IMAGES."smiley/more/073.gif' alt='smiley' />",
+        "\:smt074" => "<img src='".IMAGES."smiley/more/074.gif' alt='smiley' />",
+        "\:smt075" => "<img src='".IMAGES."smiley/more/075.gif' alt='smiley' />",
+        "\:smt076" => "<img src='".IMAGES."smiley/more/076.gif' alt='smiley' />",
+        "\:smt077" => "<img src='".IMAGES."smiley/more/077.gif' alt='smiley' />",
+        "\:smt078" => "<img src='".IMAGES."smiley/more/078.gif' alt='smiley' />",
+        "\:smt079" => "<img src='".IMAGES."smiley/more/079.gif' alt='smiley' />",
+        "\:smt080" => "<img src='".IMAGES."smiley/more/080.gif' alt='smiley' />",
+        "\:smt081" => "<img src='".IMAGES."smiley/more/081.gif' alt='smiley' />",
+        "\:smt082" => "<img src='".IMAGES."smiley/more/082.gif' alt='smiley' />",
+        "\:smt083" => "<img src='".IMAGES."smiley/more/083.gif' alt='smiley' />",
+        "\:smt084" => "<img src='".IMAGES."smiley/more/084.gif' alt='smiley' />",
+        "\:smt085" => "<img src='".IMAGES."smiley/more/085.gif' alt='smiley' />",
+        "\:smt086" => "<img src='".IMAGES."smiley/more/086.gif' alt='smiley' />",
+        "\:smt087" => "<img src='".IMAGES."smiley/more/087.gif' alt='smiley' />",
+        "\:smt088" => "<img src='".IMAGES."smiley/more/088.gif' alt='smiley' />",
+        "\:smt089" => "<img src='".IMAGES."smiley/more/089.gif' alt='smiley' />",
+        "\:smt090" => "<img src='".IMAGES."smiley/more/090.gif' alt='smiley' />",
+        "\:smt091" => "<img src='".IMAGES."smiley/more/091.gif' alt='smiley' />",
+        "\:smt092" => "<img src='".IMAGES."smiley/more/092.gif' alt='smiley' />",
+        "\:smt093" => "<img src='".IMAGES."smiley/more/093.gif' alt='smiley' />",
+        "\:smt084" => "<img src='".IMAGES."smiley/more/094.gif' alt='smiley' />",
+        "\:smt095" => "<img src='".IMAGES."smiley/more/095.gif' alt='smiley' />",
+        "\:smt096" => "<img src='".IMAGES."smiley/more/096.gif' alt='smiley' />",
+        "\:smt097" => "<img src='".IMAGES."smiley/more/097.gif' alt='smiley' />",
+        "\:smt098" => "<img src='".IMAGES."smiley/more/098.gif' alt='smiley' />",
+        "\:smt099" => "<img src='".IMAGES."smiley/more/099.gif' alt='smiley' />",
+        "\:smt101" => "<img src='".IMAGES."smiley/more/101.gif' alt='smiley' />",
+        "\:smt103" => "<img src='".IMAGES."smiley/more/103.gif' alt='smiley' />",
+        "\:smt104" => "<img src='".IMAGES."smiley/more/104.gif' alt='smiley' />",
+        "\:smt105" => "<img src='".IMAGES."smiley/more/105.gif' alt='smiley' />",
+        "\:smt106" => "<img src='".IMAGES."smiley/more/106.gif' alt='smiley' />",
+        "\:smt107" => "<img src='".IMAGES."smiley/more/107.gif' alt='smiley' />",
+        "\:smt108" => "<img src='".IMAGES."smiley/more/108.gif' alt='smiley' />",
+        "\:smt109" => "<img src='".IMAGES."smiley/more/109.gif' alt='smiley' />",
+        "\:smt110" => "<img src='".IMAGES."smiley/more/110.gif' alt='smiley' />",
+        "\:smt111" => "<img src='".IMAGES."smiley/more/111.gif' alt='smiley' />",
+        "\:smt112" => "<img src='".IMAGES."smiley/more/112.gif' alt='smiley' />",
+        "\:smt113" => "<img src='".IMAGES."smiley/more/113.gif' alt='smiley' />",
+        "\:smt114" => "<img src='".IMAGES."smiley/more/114.gif' alt='smiley' />",
+        "\:smt115" => "<img src='".IMAGES."smiley/more/115.gif' alt='smiley' />",
+        "\:smt116" => "<img src='".IMAGES."smiley/more/116.gif' alt='smiley' />",
+        "\:smt117" => "<img src='".IMAGES."smiley/more/117.gif' alt='smiley' />",
+        "\:smt118" => "<img src='".IMAGES."smiley/more/118.gif' alt='smiley' />",
+        "\:smt119" => "<img src='".IMAGES."smiley/more/119.gif' alt='smiley' />",
+        "\:smt120" => "<img src='".IMAGES."smiley/more/120.gif' alt='smiley' />",
+        "\:boring" => "<img src='".IMAGES."smiley/more/015.gif' alt='smiley' />",
+        "\:smt071" => "<img src='".IMAGES."smiley/more/071.gif' alt='smiley' />",
+        "\:smt102" => "<img src='".IMAGES."smiley/more/102.gif' alt='smiley' />",
+        "\:smt100" => "<img src='".IMAGES."smiley/more/100.gif' alt='smiley' />",
+        "\:shock\:" => "<img src='".IMAGES."smiley/more/shock.gif' alt='smiley' />",
+        "\:lol\:" => "<img src='".IMAGES."smiley/more/lol.gif' alt='smiley' />",
+        "\:razz\:" => "<img src='".IMAGES."smiley/more/razz.gif' alt='smiley' />",
+        "\:cry\:" => "<img src='".IMAGES."smiley/more/cry.gif' alt='smiley' />",
+        "\:evil\:" => "<img src='".IMAGES."smiley/more/evil.gif' alt='smiley' />",
+        "\:twisted\:" => "<img src='".IMAGES."smiley/more/icon_twisted.gif' alt='smiley' />",
+        "\:roll\:" => "<img src='".IMAGES."smiley/more/rolleyes.gif' alt='smiley' />",
+        "\:wink\:" => "<img src='".IMAGES."smiley/more/wink.gif' alt='smiley' />",
+        "\:idea\:" => "<img src='".IMAGES."smiley/more/idea.gif' alt='smiley' />",
+        "\:arrow\:" => "<img src='".IMAGES."smiley/more/arrow.gif' alt='smiley' />",
+        "\:mrgreen\:" => "<img src='".IMAGES."smiley/more/icon_mrgreen.gif' alt='smiley' />",
+        "\:badgrin\:" => "<img src='".IMAGES."smiley/more/badgrin.gif' alt='smiley' />",
+        "\;\)" => "<img src='".IMAGES."smiley/wink.gif' alt='smiley' />",
+        "\:\(" => "<img src='".IMAGES."smiley/sad.gif' alt='smiley' />",
+        "\:\|" => "<img src='".IMAGES."smiley/frown.gif' alt='smiley' />",
+        "\:o" => "<img src='".IMAGES."smiley/shock.gif' alt='smiley' />",
+        "\:p" => "<img src='".IMAGES."smiley/pfft.gif' alt='smiley' />",
+        "b\)" => "<img src='".IMAGES."smiley/cool.gif' alt='smiley' />",
+        "\:d" => "<img src='".IMAGES."smiley/grin.gif' alt='smiley' />",
+        "\:@" => "<img src='".IMAGES."smiley/angry.gif' alt='smiley' />",
+        "=D&gt;" => "<img src='".IMAGES."smiley/more/eusa_clap.gif' alt='smiley' />",
+        "\\\:D/" => "<img src='".IMAGES."smiley/more/eusa_dance.gif' alt='smiley' />",
+        "\:D" => "<img src='".IMAGES."smiley/more/biggrin.gif' alt='smiley' />",
+        "\:\-D" => "<img src='".IMAGES."smiley/more/003.gif' alt='smiley' />",
+        "\:\-\)" => "<img src='".IMAGES."smiley/more/001.gif' alt='smiley' />",
+        "\:\(" => "<img src='".IMAGES."smiley/more/sad.gif' alt='smiley' />",
+        "\:o" => "<img src='".IMAGES."smiley/more/surprised.gif' alt='smiley' />",
+        "8\)" => "<img src='".IMAGES."smiley/more/cool.gif' alt='smiley' />",
+        "\:x" => "<img src='".IMAGES."smiley/more/mad.gif' alt='smiley' />",
+        "\:\-x" => "<img src='".IMAGES."smiley/more/icon_mad.gif' alt='smiley' />",
+        "\:P" => "<img src='".IMAGES."smiley/more/icon_razz.gif' alt='smiley' />",
+        "\;\-\)" => "<img src='".IMAGES."smiley/more/002.gif' alt='smiley' />",
+        "\:\!\:" => "<img src='".IMAGES."smiley/more/exclaim.gif' alt='smiley' />",
+        "\:\?\:" => "<img src='".IMAGES."smiley/more/question.gif' alt='smiley' />",
+        "\:\?" => "<img src='".IMAGES."smiley/more/confused.gif' alt='smiley' />",
+        "\:\|" => "<img src='".IMAGES."smiley/more/neutral.gif' alt='smiley' />",
+        "\#\-o" => "<img src='".IMAGES."smiley/more/eusa_doh.gif' alt='smiley' />",
+        "\=P\~" => "<img src='".IMAGES."smiley/more/eusa_drool.gif' alt='smiley' />",
+        "\:\^o" => "<img src='".IMAGES."smiley/more/eusa_liar.gif' alt='smiley' />",
+        "\[\-X" => "<img src='".IMAGES."smiley/more/eusa_naughty.gif' alt='smiley' />",
+        "\[\-o\<\;" => "<img src='".IMAGES."smiley/more/eusa_pray.gif' alt='smiley' />",
+        "8\-\[" => "<img src='".IMAGES."smiley/more/eusa_shifty.gif' alt='smiley' />",
+        "\[\-\(" => "<img src='".IMAGES."smiley/more/eusa_snooty.gif' alt='smiley' />",
+        "\:\-k" => "<img src='".IMAGES."smiley/more/eusa_think.gif' alt='smiley' />",
+        "\]\(\*\,\)" => "<img src='".IMAGES."smiley/more/eusa_wall.gif' alt='smiley' />",
+        "\:\-\"" => "<img src='".IMAGES."smiley/more/eusa_whistle.gif' alt='smiley' />",
+        "O\:\)" => "<img src='".IMAGES."smiley/more/eusa_angel.gif' alt='smiley' />",
+        "\=\;" => "<img src='".IMAGES."smiley/more/eusa_hand.gif' alt='smiley' />",
+        "\:\-\&" => "<img src='".IMAGES."smiley/more/eusa_sick.gif' alt='smiley' />",
+        "\:\-\(\{\|\=" => "<img src='".IMAGES."smiley/more/eusa_boohoo.gif' alt='smiley' />",
+        "\:\-\$" => "<img src='".IMAGES."smiley/more/eusa_shhh.gif' alt='smiley' />",
+        "\:\-s" => "<img src='".IMAGES."smiley/more/eusa_eh.gif' alt='smiley' />",
+        "\:\-\#" => "<img src='".IMAGES."smiley/more/eusa_silenced.gif' alt='smiley' />",
+        "\:\)" => "<img src='".IMAGES."smiley/smile.gif' alt='smiley' />"
+    );
+    foreach($smiley as $key=>$smiley_img) {
+        $search = "#([[:space:]])".$key."([[:space:]])?#si";
+        $replace = "\\1".$smiley_img."\\2";
+        $message = preg_replace($search, $replace, $message);
+    }
+    return $message;
+}
+
+// internal function: preg_replace_callback for parseubb, to validate the URL found in [url]
+function _parseubb_checkurl($matches) {
+
+    // if it's a old-style bbcode (not [url=][/url] but [url][/url]), convert it before checking
+    if (empty($matches[2])) {
+        $matches[2] = $matches[3];
+    }
 
     // validate the URL (in $matches[1])
-    if (eregi($urlregex, $matches[2])) {
+    if (isURL($matches[2])) {
         // check if the URL is prefixed. If not, assume http://
-        if (!eregi("^(".$scheme."){1}", $matches[2])) {
+        if (!eregi("^((https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/){1}", $matches[2])) {
             $matches[2] = "http://".$matches[2];
         }
@@ -566 +597 @@
         return stripinput($matches[0]);
     }
+}
+
+// internal function: preg_replace_callback for parseubb, to validate the IMG found in [img]
+function _parseubb_checkimg($matches) {
+    global $locale;
+
+    // validate the URL (in $matches[1])
+    if (isURL($matches[1], true)) {
+        if (verify_image($matches[1])) {
+            return "<img src=\"".$matches[1]."\" style=\"border:0px\" alt=\"\" />";
+        }
+    }
+    // return a sanitized version of the orginal BBcode
+    return stripinput($matches[0]);
 }
 
@@ -580 +625 @@
     $text = preg_replace('#\[center\](.*?)\[/center\]#si', '<center>\1</center>', $text);
 
-    // new youtube bbcode
-    $text = preg_replace('#\[youtube\](.*?)\[/youtube\]#si', '<object type="application/x-shockwave-flash" width="425" height="350" data="http://www.youtube.com/v/\1"><param name="movie" value="http://www.youtube.com/v/\1"></param><param name="wmode" value="transparent"></param></object>', $text);
-
     // new wiki bbcode
     if (isset($settings['wiki_forum_links']) && $settings['wiki_forum_links']) {
         // add the link to the wiki page
-        $text = preg_replace('#\[wiki\](.*?)\[/wiki\]#si', '<a href="'.BASEDIR.'modules/wiki/index.php?wakka=\1" class="wiki_link" title="ExiteCMS Wiki">\1</a>', $text);
+        $text = preg_replace('#\[wiki\](.*?)\[/wiki\]#si', '<a href="'.BASEDIR.'modules/wiki/index.php?wakka=\1" class="wiki_link" title="'.$settings['wiki_wakka_name'].'">\1</a>', $text);
     } else {
         // strip the wiki bbcode
@@ -601 +643 @@
     $text = preg_replace('#\[mail\]([\r\n]*)([^\s\'\";:\+]*?)([\r\n]*)\[/mail\]#si', '<a href=\'mailto:\2\'>\2</a>', $text);
     $text = preg_replace('#\[mail=([\r\n]*)([^\s\'\";:\+]*?)\](.*?)([\r\n]*)\[/mail\]#si', '<a href=\'mailto:\2\'>\3</a>', $text);
-    
+    // small    
     $text = preg_replace('#\[small\](.*?)\[/small\]#si', '<span class=\'small\'>\1</span>', $text);
+    // color
     $text = preg_replace('#\[color=(\#[0-9a-fA-F]{6}|black|blue|brown|cyan|grey|green|lime|maroon|navy|olive|orange|purple|red|silver|violet|white|yellow)\](.*?)\[/color\]#si', '<span style=\'color:\1\'>\2</span>', $text);
-    
+    // new youtube bbcode
+    $text = preg_replace('#\[youtube\](.*?)\[/youtube\]#si', '<object type="application/x-shockwave-flash" width="425" height="350" data="http://www.youtube.com/v/\1"><param name="movie" value="http://www.youtube.com/v/\1"></param><param name="wmode" value="transparent"></param></object>', $text);
+    // flash movies
     $text = preg_replace('#\[flash width=([0-9]*?) height=([0-9]*?)\]([^\s\'\";:\+]*?)(\.swf)\[/flash\]#si', '<object classid=\'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\' codebase=\'http://active.macromedia.com/flash6/cabs/swflash.cab#version=6,0,0,0\' id=\'\3\4\' width=\'\1\' height=\'\2\'><param name=movie value=\'\3\4\'><param name=\'quality\' value=\'high\'><param name=\'bgcolor\' value=\'#ffffff\'><embed src=\'\3\4\' quality=\'high\' bgcolor=\'#ffffff\' width=\'\1\' height=\'\2\' type=\'application/x-shockwave-flash\' pluginspage=\'http://www.macromedia.com/go/getflashplayer\'></embed></object>', $text);
-    $text = preg_replace("#\[img\]((http|ftp|https|ftps)://)(.*?)(\.(jpg|jpeg|gif|png|JPG|JPEG|GIF|PNG))\[/img\]#sie","'<img src=\'\\1'.str_replace(array('.php','?','&','='),'','\\3').'\\4\' style=\'border:0px\' alt=\'\' />'",$text);
-
+    // images
+    if (ini_get('allow_url_fopen')) {
+        $text = preg_replace_callback('#\[img\](.*?)\[/img\]#si', '_parseubb_checkimg', $text);
+    } else {
+        $text = preg_replace("#\[img\]((http|ftp|https|ftps)://)(.*?)(\.(jpg|jpeg|gif|png|JPG|JPEG|GIF|PNG))\[/img\]#sie","'<img src=\'\\1'.str_replace(array('.php','?','&','='),'','\\3').'\\4\' style=\'border:0px\' alt=\'\' />'",$text);
+    }
+    // quotes
     $text = preg_replace('#\[quote=([\r\n]*)(.*?)\]#si', '<b>\2 '.$locale['199'].':</b><br />[quote]', $text);
-
     $qcount = substr_count($text, "[quote]"); $ccount = substr_count($text, "[code]");
     for ($i=0;$i < $qcount;$i++) $text = preg_replace('#\[quote\](.*?)\[/quote\]#si', '<div class=\'quote\'>\1</div>', $text);
@@ -646 +695 @@
     $text = preg_replace('#([a-z]*)=([\`\'\"]*)javascript:#iU', '$1=$2nojavascript...', $text);
     $text = preg_replace('#([a-z]*)=([\'\"]*)vbscript:#iU', '$1=$2novbscript...', $text);
-        //<span style="width: expression(alert('Ping!'));"></span> (only affects ie...)
     $text = preg_replace('#(<[^>]+)style=([\`\'\"]*).*expression\([^>]*>#iU', "$1>", $text);
     $text = preg_replace('#(<[^>]+)style=([\`\'\"]*).*behaviour\([^>]*>#iU', "$1>", $text);
@@ -660 +708 @@
 // Scan image files for malicious code
 function verify_image($file) {
-    $txt = file_get_contents($file);
     $image_safe = true;
-    if (preg_match('#&(quot|lt|gt|nbsp);#i', $txt)) { $image_safe = false; }
-    elseif (preg_match("#&\#x([0-9a-f]+);#i", $txt)) { $image_safe = false; }
-    elseif (preg_match('#&\#([0-9]+);#i', $txt)) { $image_safe = false; }
-    elseif (preg_match("#([a-z]*)=([\`\'\"]*)script:#iU", $txt)) { $image_safe = false; }
-    elseif (preg_match("#([a-z]*)=([\`\'\"]*)javascript:#iU", $txt)) { $image_safe = false; }
-    elseif (preg_match("#([a-z]*)=([\'\"]*)vbscript:#iU", $txt)) { $image_safe = false; }
-    elseif (preg_match("#(<[^>]+)style=([\`\'\"]*).*expression\([^>]*>#iU", $txt)) { $image_safe = false; }
-    elseif (preg_match("#(<[^>]+)style=([\`\'\"]*).*behaviour\([^>]*>#iU", $txt)) { $image_safe = false; }
-    elseif (preg_match("#</*(applet|link|style|script|iframe|frame|frameset)[^>]*>#i", $txt)) { $image_safe = false; }
+    if (file_exists($file)) {
+        $er = error_reporting(0);
+        // get info about the image
+        $imginfo = @getimagesize($file);
+        // get the file contents
+        $txt = file_get_contents($file);
+        error_reporting($er);
+        if ($imginfo === false) { $image_safe = false; }
+        if ($txt === false) { $image_safe = false; }
+        elseif (preg_match('#&(quot|lt|gt|nbsp);#i', $txt)) { $image_safe = false; }
+        elseif (preg_match("#&\#x([0-9a-f]+);#i", $txt)) { $image_safe = false; }
+        elseif ($imginfo[2] != 5 && preg_match('#&\#([0-9]+);#i', $txt)) { $image_safe = false; }   // skip for psd files
+        elseif (preg_match("#([a-z]*)=([\`\'\"]*)script:#iU", $txt)) { $image_safe = false; }
+        elseif (preg_match("#([a-z]*)=([\`\'\"]*)javascript:#iU", $txt)) { $image_safe = false; }
+        elseif (preg_match("#([a-z]*)=([\'\"]*)vbscript:#iU", $txt)) { $image_safe = false; }
+        elseif (preg_match("#(<[^>]+)style=([\`\'\"]*).*expression\([^>]*>#iU", $txt)) { $image_safe = false; }
+        elseif (preg_match("#(<[^>]+)style=([\`\'\"]*).*behaviour\([^>]*>#iU", $txt)) { $image_safe = false; }
+        elseif (preg_match("#</*(applet|link|style|script|iframe|frame|frameset)[^>]*>#i", $txt)) { $image_safe = false; }
+    }
     return $image_safe;
 }
@@ -981 +1038 @@
     }
 }
+
+
+// replacement for die()
+function terminate($text) {
+    die("<div style='font-family:Verdana,Sans-serif;font-size:11px;text-align:center;'>$text</div>");
+}
 ?>

branches/PLi-Fusion/includes/db_functions.php

@@ -24 +24 @@
 // database global variables
 $_db_debug = false;
-$_db_log = false;
+$_db_log = true;
 $_db_logs = array();
 $_db_last_function = "";
@@ -53 +53 @@
 
 // MySQL database functions
-function dbquery($query, $display=true) {
-
-    global $_db_last_function, $_db_debug, $_db_log, $_db_logs, $_loadstats;
+function dbquery($query, $display=false) {
+
+    global $_db_last_function, $_db_debug, $_db_log, $_db_logs, $_loadstats, $settings;
 
     // update the query for relocated user tables
     ModUserTables($query);
-
-    $_s_loadtime = explode(" ", microtime());
-    $_s_loadtime = $_s_loadtime[1] + $_s_loadtime[0];
-    $_loadstats['querytime'] -= $_s_loadtime;
 
     if ($_db_debug) {
@@ -87 +83 @@
     }
 
-    $result = @mysql_query($query);
+    $_s_loadtime = explode(" ", microtime());
+    $_s_loadtime = (float)$_s_loadtime[1] + (float)$_s_loadtime[0];
+
+    $result = mysql_query($query);
+
+    $_e_loadtime = explode(" ", microtime());
+    $_e_loadtime = (float)$_e_loadtime[1] + (float)$_e_loadtime[0];
+
+    $_loadstats['querytime'] = $_loadstats['querytime'] + $_e_loadtime - $_s_loadtime;
+
     if (!$result) {
-        if ($display) {
+        if ($display || $settings['debug_querylog']) {
             echo "<pre><br />Query: ".$query."<br />";
             echo mysql_error();
             echo "</pre>";