This commit has been accessed 567 times via Git panel.
commit 9db3f830ec2f85fe7199c7906d1c98315d82986f
tree 4cd1a1ce84f9ff11d86a924fb338e15e67845e2e
parent a50966c0b0632309683ba7a8c0aed063eb564819
author Engels Antonio <engels@majcms.org> 1294539193 +0800
committer Engels Antonio <engels@majcms.org> 1294539193 +0800
Holiday release backlog commit
diff --git a/css.php b/css.php
index 932f7db..dff4657 100644
--- a/css.php
+++ b/css.php
@@ -217,6 +217,27 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
?>
}
+.panel_wrapper {
+
+ <?php
+
+ if (file_exists("data/round.txt")) {
+ echo "\n\t-webkit-border-radius: $maj_border_radius;";
+ echo "\n\t-khtml-border-radius: $maj_border_radius;";
+ echo "\n\t-moz-border-radius: $maj_border_radius;";
+ echo "\n\tborder-radius: $maj_border_radius;";
+ }
+
+ if (file_exists("data/shadow.txt")) {
+ echo "\n\t-moz-box-shadow: 0 0 2px #ddd;";
+ echo "\n\t-webkit-box-shadow: 0 0 2px #ddd;";
+ echo "\n\t-khtml-box-shadow: 0 0 2px #ddd;";
+ echo "\n\tbox-shadow: 0 0 2px #ddd;";
+ }
+
+ ?>
+}
+
.panel_title {
padding: 5px;
margin: 0px;
diff --git a/edit.php b/edit.php
index 1c38457..0f3681f 100644
--- a/edit.php
+++ b/edit.php
@@ -799,6 +799,11 @@ if (file_exists("images/{$_REQUEST['entry']}/album")) {
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"150\">";
foreach ($ack_members as $ack_member) {
+
+ if ($_SESSION['logged_in'] == $nak_member) {
+ continue;
+ }
+
echo "<form enctype=\"multipart/form-data\" action=\"edit.php\" method=\"post\">";
echo "<input type=\"hidden\" name=\"entry\" value=\"{$_REQUEST['entry']}\">";
echo "<input type=\"hidden\" name=\"auth_member\" value=\"$ack_member\">";
@@ -818,6 +823,11 @@ if (file_exists("images/{$_REQUEST['entry']}/album")) {
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"150\">";
foreach ($nak_members as $nak_member) {
+
+ if ($_SESSION['logged_in'] == $nak_member) {
+ continue;
+ }
+
echo "<form enctype=\"multipart/form-data\" action=\"edit.php\" method=\"post\">";
echo "<input type=\"hidden\" name=\"entry\" value=\"{$_REQUEST['entry']}\">";
echo "<input type=\"hidden\" name=\"auth_member\" value=\"$nak_member\">";
diff --git a/index.php b/index.php
index 5483763..ad13d94 100644
--- a/index.php
+++ b/index.php
@@ -829,12 +829,10 @@ echo "<tr><td width=\"$maj_wside\" height=\"$maj_wspace\"></td><td width=\"$maj_
echo "<tr><td width=\"$maj_wside\" valign=\"top\">";
if (!file_exists("data/xprofile.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
-
- echo "<div class=\"panel_title\">";
+
?>
-Profile</div>
-<div class="panel_body">
+<div class="panel_wrapper"><div class="panel_title">Profile</div><div class="panel_body">
<?php
@@ -890,7 +888,7 @@ include("data/profile.php");
?>
-</div>
+</div></div>
<?php
@@ -898,11 +896,10 @@ include("data/profile.php");
if (!file_exists("data/xnavigation.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
- echo '<div class="panel_title">';
?>
-Navigation</div>
-<div class="panel_body">
+<div class="panel_wrapper"><div class="panel_title">Navigation</div><div class="panel_body">
+
<a class="navlink" href=".">Home</a><br>
<?php
@@ -946,7 +943,7 @@ else {
?>
-</div>
+</div></div>
<?php
@@ -1003,7 +1000,7 @@ if (file_exists("data/sticky")) {
if ($maj_count_sticky_list > 0) {
- echo '<div class="panel_title">Quick Links</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Quick Links</div>';
echo '<div class="panel_body">';
foreach ($maj_sticky_entries as $maj_sticky_list_entry) {
@@ -1012,7 +1009,7 @@ if (file_exists("data/sticky")) {
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
}
@@ -1152,7 +1149,7 @@ if (file_exists("data/panels")) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_left_panel_border) or isset($maj_left_panel_bgcolor_t) or isset($maj_left_panel_text_t)) {
echo ' style="';
@@ -1220,7 +1217,7 @@ if (file_exists("data/panels")) {
include("data/panels/$maj_left_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_left_panel/free.txt") and !file_exists("data/panels/$maj_left_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1286,7 +1283,7 @@ if ($maj_count_top_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_top_panel_border) or isset($maj_top_panel_bgcolor_t) or isset($maj_top_panel_text_t)) {
echo ' style="';
@@ -1354,7 +1351,7 @@ if ($maj_count_top_panels > 0) {
include("data/panels/$maj_top_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_top_panel/free.txt") and !file_exists("data/panels/$maj_top_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1687,7 +1684,7 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-summary.txt") and !file_
if ($maj_count_latest > 0) {
- echo "<div class=\"panel_title\">Latest Entries</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Latest Entries</div>";
echo "<div class=\"panel_body\">";
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"100%\">";
@@ -1766,7 +1763,7 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-summary.txt") and !file_
if ($maj_count_latest > 0) {
- echo "</table></div>";
+ echo "</table></div></div>";
}
}
@@ -1822,7 +1819,7 @@ if ($maj_count_center_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_center_panel_border) or isset($maj_center_panel_bgcolor_t) or isset($maj_center_panel_text_t)) {
echo ' style="';
@@ -1890,7 +1887,7 @@ if ($maj_count_center_panels > 0) {
include("data/panels/$maj_center_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_center_panel/free.txt") and !file_exists("data/panels/$maj_center_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1910,7 +1907,7 @@ if ($maj_count_items == 0) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" bgcolor=\"#cccccc\" style=\"background-color: transparent;\"><tr><td width=\"$maj_wmain\">";
- echo '<div class="panel_title">Oops!</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Oops!</div>';
echo "<div class=panel_body><table border=0 cellspacing=0 cellpadding=4><tr>";
echo "<td valign=middle><img src=images/oops.png width=36 height=36 border=0></td><td valign=middle>";
@@ -1927,7 +1924,7 @@ if ($maj_count_items == 0) {
}
}
- echo '</td></tr></table></div>';
+ echo '</td></tr></table></div></div>';
echo "</td></tr></table>";
}
@@ -2027,7 +2024,7 @@ foreach ($maj_disp as $maj_d) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_d_border) or isset($maj_d_bgcolor_t) or isset($maj_d_text_t)) {
echo ' style="';
@@ -2778,7 +2775,6 @@ foreach ($maj_disp as $maj_d) {
}
}
-
$maj_album_views_value = file_get_contents("data/items/$maj_d/album/views.txt");
if ($maj_album_views_value == 1) {
@@ -2975,7 +2971,7 @@ foreach ($maj_disp as $maj_d) {
echo "| <a href=\"index.php?entry=$maj_d\" class=\"status\">permalink</a>";
}
- echo "</div>";
+ echo "</div></div>";
echo "</td></tr></table>";
@@ -3030,7 +3026,7 @@ foreach ($maj_disp as $maj_d) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_entry_panel_border) or isset($maj_entry_panel_bgcolor_t) or isset($maj_entry_panel_text_t)) {
echo ' style="';
@@ -3098,7 +3094,7 @@ foreach ($maj_disp as $maj_d) {
include("data/panels/$maj_entry_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_entry_panel/free.txt") and !file_exists("data/panels/$maj_entry_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -3110,7 +3106,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">Album';
+ echo '<div class="panel_wrapper"><div class="panel_title">Album';
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo '<a href=del.php?entry=';
@@ -3249,7 +3245,7 @@ foreach ($maj_disp as $maj_d) {
}
}
}
- echo '</div>';
+ echo '</div></div>';
echo '</td></tr></table>';
@@ -3259,7 +3255,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">Videos</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Videos</div>';
echo '<div class="panel_body">';
if (file_exists("data/items/$maj_d/passwd.txt") and (!isset($_SESSION['logged_in']) or ($_SESSION['logged_in'] != $maj_login_username)) and (!isset($_REQUEST['passwd']) or ($maj_crypt_passwd != $maj_passwd))) {
@@ -3291,14 +3287,14 @@ foreach ($maj_disp as $maj_d) {
unset($maj_video);
}
}
- echo "</div></td></tr></table>";
+ echo "</div></div></td></tr></table>";
}
if (isset($maj_req_entry) and !empty($maj_req_entry) and isset($maj_req_show) and !empty($maj_req_show) and ($maj_req_show == filedrop) and file_exists("data/items/$maj_d/filedrop/files")) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo "<div class=panel_title>Filedrop";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Filedrop";
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo "<a href=del.php?entry=$maj_d&target=filedrop><img src=images/widget.del.png border=0 width=11 height=11 align=right alt=\"delete filedrop\"></a>";
@@ -3377,7 +3373,7 @@ foreach ($maj_disp as $maj_d) {
echo "</td></tr></table>";
}
}
- echo "</div>";
+ echo "</div></div>";
echo '</td></tr></table>';
}
@@ -3386,7 +3382,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">PDF';
+ echo '<div class="panel_wrapper"><div class="panel_title">PDF';
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo '<a href=del.php?entry=';
@@ -3432,7 +3428,7 @@ foreach ($maj_disp as $maj_d) {
closedir($maj_dh_pdf);
}
}
- echo '</div>';
+ echo '</div></div>';
echo '</td></tr></table>';
}
@@ -3455,11 +3451,12 @@ foreach ($maj_disp as $maj_d) {
asort($maj_show_comments);
reset($maj_show_comments);
+
foreach ($maj_show_comments as $maj_comment) {
echo "<a name=\"$maj_comment\"></a>";
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
if (file_exists("data/items/$maj_d/comments/live/$maj_comment/url.txt")) {
echo '<a target=_maj href=';
@@ -3847,7 +3844,7 @@ foreach ($maj_disp as $maj_d) {
$maj_entry_comment = preg_replace("/\b($maj_badwords)\b/i",$maj_censor,$maj_entry_comment);
}
echo $maj_entry_comment;
- echo '</tr></table></div>';
+ echo '</tr></table></div></div>';
}
unset($maj_show_comments);
echo '</td></tr></table>';
@@ -4089,7 +4086,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
if (file_exists("data/items/$maj_d/comments/pending/$maj_pending_comment/url.txt")) {
echo '<a target=_maj href=';
@@ -4346,7 +4343,7 @@ foreach ($maj_disp as $maj_d) {
echo '</font><font style="font-size: 5px;"><br><br></font>';
readfile("data/items/$maj_d/comments/pending/$maj_pending_comment/comment.txt");
- echo '</tr></table></div>';
+ echo '</tr></table></div></div>';
unset($maj_show_pending_comments);
echo '</td></tr></table>';
@@ -4406,7 +4403,7 @@ if ($maj_count_bottom_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_bottom_panel_border) or isset($maj_bottom_panel_bgcolor_t) or isset($maj_bottom_panel_text_t)) {
echo ' style="';
@@ -4474,7 +4471,7 @@ if ($maj_count_bottom_panels > 0) {
include("data/panels/$maj_bottom_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_bottom_panel/free.txt") and !file_exists("data/panels/$maj_bottom_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -4599,7 +4596,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if (($maj_count_latest > 0) and ($maj_count_pending_comment_flags > 0)) {
- echo '<div class="panel_title">Pending Comments</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Pending Comments</div>';
echo '<div class="panel_body">';
@@ -4617,10 +4614,10 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
fclose($maj_fp_comment_count_txt);
if ($maj_comment_count_value == 1) {
- echo ' ( ' . $maj_comment_count_value . ' comment ) ';
+ echo " ($maj_comment_count_value comment) ";
}
elseif ($maj_comment_count_value > 1) {
- echo ' ( ' . $maj_comment_count_value . ' comments ) ';
+ echo " ($maj_comment_count_value comments) ";
}
else {
echo '';
@@ -4630,7 +4627,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
}
closedir($maj_dh_list_pending_comment_flags);
}
- echo '</div>';
+ echo '</div></div>';
}
}
@@ -4688,7 +4685,7 @@ if (!file_exists("data/xucomment.txt") and isset($_SESSION['logged_in'])) {
if (count($maj_unread_comments) > 0) {
- echo '<div class="panel_title"><a href="del.php?target=unread"><img src="images/widget.del.png" border="0" width="11" height="11" align="right"></a>Unread Comments</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title"><a href="del.php?target=unread"><img src="images/widget.del.png" border="0" width="11" height="11" align="right"></a>Unread Comments</div>';
echo '<div class="panel_body"><table border="0" cellspacing="0" cellpadding="0" width="100%">';
foreach ($maj_unread_comments as $maj_unread_comment) {
@@ -4698,7 +4695,7 @@ if (!file_exists("data/xucomment.txt") and isset($_SESSION['logged_in'])) {
echo "<tr><td><a class=\"navlink\" href=\"index.php?entry=$maj_unread_comment&show=comments\">$maj_unread_comment_title</a></td></tr>";
}
- echo '</table></div>';
+ echo '</table></div></div>';
}
}
@@ -4719,7 +4716,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if ($maj_count_pending_list > 0) {
- echo '<div class="panel_title">Pending Member';
+ echo '<div class="panel_wrapper"><div class="panel_title">Pending Member';
if ($maj_count_pending_list > 1) {
echo "s";
@@ -4728,11 +4725,11 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if ($maj_count_pending_list > 1) {
echo "s";
}
- echo " below.</div>";
+ echo " below.</div></div>";
foreach ($maj_show_pending_list as $maj_pending_list_entry) {
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
echo "$maj_pending_list_entry";
echo '<a href=reg.php?username=';
echo $maj_pending_list_entry;
@@ -4769,14 +4766,14 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
$maj_email_confirmed = date("d M Y H:i",mktime($maj_confirmed_hh,$maj_confirmed_mm,0,$maj_confirmed_month,$maj_confirmed_day,$maj_confirmed_year));
echo "<br>$maj_email_confirmed";
}
- echo "</div>";
+ echo "</div></div>";
}
}
}
if (file_exists("data/bb.txt") and file_exists("data/bb-stats.txt")) {
- echo '<div class="panel_title">Bulletin Board</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Bulletin Board</div>';
echo "<div class=panel_body>";
@@ -4850,12 +4847,12 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-stats.txt")) {
$maj_bb_last = file_get_contents("data/bb-last.txt");
echo "<br>Latest Login: <a href=member.php?id=$maj_bb_last>$maj_bb_last</a>";
}
- echo "</div>";
+ echo "</div></div>";
}
if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt")))) {
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
?>
@@ -4864,7 +4861,7 @@ if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['
<div class="panel_body">
<input type="text" class="search" name="search" autocomplete="off" maxlength="55">
</form>
- </div>
+ </div></div>
<?php
}
@@ -4872,7 +4869,7 @@ if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
- echo '<div class="panel_title">Find Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Find Entries</div>';
echo "<div class=panel_body>";
echo "<a class=\"navlink\" href=\"index.php?find=private\">Private</a>";
@@ -4884,7 +4881,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
echo "<br><a class=\"navlink\" href=\"index.php?find=comments\">With Comments</a>";
echo "<br><a class=\"navlink\" href=\"index.php?find=filedrop\">With Attached Files</a>";
echo "<br><a class=\"navlink\" href=\"index.php?find=album\">With Photo Album</a>";
- echo "</div>";
+ echo "</div></div>";
}
if (file_exists("data/categories")) {
@@ -4912,7 +4909,7 @@ if (file_exists("data/categories")) {
if ($maj_count_categories > 0) {
- echo '<div class="panel_title">Categories</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Categories</div>';
echo '<div class=panel_body>';
@@ -4931,13 +4928,13 @@ if (file_exists("data/categories")) {
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
}
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
- echo '<div class="panel_title">Statistics</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Statistics</div>';
echo '<div class=panel_body>';
echo "Total Entries: $maj_count_latest";
@@ -4966,12 +4963,12 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
readfile("data/sitemap.txt");
}
- echo '</div>';
+ echo '</div></div>';
}
if (($maj_count_latest > 0) and ($maj_count_latest > $maj_increase) and (!file_exists("data/xrecent.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt")))) {
- echo '<div class="panel_title">Recent Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Recent Entries</div>';
echo '<div class=panel_body>';
@@ -4993,12 +4990,12 @@ if (($maj_count_latest > 0) and ($maj_count_latest > $maj_increase) and (!file_e
$maj_increment_recent_entries = $maj_increment_recent_entries + 1;
}
- echo '</div>';
+ echo '</div></div>';
}
if ($maj_count_albums > 0) {
- echo "<div class=\"panel_title\">Albums</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Albums</div>";
echo "<div class=\"panel_body\">";
@@ -5007,7 +5004,7 @@ if ($maj_count_albums > 0) {
readfile("data/items/$maj_album/title.txt");
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
@@ -5024,7 +5021,7 @@ if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_conten
if ($maj_count_random > $maj_limit_random) {
- echo '<div class="panel_title">Random Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Random Entries</div>';
echo "<div class=\"panel_body\">";
@@ -5047,7 +5044,7 @@ if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_conten
}
if ($maj_count_random > $maj_limit_random) {
- echo "</div>";
+ echo "</div></div>";
}
}
?>
@@ -5061,7 +5058,7 @@ if (($maj_count_archives > 0) and ($maj_count_latest > $maj_increase) and ($maj_
$maj_unique_archive_list = array_unique($maj_archives);
- echo "<div class=\"panel_title\">Archives ($maj_count_archives)</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Archives ($maj_count_archives)</div>";
echo "<div class=\"panel_body\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">";
foreach ($maj_unique_archive_list as $maj_archive_list_entry) {
@@ -5074,7 +5071,7 @@ if (($maj_count_archives > 0) and ($maj_count_latest > $maj_increase) and ($maj_
echo "<tr><td><a class=\"navlink\" href=\"index.php?archive=$maj_archive_list_value\"><nobr>$maj_archive_list_month $maj_archive_list_year</nobr></a></td><td align=right>$maj_archive_list_num</td></tr>";
}
- echo "</table></div>";
+ echo "</table></div></div>";
}
if ($maj_count_right_panels > 0) {
@@ -5128,7 +5125,7 @@ if ($maj_count_right_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_right_panel_border) or isset($maj_right_panel_bgcolor_t) or isset($maj_right_panel_text_t)) {
echo ' style="';
@@ -5196,7 +5193,7 @@ if ($maj_count_right_panels > 0) {
include("data/panels/$maj_right_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_right_panel/free.txt") and !file_exists("data/panels/$maj_right_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
diff --git a/login.php b/login.php
index b7ed3f6..d5ddbe8 100644
--- a/login.php
+++ b/login.php
@@ -1,5 +1,7 @@
<?php
session_start();
+
+ session_regenerate_id(TRUE);
header("Cache-control: private");
diff --git a/options.php b/options.php
index 8823a1b..02be53c 100644
--- a/options.php
+++ b/options.php
@@ -2,6 +2,8 @@
session_start();
+session_regenerate_id(TRUE);
+
header("Cache-control: private");
error_reporting(E_ERROR);
diff --git a/rel.txt b/rel.txt
index b33f126..659c594 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012142034
+201012170541
diff --git a/settings.php b/settings.php
index 7c49802..743e384 100644
--- a/settings.php
+++ b/settings.php
@@ -2,6 +2,8 @@
session_start();
+session_regenerate_id(TRUE);
+
header("Cache-control: private");
error_reporting(E_ERROR);
@@ -267,6 +269,18 @@ if (!isset($_POST['xucomment']) or empty($_POST['xucomment'])) {
}
}
+if (isset($_POST['shadow']) and !empty($_POST['shadow']) and ($_POST['shadow'] == "on") and !file_exists("data/shadow.txt")) {
+ touch("data/shadow.txt");
+}
+
+if (!isset($_POST['shadow']) or empty($_POST['shadow'])) {
+ if (isset($_POST['edit']) and ($_POST['edit'] == "on")) {
+ if (file_exists("data/shadow.txt")) {
+ unlink("data/shadow.txt");
+ }
+ }
+}
+
if (isset($_POST['round']) and !empty($_POST['round']) and ($_POST['round'] == "on")) {
if (!file_exists("data/round.txt")) {
@@ -1175,7 +1189,7 @@ a:active {
<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 = "14";
+ $toggles_rowspan = "15";
if (file_exists("data/email.txt")) {
$toggles_rowspan = $toggles_rowspan + 1;
@@ -1228,6 +1242,8 @@ else {
?> on center of page.</td></tr>
<tr><td><input type="checkbox" name="old" <?php if (file_exists("data/old.txt")) { echo checked; } ?>> Display entries from oldest to newest.</td></tr>
+<tr><td><input type="checkbox" name="shadow" <?php if (file_exists("data/shadow.txt")) { echo checked; } ?>> Display box shadow on progressive browsers.</td></tr>
+
<tr><td><input type="checkbox" name="round" <?php if (file_exists("data/round.txt")) { echo checked; } ?>> Display rounded corners on progressive browsers.</td></tr>
<?php if (file_exists("data/round.txt")) { ?>
tree 4cd1a1ce84f9ff11d86a924fb338e15e67845e2e
parent a50966c0b0632309683ba7a8c0aed063eb564819
author Engels Antonio <engels@majcms.org> 1294539193 +0800
committer Engels Antonio <engels@majcms.org> 1294539193 +0800
Holiday release backlog commit
diff --git a/css.php b/css.php
index 932f7db..dff4657 100644
--- a/css.php
+++ b/css.php
@@ -217,6 +217,27 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
?>
}
+.panel_wrapper {
+
+ <?php
+
+ if (file_exists("data/round.txt")) {
+ echo "\n\t-webkit-border-radius: $maj_border_radius;";
+ echo "\n\t-khtml-border-radius: $maj_border_radius;";
+ echo "\n\t-moz-border-radius: $maj_border_radius;";
+ echo "\n\tborder-radius: $maj_border_radius;";
+ }
+
+ if (file_exists("data/shadow.txt")) {
+ echo "\n\t-moz-box-shadow: 0 0 2px #ddd;";
+ echo "\n\t-webkit-box-shadow: 0 0 2px #ddd;";
+ echo "\n\t-khtml-box-shadow: 0 0 2px #ddd;";
+ echo "\n\tbox-shadow: 0 0 2px #ddd;";
+ }
+
+ ?>
+}
+
.panel_title {
padding: 5px;
margin: 0px;
diff --git a/edit.php b/edit.php
index 1c38457..0f3681f 100644
--- a/edit.php
+++ b/edit.php
@@ -799,6 +799,11 @@ if (file_exists("images/{$_REQUEST['entry']}/album")) {
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"150\">";
foreach ($ack_members as $ack_member) {
+
+ if ($_SESSION['logged_in'] == $nak_member) {
+ continue;
+ }
+
echo "<form enctype=\"multipart/form-data\" action=\"edit.php\" method=\"post\">";
echo "<input type=\"hidden\" name=\"entry\" value=\"{$_REQUEST['entry']}\">";
echo "<input type=\"hidden\" name=\"auth_member\" value=\"$ack_member\">";
@@ -818,6 +823,11 @@ if (file_exists("images/{$_REQUEST['entry']}/album")) {
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"150\">";
foreach ($nak_members as $nak_member) {
+
+ if ($_SESSION['logged_in'] == $nak_member) {
+ continue;
+ }
+
echo "<form enctype=\"multipart/form-data\" action=\"edit.php\" method=\"post\">";
echo "<input type=\"hidden\" name=\"entry\" value=\"{$_REQUEST['entry']}\">";
echo "<input type=\"hidden\" name=\"auth_member\" value=\"$nak_member\">";
diff --git a/index.php b/index.php
index 5483763..ad13d94 100644
--- a/index.php
+++ b/index.php
@@ -829,12 +829,10 @@ echo "<tr><td width=\"$maj_wside\" height=\"$maj_wspace\"></td><td width=\"$maj_
echo "<tr><td width=\"$maj_wside\" valign=\"top\">";
if (!file_exists("data/xprofile.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
-
- echo "<div class=\"panel_title\">";
+
?>
-Profile</div>
-<div class="panel_body">
+<div class="panel_wrapper"><div class="panel_title">Profile</div><div class="panel_body">
<?php
@@ -890,7 +888,7 @@ include("data/profile.php");
?>
-</div>
+</div></div>
<?php
@@ -898,11 +896,10 @@ include("data/profile.php");
if (!file_exists("data/xnavigation.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
- echo '<div class="panel_title">';
?>
-Navigation</div>
-<div class="panel_body">
+<div class="panel_wrapper"><div class="panel_title">Navigation</div><div class="panel_body">
+
<a class="navlink" href=".">Home</a><br>
<?php
@@ -946,7 +943,7 @@ else {
?>
-</div>
+</div></div>
<?php
@@ -1003,7 +1000,7 @@ if (file_exists("data/sticky")) {
if ($maj_count_sticky_list > 0) {
- echo '<div class="panel_title">Quick Links</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Quick Links</div>';
echo '<div class="panel_body">';
foreach ($maj_sticky_entries as $maj_sticky_list_entry) {
@@ -1012,7 +1009,7 @@ if (file_exists("data/sticky")) {
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
}
@@ -1152,7 +1149,7 @@ if (file_exists("data/panels")) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_left_panel_border) or isset($maj_left_panel_bgcolor_t) or isset($maj_left_panel_text_t)) {
echo ' style="';
@@ -1220,7 +1217,7 @@ if (file_exists("data/panels")) {
include("data/panels/$maj_left_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_left_panel/free.txt") and !file_exists("data/panels/$maj_left_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1286,7 +1283,7 @@ if ($maj_count_top_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_top_panel_border) or isset($maj_top_panel_bgcolor_t) or isset($maj_top_panel_text_t)) {
echo ' style="';
@@ -1354,7 +1351,7 @@ if ($maj_count_top_panels > 0) {
include("data/panels/$maj_top_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_top_panel/free.txt") and !file_exists("data/panels/$maj_top_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1687,7 +1684,7 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-summary.txt") and !file_
if ($maj_count_latest > 0) {
- echo "<div class=\"panel_title\">Latest Entries</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Latest Entries</div>";
echo "<div class=\"panel_body\">";
echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\" bgcolor=\"#cccccc\" width=\"100%\">";
@@ -1766,7 +1763,7 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-summary.txt") and !file_
if ($maj_count_latest > 0) {
- echo "</table></div>";
+ echo "</table></div></div>";
}
}
@@ -1822,7 +1819,7 @@ if ($maj_count_center_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_center_panel_border) or isset($maj_center_panel_bgcolor_t) or isset($maj_center_panel_text_t)) {
echo ' style="';
@@ -1890,7 +1887,7 @@ if ($maj_count_center_panels > 0) {
include("data/panels/$maj_center_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_center_panel/free.txt") and !file_exists("data/panels/$maj_center_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -1910,7 +1907,7 @@ if ($maj_count_items == 0) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" bgcolor=\"#cccccc\" style=\"background-color: transparent;\"><tr><td width=\"$maj_wmain\">";
- echo '<div class="panel_title">Oops!</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Oops!</div>';
echo "<div class=panel_body><table border=0 cellspacing=0 cellpadding=4><tr>";
echo "<td valign=middle><img src=images/oops.png width=36 height=36 border=0></td><td valign=middle>";
@@ -1927,7 +1924,7 @@ if ($maj_count_items == 0) {
}
}
- echo '</td></tr></table></div>';
+ echo '</td></tr></table></div></div>';
echo "</td></tr></table>";
}
@@ -2027,7 +2024,7 @@ foreach ($maj_disp as $maj_d) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_d_border) or isset($maj_d_bgcolor_t) or isset($maj_d_text_t)) {
echo ' style="';
@@ -2778,7 +2775,6 @@ foreach ($maj_disp as $maj_d) {
}
}
-
$maj_album_views_value = file_get_contents("data/items/$maj_d/album/views.txt");
if ($maj_album_views_value == 1) {
@@ -2975,7 +2971,7 @@ foreach ($maj_disp as $maj_d) {
echo "| <a href=\"index.php?entry=$maj_d\" class=\"status\">permalink</a>";
}
- echo "</div>";
+ echo "</div></div>";
echo "</td></tr></table>";
@@ -3030,7 +3026,7 @@ foreach ($maj_disp as $maj_d) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_entry_panel_border) or isset($maj_entry_panel_bgcolor_t) or isset($maj_entry_panel_text_t)) {
echo ' style="';
@@ -3098,7 +3094,7 @@ foreach ($maj_disp as $maj_d) {
include("data/panels/$maj_entry_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_entry_panel/free.txt") and !file_exists("data/panels/$maj_entry_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -3110,7 +3106,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">Album';
+ echo '<div class="panel_wrapper"><div class="panel_title">Album';
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo '<a href=del.php?entry=';
@@ -3249,7 +3245,7 @@ foreach ($maj_disp as $maj_d) {
}
}
}
- echo '</div>';
+ echo '</div></div>';
echo '</td></tr></table>';
@@ -3259,7 +3255,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">Videos</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Videos</div>';
echo '<div class="panel_body">';
if (file_exists("data/items/$maj_d/passwd.txt") and (!isset($_SESSION['logged_in']) or ($_SESSION['logged_in'] != $maj_login_username)) and (!isset($_REQUEST['passwd']) or ($maj_crypt_passwd != $maj_passwd))) {
@@ -3291,14 +3287,14 @@ foreach ($maj_disp as $maj_d) {
unset($maj_video);
}
}
- echo "</div></td></tr></table>";
+ echo "</div></div></td></tr></table>";
}
if (isset($maj_req_entry) and !empty($maj_req_entry) and isset($maj_req_show) and !empty($maj_req_show) and ($maj_req_show == filedrop) and file_exists("data/items/$maj_d/filedrop/files")) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo "<div class=panel_title>Filedrop";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Filedrop";
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo "<a href=del.php?entry=$maj_d&target=filedrop><img src=images/widget.del.png border=0 width=11 height=11 align=right alt=\"delete filedrop\"></a>";
@@ -3377,7 +3373,7 @@ foreach ($maj_disp as $maj_d) {
echo "</td></tr></table>";
}
}
- echo "</div>";
+ echo "</div></div>";
echo '</td></tr></table>';
}
@@ -3386,7 +3382,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">PDF';
+ echo '<div class="panel_wrapper"><div class="panel_title">PDF';
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
echo '<a href=del.php?entry=';
@@ -3432,7 +3428,7 @@ foreach ($maj_disp as $maj_d) {
closedir($maj_dh_pdf);
}
}
- echo '</div>';
+ echo '</div></div>';
echo '</td></tr></table>';
}
@@ -3455,11 +3451,12 @@ foreach ($maj_disp as $maj_d) {
asort($maj_show_comments);
reset($maj_show_comments);
+
foreach ($maj_show_comments as $maj_comment) {
echo "<a name=\"$maj_comment\"></a>";
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
if (file_exists("data/items/$maj_d/comments/live/$maj_comment/url.txt")) {
echo '<a target=_maj href=';
@@ -3847,7 +3844,7 @@ foreach ($maj_disp as $maj_d) {
$maj_entry_comment = preg_replace("/\b($maj_badwords)\b/i",$maj_censor,$maj_entry_comment);
}
echo $maj_entry_comment;
- echo '</tr></table></div>';
+ echo '</tr></table></div></div>';
}
unset($maj_show_comments);
echo '</td></tr></table>';
@@ -4089,7 +4086,7 @@ foreach ($maj_disp as $maj_d) {
echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"$maj_wmain\"><tr><td>";
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
if (file_exists("data/items/$maj_d/comments/pending/$maj_pending_comment/url.txt")) {
echo '<a target=_maj href=';
@@ -4346,7 +4343,7 @@ foreach ($maj_disp as $maj_d) {
echo '</font><font style="font-size: 5px;"><br><br></font>';
readfile("data/items/$maj_d/comments/pending/$maj_pending_comment/comment.txt");
- echo '</tr></table></div>';
+ echo '</tr></table></div></div>';
unset($maj_show_pending_comments);
echo '</td></tr></table>';
@@ -4406,7 +4403,7 @@ if ($maj_count_bottom_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_bottom_panel_border) or isset($maj_bottom_panel_bgcolor_t) or isset($maj_bottom_panel_text_t)) {
echo ' style="';
@@ -4474,7 +4471,7 @@ if ($maj_count_bottom_panels > 0) {
include("data/panels/$maj_bottom_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_bottom_panel/free.txt") and !file_exists("data/panels/$maj_bottom_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
@@ -4599,7 +4596,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if (($maj_count_latest > 0) and ($maj_count_pending_comment_flags > 0)) {
- echo '<div class="panel_title">Pending Comments</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Pending Comments</div>';
echo '<div class="panel_body">';
@@ -4617,10 +4614,10 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
fclose($maj_fp_comment_count_txt);
if ($maj_comment_count_value == 1) {
- echo ' ( ' . $maj_comment_count_value . ' comment ) ';
+ echo " ($maj_comment_count_value comment) ";
}
elseif ($maj_comment_count_value > 1) {
- echo ' ( ' . $maj_comment_count_value . ' comments ) ';
+ echo " ($maj_comment_count_value comments) ";
}
else {
echo '';
@@ -4630,7 +4627,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
}
closedir($maj_dh_list_pending_comment_flags);
}
- echo '</div>';
+ echo '</div></div>';
}
}
@@ -4688,7 +4685,7 @@ if (!file_exists("data/xucomment.txt") and isset($_SESSION['logged_in'])) {
if (count($maj_unread_comments) > 0) {
- echo '<div class="panel_title"><a href="del.php?target=unread"><img src="images/widget.del.png" border="0" width="11" height="11" align="right"></a>Unread Comments</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title"><a href="del.php?target=unread"><img src="images/widget.del.png" border="0" width="11" height="11" align="right"></a>Unread Comments</div>';
echo '<div class="panel_body"><table border="0" cellspacing="0" cellpadding="0" width="100%">';
foreach ($maj_unread_comments as $maj_unread_comment) {
@@ -4698,7 +4695,7 @@ if (!file_exists("data/xucomment.txt") and isset($_SESSION['logged_in'])) {
echo "<tr><td><a class=\"navlink\" href=\"index.php?entry=$maj_unread_comment&show=comments\">$maj_unread_comment_title</a></td></tr>";
}
- echo '</table></div>';
+ echo '</table></div></div>';
}
}
@@ -4719,7 +4716,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if ($maj_count_pending_list > 0) {
- echo '<div class="panel_title">Pending Member';
+ echo '<div class="panel_wrapper"><div class="panel_title">Pending Member';
if ($maj_count_pending_list > 1) {
echo "s";
@@ -4728,11 +4725,11 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
if ($maj_count_pending_list > 1) {
echo "s";
}
- echo " below.</div>";
+ echo " below.</div></div>";
foreach ($maj_show_pending_list as $maj_pending_list_entry) {
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
echo "$maj_pending_list_entry";
echo '<a href=reg.php?username=';
echo $maj_pending_list_entry;
@@ -4769,14 +4766,14 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
$maj_email_confirmed = date("d M Y H:i",mktime($maj_confirmed_hh,$maj_confirmed_mm,0,$maj_confirmed_month,$maj_confirmed_day,$maj_confirmed_year));
echo "<br>$maj_email_confirmed";
}
- echo "</div>";
+ echo "</div></div>";
}
}
}
if (file_exists("data/bb.txt") and file_exists("data/bb-stats.txt")) {
- echo '<div class="panel_title">Bulletin Board</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Bulletin Board</div>';
echo "<div class=panel_body>";
@@ -4850,12 +4847,12 @@ if (file_exists("data/bb.txt") and file_exists("data/bb-stats.txt")) {
$maj_bb_last = file_get_contents("data/bb-last.txt");
echo "<br>Latest Login: <a href=member.php?id=$maj_bb_last>$maj_bb_last</a>";
}
- echo "</div>";
+ echo "</div></div>";
}
if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt")))) {
- echo '<div class="panel_title">';
+ echo '<div class="panel_wrapper"><div class="panel_title">';
?>
@@ -4864,7 +4861,7 @@ if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['
<div class="panel_body">
<input type="text" class="search" name="search" autocomplete="off" maxlength="55">
</form>
- </div>
+ </div></div>
<?php
}
@@ -4872,7 +4869,7 @@ if (($maj_count_grand > 0) and (!file_exists("data/xsearch.txt") or ($_SESSION['
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
- echo '<div class="panel_title">Find Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Find Entries</div>';
echo "<div class=panel_body>";
echo "<a class=\"navlink\" href=\"index.php?find=private\">Private</a>";
@@ -4884,7 +4881,7 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
echo "<br><a class=\"navlink\" href=\"index.php?find=comments\">With Comments</a>";
echo "<br><a class=\"navlink\" href=\"index.php?find=filedrop\">With Attached Files</a>";
echo "<br><a class=\"navlink\" href=\"index.php?find=album\">With Photo Album</a>";
- echo "</div>";
+ echo "</div></div>";
}
if (file_exists("data/categories")) {
@@ -4912,7 +4909,7 @@ if (file_exists("data/categories")) {
if ($maj_count_categories > 0) {
- echo '<div class="panel_title">Categories</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Categories</div>';
echo '<div class=panel_body>';
@@ -4931,13 +4928,13 @@ if (file_exists("data/categories")) {
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
}
if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_username)) {
- echo '<div class="panel_title">Statistics</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Statistics</div>';
echo '<div class=panel_body>';
echo "Total Entries: $maj_count_latest";
@@ -4966,12 +4963,12 @@ if (isset($_SESSION['logged_in']) and ($_SESSION['logged_in'] == $maj_login_user
readfile("data/sitemap.txt");
}
- echo '</div>';
+ echo '</div></div>';
}
if (($maj_count_latest > 0) and ($maj_count_latest > $maj_increase) and (!file_exists("data/xrecent.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt")))) {
- echo '<div class="panel_title">Recent Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Recent Entries</div>';
echo '<div class=panel_body>';
@@ -4993,12 +4990,12 @@ if (($maj_count_latest > 0) and ($maj_count_latest > $maj_increase) and (!file_e
$maj_increment_recent_entries = $maj_increment_recent_entries + 1;
}
- echo '</div>';
+ echo '</div></div>';
}
if ($maj_count_albums > 0) {
- echo "<div class=\"panel_title\">Albums</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Albums</div>";
echo "<div class=\"panel_body\">";
@@ -5007,7 +5004,7 @@ if ($maj_count_albums > 0) {
readfile("data/items/$maj_album/title.txt");
echo "</a><br>";
}
- echo '</div>';
+ echo '</div></div>';
}
if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_contents("data/username.txt"))) {
@@ -5024,7 +5021,7 @@ if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_conten
if ($maj_count_random > $maj_limit_random) {
- echo '<div class="panel_title">Random Entries</div>';
+ echo '<div class="panel_wrapper"><div class="panel_title">Random Entries</div>';
echo "<div class=\"panel_body\">";
@@ -5047,7 +5044,7 @@ if (!file_exists("data/xrand.txt") or ($_SESSION['logged_in'] == file_get_conten
}
if ($maj_count_random > $maj_limit_random) {
- echo "</div>";
+ echo "</div></div>";
}
}
?>
@@ -5061,7 +5058,7 @@ if (($maj_count_archives > 0) and ($maj_count_latest > $maj_increase) and ($maj_
$maj_unique_archive_list = array_unique($maj_archives);
- echo "<div class=\"panel_title\">Archives ($maj_count_archives)</div>";
+ echo "<div class=\"panel_wrapper\"><div class=\"panel_title\">Archives ($maj_count_archives)</div>";
echo "<div class=\"panel_body\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">";
foreach ($maj_unique_archive_list as $maj_archive_list_entry) {
@@ -5074,7 +5071,7 @@ if (($maj_count_archives > 0) and ($maj_count_latest > $maj_increase) and ($maj_
echo "<tr><td><a class=\"navlink\" href=\"index.php?archive=$maj_archive_list_value\"><nobr>$maj_archive_list_month $maj_archive_list_year</nobr></a></td><td align=right>$maj_archive_list_num</td></tr>";
}
- echo "</table></div>";
+ echo "</table></div></div>";
}
if ($maj_count_right_panels > 0) {
@@ -5128,7 +5125,7 @@ if ($maj_count_right_panels > 0) {
}
}
- echo '<div class="panel_title"';
+ echo '<div class="panel_wrapper"><div class="panel_title"';
if (isset($maj_right_panel_border) or isset($maj_right_panel_bgcolor_t) or isset($maj_right_panel_text_t)) {
echo ' style="';
@@ -5196,7 +5193,7 @@ if ($maj_count_right_panels > 0) {
include("data/panels/$maj_right_panel/panel.php");
- echo '</div>';
+ echo '</div></div>';
if (file_exists("data/panels/$maj_right_panel/free.txt") and !file_exists("data/panels/$maj_right_panel/nomargin.txt")) {
echo "<div style=\"height:10px;\"></div>";
diff --git a/login.php b/login.php
index b7ed3f6..d5ddbe8 100644
--- a/login.php
+++ b/login.php
@@ -1,5 +1,7 @@
<?php
session_start();
+
+ session_regenerate_id(TRUE);
header("Cache-control: private");
diff --git a/options.php b/options.php
index 8823a1b..02be53c 100644
--- a/options.php
+++ b/options.php
@@ -2,6 +2,8 @@
session_start();
+session_regenerate_id(TRUE);
+
header("Cache-control: private");
error_reporting(E_ERROR);
diff --git a/rel.txt b/rel.txt
index b33f126..659c594 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012142034
+201012170541
diff --git a/settings.php b/settings.php
index 7c49802..743e384 100644
--- a/settings.php
+++ b/settings.php
@@ -2,6 +2,8 @@
session_start();
+session_regenerate_id(TRUE);
+
header("Cache-control: private");
error_reporting(E_ERROR);
@@ -267,6 +269,18 @@ if (!isset($_POST['xucomment']) or empty($_POST['xucomment'])) {
}
}
+if (isset($_POST['shadow']) and !empty($_POST['shadow']) and ($_POST['shadow'] == "on") and !file_exists("data/shadow.txt")) {
+ touch("data/shadow.txt");
+}
+
+if (!isset($_POST['shadow']) or empty($_POST['shadow'])) {
+ if (isset($_POST['edit']) and ($_POST['edit'] == "on")) {
+ if (file_exists("data/shadow.txt")) {
+ unlink("data/shadow.txt");
+ }
+ }
+}
+
if (isset($_POST['round']) and !empty($_POST['round']) and ($_POST['round'] == "on")) {
if (!file_exists("data/round.txt")) {
@@ -1175,7 +1189,7 @@ a:active {
<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 = "14";
+ $toggles_rowspan = "15";
if (file_exists("data/email.txt")) {
$toggles_rowspan = $toggles_rowspan + 1;
@@ -1228,6 +1242,8 @@ else {
?> on center of page.</td></tr>
<tr><td><input type="checkbox" name="old" <?php if (file_exists("data/old.txt")) { echo checked; } ?>> Display entries from oldest to newest.</td></tr>
+<tr><td><input type="checkbox" name="shadow" <?php if (file_exists("data/shadow.txt")) { echo checked; } ?>> Display box shadow on progressive browsers.</td></tr>
+
<tr><td><input type="checkbox" name="round" <?php if (file_exists("data/round.txt")) { echo checked; } ?>> Display rounded corners on progressive browsers.</td></tr>
<?php if (file_exists("data/round.txt")) { ?>