mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-23 16:01:39 +02:00
Code Issues Releases Wiki Activity

Bugtracker #3890 - avoid problems if logging in immediately after rejected download request

Browse Source
This commit is contained in:
e107steved
2007-10-28 20:03:10 +00:00
parent 28d4fe0d1e
commit b57d3bce41
2 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
download.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/download.php,v $
| $Revision: 1.15 $
| $Date: 2007-09-22 09:43:30 $
| $Revision: 1.16 $
| $Date: 2007-10-28 20:03:10 $
| $Author: e107steved $
|
+----------------------------------------------------------------------------+
@@ -75,6 +75,7 @@ else
{
$action = preg_replace("#\W#", "", $tp -> toDB($tmp[0]));
$id = intval($tmp[1]);
$errnum = intval(varset($tmp[2],0));
}
switch ($action)
{
@@ -111,6 +112,23 @@ else
break;
case 'mirror' :
break;
case 'error' : // Errors passed from request.php
define("e_PAGETITLE", PAGE_NAME);
require_once(HEADERF);
switch ($errnum)
{
case 1 :
$errmsg = LAN_dl_63; // No permissions
break;
case 2 :
$errmsg = LAN_dl_62; // Quota exceeded
break;
default:
$errmsg = LAN_dl_61." ".$errnum; // Generic error - shouldn't happen
}
$ns->tablerender(LAN_dl_61, "<div style='text-align:center'>".$errmsg."</div>");
require_once(FOOTERF);
exit;
}
}

70
request.php
View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/request.php,v $
| $Revision: 1.1.1.1 $
| $Date: 2006-12-02 04:33:09 $
| $Author: mcfly_e107 $
| $Revision: 1.2 $
| $Date: 2007-10-28 20:03:10 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -49,7 +49,8 @@ if(strstr(e_QUERY, "mirror")) {
if ($sql->db_Select_gen($qry)) {
$row = $sql->db_Fetch();
extract($row);
if (check_class($download_category_class) && check_class($download_class)) {
if (check_class($download_category_class) && check_class($download_class))
{
if($pref['download_limits'] && $download_active == 1) {
check_download_limits();
}
@@ -73,6 +74,8 @@ if(strstr(e_QUERY, "mirror")) {
header("Location: {$gaddress}");
exit();
}
header("Location: ".e_BASE."download.php?error.{$download_id}.1");
exit;
}
}
@@ -180,22 +183,29 @@ if ($type == "file")
exit();
}
}
} else {
// Download Access Denied.
if((!strpos($pref['download_denied'],".php") &&
}
else
{ // Download Access Denied.
if((!strpos($pref['download_denied'],".php") &&
!strpos($pref['download_denied'],".htm") &&
!strpos($pref['download_denied'],".html") &&
!strpos($pref['download_denied'],".shtml") ||
(strpos($pref['download_denied'],"signup.php") && USER == TRUE)
)){
require_once(HEADERF);
))
{
header("Location: ".e_BASE."download.php?error.{$id}.1");
exit;
/* require_once(HEADERF);
$denied_message = ($pref['download_denied'] && !strpos($pref['download_denied'],"signup.php")) ? $tp->toHTML($pref['download_denied'],"","defs") : LAN_dl_63;
$ns -> tablerender(LAN_dl_61, $denied_message);
require_once(FOOTERF);
exit();
}else{
header("Location: ".trim($pref['download_denied']));
}
require_once(FOOTERF);
exit(); */
}
else
{
header("Location: ".trim($pref['download_denied']));
exit;
}
}
}
else if(strstr(e_QUERY, "pub_"))
@@ -292,7 +302,7 @@ function send_file($file) {
if(!strstr($path, $path_downloads) && !strstr($path,$path_public)) {
if(E107_DEBUG_LEVEL > 0 && ADMIN){
echo "Failed to Download <b>".$file."</b><br />";
echo "The file-path <b>".$path."<b> didn't match with either <b>$path_downloads</b> or <b>$path_public</b><br />";
echo "The file-path <b>".$path."<b> didn't match with either <b>{$path_downloads}</b> or <b>{$path_public}</b><br />";
exit();
}else{
header("location: {$e107->base_path}");
@@ -351,28 +361,33 @@ function send_file($file) {
}
}
}
function check_download_limits() {
function check_download_limits()
{
global $pref, $sql, $ns, $HEADER, $e107, $tp;
// Check download count limits
$qry = "SELECT gen_intdata, gen_chardata, (gen_intdata/gen_chardata) as count_perday FROM #generic WHERE gen_type = 'download_limit' AND gen_datestamp IN (".USERCLASS_LIST.") AND (gen_chardata >= 0 AND gen_intdata >= 0) ORDER BY count_perday DESC";
if($sql->db_Select_gen($qry)) {
if($sql->db_Select_gen($qry))
{
$limits = $sql->db_Fetch();
$cutoff = time() - (86400 * $limits['gen_chardata']);
if(USER) {
if(USER)
{
$where = "dr.download_request_datestamp > {$cutoff} AND dr.download_request_userid = ".USERID;
} else {
$ip = $e107->getip();
$where = "dr.download_request_datestamp > {$cutoff} AND dr.download_request_ip = '{$ip}'";
}
$qry = "SELECT COUNT(d.download_id) as count FROM #download_requests as dr LEFT JOIN #download as d ON dr.download_request_download_id = d.download_id AND d.download_active = 1 WHERE {$where} GROUP by dr.download_request_userid";
if($sql->db_Select_gen($qry)) {
if($sql->db_Select_gen($qry))
{
$row=$sql->db_Fetch();
if($row['count'] >= $limits['gen_intdata']) {
if($row['count'] >= $limits['gen_intdata'])
{
// Exceeded download count limit
require_once(HEADERF);
header("Location: ".e_BASE."download.php?error.{$cutoff}.2");
/* require_once(HEADERF);
$ns->tablerender(LAN_dl_61, LAN_dl_62);
require(FOOTERF);
require(FOOTERF); */
exit();
}
}
@@ -391,11 +406,12 @@ function check_download_limits() {
$qry = "SELECT SUM(d.download_filesize) as total_bw FROM #download_requests as dr LEFT JOIN #download as d ON dr.download_request_download_id = d.download_id AND d.download_active = 1 WHERE {$where} GROUP by dr.download_request_userid";
if($sql->db_Select_gen($qry)) {
$row=$sql->db_Fetch();
if($row['total_bw'] / 1024 > $limit['gen_user_id']) {
//Exceed bandwith limit
require(HEADERF);
if($row['total_bw'] / 1024 > $limit['gen_user_id'])
{ //Exceed bandwith limit
header("Location: ".e_BASE."download.php?error.{$cutoff}.2");
/* require(HEADERF);
$ns->tablerender(LAN_dl_61, LAN_dl_62);
require(FOOTERF);
require(FOOTERF); */
exit();
}
}