gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge conflickts

Browse Source
This commit is contained in:
Uwe Steinmann 2014-03-21 09:21:49 +01:00
parent 468846b19f
commit 1b95fee8d5
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
op/op.Download.php
View File

@ -139,12 +139,8 @@ if (isset($_GET["version"])) {
header("Cache-Control: public"); header("Cache-Control: public");
//header("Pragma: no-cache"); //header("Pragma: no-cache");
<<<<<<< HEAD
ob_clean(); ob_clean();
readfile($settings->_contentDir .$_GET["arkname"] );
=======
readfile($settings->_contentDir .$filename ); readfile($settings->_contentDir .$filename );
>>>>>>> seeddms-4.3.7
} elseif (isset($_GET["logname"])) { } elseif (isset($_GET["logname"])) {
$filename = basename($_GET["logname"]); $filename = basename($_GET["logname"]);
@ -164,14 +160,9 @@ if (isset($_GET["version"])) {
header("Content-Length: " . filesize($settings->_contentDir . $filename )); header("Content-Length: " . filesize($settings->_contentDir . $filename ));
header("Content-Disposition: attachment; filename=\"" .$filename . "\""); header("Content-Disposition: attachment; filename=\"" .$filename . "\"");
header("Cache-Control: must-revalidate"); header("Cache-Control: must-revalidate");
<<<<<<< HEAD
ob_clean(); ob_clean();
readfile($settings->_contentDir .$_GET["logname"] );
=======
readfile($settings->_contentDir .$filename ); readfile($settings->_contentDir .$filename );
>>>>>>> seeddms-4.3.7
} elseif (isset($_GET["vfile"])) { } elseif (isset($_GET["vfile"])) {
@ -226,12 +217,8 @@ if (isset($_GET["version"])) {
header("Cache-Control: must-revalidate"); header("Cache-Control: must-revalidate");
//header("Pragma: no-cache"); //header("Pragma: no-cache");
<<<<<<< HEAD
ob_clean(); ob_clean();
readfile($settings->_contentDir .$_GET["dumpname"] );
=======
readfile($settings->_contentDir .$filename ); readfile($settings->_contentDir .$filename );
>>>>>>> seeddms-4.3.7
} }
add_log_line(); add_log_line();