mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00
Code Issues Releases Wiki Activity

e_FILE.'public/' replaced with e_UPLOAD

Browse Source
This commit is contained in:
CaMer0n
2009-11-07 02:10:52 +00:00
parent c1d99b4052
commit b2986c3960
13 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/banlist.php
View File

@@ -9,9 +9,9 @@
* Ban List Management
*
* $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $
* $Revision: 1.19 $
* $Date: 2009-10-29 12:39:21 $
* $Author: marj_nl_fr $
* $Revision: 1.20 $
* $Date: 2009-11-07 02:10:34 $
* $Author: e107coders $
*
*/
@@ -539,7 +539,7 @@ switch($action)
if(isset($_POST['ban_import']))
{ // Got a file to import
require_once (e_HANDLER.'upload_handler.php');
if(($files = process_uploaded_files(e_FILE."public/", FALSE, array('overwrite' => TRUE, 'max_file_count' => 1, 'file_mask' => 'csv'))) === FALSE)
if(($files = process_uploaded_files(e_UPLOAD, FALSE, array('overwrite' => TRUE, 'max_file_count' => 1, 'file_mask' => 'csv'))) === FALSE)
{ // Invalid file
$error = true;
$message = BANLAN_47;
@@ -553,8 +553,8 @@ switch($action)
}
if(!$error)
{ // Got a file of some sort
$message = process_csv(e_FILE."public/".$files[0]['name'], intval(varset($_POST['ban_over_import'], 0)), intval(varset($_POST['ban_over_expiry'], 0)), $separator_char[intval(varset($_POST['ban_separator'], 1))], $quote_char[intval(varset($_POST['ban_quote'], 3))]);
banlist_adminlog("07", 'File: '.e_FILE."public/".$files[0]['name'].'<br />'.$message);
$message = process_csv(e_UPLOAD.$files[0]['name'], intval(varset($_POST['ban_over_import'], 0)), intval(varset($_POST['ban_over_expiry'], 0)), $separator_char[intval(varset($_POST['ban_separator'], 1))], $quote_char[intval(varset($_POST['ban_quote'], 3))]);
banlist_adminlog("07", 'File: '.e_UPLOAD.$files[0]['name'].'<br />'.$message);
}
}

20
e107_admin/download.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| <20>Steve Dunstan 2001-2002
| <20>Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/download.php,v $
| $Revision: 1.18 $
| $Date: 2009-08-28 16:10:56 $
| $Author: marj_nl_fr $
| $Revision: 1.19 $
| $Date: 2009-11-07 02:10:34 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -100,11 +100,11 @@ if($file_array = $fl->get_files(e_DOWNLOAD, "","standard",5))
}
if($public_array = $fl->get_files(e_FILE."public/"))
if($public_array = $fl->get_files(e_UPLOAD))
{
foreach($public_array as $key=>$val)
{
$file_array[] = str_replace(e_FILE."public/","",$val);
$file_array[] = str_replace(e_UPLOAD,"",$val);
}
}
@@ -900,7 +900,7 @@ class download
}
$etext = " - (".DOWLAN_68.")";
if (file_exists(e_FILE."public/".$download_url))
if (file_exists(e_UPLOAD.$download_url))
{
$etext = "";
}
@@ -1258,7 +1258,7 @@ class download
{
if($_POST['download_thumb'])
{
$oldname = e_FILE."public/".$_POST['download_thumb'];
$oldname = e_UPLOAD.$_POST['download_thumb'];
$newname = e_FILE."downloadthumbs/".$_POST['download_thumb'];
if(!$this -> move_file($oldname,$newname))
{
@@ -1267,7 +1267,7 @@ class download
}
if($_POST['download_image'])
{
$oldname = e_FILE."public/".$_POST['download_image'];
$oldname = e_UPLOAD.$_POST['download_image'];
$newname = e_FILE."downloadimages/".$_POST['download_image'];
if(!$this -> move_file($oldname,$newname))
{
@@ -1278,7 +1278,7 @@ class download
if($_POST['move_file'] && $_POST['download_url'])
{
$oldname = e_FILE."public/".$_POST['download_url'];
$oldname = e_UPLOAD.$_POST['download_url'];
$newname = $_POST['move_file'].$_POST['download_url'];
if(!$this -> move_file($oldname,$newname))
{

16
e107_admin/filemanager.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| <20>Steve Dunstan 2001-2002
| <20>Steve Dunstan 2001-2002
| http://e107.org
| jalist@e107.org
|
@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/filemanager.php,v $
| $Revision: 1.10 $
| $Date: 2009-08-28 16:10:54 $
| $Author: marj_nl_fr $
| $Revision: 1.11 $
| $Date: 2009-11-07 02:10:34 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
require_once("../class2.php");
@@ -35,7 +35,7 @@ require_once (e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
//FIXME - messages
$pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_FILE."public/")) ? TRUE : FALSE;
$pubfolder = (str_replace("../","",e_QUERY) == str_replace("../","",e_UPLOAD)) ? TRUE : FALSE;
$imagedir = e_IMAGE."filemanager/";
@@ -45,7 +45,7 @@ $imagedir = e_IMAGE."filemanager/";
$dir_options[2] = FMLAN_40;
$adchoice[0] = e_FILE."public/";
$adchoice[0] = e_UPLOAD;
$adchoice[1] = e_FILE;
$adchoice[2] = e_IMAGE."newspost_images/";
@@ -365,8 +365,8 @@ while ($files[$c]) {
}
sort($movechoice);
$movechoice[] = e_FILE."downloadimages/";
if(e_QUERY != str_replace("../","",e_FILE."public/")){
$movechoice[] = e_FILE."public/";
if(e_QUERY != str_replace("../","",e_UPLOAD)){
$movechoice[] = e_UPLOAD;
}
if(e_QUERY != str_replace("../","",e_FILE."downloadthumbs/")){
$movechoice[] = e_FILE."downloadthumbs/";

20
e107_admin/image.php
View File

@@ -9,9 +9,9 @@
* Image Administration Area
*
* $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
* $Revision: 1.24 $
* $Date: 2009-10-29 12:39:20 $
* $Author: marj_nl_fr $
* $Revision: 1.25 $
* $Date: 2009-11-07 02:10:34 $
* $Author: e107coders $
*
*/
require_once("../class2.php");
@@ -88,7 +88,7 @@ if (isset($_POST['submit_show_delete_multi']))
}
//delete it from server
@unlink(e_FILE."public/avatars/".$todel[1]);
@unlink(e_UPLOAD."avatars/".$todel[1]);
//admin log & sysmessage
$message[] = $todel[1];
@@ -135,10 +135,10 @@ if (isset($_POST['submit_show_delete_multi']))
*/
if (isset($_POST['submit_show_deleteall']))
{
$handle = opendir(e_FILE."public/avatars/");
$handle = opendir(e_UPLOAD."avatars/");
$dirlist = array();
while ($file = readdir($handle)) {
if (!is_dir(e_FILE."public/avatars/{$file}") && $file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') {
if (!is_dir(e_UPLOAD."avatars/{$file}") && $file != '.' && $file != '..' && $file != "index.html" && $file != "null.txt" && $file != '/' && $file != 'CVS' && $file != 'Thumbs.db') {
$dirlist[] = $file;
}
}
@@ -153,7 +153,7 @@ if (isset($_POST['submit_show_deleteall']))
$image_name = basename($image_name);
$image_todb = $tp->toDB($image_name);
if (!$sql->db_Count('user', '(*)', "WHERE user_image='-upload-{$image_todb}' OR user_sess='{$image_todb}'")) {
unlink(e_FILE."public/avatars/".$image_name);
unlink(e_UPLOAD."avatars/".$image_name);
$imgList .= '[!br!]'.$image_name;
$count++;
}
@@ -245,7 +245,7 @@ function show_avatars()
{
global $ns, $sql, $frm, $tp, $emessage, $e107, $pref;
$handle = opendir(e_FILE."public/avatars/");
$handle = opendir(e_UPLOAD."avatars/");
$dirlist = array();
while ($file = readdir($handle))
{
@@ -288,7 +288,7 @@ function show_avatars()
}
//directory?
if(is_dir(e_FILE."public/avatars/".$image_name))
if(is_dir(e_UPLOADE."avatars/".$image_name))
{
//File info
$users = "<a class='e-tooltip' href='#' title='".IMALAN_69.": {$image_name}'><img class='icon S16' src='".e_IMAGE_ABS."admin_images/info_16.png' alt='".IMALAN_66.": {$image_name}' /></a> <span class='error'>".IMALAN_69."</span>";
@@ -303,7 +303,7 @@ function show_avatars()
$users = "<a class='e-tooltip' href='#' title='".IMALAN_66.": {$image_name}'><img src='".e_IMAGE_ABS."admin_images/info_16.png' alt='".IMALAN_66.": {$image_name}' /></a> ".$users;
// Control over the image size (design)
$image_size = getimagesize(e_FILE."public/avatars/".$image_name);
$image_size = getimagesize(e_UPLOAD."avatars/".$image_name);
//Friendly UI - click text to select a form element
$img_src = "<label for='image-action-{$count}' title='".IMALAN_56."'><img src='".e_FILE_ABS."public/avatars/{$image_name}' alt='{$image_name}' /></label>";

12
e107_admin/upload.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/upload.php,v $
| $Revision: 1.10 $
| $Date: 2009-11-05 09:15:12 $
| $Revision: 1.11 $
| $Date: 2009-11-07 02:10:34 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -46,9 +46,9 @@ if ($action == "dis" && isset($_POST['updelete']['upload_'.$id]) )
{
$sql -> db_Delete("rbinary", "binary_id='".$tp -> toDB($match[1])."'");
}
else if ($row['upload_file'] && file_exists(e_FILE."public/".$row['upload_file']))
else if ($row['upload_file'] && file_exists(e_UPLOAD.$row['upload_file']))
{
unlink(e_FILE."public/".$row['upload_file']);
unlink(e_UPLOAD.$row['upload_file']);
}
if (preg_match("#Binary (.*?)/#", $row['upload_ss'], $match))
{
@@ -56,7 +56,7 @@ if ($action == "dis" && isset($_POST['updelete']['upload_'.$id]) )
}
else if ($row['upload_ss'] && file_exists(e_FILE."public/".$row['upload_ss']))
{
unlink(e_FILE."public/".$row['upload_ss']);
unlink(e_UPLOAD.$row['upload_ss']);
}
$message = ($sql->db_Delete("upload", "upload_id='".intval($id)."'")) ? UPLLAN_1 : LAN_DELETED_FAILED;
$admin_log->log_event('UPLOAD_01',$row['upload_file'],E_LOG_INFORMATIVE,'');
@@ -95,7 +95,7 @@ if ($action == "dl")
}
else
{
header("location:".e_FILE."public/".str_replace("dl.", "", e_QUERY));
header("location:".e_UPLOAD.str_replace("dl.", "", e_QUERY));
exit;
}
}