maj.world

commit 35aa603044ef2b9ba661b08fcd8256347672c1f6
tree b9c5bcfa45df6378afa7fbca91aaf651d96f85b4
parent b2900f78c6757ee7a5ef44de8865c971deae3cda
author Engels Antonio <engels@majcms.org> 1294539196 +0800
committer Engels Antonio <engels@majcms.org> 1294539196 +0800

    Holiday release backlog commit

diff --git a/add.php b/add.php
index a1e868c..cb77d6d 100644
--- a/add.php
+++ b/add.php
@@ -691,7 +691,7 @@ a:active {
           $ml_subject = file_get_contents("data/ml-prepend.txt") . " " . $ml_subject;
       }
       
-      $ml_mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+      $ml_mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
       $ml_body = ucfirst($_POST['body_input']);
       $ml_body = str_replace('<br />', "\n", $ml_body);
       $ml_body = str_replace('<img src="images/smileys/crying.png" border="0">', ':((', $ml_body);
diff --git a/css.php b/css.php
index 737f1af..d3ffd87 100644
--- a/css.php
+++ b/css.php
@@ -572,23 +572,18 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 .mbadge {
        width: 80px;
        padding: 1px;
-       //margin: 0px 0px 3px 0px;
-       margin: 0px 0px 2px 0px;
+       margin: 0px 0px 3px 0px;
+       //margin: 0px 0px 2px 0px;
        color: #ccc;
        background-color: #fff;
        border: 1px solid #dedede;
        font-family: "lucida grande",arial,helvetica,sans-serif;
        font-size: 9px;
 
-       //-webkit-border-radius: 2px;
-       //-khtml-border-radius: 2px;
-       //-moz-border-radius: 2px;
-       //border-radius: 2px;
-
-       //-webkit-box-shadow: 0 0 2px #ddd;
-       //-khtml-box-shadow: 0 0 2px #ddd;
-       //-moz-box-shadow: 0 0 2px #ddd;
-       //box-shadow: 0 0 2px #ddd;
+       -webkit-box-shadow: 0 0 1px #ddd;
+       -khtml-box-shadow: 0 0 1px #ddd;
+       -moz-box-shadow: 0 0 1px #ddd;
+       box-shadow: 0 0 1px #ddd;
 
        margin-left: auto;
        margin-right: auto;
@@ -604,7 +599,7 @@ a.mblink:link,a.mblink:visited,a.mblink:active,a.mblink:hover {
 .mbox1, .mbox2 {
        font-weight: bold;
        text-align: center;
-       float: left;
+       display: inline-block;
        border: 1px solid #dedede;
        font-size: 9px;
 }
@@ -628,10 +623,6 @@ a.mblink:link,a.mblink:visited,a.mblink:active,a.mblink:hover {
        border-color: #dedede;
 }
 
-.mclear {
-       clear: left;
-}
-
 <?php if (file_exists("data/css.txt")) { readfile("data/css.txt"); } ?>
 
 </style>
diff --git a/index.php b/index.php
index fe01d82..ace8e38 100644
--- a/index.php
+++ b/index.php
@@ -5213,12 +5213,12 @@ if ($maj_count_latest > 0) {
 
 $mphp_version = phpversion();
 
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://majcms.org/\"><span class=\"mbox1\">MAJ</span><span class=\"mbox2\">2.0</span></a><div class=\"mclear\"></div></div>";
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://php.net/\"><span class=\"mbox1\">PHP</span><span class=\"mbox2\">$mphp_version</span></a><div class=\"mclear\"></div></div>";
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=0.91\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">0.91</span></a><div class=\"mclear\"></div></div>";
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=1.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">1.0</span></a><div class=\"mclear\"></div></div>";
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=2.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">2.0</span></a><div class=\"mclear\"></div></div>";
-echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"sitemap.php\"><span class=\"mbox1\">XML</span><span class=\"mbox2\">SITEMAP</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"http://majcms.org/\"><span class=\"mbox1\">MAJ</span><span class=\"mbox2\">2.0</span></a></nobr></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"http://php.net/\"><span class=\"mbox1\">PHP</span><span class=\"mbox2\">$mphp_version</span></a></nobr></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=0.91\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">0.91</span></a></nobr></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=1.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">1.0</span></a></nobr></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=2.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">2.0</span></a></nobr></div>";
+echo "<div class=\"mbadge\"><nobr><a class=\"mblink\" target=\"_maj\" href=\"sitemap.php\"><span class=\"mbox1\">XML</span><span class=\"mbox2\">SITEMAP</span></a></nobr></div>";
 
 }
 
diff --git a/options.php b/options.php
index 02be53c..9717e19 100644
--- a/options.php
+++ b/options.php
@@ -163,7 +163,7 @@ if (isset($_POST['email']) and !empty($_POST['email']) and (file_get_contents("d
 
        $old_email = file_get_contents("data/members/active/{$_SESSION['logged_in']}/email.txt");
 
-       $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+       $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
        $sig_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . "/";
        $sig_url = str_replace('//', '/', $sig_url);
diff --git a/reg.php b/reg.php
index 8498503..4f9a89b 100644
--- a/reg.php
+++ b/reg.php
@@ -197,7 +197,7 @@ if (isset($_REQUEST['username']) and !empty($_REQUEST['username']) and isset($_R
                        $email = file_get_contents("data/members/active/$username/email.txt");
                        $from_email = file_get_contents("data/email.txt");
 
-                       $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+                       $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
                        $sig_author = file_get_contents("data/author.txt");
 
@@ -256,7 +256,7 @@ if (isset($_REQUEST['username']) and !empty($_REQUEST['username']) and isset($_R
                $email = file_get_contents("data/members/pending/$username/email.txt");
                $from_email = file_get_contents("data/email.txt");
 
-               $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+               $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
                $sig_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . "/";
                $sig_url = str_replace('//', '/', $sig_url);
@@ -325,7 +325,7 @@ if (isset($_REQUEST['username']) and !empty($_REQUEST['username']) and isset($_R
                        $email = file_get_contents("data/members/active/$username/email.txt");
                        $from_email = file_get_contents("data/email.txt");
 
-                       $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+                       $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
                        $sig_author = file_get_contents("data/author.txt");
 
@@ -630,7 +630,7 @@ if ($_POST['submit'] == "1") {
                fwrite($fp_key_txt,$key);
                fclose($fp_key_txt);
 
-               $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+               $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
                $sig_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . "/";
                $sig_url = str_replace('//', '/', $sig_url);
diff --git a/rel.txt b/rel.txt
index 1711105..7634017 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012260422
+201012291935
diff --git a/reset.php b/reset.php
index 87851ca..cf5f310 100644
--- a/reset.php
+++ b/reset.php
@@ -156,7 +156,7 @@ if (isset($_POST['username']) and !empty($_POST['username']) and isset($_POST['a
        $email = file_get_contents("data/members/active/$username/email.txt");
        $from_email = file_get_contents("data/email.txt");
 
-       $mailer = 'MAJ/0.14 (PHP/' . phpversion() . ')';
+       $mailer = 'MAJ/2.0 (PHP/' . phpversion() . ')';
 
        $sig_author = file_get_contents("data/author.txt");