From 07b233ea059abca30a5b8598f0747132a4ce397b Mon Sep 17 00:00:00 2001 From: marj Date: Tue, 17 Nov 2009 09:17:08 +0000 Subject: [PATCH] We need to fix this --- e107_admin/image.php | 11 +++++++---- e107_handlers/e107_class.php | 8 +++++--- e107_handlers/phpmailer/mailout_process.php | 7 ++++--- e107_handlers/upload_handler.php | 7 ++++--- e107_plugins/calendar_menu/subs_menu.php | 9 +++++---- e107_themes/templates/footer_default.php | 11 +++++++---- 6 files changed, 32 insertions(+), 21 deletions(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index c7ec422dc..b1a0925c0 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -9,9 +9,9 @@ * Image Administration Area * * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ - * $Revision: 1.30 $ - * $Date: 2009-11-15 20:24:55 $ - * $Author: secretr $ + * $Revision: 1.31 $ + * $Date: 2009-11-17 09:17:08 $ + * $Author: marj_nl_fr $ * */ require_once("../class2.php"); @@ -182,6 +182,7 @@ class media_admin_ui extends e_admin_ui { $pref['upload_storagetype'] = "1"; require_once(e_HANDLER."upload_handler.php"); //TODO - still not a class! + //FIXME need another name $uploaded = process_uploaded_files(e_MEDIA.'temp/'); foreach($uploaded as $upload) @@ -193,6 +194,7 @@ class media_admin_ui extends e_admin_ui 'media_type' => $upload['type'], 'media_name' => $upload['name'], 'media_datestamp' => time(), + //FIXME need another name 'media_url' => "{e_MEDIA}".$newpath, 'media_size' => $upload['size'], 'media_author' => USERID @@ -278,9 +280,10 @@ class media_admin_ui extends e_admin_ui { list($pmime,$tmp) = explode('/',$type); $dir = $this->mimePaths[$pmime]."/".date("Y-m"); + //FIXME need another name if(!is_dir(e_MEDIA.$dir)) { - mkdir(e_MEDIA.$dir,0755); + mkdir(e_MEDIA.$dir, 0755); } return $dir; } diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 748d48ec1..0decf05ca 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -9,8 +9,8 @@ * e107 Main * * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $ - * $Revision: 1.70 $ - * $Date: 2009-11-17 09:11:05 $ + * $Revision: 1.71 $ + * $Date: 2009-11-17 09:17:08 $ * $Author: marj_nl_fr $ */ @@ -1212,6 +1212,7 @@ class e107 define("e_HANDLER", e_BASE.$HANDLERS_DIRECTORY); define("e_LANGUAGEDIR", e_BASE.$LANGUAGES_DIRECTORY); define("e_DOCS", e_BASE.$HELP_DIRECTORY); + //FIXME need another name define("e_MEDIA", e_BASE.$MEDIA_DIRECTORY); // // HTTP absolute paths @@ -1243,7 +1244,8 @@ class e107 } else { - define("e_CACHE", e_MEDIA."cache/"); + //FIXME need another name + define("e_CACHE", e_MEDIA."cache/"); } /* diff --git a/e107_handlers/phpmailer/mailout_process.php b/e107_handlers/phpmailer/mailout_process.php index 7644b82d9..c3628f66c 100644 --- a/e107_handlers/phpmailer/mailout_process.php +++ b/e107_handlers/phpmailer/mailout_process.php @@ -9,9 +9,9 @@ * * * $Source: /cvs_backup/e107_0.8/e107_handlers/phpmailer/mailout_process.php,v $ - * $Revision: 1.11 $ - * $Date: 2009-11-17 08:16:33 $ - * $Author: e107coders $ + * $Revision: 1.12 $ + * $Date: 2009-11-17 09:17:08 $ + * $Author: marj_nl_fr $ | | Modifications in hand to work with most recent mailout.php @@ -30,6 +30,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_mailout.php"); // Directory for log (if enabled) +//FIXME need another name define('MAIL_LOG_PATH',e_MEDIA."logs/"); $HEADER = ""; diff --git a/e107_handlers/upload_handler.php b/e107_handlers/upload_handler.php index 29e07a84d..b0657ea17 100644 --- a/e107_handlers/upload_handler.php +++ b/e107_handlers/upload_handler.php @@ -9,9 +9,9 @@ * File Upload Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/upload_handler.php,v $ - * $Revision: 1.24 $ - * $Date: 2009-11-14 04:13:11 $ - * $Author: e107coders $ + * $Revision: 1.25 $ + * $Date: 2009-11-17 09:17:08 $ + * $Author: marj_nl_fr $ */ if (!defined('e107_INIT')) @@ -24,6 +24,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_upload_handler.php"); //define("UH_DEBUG",TRUE); define("UH_DEBUG", FALSE); +//FIXME need another name define('e_UPLOAD_TEMP_DIR', e_MEDIA.'temp/'); // Temporary directory define('e_READ_FILETYPES', 'filetypes.xml'); // Upload permissions define('e_SAVE_FILETYPES', 'filetypes_.xml'); diff --git a/e107_plugins/calendar_menu/subs_menu.php b/e107_plugins/calendar_menu/subs_menu.php index e0f51f892..8afcdfc27 100644 --- a/e107_plugins/calendar_menu/subs_menu.php +++ b/e107_plugins/calendar_menu/subs_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/subs_menu.php,v $ -| $Revision: 1.6 $ -| $Date: 2009-11-17 07:40:43 $ -| $Author: e107coders $ +| $Revision: 1.7 $ +| $Date: 2009-11-17 09:17:08 $ +| $Author: marj_nl_fr $ | +----------------------------------------------------------------------------+ */ @@ -83,7 +83,8 @@ function subs_log_a_line($log_text,$close_after = FALSE, $log_always = FALSE) if ($ec_run_from_menu && ($log_always == FALSE)) return; // echo "Logging: ".$log_text."
"; static $handle = NULL; - $log_filename = e_MEDIA."logs/calendar_mail.txt"; + //FIXME need another name + $log_filename = e_MEDIA."logs/calendar_mail.txt"; if ($handle == NULL) { if (!($handle = fopen($log_filename, "a"))) diff --git a/e107_themes/templates/footer_default.php b/e107_themes/templates/footer_default.php index b06204edd..935ce93b2 100644 --- a/e107_themes/templates/footer_default.php +++ b/e107_themes/templates/footer_default.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_themes/templates/footer_default.php,v $ - | $Revision: 1.19 $ - | $Date: 2009-11-17 07:40:51 $ - | $Author: e107coders $ + | $Revision: 1.20 $ + | $Date: 2009-11-17 09:17:08 $ + | $Author: marj_nl_fr $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) @@ -126,7 +126,10 @@ if (varset($e107_popup) != 1) } if ($pref['log_page_accesses']) - { // Need to log the page info to a text file as CSV data + { + // Need to log the page info to a text file as CSV data + + //FIXME need another name $logname = e_MEDIA."logs/logd_".date("z.Y", time()).".csv"; $logfp = fopen($logname, 'a+'); fwrite($logfp, $logLine."\n");