more big update (sorry about all of them, but i not remember exactly all fixes that i did)

This commit is contained in:
unknown
2012-05-19 12:29:56 +03:00
parent 0ef7620da6
commit 3bcc09d110
29 changed files with 1960 additions and 1221 deletions
+7 -7
View File
@@ -15,17 +15,17 @@ include("menu.tpl");
<th colspan="2" class="buttons">
<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /> <input name="start" type="image" value="Back" alt="Back" id="btn_back" class="dynamic_img" src="img/x.gif" /></th>
<th class="navi"><?php
if(!isset($_GET['s']) && count($message->archived)-count($database->getDelArchive($session->uid)) < 10) {
if(!isset($_GET['s']) && count($message->archived1) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->archived)-count($database->getDelArchive($session->uid)) > 10) {
else if (!isset($_GET['s']) && count($message->archived1) > 10) {
echo "&laquo;<a href=\"?s=10&o=0\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->archived)-count($database->getDelArchive($session->uid)) > $_GET['s']) {
if(count($message->archived)-count($database->getDelArchive($session->uid)) > ($_GET['s']+10) && $_GET['s']-10 < count($message->archived)-count($database->getDelArchive($session->uid)) && $_GET['s'] != 0) {
else if(isset($_GET['s']) && count($message->archived1) > $_GET['s']) {
if(count($message->archived1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->archived1) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($message->archived)-count($database->getDelArchive($session->uid)) > $_GET['s']+10) {
else if(count($message->archived1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
@@ -42,7 +42,7 @@ include("menu.tpl");
}
$name = 1;
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->archived)-count($database->getDelArchive($session->uid)) >= $i) {
if(count($message->archived1) >= $i) {
if($message->archived[$i-1]['owner'] == 0) {
echo "<tr class=\"sup\">";
}
@@ -60,7 +60,7 @@ include("menu.tpl");
}
$name++;
}
if(count($message->archived)-count($database->getDelArchive($session->uid)) == 0) {
if(count($message->archived1) == 0) {
echo "<td colspan=\"4\" class=\"none\">There are no messages available in the archive.</td></tr>";
}
?>
+15 -15
View File
@@ -24,17 +24,17 @@ include("menu.tpl");
<?php if($session->plus) { echo "<input name=\"archive\" value=\"Archive\" type=\"image\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" alt=\"Archive\" />"; } ?>
<input name="ft" value="m3" type="hidden" />
</th><th class="navi"><?php
if(!isset($_GET['s']) && count($message->inbox)-count($database->getDelInbox($session->uid)) < 10) {
if(!isset($_GET['s']) && count($message->inbox1) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->inbox)-count($database->getDelInbox($session->uid)) > 10) {
else if (!isset($_GET['s']) && count($message->inbox1) > 10) {
echo "&laquo;<a href=\"?s=10&o=0\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->inbox)-count($database->getDelInbox($session->uid)) > $_GET['s']) {
if(count($message->inbox)-count($database->getDelInbox($session->uid)) > ($_GET['s']+10) && $_GET['s']-10 < count($message->inbox)-count($database->getDelInbox($session->uid)) && $_GET['s'] != 0) {
else if(isset($_GET['s']) && count($message->inbox1) > $_GET['s']) {
if(count($message->inbox1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->inbox1) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($message->inbox)-count($database->getDelInbox($session->uid)) > $_GET['s']+10) {
else if(count($message->inbox1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
@@ -51,31 +51,31 @@ include("menu.tpl");
}
$name = 1;
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->inbox)-count($database->getDelInbox($session->uid)) >= $i) {
if($message->inbox[$i-1]['owner'] <= 1) {
if(count($message->inbox1) >= $i) {
if($message->inbox1[$i-1]['owner'] <= 1) {
echo "<tr class=\"sup\">";
}
else {
echo "<tr>";
}
echo "<td class=\"sel\"><input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->inbox[$i-1]['id']."\" /></td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->inbox[$i-1]['id']."\">".$message->inbox[$i-1]['topic']."</a> ";
if($message->inbox[$i-1]['viewed'] == 0) {
echo "<td class=\"sel\"><input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->inbox1[$i-1]['id']."\" /></td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->inbox1[$i-1]['id']."\">".$message->inbox1[$i-1]['topic']."</a> ";
if($message->inbox1[$i-1]['viewed'] == 0) {
echo "(new)";
}
$date = $generator->procMtime($message->inbox[$i-1]['time']);
if($message->inbox[$i-1]['owner'] <= 1) {
echo "</td><td class=\"send\"><a><u>".$database->getUserField($message->inbox[$i-1]['owner'],'username',0)."</u></a></td>
$date = $generator->procMtime($message->inbox1[$i-1]['time']);
if($message->inbox1[$i-1]['owner'] <= 1) {
echo "</td><td class=\"send\"><a><u>".$database->getUserField($message->inbox1[$i-1]['owner'],'username',0)."</u></a></td>
<td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
}
else {
echo "</td><td class=\"send\"><a href=\"spieler.php?uid=".$message->inbox[$i-1]['owner']."\">".$database->getUserField($message->inbox[$i-1]['owner'],'username',0)."</a></td>
echo "</td><td class=\"send\"><a href=\"spieler.php?uid=".$message->inbox1[$i-1]['owner']."\">".$database->getUserField($message->inbox1[$i-1]['owner'],'username',0)."</a></td>
<td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
}
}
$name++;
}
if(count($message->inbox)-count($database->getDelInbox($session->uid)) == 0) {
if(count($message->inbox1) == 0) {
echo "<td colspan=\"4\" class=\"none\">There are no messages available.</td></tr>";
}
?>
+13 -13
View File
@@ -30,17 +30,17 @@
<input class="check" type="checkbox" id="s10" name="s10" onclick="Allmsg(this.form);" />
<?php } ?></th>
<th colspan="2" class="buttons"><input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /></th><th class="navi"><?php
if(!isset($_GET['s']) && count($message->sent)-count($database->getDelSent($session->uid)) < 10) {
if(!isset($_GET['s']) && count($message->sent1) < 10) {
echo "&laquo;&raquo;";
}
else if (!isset($_GET['s']) && count($message->sent)-count($database->getDelSent($session->uid)) > 10) {
else if (!isset($_GET['s']) && count($message->sent1) > 10) {
echo "&laquo;<a href=\"?s=10&o=0\">&raquo;</a>";
}
else if(isset($_GET['s']) && count($message->sent)-count($database->getDelSent($session->uid)) > $_GET['s']) {
if(count($message->sent)-count($database->getDelSent($session->uid)) > ($_GET['s']+10) && $_GET['s']-10 < count($message->sent)-count($database->getDelSent($session->uid)) && $_GET['s'] != 0) {
else if(isset($_GET['s']) && count($message->sent1) > $_GET['s']) {
if(count($message->sent1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->sent1) && $_GET['s'] != 0) {
echo "<a href=\"?s=".($_GET['s']-10)."&o=0\">&laquo;</a><a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else if(count($message->sent)-count($database->getDelSent($session->uid)) > $_GET['s']+10) {
else if(count($message->sent1) > $_GET['s']+10) {
echo "&laquo;<a href=\"?s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
}
else {
@@ -58,25 +58,25 @@
}
$name = 1;
for($i=(1+$s);$i<=(10+$s);$i++) {
if(count($message->sent)-count($database->getDelSent($session->uid)) >= $i) {
if($message->sent[$i-1]['target'] == 0) {
if(count($message->sent1) >= $i) {
if($message->sent1[$i-1]['target'] == 0) {
echo "<tr class=\"sup\">";
}
else {
echo "<tr>";
}
echo "<td class=\"sel\"><input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->sent[$i-1]['id']."\" /></td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->sent[$i-1]['id']."\">".$message->sent[$i-1]['topic']."</a> ";
if($message->sent[$i-1]['viewed'] == 0) {
echo "<td class=\"sel\"><input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->sent1[$i-1]['id']."\" /></td>
<td class=\"top\"><a href=\"nachrichten.php?id=".$message->sent1[$i-1]['id']."\">".$message->sent1[$i-1]['topic']."</a> ";
if($message->sent1[$i-1]['viewed'] == 0) {
echo "(unread)";
}
$date = $generator->procMtime($message->sent[$i-1]['time']);
echo "</td><td class=\"send\"><a href=\"spieler.php?uid=".$message->sent[$i-1]['target']."\">".$database->getUserField($message->sent[$i-1]['target'],'username',0)."</a></td>
$date = $generator->procMtime($message->sent1[$i-1]['time']);
echo "</td><td class=\"send\"><a href=\"spieler.php?uid=".$message->sent1[$i-1]['target']."\">".$database->getUserField($message->sent1[$i-1]['target'],'username',0)."</a></td>
<td class=\"dat\">".$date[0]." ".$date[1]."</td></tr>";
}
$name++;
}
if(count($message->sent)-count($database->getDelSent($session->uid)) == 0) {
if(count($message->sent1) == 0) {
echo "<td colspan=\"4\" class=\"none\">There are no sent messages available.</td></tr>";
}
?>