Adapt the instance to the major Cache Sifo changes

sifophp · Apr 20, 2012 · 6eaf6e5 · 6eaf6e5
1 parent 776e8b4
commit 6eaf6e5
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/config/memcache.config.php → config/cache.config.php b/config/memcache.config.php → config/cache.config.php
diff --git a/config/classes.config.php b/config/classes.config.php
@@ -20,9 +20,21 @@
   array (
     'Sifo' => 'libs/Sifo/Cache.php',
   ),
+  'CacheBase' => 
+  array (
+    'Sifo' => 'libs/Sifo/Cache/Base.php',
+  ),
   'CacheDisk' => 
   array (
-    'Sifo' => 'libs/Sifo/CacheDisk.php',
+    'Sifo' => 'libs/Sifo/Cache/Disk.php',
+  ),
+  'CacheMemcache' => 
+  array (
+    'Sifo' => 'libs/Sifo/Cache/Memcache.php',
+  ),
+  'CacheMemcached' => 
+  array (
+    'Sifo' => 'libs/Sifo/Cache/Memcached.php',
   ),
   'Client' => 
   array (
@@ -100,6 +112,10 @@
   array (
     'Sifo' => 'libs/Sifo/JsPacker.php',
   ),
+  'Keyspace' => 
+  array (
+    'Sifo' => 'libs/Sifo/Keyspace.php',
+  ),
   'LoadBalancer' => 
   array (
     'Sifo' => 'libs/Sifo/LoadBalancer.php',
@@ -132,6 +148,10 @@
   array (
     'Sifo' => 'libs/Sifo/MysqlModel.php',
   ),
+  'PaypalNotifier' => 
+  array (
+    'Sifo' => 'libs/Sifo/PaypalNotifier.php',
+  ),
   'RedisModel' => 
   array (
     'Sifo' => 'libs/Sifo/RedisModel.php',
@@ -253,9 +273,9 @@
   array (
     'Common' => 'instances/common/controllers/shared/advertising.ctrl.php',
   ),
-  'SharedCommandLineControllerController' => 
+  'SharedCommandLineController' => 
   array (
-    'Common' => 'instances/common/controllers/shared/commandLineController.ctrl.php',
+    'Common' => 'instances/common/controllers/shared/commandLine.ctrl.php',
   ),
   'SharedFirstLevelController' => 
   array (

diff --git a/config/configuration_files.config.php b/config/configuration_files.config.php
@@ -2,12 +2,14 @@
 $config = array (
   '301_rules' => 'instances/sifoweb/config/301_rules.config.php',
   'ads' => 'instances/sifoweb/config/ads.config.php',
+  'cache' => 'instances/sifoweb/config/cache.config.php',
   'classes' => 'instances/sifoweb/config/classes.config.php',
   'css' => 'instances/sifoweb/config/css.config.php',
   'db_profiles' => 'instances/sifoweb/config/db_profiles.config.php',
   'domains' => 'instances/sifoweb/config/domains.config.php',
   'forms/example.form' => 'instances/sifoweb/config/forms/example.form.config.php',
   'js' => 'instances/sifoweb/config/js.config.php',
+  'keyspace' => 'instances/common/config/keyspace.config.php',
   'lang/metadata_en_US' => 'instances/sifoweb/config/lang/metadata_en_US.config.php',
   'lang/metadata_es_ES' => 'instances/sifoweb/config/lang/metadata_es_ES.config.php',
   'lang/router_en_US' => 'instances/sifoweb/config/lang/router_en_US.config.php',
@@ -16,7 +18,6 @@
   'libraries' => 'instances/sifoweb/config/libraries.config.php',
   'locale' => 'instances/sifoweb/config/locale.config.php',
   'mail' => 'instances/sifoweb/config/mail.config.php',
-  'memcache' => 'instances/sifoweb/config/memcache.config.php',
   'openinviter' => 'instances/sifoweb/config/openinviter.config.php',
   'redis' => 'instances/sifoweb/config/redis.config.php',
   'router' => 'instances/sifoweb/config/router.config.php',

diff --git a/config/locale.config.php b/config/locale.config.php
@@ -2,4 +2,6 @@
 $config = array (
   'messages_en_US' => 'instances/sifoweb/locale/messages_en_US.php',
   'messages_es_ES' => 'instances/common/locale/messages_es_ES.php',
+  'urlparams_en_US' => 'instances/common/locale/urlparams_en_US.php',
+  'urlparams_es_ES' => 'instances/common/locale/urlparams_es_ES.php',
 );
diff --git a/templates/home/index.tpl b/templates/home/index.tpl
@@ -18,10 +18,6 @@
 			<div class="row">
 				<div class="span5 columns">
 					<img alt="SIFO logo" src="{$url.static}/css/images/logo.jpg" /><br/>
-					<a href="{$url.base}/in-loving-memory" title="In memory of Carlos Soriano">
-                    <img alt="crespon" src="{$url.static}/css/images/crespon.jpeg" />
-                    </a>
-
 				</div>
 				<div class="span11 columns">
 

diff --git a/templates/shared/footer.tpl b/templates/shared/footer.tpl
@@ -3,6 +3,8 @@
 		<p class="right"><a href="#">Back to top</a></p>
 		<p>
 			SIFO is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Download the source code of this site at <a href="https://github.com/alombarte/sifo-web" target="_blank">GitHub</a>
+			<br/>
+			In loving memory of <a href="{$url.base}/in-loving-memory" title="In memory of Carlos Soriano">Carlos Soriano</a>
 		</p>
 	</div>
 </div>