From 0243decd2b9be1b7691c0d4ac7b0cad8a1dc825d Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Tue, 17 Nov 2009 07:40:51 +0000
Subject: [PATCH] path corrections

---
 e107_plugins/calendar_menu/subs_menu.php | 10 +++++-----
 e107_themes/templates/footer_default.php |  8 ++++----
 install_.php                             | 14 ++++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/e107_plugins/calendar_menu/subs_menu.php b/e107_plugins/calendar_menu/subs_menu.php
index ee7817f17..e0f51f892 100644
--- a/e107_plugins/calendar_menu/subs_menu.php
+++ b/e107_plugins/calendar_menu/subs_menu.php
@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     ©Steve Dun.an 2001-2002
+|     �Steve Dun.an 2001-2002
 |     http://e107.org
 |     jali.@e107.org
 |
@@ -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.5 $
-|     $Date: 2009-08-15 11:55:30 $
-|     $Author: marj_nl_fr $
+|     $Revision: 1.6 $
+|     $Date: 2009-11-17 07:40:43 $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
@@ -83,7 +83,7 @@ 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."<br />";
   static $handle = NULL;
-  $log_filename = e_FILE."logs/calendar_mail.txt";
+  $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 87078e9b1..b06204edd 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.18 $
- |     $Date: 2009-10-01 15:05:40 $
- |     $Author: secretr $
+ |     $Revision: 1.19 $
+ |     $Date: 2009-11-17 07:40:51 $
+ |     $Author: e107coders $
  +----------------------------------------------------------------------------+
  */
 if (!defined('e107_INIT'))
@@ -127,7 +127,7 @@ if (varset($e107_popup) != 1)
 	
 	if ($pref['log_page_accesses'])
 	{ // Need to log the page info to a text file as CSV data
-		$logname = e_FILE."logs/logd_".date("z.Y", time()).".csv";
+		$logname = e_MEDIA."logs/logd_".date("z.Y", time()).".csv";
 		$logfp = fopen($logname, 'a+');
 		fwrite($logfp, $logLine."\n");
 		fclose($logfp);
diff --git a/install_.php b/install_.php
index 54191bf8a..383480226 100644
--- a/install_.php
+++ b/install_.php
@@ -9,8 +9,8 @@
 * Installation file
 *
 * $Source: /cvs_backup/e107_0.8/install_.php,v $
-* $Revision: 1.48 $
-* $Date: 2009-11-05 09:15:12 $
+* $Revision: 1.49 $
+* $Date: 2009-11-17 07:40:43 $
 * $Author: e107coders $
 *
 */
@@ -28,14 +28,15 @@ $MySQLPrefix	     = 'e107_';
 $ADMIN_DIRECTORY     = "e107_admin/";
 $FILES_DIRECTORY     = "e107_files/";
 $IMAGES_DIRECTORY    = "e107_images/";
+$MEDIA_DIRECTORY	 = "e107_media/";
 $THEMES_DIRECTORY    = "e107_themes/";
 $PLUGINS_DIRECTORY   = "e107_plugins/";
 $HANDLERS_DIRECTORY  = "e107_handlers/";
 $LANGUAGES_DIRECTORY = "e107_languages/";
 $HELP_DIRECTORY      = "e107_docs/help/";
-$CACHE_DIRECTORY 	 = "e107_files/cache/";
-$DOWNLOADS_DIRECTORY = "e107_files/downloads/";
-$UPLOADS_DIRECTORY   = "e107_files/public/";
+$CACHE_DIRECTORY 	 = "e107_media/cache/";
+$DOWNLOADS_DIRECTORY = "e107_media/downloads/";
+$UPLOADS_DIRECTORY   = "e107_media/public/";
 
 /* End configurable variables */
 
@@ -140,7 +141,7 @@ function check_class($whatever)
 }
 
 
-$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY');
+$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'CACHE_DIRECTORY', 'DOWNLOADS_DIRECTORY', 'UPLOADS_DIRECTORY', 'MEDIA_DIRECTORY');
 
 $e107 = e107::getInstance();
 $e107->init($e107_paths, realpath(dirname(__FILE__)));
@@ -904,6 +905,7 @@ class e_install
 \$CACHE_DIRECTORY     = '{$this->e107->e107_dirs['CACHE_DIRECTORY']}';
 \$DOWNLOADS_DIRECTORY = '{$this->e107->e107_dirs['DOWNLOADS_DIRECTORY']}';
 \$UPLOADS_DIRECTORY   = '{$this->e107->e107_dirs['UPLOADS_DIRECTORY']}';
+\$MEDIA_DIRECTORY   = '{$this->e107->e107_dirs['MEDIA_DIRECTORY']}';
 
 
 ";