maj.world

commit a343c1200dd37c89738f1c372d61333502ab5057
tree 01822e4aac231d7745e640157af355ef3342797d
parent e6f4bdde48b940ce7dbacdbc7d19da2465755bc4
author Engels Antonio <engels@majcms.org> 1277314211 +0800
committer Engels Antonio <engels@majcms.org> 1277314211 +0800

    maj-1.0-20090613-bb.zip

diff --git a/rel.txt b/rel.txt
index 9bf63ec..8a385a7 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-20090328
\ No newline at end of file
+20090613
\ No newline at end of file
diff --git a/settings.php b/settings.php
index 2defda5..937df59 100644
--- a/settings.php
+++ b/settings.php
@@ -1083,18 +1083,33 @@ a:active {
 <tr><td>spread firefox <a href="http://www.spreadfirefox.com/?q=user/register&r=76458" target="_maj">affiliate</a> id</td><td><input autocomplete="off" class="input" type="text" name="sfx" value="<?php readfile("data/sfx.txt"); ?>"></td></tr>
 <tr><td>ping on content change</td><td><input autocomplete="off" class="input" type="text" name="ping" value="<?php readfile("data/ping.txt"); ?>"></td></tr>
 <tr><td rowspan="<?php
+
+       $toggles_rowspan = "13";
+
        if (file_exists("data/email.txt")) {
-               echo "14";
+               $toggles_rowspan = $toggles_rowspan + 1;
        }
-       else {
-               echo "13";
+
+       if (file_exists("data/lite.txt")) {
+               $toggles_rowspan = $toggles_rowspan - 2;
        }
+
+       echo $toggles_rowspan;
+
 ?>">toggles</td><td><input type="checkbox" name="nocomment" <?php if (file_exists("data/nocomment.txt")) { echo checked; } ?>> Do not allow visitors to post comments.</td></tr>
+
+<?php if (!file_exists("data/lite.txt")) { ?>
 <tr><td><input type="checkbox" name="memcomment" <?php if (file_exists("data/memcomment.txt")) { echo checked; } ?>> Do not prevent members from posting comments.</td></tr>
+<?php } ?>
+
 <?php if (file_exists("data/email.txt")) { ?>
 <tr><td><input type="checkbox" name="nak" <?php if (file_exists("data/nak.txt")) { echo checked; } ?>> Do not acknowledge comment submissions via e-mail.</td></tr>
 <?php } ?>
+
+<?php if (!file_exists("data/lite.txt")) { ?>
 <tr><td><input type="checkbox" name="xscreen" <?php if (file_exists("data/xscreen.txt")) { echo checked; } ?>> Do not screen comments. Automatically approve them.</td></tr>
+<?php } ?>
+
 <tr><td><input type="checkbox" name="nopdf" <?php if (file_exists("data/nopdf.txt")) { echo checked; } ?>> Do not allow PDF generation for all entries.</td></tr>
 <tr><td><input type="checkbox" name="xrecent" <?php if (file_exists("data/xrecent.txt")) { echo checked; } ?>> Do not show recent entries panel to guests.</td></tr>
 <tr><td><input type="checkbox" name="xucomment" <?php if (file_exists("data/xucomment.txt")) { echo checked; } ?>> Do not show unread comments panel.</td></tr>