mft39 · mft39 · Feb 24, 2014 · Feb 24, 2014 · Feb 24, 2014 · Feb 24, 2014
diff --git a/admin/functions.php b/admin/functions.php
@@ -7,6 +7,7 @@ function end_chmod($dir, $chm) {
 		$per = substr($pdir, -3);
 		if ($per != $chm) return "".$dir." �� ����� ������ ���������� ��� ������ �� �������.<br />���������� ������ �������� CHMOD - ".$chm."";
 	}
+	return;
 }
 
 ?>
diff --git a/admin/modules/blocks.php b/admin/modules/blocks.php
@@ -4,7 +4,16 @@
 
 $prefix = "orbital";
 
-$allowed_modules = array(
+// This change is made to list all PHPs in tracker root, to make
+// manual adding of pages to block system obsolete
+// Howewer, you can use array below to map filename to some human-readable name
+$existing_modules = str_replace('.php', '', glob('*.php'));
+$allowed_modules = array_combine($existing_modules, array_map(
+function ($el) {
+	return "<i>{$el}</i>";
+}, $existing_modules));
+
+$allowed_modules = array_merge($allowed_modules, array(
 	"admincp" => "�������",
 	"browse" => "�����",
 	"forums" => "�����",
@@ -24,8 +33,8 @@
 	"login" => "����",
 	"mybonus" => "��� �����",
 	"invite" => "�����������",
-	"bookmarks" => "��������"
-);
+	"bookmarks" => "��������",
+));
 
 function BlocksNavi() {
 	global $admin_file;
@@ -307,7 +316,7 @@ function BlocksEdit($bid) {
 		$i++;
 		$cel = "";
 		foreach ($where_mas as $key => $val) {
-			if ($val == $name) $cel = " checked";
+			if ($val == $name) { $cel = " checked"; $title = "<b>$title</b>"; } // Just to highlight selected pages on block edit, due to many checkboxes now...
 		}
 		$title = str_replace("_", " ", $title);
 		echo "<td><input type=\"checkbox\" name=\"blockwhere[]\" value=\"".$name."\"$cel></td><td>$title</td>";

diff --git a/admin/modules/faq.php b/admin/modules/faq.php
@@ -54,8 +54,8 @@ function FaqAdmin() {
 					print("<option value=\"$n\"". $sel .">". $n ."</option>");
 				}
 				if ($faq_categ[$id]["items"][$id2][flag] == "0") $status = "<font color=\"#FF0000\">������</font>";
-				elseif ($faq_categ[$id]["items"][$id2][flag] == "2") $status = "<font color=\"#0000FF\"><img src=\"".$rootpath.$pic_base_url."updated.png\" alt=\"Updated\" align=\"absbottom\"></font>";
-				elseif ($faq_categ[$id]["items"][$id2][flag] == "3") $status = "<font color=\"#008000\"><img src=\"".$rootpath.$pic_base_url."new.png\" alt=\"�����\" align=\"absbottom\"></font>";
+				elseif ($faq_categ[$id]["items"][$id2][flag] == "2") $status = "<font color=\"#0000FF\"><img src=\"".$rootpath.$pic_base_url."/updated.png\" alt=\"Updated\" align=\"absbottom\"></font>";
+				elseif ($faq_categ[$id]["items"][$id2][flag] == "3") $status = "<font color=\"#008000\"><img src=\"".$rootpath.$pic_base_url."/new.png\" alt=\"�����\" align=\"absbottom\"></font>";
 				else $status = "�������";
 				print("</select></td><td>". $faq_categ[$id]["items"][$id2]["question"] ."</td><td align=\"center\" width=\"60px\">". $status ."</td><td align=\"center\" width=\"60px\"><a href=\"$admin_file.php?op=FaqAction&action=edit&id=". $id2 ."\">E</a> / <a href=\"$admin_file.php?op=FaqAction&action=delete&id=". $id2 ."\">D</a></td></tr>\n");
 			}
@@ -90,7 +90,7 @@ function FaqAction() {
 	global $admin_file;
 	if ($_GET["action"] == "reorder") {
 		foreach($_POST["order"] as $id => $position)
-			sql_query("UPDATE `faq` SET `order`='$position' WHERE id=".sqlesc((int)$id)) or sqlerr(__FILE__,__LINE__);
+			sql_query("UPDATE `faq` SET `order` = ".sqlesc($position)." WHERE id = ".sqlesc((int)$id)) or sqlerr(__FILE__,__LINE__);
 		header("Location: $admin_file.php?op=FaqAdmin"); 
 	}
 

diff --git a/announce.php b/announce.php
@@ -45,7 +45,7 @@
 }
 
 foreach (array('port','downloaded','uploaded','left') as $x)
-	$GLOBALS[$x] = 0 + $_GET[$x];
+	$GLOBALS[$x] = intval($_GET[$x]);
 
 if (get_magic_quotes_gpc()) {
     $info_hash = stripslashes($info_hash);

diff --git a/blocks/block-online.php b/blocks/block-online.php
@@ -4,7 +4,9 @@
  exit;
 }
 
-global $CURUSER, $use_sessions;
+global $CURUSER, $use_sessions, $tracker_lang;
+
+$blocktitle = $tracker_lang['whos_online'];
 
 $a = mysql_fetch_array(sql_query("SELECT id, username FROM users WHERE status='confirmed' ORDER BY id DESC LIMIT 1"));
 
@@ -24,11 +26,10 @@
 
 $users = $guests = $staff = $total = 0;
 
-while (list($uid, $uname, $class) = mysql_fetch_row($result)) {
-
-	$parsed = array();
-	$parsed_id = array();
+$parsed = array();
+$parsed_id = array();
 
+while (list($uid, $uname, $class) = mysql_fetch_row($result)) {
     if (!empty($uname) && !in_array($uname, $parsed)) {
     	$parsed[] = $uname;
     	$title_who[] = "<a href=\"userdetails.php?id=".$uid."\" class=\"online\">".get_user_class_color($class, $uname)."</a>";

diff --git a/blocks/block-releases.php b/blocks/block-releases.php
@@ -26,8 +26,8 @@
 		$content .= "<tr><td>";
 		$content .= "<table width=\"100%\" class=\"main\" border=\"1\" cellspacing=\"0\" cellpadding=\"5\">";
 		$content .= "<tr><td class=\"colhead\" colspan=\"2\" align=\"center\">".htmlspecialchars_uni($release["name"]).(get_user_class() >= UC_MODERATOR ? "<font class=\"small\"> - [<a class=\"altlink_white\" href=\"indexedit.php?action=edit&id=$release[id]&returnto=" . urlencode($_SERVER['PHP_SELF']) . "\"><b>�������������</b></a>][<a class=\"altlink_white\" href=\"indexdelete.php?action=delete&id=$release[id]&returnto=" . urlencode($_SERVER['PHP_SELF']) . "\"><b>�������</b></a>]</font>" : "")."</td></tr>";
-		$content .= "<tr valign=\"top\"><td align=\"center\" width=\"160\"><img src=\"$release[poster]\" width=\"160\" border=\"0\" /></td>";
-		$content .= "<td><div align=\"left\">".(!empty($catname) ? "<a href=\"browse.php?cat=$catid\"><img src=\"pic/cats/$catimage\" alt=\"$catname\" title=\"$catname\" align=\"right\" border=\"0\" /></a>" : "").format_comment($release["top"])."<br /></div><div align=\"left\"><hr align=\"left\" width=\"85%\" color=\"#000000\" size=\"1\"></div><div align=\"left\">".format_comment($release["center"])."<br /></div><div align=\"left\"><hr align=\"left\" width=\"85%\" color=\"#000000\" size=\"1\"></div><div align=\"left\">".format_comment($release["bottom"])."</div><div align=\"right\">".($release["imdb"] ? "[<a href=\"$release[imdb]\" class=\"online\">IMDB</a>] " : "")."[<a href=\"details.php?id=$release[torrentid]\" alt=\"$release[name]\" title=\"$release[name]\"><b>������</b></a>]</div></td>";
+		$content .= "<tr valign=\"top\"><td align=\"center\" width=\"160\"><a href=\"details.php?id=$release[torrentid]\" alt=\"$release[name]\" title=\"$release[name]\"><img src=\"$release[poster]\" width=\"160\" border=\"0\" /></a></td>";
+		$content .= "<td><div align=\"left\">".(!empty($catimage) ? "<a href=\"browse.php?cat=$catid\"><img src=\"pic/cats/$catimage\" alt=\"$catname\" title=\"$catname\" align=\"right\" border=\"0\" /></a>" : "<span align=\"right\" style=\"float: right;\">$catname</span>").format_comment($release["top"])."<br /></div><div align=\"left\"><hr align=\"left\" width=\"85%\" color=\"#000000\" size=\"1\"></div><div align=\"left\">".format_comment($release["center"])."<br /></div><div align=\"left\"><hr align=\"left\" width=\"85%\" color=\"#000000\" size=\"1\"></div><div align=\"left\">".format_comment($release["bottom"])."</div><div align=\"right\">".($release["imdb"] ? "[<a href=\"$release[imdb]\" class=\"online\">IMDB</a>] " : "")."[<a href=\"details.php?id=$release[torrentid]\" alt=\"$release[name]\" title=\"$release[name]\"><b>������</b></a>]</div></td>";
 		$content .= "</tr>";
 		$content .= "</table>";
 		$content .= "</td></tr>";

diff --git a/blocks/block-search.php b/blocks/block-search.php
@@ -6,6 +6,8 @@
 
 global $tracker_lang;
 
+$blocktitle = $tracker_lang['search'];
+
 $content = '<table width="100%">
    <tr><td class="embedded">
    &nbsp;'.$tracker_lang['torrents'].'

diff --git a/blocks/block-stats.php b/blocks/block-stats.php
@@ -1,10 +1,15 @@
 <?php
+
+/* ToDo:
+ * Make cache in this block
+*/
+
 if (!defined('BLOCK_FILE')) {
  Header("Location: ../index.php");
  exit;
 }
 
-global $tracker_lang, $ss_uri, $maxusers;
+global $tracker_lang, $ss_uri, $maxusers, $pic_base_url;
 
 $registered = number_format(get_row_count("users"));
 $unverified = number_format(get_row_count("users", "WHERE status='pending'"));
@@ -14,6 +19,7 @@
 $dead = number_format(get_row_count("torrents", "WHERE visible='no'"));
 $seeders = get_row_count("peers", "WHERE seeder='yes'");
 $leechers = get_row_count("peers", "WHERE seeder='no'");
+list($external_seeders, $external_leechers) = array_map('number_format', mysql_fetch_row(sql_query('SELECT SUM(seeders), SUM(leechers) FROM torrents_scrape')));
 $warned_users = number_format(get_row_count("users", "WHERE warned = 'yes'"));
 $disabled = number_format(get_row_count("users", "WHERE enabled = 'no'"));
 $uploaders = number_format(get_row_count("users", "WHERE class = ".UC_UPLOADER));
@@ -32,25 +38,28 @@
 <table width=\"100%\" class=\"main\" border=\"0\" cellspacing=\"0\" cellpadding=\"10\">
   <tr>
     <td width=\"50%\" align=\"center\" style=\"border: none;\"><table class=\"main\" border=\"1\" cellspacing=\"0\" cellpadding=\"5\">
-<tr><td class=\"rowhead\">".$tracker_lang['users_registered']."</td><td align=right><img src=\"pic/male.gif\" alt=\"�����\">$male<img src=\"pic/female.gif\" alt=\"�������\">$female<br />".$tracker_lang['total'].": $registered</td></tr>
-<tr><td colspan=\"2\" class=\"rowhead\"><table width=\"100%\" border=\"1\" cellspacing=\"0\" cellpadding=\"5\"><tr><td style=\"text-align: right; font-weight: bold; vertical-align: top;\">���� �� �������</td><td align=\"right\">$maxusers</td></tr></table></td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['users_unconfirmed']."</td><td align=right>$unverified</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['users_warned']."&nbsp;<img src=\"pic/warned.gif\" border=0 align=absbottom></td><td align=right>$warned_users</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['users_disabled']."&nbsp;<img src=\"pic/disabled.gif\" border=0 align=absbottom></td><td align=right>$disabled</td></tr>
-<tr><td class=\"rowhead\"><font color=\"orange\">".$tracker_lang['users_uploaders']."</font></td><td align=right>$uploaders</td></tr>
-<tr><td class=\"rowhead\"><font color=\"#9C2FE0\">".$tracker_lang['users_vips']."</font></td><td align=right>$vip</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['users_registered']}</td><td align=right><img src=\"$pic_base_url/male.gif\" alt=\"{$tracker_lang['stats_male']}\">$male<img src=\"$pic_base_url/female.gif\" alt=\"{$tracker_lang['stats_female']}\">$female<br />{$tracker_lang['total']}: {$registered}</td></tr>
+<tr><td colspan=\"2\" class=\"rowhead\"><table width=\"100%\" border=\"1\" cellspacing=\"0\" cellpadding=\"5\"><tr><td style=\"text-align: right; font-weight: bold; vertical-align: top;\">{$tracker_lang['stats_maxusers']}</td><td align=\"right\">{$maxusers}</td></tr></table></td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['users_unconfirmed']}</td><td align=\"right\">{$unverified}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['users_warned']}&nbsp;<img src=\"$pic_base_url/warned.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$warned_users}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['users_disabled']}&nbsp;<img src=\"$pic_base_url/disabled.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$disabled}</td></tr>
+<tr><td class=\"rowhead\"><font color=\"orange\">{$tracker_lang['users_uploaders']}</font></td><td align=\"right\">{$uploaders}</td></tr>
+<tr><td class=\"rowhead\"><font color=\"#9C2FE0\">{$tracker_lang['users_vips']}</font></td><td align=\"right\">{$vip}</td></tr>
 
 </table></td>
-<td width=\"50%\" align=\"center\" style=\"border: none;\"><table class=main border=1 cellspacing=0 cellpadding=5>
-<tr><td class=\"rowhead\">".$tracker_lang['tracker_torrents']."</td><td align=right>$torrents</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['tracker_dead_torrents']."</td><td align=right>$dead</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['tracker_peers']."</td><td align=right>$peers</td></tr>";
+<td width=\"50%\" align=\"center\" style=\"border: none;\"><table class=\"main\" border=\"1\" cellspacing=\"0\" cellpadding=\"5\">
+<tr><td class=\"rowhead\">{$tracker_lang['tracker_torrents']}</td><td align=\"right\">{$torrents}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['tracker_dead_torrents']}</td><td align=\"right\">{$dead}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['tracker_peers']}</td><td align=\"right\">{$peers}</td></tr>";
 if (isset($peers)) {
-$content .= "<tr><td class=\"rowhead\">".$tracker_lang['tracker_seeders']."&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowup.gif\" border=0 align=absbottom></td><td align=right>$seeders</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['tracker_leechers']."&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowdown.gif\" border=0 align=absbottom></td><td align=right>$leechers</td></tr>
-<tr><td class=\"rowhead\">".$tracker_lang['tracker_seed_peer']."</td><td align=right>$ratio</td></tr>";
+$content .= "<tr><td class=\"rowhead\">{$tracker_lang['tracker_seeders']}&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowup.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$seeders}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['tracker_leechers']}&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowdown.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$leechers}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['tracker_seed_peer']}</td><td align=\"right\">{$ratio}</td></tr>";
 }
 
+$content .= "<tr><td class=\"rowhead\">{$tracker_lang['external_seeders']}&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowup.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$external_seeders}</td></tr>
+<tr><td class=\"rowhead\">{$tracker_lang['external_leechers']}&nbsp;&nbsp;<img src=\"./themes/$ss_uri/images/arrowdown.gif\" border=\"0\" align=\"absbottom\"></td><td align=\"right\">{$external_leechers}</td></tr>";
+
 $content .= "</table></td>
 
 </table>

diff --git a/bookmarks.php b/bookmarks.php
@@ -50,7 +50,7 @@
 
 list($pagertop, $pagerbottom, $limit) = pager($perpage, $count, "bookmarks.php?");
 
-$res = sql_query("SELECT bookmarks.id AS bookmarkid, users.username, users.class, users.id AS owner, torrents.id, torrents.name, torrents.type, torrents.comments, torrents.leechers, torrents.seeders, IF(torrents.numratings < $minvotes, NULL, ROUND(torrents.ratingsum / torrents.numratings)) AS rating, categories.name AS cat_name, categories.image AS cat_pic, torrents.save_as, torrents.numfiles, torrents.added, torrents.filename, torrents.size, torrents.views, torrents.visible, torrents.free, torrents.hits, torrents.times_completed, torrents.category FROM bookmarks INNER JOIN torrents ON bookmarks.torrentid = torrents.id LEFT JOIN users ON torrents.owner = users.id LEFT JOIN categories ON torrents.category = categories.id WHERE bookmarks.userid = ".sqlesc($CURUSER["id"])." ORDER BY torrents.id DESC $limit") or sqlerr(__FILE__, __LINE__);
+$res = sql_query("SELECT bookmarks.id AS bookmarkid, users.username, users.class, users.id AS owner, torrents.id, torrents.name, torrents.info_hash, torrents.type, torrents.comments, (torrents.leechers + torrents.remote_leechers) AS leechers, (torrents.seeders + torrents.remote_seeders) AS seeders, torrents.multitracker, torrents.last_mt_update, IF(torrents.numratings < $minvotes, NULL, ROUND(torrents.ratingsum / torrents.numratings)) AS rating, categories.name AS cat_name, categories.image AS cat_pic, torrents.save_as, torrents.numfiles, torrents.added, torrents.filename, torrents.size, torrents.views, torrents.visible, torrents.free, torrents.hits, torrents.times_completed, torrents.category FROM bookmarks INNER JOIN torrents ON bookmarks.torrentid = torrents.id LEFT JOIN users ON torrents.owner = users.id LEFT JOIN categories ON torrents.category = categories.id WHERE bookmarks.userid = ".sqlesc($CURUSER["id"])." ORDER BY torrents.id DESC $limit") or sqlerr(__FILE__, __LINE__);
 
 print("<tr><td class=\"index\" colspan=\"12\">");
 print($pagertop);
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ function end_chmod($dir, $chm) { @@
     		$per = substr($pdir, -3);
     		if ($per != $chm) return "".$dir." �� ����� ������ ���������� ��� ������ �� �������.<br />���������� ������ �������� CHMOD - ".$chm."";
     	}
+    	return;
     }
     ?>