From 1d52185bc84e5c29af6996bff18a16e34c5b36b3 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Fri, 8 Jun 2012 08:18:03 +0000
Subject: [PATCH] Added e_CACHE_URL

---
 e107_admin/update_routines.php   |  4 ++++
 e107_handlers/application.php    |  8 ++++----
 e107_handlers/e107_class.php     |  6 ++++--
 e107_plugins/gallery/gallery.php | 27 +++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index b962ffa3a..f3bb270bf 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -1045,6 +1045,10 @@ function update_706_to_800($type='')
 	{
 		mkdir(e_BACKUP,0755);
 	}
+	if(!is_dir(e_CACHE_URL))
+	{
+		mkdir(e_CACHE_URL,0755);
+	}
 	
 	
 	$root_media = str_replace(basename(e_MEDIA)."/","",e_MEDIA);
diff --git a/e107_handlers/application.php b/e107_handlers/application.php
index d710a9160..e44fae859 100644
--- a/e107_handlers/application.php
+++ b/e107_handlers/application.php
@@ -870,8 +870,8 @@ class eRouter
 	 */
 	protected function _loadConfig()
 	{
-		if(!is_readable(e_SYSTEM.'url/config.php')) $config = $this->buildGlobalConfig();
-		else $config = include(e_SYSTEM.'url/config.php');
+		if(!is_readable(e_CACHE_URL.'config.php')) $config = $this->buildGlobalConfig();
+		else $config = include(e_CACHE_URL.'config.php');
 		
 		if(!$config) $config = array();
 		
@@ -891,7 +891,7 @@ class eRouter
 	
 	public static function clearCache()
 	{
-		@unlink(e_SYSTEM.'url/config.php');
+		@unlink(e_CACHE_URL.'config.php');
 	}
 	
 	/**
@@ -940,7 +940,7 @@ class eRouter
 			$fileContent = '<?php'."\n### Auto-generated - DO NOT EDIT ### \nreturn ";
 			$fileContent .= trim(var_export($config, true)).';';
 			
-			file_put_contents(e_SYSTEM.'url/config.php', $fileContent);
+			file_put_contents(e_CACHE_URL.'config.php', $fileContent);
 		}
 		return $config;
 	}
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 06d834ff7..a928ea216 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -404,8 +404,8 @@ class e107
 		$ret['MEDIA_FILES_DIRECTORY'] 		= $ret['MEDIA_DIRECTORY'].'files/';
 		$ret['MEDIA_UPLOAD_DIRECTORY'] 		= $ret['MEDIA_DIRECTORY'].'temp/';
 
-		$ret['WEB_JS_DIRECTORY'] 			= $ret['WEB_DIRECTORY'].'js/';
-		
+	//	$ret['WEB_JS_DIRECTORY'] 			= $ret['WEB_DIRECTORY'].'js/';
+		$ret['WEB_JS_DIRECTORY'] 			= $ret['FILES_DIRECTORY'].'jslib/';
 		
 		
 		$ret['WEB_CSS_DIRECTORY'] 			= $ret['WEB_DIRECTORY'].'css/';
@@ -419,6 +419,7 @@ class e107
 		$ret['CACHE_CONTENT_DIRECTORY'] 	= $ret['CACHE_DIRECTORY'].'content/';
 		$ret['CACHE_IMAGE_DIRECTORY'] 		= $ret['CACHE_DIRECTORY'].'images/';
 		$ret['CACHE_DB_DIRECTORY'] 			= $ret['CACHE_DIRECTORY'].'db/';
+		$ret['CACHE_URL_DIRECTORY'] 		= $ret['CACHE_DIRECTORY'].'url/';
 
 		$ret['LOGS_DIRECTORY'] 				= $ret['SYSTEM_DIRECTORY'].'logs/';
 		$ret['BACKUP_DIRECTORY'] 			= $ret['SYSTEM_DIRECTORY'].'backup/';
@@ -2514,6 +2515,7 @@ class e107
 			define('e_CACHE_CONTENT', $this->get_override_rel('CACHE_CONTENT'));
 			define('e_CACHE_IMAGE', $this->get_override_rel('CACHE_IMAGE'));
 			define('e_CACHE_DB', $this->get_override_rel('CACHE_DB'));
+			define('e_CACHE_URL', $this->get_override_rel('CACHE_URL'));
 
 			define('e_LOG', $this->get_override_rel('LOGS'));
 			define('e_BACKUP', $this->get_override_rel('BACKUP'));
diff --git a/e107_plugins/gallery/gallery.php b/e107_plugins/gallery/gallery.php
index 8681dbdf8..3f9891c86 100644
--- a/e107_plugins/gallery/gallery.php
+++ b/e107_plugins/gallery/gallery.php
@@ -111,6 +111,33 @@ class gallery
 
 new gallery;
 
+
+echo '<a class="backward">prev</a>
+ 
+<!-- container for the slides -->
+<div class="images">
+ 
+  <!-- first slide -->
+  <div>Lorem ipsum ..</div>
+ 
+  <!-- second slide -->
+  <div>Lorem ipsum the 2nd..</div>
+ 
+  <!-- third slide -->
+  <div>Lorem ipsum the 3rd</div>
+ 
+</div>
+ 
+<!-- "next slide" button -->
+<a class="forward">next</a>
+ 
+<!-- the tabs -->
+<div class="slidetabs">
+  <a href="#"></a>
+  <a href="#"></a>
+  <a href="#"></a>
+</div>';
+
 require_once(FOOTERF);
 exit;