Changeset 1524 in ExiteCMS

Timestamp:

07/05/08 12:58:33 (4 years ago)

Author:

hverton

Message:

added code coloring for [code] bbcode sections, and an option to download the code
fixed a bug with pm read timestamps
registration now sends a pm to the webmaster when new user activation is set to admin-approval
user activation has been extended to work with both manual approvals and with email verification

Location:

trunk

Files:

• administration/activation.php (modified) (2 diffs)
• administration/tools/language_pack_English.php (modified) (1 diff)
• administration/tools/language_pack_Nederlands.php (modified) (1 diff)
• files/locales/en.main.global.php (modified) (1 diff)
• forum/post.php (modified) (2 diffs)
• forum/viewthread.php (modified) (1 diff)
• getfile.php (modified) (5 diffs)
• includes/forum_functions_include.php (modified) (3 diffs)
• includes/jscripts/core_functions.js (modified) (1 diff)
• includes/templates/admin.activation.tpl (modified) (1 diff)
• includes/templates/forum.viewthread.tpl (modified) (2 diffs)
• includes/templates/main.pm.renderpm.tpl (modified) (1 diff)
• includes/templates/main.pm.tpl (modified) (1 diff)
• pm.php (modified) (1 diff)
• register.php (modified) (5 diffs)
• themes/ExiteCMS/templates/templates/_stylesheets.tpl (modified) (3 diffs)

trunk/administration/activation.php

@@ -30 +30 @@
 // activate a newly registered user
 if ($step == "activate") {
-    $usercode = stripinput($_GET['user_code']);
-    $result = dbquery("SELECT * FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
-    if (dbrows($result)) {
-        $data = dbarray($result);
-        $data = array_merge($data, unserialize($data['user_info']));
-        $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_offset, user_posts, user_joined, user_level, user_ip, user_status) VALUES('".$data['user_name']."', '".$data['user_fullname']."', md5(md5('".$data['user_password']."')), '".$data['user_email']."', '".$data['user_hide_email']."', '".$data['user_offset']."', '0', '".time()."', '101', '".$data['user_ip']."', '0')");
-        $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
+    // check which kind of activation is needed
+    if (isset($_GET['user_code'])) {
+        $usercode = stripinput($_GET['user_code']);
+        $result = dbquery("SELECT * FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
+        if (dbrows($result)) {
+            $data = dbarray($result);
+            $data = array_merge($data, unserialize($data['user_info']));
+            $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_offset, user_posts, user_joined, user_level, user_ip, user_status) VALUES('".$data['user_name']."', '".$data['user_fullname']."', md5(md5('".$data['user_password']."')), '".$data['user_email']."', '".$data['user_hide_email']."', '".$data['user_offset']."', '0', '".time()."', '101', '".$data['user_ip']."', '0')");
+            $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code = '$usercode'");
+        }
+    } elseif (isset($_GET['user_id'])) {
+        $user_id = stripinput($_GET['user_id']);
+        if (isNum($user_id)) {
+            $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_id = '$user_id'");
+            if (dbrows($result)) {
+                $result = dbquery("UPDATE ".$db_prefix."users SET user_status = '0' WHERE user_id = '$user_id'");
+            }
+        }
     }
 }
@@ -49 +60 @@
 $variables['newusers'] = array();
 
-$result = dbquery("SELECT * FROM ".$db_prefix."new_users ORDER BY user_datestamp");
-while ($data = dbarray($result)) {
-    $variables['newusers'][] = array_merge($data, unserialize($data['user_info']));
+// when using email verification...
+if ($settings['email_verification'] == '1') {
+    // get the users from the new_users table
+    $result = dbquery("SELECT * FROM ".$db_prefix."new_users ORDER BY user_datestamp");
+    while ($data = dbarray($result)) {
+        $variables['newusers'][] = array_merge($data, unserialize($data['user_info']));
+    }
+} else {
+    // otherwise they are in the users tabel with a user_status of 2
+    $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_status = '2' ORDER BY user_joined");
+    while ($data = dbarray($result)) {
+        $variables['newusers'][] = $data;
+    }
 }
 

trunk/administration/tools/language_pack_English.php

@@ -2993 +2993 @@
         $localestrings['507'] = "The registration system is currently disabled.";
         $localestrings['508'] = "New code";
+        $localestrings['509'] = "New user awaiting activation";
+        $localestrings['510'] = "The user '%s' has registered, please go the the user administration section to activate the new account";
         $localestrings['550'] = "Please specify a user name.";
         $localestrings['551'] = "Please specify a password.";

trunk/administration/tools/language_pack_Nederlands.php

@@ -2993 +2993 @@
         $localestrings['507'] = "Het registratie systeem is momenteel uitgeschakeld.";
         $localestrings['508'] = "Nieuwe code";
+        $localestrings['509'] = "Nieuwe gebruiker wacht op activatie";
+        $localestrings['510'] = "De gebruiker '%s' heeft zich geregistreerd, ga a.u.b. naar de gebruikers administratie en activeer deze nieuwe gebruiker.";
         $localestrings['550'] = "Voer a.u.b. een gebruikersnaam in.";
         $localestrings['551'] = "Voer a.u.b. een wachtwoord in.";

trunk/files/locales/en.main.global.php

@@ -3 +3 @@
 // locale       : English
 // locale name  : main.global
-// generated on : Thu Jul 3 2008, 16:01:33 CEST
+// generated on : Sat Jul 5 2008, 12:21:41 CEST
 // translators  : ExiteCMS team,WanWizard
 // ----------------------------------------------------------

trunk/forum/post.php

@@ -415 +415 @@
                 $preview['post_message'] = $locale['421'];
             }
-            $preview['post_message'] = parsemessage($preview['post_message'], $preview['post_smileys']);
+            $preview['post_message'] = parsemessage($preview);
             $preview['post_reply_id'] = $reply_id;
             if ($reply_id != 0) {
@@ -447 +447 @@
             // add information about the current user
             $preview = array_merge($preview, $userdata);
-            $preview['user_sig'] = parsemessage($preview['user_sig'], $preview['post_smileys']);
+            $_x = $preview['user_message'];
+            $preview['user_message'] = $preview['user_sig'];
+            $preview['user_sig'] = parsemessage($preview);
+            $preview['user_message'] = $_x;
             // process attachments
             if ($settings['attachments'] == "1" && $fdata['forum_attach'] == "1") {

trunk/forum/viewthread.php

@@ -419 +419 @@
         if (!file_exists(PATH_IMAGES."avatars/".$data['user_avatar'])) $data['user_avatar'] = "imagenotfound.jpg";
         // prepare the message text for display
-        $data['post_message'] = parsemessage($data['post_message'], $data['post_smileys']);
+        $data['post_message'] = parsemessage($data);
 
         // prepare the users signature

trunk/getfile.php

@@ -262 +262 @@
         case "cc":
         case "c":
+        case "c++":
         case "hh":
         case "php":
@@ -310 +311 @@
 
 // parameter validation
-if (!isset($file_id) || !isNum($file_id)) {
-    terminate("<b>Invalid or missing file ID.</b>");
-}
 if (!isset($type)) {
     terminate("<b>Missing file type.</b>");
+}
+switch ($type) {
+    case "fc":
+        if (!isset($forum_id) || !isNum($forum_id) || !isset($thread_id) || !isNum($thread_id) || !isset($post_id) || !isNum($post_id) || !isset($id) || !isNum($id)) {
+            terminate("<b>Invalid or missing message ID.</b>");
+        }
+        break;
+    default:
+        if (!isset($file_id) || !isNum($file_id)) {
+            terminate("<b>Invalid or missing file ID.</b>");
+        }
 }
 
@@ -353 +362 @@
         $result = dbquery("UPDATE ".$db_prefix."forum_attachments SET attach_count=attach_count+1 WHERE attach_id='$file_id'");
         // define the required parameters for the download
+        $source = "file";
         $filename = $attachment['attach_name'];
         $filepath = PATH_ATTACHMENTS;
         $downloadname = $attachment['attach_realname'] == "" ? $attachment['attach_name'] : $attachment['attach_realname'];
+        break;
+
+    case "fc":  // forum code blocks
+        // check if the requester has read access to the forum
+        $forum = dbarray(dbquery("SELECT * FROM ".$db_prefix."forums WHERE forum_id = '".$forum_id."'"));
+        if (!is_array($forum)) {
+            terminate("<b>Invalid or missing message 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'])) {
+            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
+        if (!iMEMBER && $forum['forum_access'] != 0) {
+            // Not public, authentication is required
+            auth_BasicAuthentication();
+        }
+        // check if the requested message exists, if so retrieve the information
+        $message = dbarray(dbquery("SELECT * FROM ".$db_prefix."posts WHERE forum_id='$forum_id' AND thread_id='$thread_id' AND post_id='$post_id'"));
+        if (!is_array($message)) {
+            terminate("<b>Invalid or missing message ID.</b>");
+        }
+        // get the code blocks from the message body
+        require PATH_INCLUDES."forum_functions_include.php";
+        // strip CODE bbcode, optionally perform Geshi color coding
+        $codeblocks = array();
+        $raw_color_blocks = true;
+        $message = preg_replace_callback('#\[code(=.*?)?\](.*?)([\r\n]*)\[/code\]#si', '_parseubb_codeblock', $message['post_message']);
+        // do we have the requested code block?
+        if (!isset($codeblocks[$id])) {
+            terminate("<b>Invalid or missing message ID.</b>");
+        }
+        $source = "var";
+        $downloadname = "file.".($codeblocks[$id][1]==""?"txt":$codeblocks[$id][1]);
+        $downloaddata = _unhtmlentities($codeblocks[$id][0]);
         break;
 
@@ -375 +420 @@
         }
         // define the required parameters for the download
+        $source = "file";
         $filename = $attachment['pmattach_name'];
         $filepath = PATH_PM_ATTACHMENTS;
@@ -395 +441 @@
 // define the download parameters and start the download
 $object = new httpdownload;
-$object->set_mime(setmime($filename));
-$object->set_byfile($filepath.$filename);
-$object->set_filename($downloadname);
-$object->use_resume = false;
+
+switch($source) {
+    case "file":
+        $object->set_mime(setmime($filename));
+        $object->set_byfile($filepath.$filename);
+        $object->set_filename($downloadname);
+        $object->use_resume = false;
+        break;
+    case "var":
+        $object->set_mime(setmime($downloadname));
+        $object->set_bydata($downloaddata);
+        $object->set_filename($downloadname);
+        $object->use_resume = false;
+        break;
+}
+
 $object->download();
 ?>

trunk/includes/forum_functions_include.php

@@ -14 +14 @@
 +----------------------------------------------------*/
 if (eregi("forum_functions_include.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die();
+
+$current_message = array();
+$codeblocks = array();
+$urlblocks = array();
+$blockcount = 0;
+$raw_color_blocks = false;
 
 // add a poll vote to the database
@@ -313 +319 @@
 }
 
-// parse the [code] sections in a post
-function parsemessage($rawmsg, $smileys=true) {
-
-    global $settings, $db_prefix;
-    
-    // temp message storage
-    $message = "";
+function _unhtmlentities($string) {
+
+    $string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string);
+    $string = preg_replace('~&#([0-9]+);~e', 'chr("\\1")', $string);
+    // replace literal entities
+    $trans_tbl = get_html_translation_table(HTML_ENTITIES);
+    $trans_tbl = array_flip($trans_tbl);
+    return strtr($string, $trans_tbl);
+}
+
+function _parseubb_codeblock($matches) {
+    global $codeblocks, $blockcount, $current_message, $raw_color_blocks;
+
+    // empty code block?
+    if (trim($matches[2]) == "") {
+        // remove the code block entirely
+        return "";
+    }
+    // trim the values passed
+    $matches[1] = trim(substr($matches[1],1));
+
+    if ($raw_color_blocks == false) {
+        require_once PATH_GESHI."/geshi.php";
+        $geshi =& new GeSHi("", "");
+        // colorize the code
+        $geshi->set_language($matches[1]);
+        $geshi->set_header_type(GESHI_HEADER_DIV);
+        $geshi->set_tab_width(4);
+        $geshi->set_source(_unhtmlentities($matches[2]));
+        $matches[2] = $geshi->parse_code();
+    }
+
+    if ($raw_color_blocks) {
+        $codeblocks[] = array($matches[2], $matches[1]);
+        return true;
+    }
+
+    // generate the linenumbers
+    $ln = "";
+    $cnt = substr_count($matches[2], "\n")+1;
+    for ($i=1;$i<=$cnt;$i++) {
+        $ln .= $i."<br />";
+    }
+    $id = count($codeblocks);
+    ++$blockcount;
+    $link = "<img src='".THEME."images/panel_on.gif' alt='' title='Toggle full code view' name='b_code_".$id."' onclick=\"javascript:flipOverflow('code_".$id."')\" />";
+    $link .= "<div class='side' style='display:inline;'> <a href='".BASEDIR."getfile.php?type=fc&amp;forum_id=".$current_message['forum_id']."&amp;thread_id=".$current_message['thread_id']."&amp;post_id=".$current_message['post_id']."&amp;id=".$id."' title='download this ".$matches[1]." code'>download</a> </div>";
+    $codeblocks[] = array("
+    <div id='box_code_".$id."' class='codecontainer'>
+    <table class='codeblock' cellpadding='0' cellspacing='0'>
+        <tr style='padding:0px;margin:0px;'>
+            <td class='codenr'>".$ln."</td>
+            <td class='code'>".$matches[2]."</td>
+        </tr>
+    </table>
+    </div>".$link."
+    ", $matches[1]);
+    return "{**@".($id)."@**}";
+}
+
+function _parseubb_urlblock($matches) {
+    global $urlblocks;
+
+    $urlblocks[] = array($matches[1]=="="?$matches[2]:substr($matches[1],1), $matches[2]);
+    return "{@@*".(count($urlblocks)-1)."*@@}";
+}
+
+// message parser, strip [code] and [url] sections, parse for BBcode and smiley's, then insert the sections again
+function parsemessage($msg_array) {
+    global $settings, $db_prefix, $codeblocks, $urlblocks, $current_message;
+
+    // validate the parameters
+    if (!is_array($msg_array) || !isset($msg_array['post_message']) || !isset($msg_array['post_smileys'])) {
+        return "";
+    }
+
+    $current_message = $msg_array;
+    $rawmsg = $msg_array['post_message'];
+    $smileys = $msg_array['post_smileys'];
+
+    // make sure these are empty!
     $codeblocks = array();
-
-    // Split off the [code] blocks to exclude them from BBcode parsing
-    
-    // find the code [code] occurence
-    $i = strpos($rawmsg, "[code]");
-
-    // loop through the message until all are found and processed
-    while ($i !== false) {
-        // strip the bit before the [code] BBcode, and add a placeholder
-        $message .= substr($rawmsg, 0, $i+6)."{**@@**}";
-        // strip the processed bit
-        $rawmsg = substr($rawmsg, $i+6);
-        // find the end of the [code] block
-        $j = strpos($rawmsg, "[/code]");
-        // if not found, add the remaining bit, a forced [/code], and stop processing
-        if ($j === false) {
-            $message = str_replace("{**@@**}", $rawmsg, $message);
-            break;
-        }
-        // store this code block (convert the & to prevent entity replacement upon display)
-        $codeblocks[] = substr($rawmsg, 0, $j);
-        // strip the processed bit
-        $rawmsg = substr($rawmsg, $j);
-        // check if there are more code segments
-        $i = strpos($rawmsg, "[code]");
-    }
-
-    // any text left?
-    if (strlen($rawmsg)) $message .= $rawmsg;
-
-    // Split off the [url] blocks to exclude them from url parsing
-    $rawmsg = $message;
-    $message = "";
     $urlblocks = array();
 
-    // find the code [url] occurence
-    $i = strpos($rawmsg, "[url");
-
-    // loop through the message until all are found and processed
-    while ($i !== false) {
-        // strip the bit before the [url] BBcode, and add a placeholder
-        $message .= substr($rawmsg, 0, $i+4)."{@@**@@}";
-        // strip the processed bit
-        $rawmsg = substr($rawmsg, $i+4);
-        // find the end of the [url] block
-        $j = strpos($rawmsg, "[/url]");
-        // if not found, add the remaining bit, a forced [/url], and stop processing
-        if ($j === false) {
-            $message = str_replace("{@@**@@}", $rawmsg, $message);
-            break;
-        }
-        // store this url block
-        $urlblocks[] = substr($rawmsg, 0, $j);
-        // strip the processed bit
-        $rawmsg = substr($rawmsg, $j);
-        // check if there are more code segments
-        $i = strpos($rawmsg, "[url");
-    }
-
-    // any text left?
-    if (strlen($rawmsg)) $message .= $rawmsg;
+    // strip CODE bbcode, optionally perform Geshi color coding
+    $rawmsg = preg_replace_callback('#\[code(=.*?)?\](.*?)([\r\n]*)\[/code\]#si', '_parseubb_codeblock', $rawmsg);
+
+    // strip URL bbcode
+    $rawmsg = preg_replace_callback('#\[url(=.*?)\](.*?)([\r\n]*)\[/url\]#si', '_parseubb_urlblock', $rawmsg);
 
     // detect and convert wikitags to wiki bbcodes if needed
@@ -393 +419 @@
             $replace[] = "\\1[wiki]\\2[/wiki]\\3";
         }
-        $message = preg_replace($search, $replace, $message);
-    }
-
-    // find remaining URL's in the text, and convert them to a href as well
-    $pattern = '#(^|[^\"=]{1})(https?://|ftp://|mailto:|news:)([^(,\s<>\[\]\)]+)([,\s\n<>\)]|$)#sme';
-    $message = preg_replace($pattern,"'$1<a href=\'$2$3\' target=\'_blank\'>'.shortenlink('$2$3',83).'</a>$4'",$message);
+        $rawmsg = preg_replace($search, $replace, $rawmsg);
+    }
+
+    // parse the smileys in the message
+    if ($smileys) $rawmsg = parsesmileys($rawmsg);
+    // parse all ubbcode
+    $rawmsg = parseubb($rawmsg);
+    // convert any newlines to html <br>
+    $rawmsg = nl2br($rawmsg);
+
+    // re-insert the saved code blocks
+    foreach($codeblocks as $key => $codeblock) {
+        $rawmsg = str_replace("{**@".$key."@**}", $codeblock[0], $rawmsg);
+    }
+
     // re-insert the saved url blocks
-    foreach($urlblocks as $urlblock) {
-        // find the first placeholder
-        $i = strpos($message, "{@@**@@}");
-        $message = substr($message, 0, $i).$urlblock.substr($message, $i+8);
-    }
-
-    // parse the smileys in the message
-    if ($smileys) $message = parsesmileys($message);
-    // page all ubbcode
-    $message = parseubb($message);
-    // convert any newlines to html <br>
-    $message = nl2br($message);
-
-    // re-insert the saved code blocks
-    foreach($codeblocks as $codeblock) {
-        // split the codeblock to add linenumbers
-        $lines = explode("\n", stripinput($codeblock));
-        // get rid of empty lines at the beginning and the end of the block
-        while (count($lines)>0 && trim($lines[0]) == "") {
-            array_shift($lines);
-        }
-        while (count($lines)>0 && trim($lines[count($lines)-1]) == "") {
-            array_pop($lines);
-        }
-        // only create a code block if there's code to display
-        if (count($lines) > 0) {
-            // check how wide the number column should be
-            $w = strlen(count($lines));
-            // embedded div with the linenumbers
-            $codeblock = "<div><pre class='codenr'>";
-            for($i=0;$i<count($lines);$i++) {
-                $codeblock .= str_replace("*", "&nbsp;", str_pad($i+1, $w, "*", STR_PAD_LEFT))."\n";
+    foreach($urlblocks as $key => $urlblock) {
+        if (isURL($urlblock[0])) {
+            // check if the URL is prefixed. If not, assume http://
+            if (!eregi("^((https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/){1}", $urlblock[0])) {
+                $urlblock[0] = "http://".$urlblock[0];
             }
-            $codeblock .= "</pre></div><pre class='code'>";
-            // add the lines back to the code div
-            foreach($lines as $nr => $line) {
-                $codeblock .= $line;
-            }
-            $codeblock .= "</pre>";
-            // find the first placeholder
-            $i = strpos($message, "{**@@**}");
-            $message = substr($message, 0, $i).$codeblock.substr($message, $i+8);
+            // convert it into a link
+            $rawmsg = str_replace("{@@*".$key."*@@}", "<a href='".$urlblock[0]."' alt='' target='_blank'>".$urlblock[1]."</a>", $rawmsg);
         } else {
-            // no code, remove the code block entirely
-            $i = strpos($message, "{**@@**}");
-            $message = substr($message, 0, $i-6).substr($message, $i+15);
-        }
-    }   
-    // return the parsed message body
-    return $message;
+            // make the URL harmless
+            $rawmsg = str_replace("{@@*".$key."*@@}", "[url=".stripinput($urlblock[0])."]".stripinput($urlblock[1])."[/url]", $rawmsg);
+        }
+    }
+
+    return $rawmsg;
 }
 ?>

trunk/includes/jscripts/core_functions.js

@@ -179 +179 @@
     }
 }
+
+function whichBrowser() {
+    //test for Firefox/x.x or Firefox x.x (ignoring remaining digits);
+    if (/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)) {
+        var ffversion=new Number(RegExp.$1); // capture x.x portion and store as a number
+        if (ffversion>=3)
+            return "FF 3";
+        else if (ffversion>=2)
+            return "FF 2";
+        else if (ffversion>=1)
+            return "FF 1";
+    } else {
+        //test for MSIE x.x;
+        if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) {
+            var ieversion=new Number(RegExp.$1); // capture x.x portion and store as a number
+            if (ieversion>=8)
+                return "IE 8";
+            else if (ieversion>=7)
+                return "IE 7";
+            else if (ieversion>=6)
+                return "IE 6";
+            else if (ieversion>=5)
+                return "IE 5";
+        } else {
+            //test for Opera/x.x or Opera x.x (ignoring remaining decimal places);
+            if (/Opera[\/\s](\d+\.\d+)/.test(navigator.userAgent)) {
+                var oprversion=new Number(RegExp.$1); // capture x.x portion and store as a number
+                if (oprversion>=10)
+                    return "OP 10";
+                else if (oprversion>=9)
+                    return "OP 9";
+                else if (oprversion>=8)
+                    return "OP 8";
+                else if (oprversion>=7)
+                    return "OP 7";
+                else
+                    document.write("n/a");
+            } else {
+                document.write("n/a");
+            }
+        }
+    }
+}

trunk/includes/templates/admin.activation.tpl

@@ -45 +45 @@
             </td>
             <td class='{cycle values='tbl1,tbl2'}' style='text-align:center;width:1%;white-space:nowrap;'>
-                {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_code="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;
-                {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_code="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407}
+                {if $settings.email_activation == 1}
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_code="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_code="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407}
+                {else}
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_id="|cat:$newusers[id].user_id image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp;
+                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_id="|cat:$newusers[id].user_id image="page_delete.gif" alt="$locale.407 title=$locale.407}
+                {/if}
             </td>
         </tr>

trunk/includes/templates/forum.viewthread.tpl

@@ -15 +15 @@
 {*                                                                         *}
 {***************************************************************************}
+<script type='text/javascript'>
+function jumpForum(forumid) {ldelim}
+    document.location.href='{$smarty.const.FORUM}viewforum.php?forum_id='+forumid;
+{rdelim}
+{literal}
+function flipOverflow(who) {
+    var tmp;
+    var status;
+    if (document.images['b_' + who].src.indexOf('_on') == -1) { 
+        tmp = document.images['b_' + who].src.replace('_off', '_on');
+        document.getElementById('box_' + who).style.overflowX = 'hidden';
+        document.getElementById('box_' + who).style.overflow = 'hidden';
+    } else { 
+        tmp = document.images['b_' + who].src.replace('_on', '_off');
+        var browser = whichBrowser();
+        if (browser == 'IE 6' || browser == 'IE 7') {
+            document.getElementById('box_' + who).style.overflowX = 'scroll';
+        } else {
+            document.getElementById('box_' + who).style.overflow = 'visible';
+        }
+    }
+    document.images['b_' + who].src = tmp;
+    return false;
+}{/literal}
+</script>
 {include file="_opentable.tpl" name=$_name title=$locale.500 state=$_state style=$_style}
 <table cellspacing='0' cellpadding='0' width='100%'>
@@ -221 +246 @@
 {include file="_closetable.tpl"}
 {/if}
-<script type='text/javascript'>
-function jumpForum(forumid) {ldelim}
-    document.location.href='{$smarty.const.FORUM}viewforum.php?forum_id='+forumid;
-{rdelim}
-</script>
 {***************************************************************************}
 {* End of template                                                         *}

trunk/includes/templates/main.pm.renderpm.tpl

@@ -40 +40 @@
             </span>
         </td>
-        <td class='tbl_top_mid' style='text-align:right;white-space:nowrap'>
+        <td class='tbl_top_mid' style='text-align:right;'>
             {if !$is_preview}
                 {buttonlink name=$locale.423 link=$smarty.const.FUSION_SELF|cat:"?folder="|cat:$folder|cat:"&amp;action=forward&amp;msg_id="|cat:$messages[id].pmindex_id}&nbsp;

trunk/includes/templates/main.pm.tpl

@@ -152 +152 @@
                     {section name=rc loop=$messages[id].readstatus}
                         {if $smarty.section.rc.first}
-                            <br />{$locale.542}
+                            {$locale.542}:<br />
                         {/if}
-                        <a href='{$smarty.const.BASEDIR}profile.php?lookup={$messages[id].readstatus[rc].user_id}'>{$messages[id].readstatus[rc].user_name}</a>
-                        {$locale.543} {$messages[id].readstatus[rc].datestamp|date_format:"forumdate"}
+                        <a href='{$smarty.const.BASEDIR}profile.php?lookup={$messages[id].readstatus[rc].user_id}'>{$messages[id].readstatus[rc].user_name}</a>:
+                        {if $messages[id].readstatus[rc].read}
+                            {$messages[id].readstatus[rc].datestamp|date_format:"forumdate"}
+                        {else}
+                            {$locale.543}
+                        {/if}
                         {if !$smarty.section.rc.last},{/if}
                     {/section}

trunk/pm.php

@@ -133 +133 @@
 
     // parse the messsage body
-    $msgrec['pm_message'] = parsemessage($msgrec['pm_message'], $msgrec['pm_smileys']==0);
+    $_s = $msgrec['pm_smileys'];
+    $msgrec['post_smileys'] = $msgrec['pm_smileys']==0;
+    $msgrec['post_message'] = $msgrec['pm_message'];
+    $msgrec['pm_message'] = parsemessage($msgrec);
+    $msgrec['pm_smileys'] = $_s;
     
     // check if the users avatar exists

trunk/register.php

@@ -17 +17 @@
 require_once PATH_INCLUDES."dns_functions.php";
 
+// do we want extensive email checks?
+define('CHECK_EMAIL', true);
+
 // temp storage for template variables
 $variables = array();
@@ -38 +41 @@
             $user_info = unserialize($data['user_info']);
             $activation = $settings['admin_activation'] == "1" ? "2" : "0";
-            $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_theme, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status, user_newsletters) VALUES('".$user_info['user_name']."', '".$user_info['user_fullname']."', '".md5(md5($user_info['user_password']))."', '".$user_info['user_email']."', '".$user_info['user_hide_email']."', '', '0000-00-00', '', '', '', '', '', 'Default', '".$user_info['user_offset']."', '', '', '0', '".time()."', '".time()."', '".USER_IP."', '', '', '101', '$activation', '1')");
+            $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_locale, user_theme, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status, user_newsletters) VALUES('".$user_info['user_name']."', '".$user_info['user_fullname']."', '".md5(md5($user_info['user_password']))."', '".$user_info['user_email']."', '".$user_info['user_hide_email']."', '', '0000-00-00', '', '', '', '', '', '".$settings['locale']."', 'Default', '".$user_info['user_offset']."', '', '', '0', '".time()."', '".time()."', '".USER_IP."', '', '', '101', '$activation', '1')");
             $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code='$activate'");   
             if ($settings['admin_activation'] == "1") {
@@ -74 +77 @@
         }
         
-        $email_domain = substr(strrchr($email, "@"), 1);
-        if (CMS_getmxrr($email_domain, $mxhosts)) {
-            // Get the hostname the MX record points to
-            $mailhost = $mxhosts[0];
-        } else {
-            // No MX record for this domain. Might be a hostname that accepts email
-            $mailhost = $email_domain;
-        }
-        $mailhost_ip = gethostbyname($mailhost);
-        if ($mailhost != $mailhost_ip) {
-            // found the mailserver for this email address. Check if the address exists
-            require_once PATH_INCLUDES.'smtp_include.php';
-            $mail = new SMTP();
-            if (!$mail->Connect($mailhost_ip, 0, 60)) {     // default SMTP port, 60sec timeout
-                // mail server doesn't respond
-                $error .= sprintf($locale['413'], $email_domain)."<br /><br />\n";
-            } else {
-                if (!$mail->Hello(substr(strrchr($settings['siteemail'], "@"), 1))) {
-                    // mail server doesn't respond to HELLO message
+        if (CHECK_EMAIL) {
+            $email_domain = substr(strrchr($email, "@"), 1);
+            if (CMS_getmxrr($email_domain, $mxhosts)) {
+                // Get the hostname the MX record points to
+                $mailhost = $mxhosts[0];
+            } else {
+                // No MX record for this domain. Might be a hostname that accepts email
+                $mailhost = $email_domain;
+            }
+            $mailhost_ip = gethostbyname($mailhost);
+            if ($mailhost != $mailhost_ip) {
+                // found the mailserver for this email address. Check if the address exists
+                require_once PATH_INCLUDES.'smtp_include.php';
+                $mail = new SMTP();
+                if (!$mail->Connect($mailhost_ip, 0, 60)) {     // default SMTP port, 60sec timeout
+                    // mail server doesn't respond
                     $error .= sprintf($locale['413'], $email_domain)."<br /><br />\n";
                 } else {
-                    if (!$mail->Mail('address-validation'.strrchr($settings['siteemail'], "@"))) {
-                        // mail server doesn't respond to MAIL FROM message
+                    if (!$mail->Hello(substr(strrchr($settings['siteemail'], "@"), 1))) {
+                        // mail server doesn't respond to HELLO message
                         $error .= sprintf($locale['413'], $email_domain)."<br /><br />\n";
                     } else {
-                        if (!$mail->CheckRecipient($email)) {
-                            // mail server doesn't respond to RCPT TO message
-                            $error .= sprintf($locale['414'], $email, $mailhost)."<br /><br />\n";
+                        if (!$mail->Mail('address-validation'.strrchr($settings['siteemail'], "@"))) {
+                            // mail server doesn't respond to MAIL FROM message
+                            $error .= sprintf($locale['413'], $email_domain)."<br /><br />\n";
                         } else {
-                            // email address is accepted
+                            if (!$mail->CheckRecipient($email)) {
+                                // mail server doesn't respond to RCPT TO message
+                                $error .= sprintf($locale['414'], $email, $mailhost)."<br /><br />\n";
+                            } else {
+                                // email address is accepted
+                            }
                         }
                     }
+                    $mail->Quit();
                 }
-                $mail->Quit();
-            }
-        } else {
-            $error .= sprintf($locale['412'], $email_domain)."<br /><br />\n";
-        }
-    
+            } else {
+                $error .= sprintf($locale['412'], $email_domain)."<br /><br />\n";
+            }
+        }
+
         $result = dbquery("SELECT * FROM ".$db_prefix."blacklist WHERE blacklist_email='".$email."' OR blacklist_email='$email_domain'");
         if (dbrows($result) != 0) $error .= $locale['411']."<br /><br />\n";
@@ -161 +166 @@
             $user_sig = isset($_POST['user_sig']) ? stripinput(trim($_POST['user_sig'])) : "";
         }
+        error_reporting(E_ALL);
         if ($error == "") {
             if ($settings['email_verification'] == "1") {
@@ -193 +199 @@
             } else {
                 $activation = $settings['admin_activation'] == "1" ? "2" : "0";
-                $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_theme, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status) VALUES('$username', md5(md5('".$password1."')), '".$email."', '$user_hide_email', '$user_location', '$user_birthdate', '$user_aim', '$user_icq', '$user_msn', '$user_yahoo', '$user_web', '$user_theme', '$user_offset', '', '$user_sig', '0', '".time()."', '0', '".USER_IP."', '', '', '101', '$activation')");
+                $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_theme, user_locale, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status) VALUES('$username', md5(md5('".$password1."')), '".$email."', '$user_hide_email', '$user_location', '$user_birthdate', '$user_aim', '$user_icq', '$user_msn', '$user_yahoo', '$user_web', '$user_theme', '".$settings['locale']."', '$user_offset', '', '$user_sig', '0', '".time()."', '0', '".USER_IP."', '', '', '101', '$activation')");
                 if ($settings['admin_activation'] == "1") {
                     $variables['message'] = $locale['453'];
+                    // send the webmaster a PM that an account needs to be activated
+                    $result = dbquery("INSERT INTO ".$db_prefix."pm (pm_subject, pm_message, pm_recipients, pm_size, pm_datestamp) VALUES ('".$locale['509']."', '".mysql_escape_string(sprintf($locale['510'], $username))."', '1', '100', '".time()."')");
+                    if ($result) {
+                        $pm_id = mysql_insert_id();
+                        $result = dbquery("INSERT INTO ".$db_prefix."pm_index (pm_id, pmindex_user_id, pmindex_from_id, pmindex_to_id, pmindex_folder) VALUES ('".$pm_id."', '1', '1', '1', '0')");
+                    }
                 } else {
                     $variables['message'] = $locale['452'];

trunk/themes/ExiteCMS/templates/templates/_stylesheets.tpl

@@ -49 +49 @@
 
                         /* buttons */
-.button                 { font-size:90%; font-weight:normal; width:auto; overflow:visible; font-weight: bold; color:#ffffff; background-color:#666; border-top:1px #bbb solid; border-left:1px #bbb solid; border-bottom:1px #000 solid; border-right:1px #000 solid; cursor:pointer; margin:2px 0px 2px 0px; padding:0px; }
+.button                 { font-size:0.8em; font-weight:normal; width:auto; overflow:visible; font-weight: bold; color:#ffffff; background-color:#666; border-top:1px #bbb solid; border-left:1px #bbb solid; border-bottom:1px #000 solid; border-right:1px #000 solid; cursor:pointer; margin:2px 0px 2px 0px; padding:0px; }
 .button:hover           { color:#666; background-color:#ddd; border-top:1px #999 solid; border-left:1px #999 solid; border-bottom:1px #fff solid; border-right:1px #fff solid; }
 
@@ -58 +58 @@
 
                         /* page body (normal/user mode + maintenance/webmaster mode) */
-body                    { font-size:1em; font-family:Verdana,"Bitstream Vera Sans","Deja Vu Sans",Arial,Sans-Serif; margin:4px 10px 5px 10px; }
+body                    { font-size:1em; font-family:Verdana,"Bitstream Vera Sans","Deja Vu Sans",Arial,Sans-Serif; margin:4px 10px 5px 10px; width:100%; }
 .body                   { color:#444; background-color:#aaa; }
 .body-maint             { color:#444; background-color:{/literal}{$settings.maintenance_color}{literal}; }
@@ -176 +176 @@
 .quote                  { color:#333; background-color:#ddd; padding:4px; margin:5px 10px 5px 10px; border:1px #444 solid; }
 
-                        /* code sections within the message body */
-.codeblock              { font-family: courier, monospace; font-size:110%; margin:5px 20px 5px 20px; overflow-x:auto; white-space: nowrap}
-.code                   { margin:0px; padding:0 0 0 5px; border:1px #bbb solid; background-color:#fff; overflow-x:hidden}
-.codenr                 { margin:0px; padding:0px 3px 0px 3px; border:1px #bbb solid; background-color:#ddd; float:left; }
+.codecontainer          { width:480px; background-color:#ffffef; border:1px #bbb solid; overflow:hidden; position:relative; z-index:1; }
+.codeblock              { }
+.codenr                 { font-family:monospace; font-size:1em; background-color:#fffef; padding: 0px 5px 0px 5px; vertical-align:top; }
+.code                   { font-family:monospace; background-color:#ffffef; white-space:nowrap; }
 
                         /* thumbnail caption in the message body */