maj.world

commit 9c890cd7d9f6bac72020345997d8d604be9803f9
tree 75e04789a6a0abc4ac09f63acad1c888332c053a
parent a67ef7506ec0ea49814e070fb08844de941b8b80
author Engels Antonio <engels@majcms.org> 1277314203 +0800
committer Engels Antonio <engels@majcms.org> 1277314203 +0800

    maj-1.0-20081127-bb.zip

diff --git a/add.php b/add.php
index 72f6765..09cb210 100644
--- a/add.php
+++ b/add.php
@@ -519,7 +519,7 @@ $body_write_content = str_replace(';)', '<img src="images/smileys/wink.png" bord
 $body_write_content = str_replace('[code]', '<code>', $body_write_content);
 $body_write_content = str_replace('[/code]', '</code>', $body_write_content);
 $body_write_content = reformat_code($body_write_content);
-$body_write_content = str_replace("\n", '<br />', $body_write_content);
+$body_write_content = str_replace("\n", '<br>', $body_write_content);
 $body_write_content = str_replace('[b]', '<b>', $body_write_content);
 $body_write_content = str_replace('[/b]', '</b>', $body_write_content);
 $body_write_content = str_replace('[i]', '<i>', $body_write_content);
@@ -746,7 +746,7 @@ if (file_exists("data/members/active") and file_exists("data/ml.txt") and file_e
 
        $ml_mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
        $ml_body = ucfirst($_POST['body_input']);
-       $ml_body = str_replace('<br />', "\n", $ml_body);
+       $ml_body = str_replace('<br>', "\n", $ml_body);
        $ml_body = str_replace('<img src="images/smileys/crying.png" border="0">', ':((', $ml_body);
        $ml_body = str_replace('<img src="images/smileys/frown.png" border="0">', ':(', $ml_body);
        $ml_body = str_replace('<img src="images/smileys/indifferent.png" border="0">', ':|', $ml_body);
diff --git a/edit.php b/edit.php
index 506e06c..cb6391d 100644
--- a/edit.php
+++ b/edit.php
@@ -235,22 +235,23 @@ a:active {
 
 if (isset($_POST['category']) and !empty($_POST['category'])) {
 
-       if (!file_exists("data/items/{$_REQUEST['entry']}/categories")) {
-               mkdir("data/items/{$_REQUEST['entry']}/categories");
-       }
-
        if (($_POST['do'] == "unfile") and file_exists("data/items/{$_REQUEST['entry']}/categories/{$_REQUEST['category']}")) {
                rmdirr("data/items/{$_REQUEST['entry']}/categories/{$_REQUEST['category']}");
        }
 
        if (($_POST['do'] == "file") and !file_exists("data/items/{$_REQUEST['entry']}/categories/{$_REQUEST['category']}")) {
+
+               if (!file_exists("data/items/{$_REQUEST['entry']}/categories")) {
+                       mkdir("data/items/{$_REQUEST['entry']}/categories");
+               }
+
                mkdir("data/items/{$_REQUEST['entry']}/categories/{$_REQUEST['category']}");
        }
 }
 
 if (isset($_REQUEST['comment']) and !empty($_REQUEST['comment']) and isset($_POST['comment_txt']) and !empty($_POST['comment_txt']) and isset($_REQUEST['type']) and !empty($_REQUEST['type']) and (($_REQUEST['type'] == "live") or ($_REQUEST['type'] == "pending"))) {
        $comment_txt = ucfirst($_POST['comment_txt']);
-       $comment_txt = str_replace("\n", '<br />', $comment_txt);
+       $comment_txt = str_replace("\n", '<br>', $comment_txt);
        $comment_txt = str_replace(':((', '<img src="images/smileys/crying.png" border="0">', $comment_txt);
        $comment_txt = str_replace(':(', '<img src="images/smileys/frown.png" border="0">', $comment_txt);
        $comment_txt = str_replace(':|', '<img src="images/smileys/indifferent.png" border="0">', $comment_txt);
@@ -270,6 +271,7 @@ if (isset($_REQUEST['comment']) and !empty($_REQUEST['comment']) and isset($_POS
        $fp_comment_revisions_file = fopen($comment_revisions_file, "r");
        $comment_revisions_count = fread($fp_comment_revisions_file, filesize($comment_revisions_file));
        fclose($fp_comment_revisions_file);
+
        $comment_revisions_count = $comment_revisions_count + 1;
        $fp_comment_revisions_file = fopen($comment_revisions_file, "w");
        fwrite($fp_comment_revisions_file, $comment_revisions_count);
@@ -288,7 +290,8 @@ if (isset($_REQUEST['comment']) and !empty($_REQUEST['comment']) and isset($_REQ
        <div id="panel_body"><?php readfile("data/items/{$_REQUEST['entry']}/comments/{$_REQUEST['type']}/{$_REQUEST['comment']}/comment.txt"); ?></div>
        <div id="panel_footer"><font style="font-size: 10px; color: #999999;">
        <?php
-               readfile("data/items/{$_REQUEST['entry']}/comments/{$_REQUEST['type']}/{$_REQUEST['comment']}/timestamp.txt");
+               echo date("l, M j, Y, g:i A",filemtime("data/items/{$_REQUEST['entry']}/comments/{$_REQUEST['type']}/{$_REQUEST['comment']}/timestamp.txt"));
+
                if (file_exists("data/items/{$_REQUEST['entry']}/comments/{$_REQUEST['type']}/{$_REQUEST['comment']}/revisions.txt")) {
                        echo " (Revision ";
                        readfile("data/items/{$_REQUEST['entry']}/comments/{$_REQUEST['type']}/{$_REQUEST['comment']}/revisions.txt");
@@ -307,7 +310,8 @@ if (isset($_REQUEST['comment']) and !empty($_REQUEST['comment']) and isset($_REQ
        $read_comment_txt_file = fread($open_comment_txt_file,filesize($comment_txt_file));
        fclose($open_comment_txt_file);
 
-       $comment_smiley2emoticon = str_replace('<br />', "\n", $read_comment_txt_file);
+       $comment_smiley2emoticon = str_replace('<br>', "\n", $read_comment_txt_file);
+       $comment_smiley2emoticon = str_replace('<br />', "\n", $comment_smiley2emoticon);
        $comment_smiley2emoticon = str_replace('<img src="images/smileys/crying.png" border="0">', ':((', $comment_smiley2emoticon);
        $comment_smiley2emoticon = str_replace('<img src="images/smileys/frown.png" border="0">', ':(', $comment_smiley2emoticon);
        $comment_smiley2emoticon = str_replace('<img src="images/smileys/indifferent.png" border="0">', ':|', $comment_smiley2emoticon);
@@ -356,7 +360,7 @@ if (file_exists("data/items/{$_REQUEST['entry']}/author.txt")) {
        echo " - ";
 }
 
-readfile($date_file);
+echo date("l, M j, Y, g:i A",filemtime("data/items/{$_REQUEST['entry']}/date.txt"));
 
 if (file_exists($revisions_file)) {
                echo ' (Revision ';
@@ -453,7 +457,8 @@ $open_body_file = fopen($body_file,"r");
 $read_body_file = fread($open_body_file,filesize($body_file));
 fclose($open_body_file);
 
-$body_read_content = str_replace('<br />', "\n", $read_body_file);
+$body_read_content = str_replace('<br>', "\n", $read_body_file);
+$body_read_content = str_replace('<br />', "\n", $body_read_content);
 $body_read_content = str_replace('<img src="images/smileys/crying.png" border="0">', ':((', $body_read_content);
 $body_read_content = str_replace('<img src="images/smileys/frown.png" border="0">', ':(', $body_read_content);
 $body_read_content = str_replace('<img src="images/smileys/indifferent.png" border="0">', ':|', $body_read_content);
@@ -659,7 +664,7 @@ $body_write_content = str_replace(';)', '<img src="images/smileys/wink.png" bord
 $body_write_content = str_replace('[code]', '<code>', $body_write_content);
 $body_write_content = str_replace('[/code]', '</code>', $body_write_content);
 $body_write_content = reformat_code($body_write_content);
-$body_write_content = str_replace("\n", '<br />', $body_write_content);
+$body_write_content = str_replace("\n", '<br>', $body_write_content);
 $body_write_content = str_replace('[b]', '<b>', $body_write_content);
 $body_write_content = str_replace('[/b]', '</b>', $body_write_content);
 $body_write_content = str_replace('[i]', '<i>', $body_write_content);
@@ -738,7 +743,7 @@ if (isset($_FILES['album_image_input']) and !empty($_FILES['album_image_input'])
                                                        $caption_txt = str_replace(';)', '<img src="images/smileys/wink.png" border="0">', $caption_txt);
                                                        $caption_txt = str_replace('[code]', '<code>', $caption_txt);
                                                        $caption_txt = str_replace('[/code]', '</code>', $caption_txt);
-                                                       $caption_txt = str_replace("\n", '<br />', $caption_txt);
+                                                       $caption_txt = str_replace("\n", '<br>', $caption_txt);
                                                        $caption_txt = str_replace('[b]', '<b>', $caption_txt);
                                                        $caption_txt = str_replace('[/b]', '</b>', $caption_txt);
                                                        $caption_txt = str_replace('[i]', '<i>', $caption_txt);
diff --git a/index.php b/index.php
index 2a0836e..bab8431 100644
--- a/index.php
+++ b/index.php
@@ -523,7 +523,7 @@ if (isset($req_entry) and !empty($req_entry)) {
                                mkdir("data/items/$req_entry/comments/live");
                        }
 
-                       $timestamp = date("l,M j,Y,g:i A",time() + $offset);
+                       $timestamp = date("l, M j, Y, g:i A",time() + $offset);
       
                        $comment_entry_dir = date("YmdHis",time() + $offset);
       
@@ -1967,6 +1967,10 @@ if ($dh_items = opendir("data/items")) {
 
                                $latest[] = $item;
 
+                               if (file_exists("data/items/$item/member.txt") and (!isset($_SESSION['logged_in']))) {
+                                       continue;
+                               }
+
                                if (file_exists("data/items/$item/album")) {
                                        $albums[] = $item;
                                }
@@ -1974,10 +1978,6 @@ if ($dh_items = opendir("data/items")) {
                                $random[] = $item;
                                $archives[] = substr($item,0,6);
 
-                               if (file_exists("data/items/$item/member.txt") and (!isset($_SESSION['logged_in']))) {
-                                       continue;
-                               }
-
                                if (file_exists("data/nocat.txt") and file_exists("data/items/$item/categories") and !file_exists("data/items/$item/cat.txt") and (!isset($req_category) or empty($req_category)) and (!isset($req_entry) or empty($req_entry)) and (!isset($req_author) or empty($req_author))) {
                                        continue;
                                }
@@ -2569,7 +2569,7 @@ foreach ($disp as $d) {
                echo "$xavatar_author - ";
        }
 
-       readfile("data/items/$d/date.txt");
+       echo date("l, M j, Y, g:i A",filemtime("data/items/$d/date.txt"));
 
        if ((isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $login_username)) or file_exists("data/items/$d/lastmod.txt")) {
 
@@ -3472,20 +3472,27 @@ foreach ($disp as $d) {
                                }
 
                                echo '<font style="font-size: 10px; color: #999999;">';
+
                                if ((file_exists("data/items/$d/comments/live/$comment/author.txt") and (file_exists("data/bb.txt") and !file_exists("data/avatar.txt")) or (file_exists("data/items/$d/comments/live/$comment/author.txt") and (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $login_username) and !file_exists("data/avatar.txt"))))) {
                                        $cxavatar_author = file_get_contents("data/items/$d/comments/live/$comment/author.txt");
                                        echo "<a href=member.php?id=$cxavatar_author>$cxavatar_author</a> - ";
                                }
-                               readfile("data/items/$d/comments/live/$comment/timestamp.txt");
+
+                               echo date("l, M j, Y, g:i A",filemtime("data/items/$d/comments/live/$comment/timestamp.txt"));
+
                                if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $login_username)) {
+
                                        if (file_exists("data/items/$d/comments/live/$comment/revisions.txt")) {
                                                echo '  (Revision ';
                                                readfile("data/items/$d/comments/live/$comment/revisions.txt");
                                                echo ')';
                                        }
                                }
+
                                echo '</font><font style="font-size: 5px;"><br><br></font>';
+
                                $entry_comment = file_get_contents("data/items/$d/comments/live/$comment/comment.txt");
+
                                if (file_exists("data/pf.txt") and file_exists("data/pf-badwords.txt") and (!isset($_SESSION['logged_in']) or empty($_SESSION['logged_in']) or (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] != file_get_contents("data/username.txt"))))) {
                                        $badwords = file_get_contents("data/pf-badwords.txt");
                                        if (file_exists("data/pf-censor.txt")) {
diff --git a/rel.txt b/rel.txt
index 9421504..e394f17 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-20081126
\ No newline at end of file
+20081127
\ No newline at end of file
diff --git a/wiki.php b/wiki.php
index fcad5f8..ebe9494 100644
--- a/wiki.php
+++ b/wiki.php
@@ -240,7 +240,7 @@ if (file_exists("data/items/$entry/wiki/delta")) {
 
                        $title = file_get_contents("data/items/$entry/wiki/delta/$item/title.txt");
                        $body = file_get_contents("data/items/$entry/wiki/delta/$item/body.txt");
-                       $date = file_get_contents("data/items/$entry/wiki/delta/$item/date.txt");
+                       $date = date("l, M j, Y, g:i A",filemtime("data/items/$entry/wiki/delta/$item/date.txt"));
                        $author = file_get_contents("data/items/$entry/author.txt");
                        $editor = file_get_contents("data/items/$entry/wiki/delta/$item/editor.txt");
       
@@ -251,7 +251,7 @@ if (file_exists("data/items/$entry/wiki/delta")) {
                        $itemMinute = substr($item,10,2);
                        $itemSecond = substr($item,12,2);
 
-                       $mod = date("l, M j, g:i A", mktime($itemHour,$itemMinute,$itemSecond,$itemMonth,$itemDay,$itemYear));
+                       $mod = date("l, M j, Y, g:i A", mktime($itemHour,$itemMinute,$itemSecond,$itemMonth,$itemDay,$itemYear));
 
                        $prev = file_get_contents("data/items/$entry/wiki/delta/$item/prev.txt");