Updating file modifications

akelos · Oct 16, 2011 · 22e76b1 · 22e76b1
1 parent 679d6e1
commit 22e76b1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/installer/filemods/data/config/config.php b/installer/filemods/data/config/config.php
@@ -1,9 +1,8 @@
 <?php
     $search_replace = array(
             array(
-                "searched" => "/(\?\>)/",
+                "searched" => "/(include_once)/",
                 "detect_modified" => "/AK_EDITAM_PUBLIC_SITE_URL_SUFFIX/",
                 "replaced" => "\ndefine('AK_EDITAM_PUBLIC_SITE_URL_SUFFIX','cms');\n$1"
             )
     );
-?>
diff --git a/installer/filemods/data/config/environments/development.php b/installer/filemods/data/config/environments/development.php
@@ -1,20 +1,22 @@
 <?php
     $search_replace = array(
             array(
-                "searched" => "/(define\('AK_ENABLE_STRICT_XHTML_VALIDATION',\s*\w*\);.*)/",
+                "searched" => "/(\<\?php\s*)/",
                 "detect_modified" => "/define\('EDITAM_SITE_THEME'/",
-                "replaced" => "$1\n\ndefine('EDITAM_SITE_THEME', '#003366');
+                "replaced" => "$1
+
+define('EDITAM_SITE_THEME', '#003366');
 define('EDITAM_CACHE_LIFE', 60*5);
 define('EDITAM_CACHE_ENABLED', false);
 define('EDITAM_COMPRESS_OUTPUT', true);
 define('EDITAM_SHOW_DELETE_ON_PAGE_LISTING', false);
 define('EDITAM_SITE_NAME', 'Editam website');
 define('EDITAM_CACHE_PREFERENCES_ON_SESSION', false);
 
-
 define('AK_CACHE_HANDLER', 1); // 1 file based, 2 database based
 define('AK_ACTION_CONTROLLER_DEFAULT_REQUEST_TYPE', 'web_request');
-define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');\n\n"
+define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');
+
+"
             )
     );
-?>
diff --git a/installer/filemods/data/config/environments/production.php b/installer/filemods/data/config/environments/production.php
@@ -1,9 +1,9 @@
 <?php
     $search_replace = array(
             array(
-                "searched" => "/(\s*\?\>)/",
+                "searched" => "/(\<\?php\s*)/",
                 "detect_modified" => "/define\('EDITAM_SITE_THEME'/",
-                "replaced" => "\n@ini_set('memory_limit', -1);
+                "replaced" => "$1
 
 define('EDITAM_SITE_THEME', '#003366');
 define('EDITAM_CACHE_LIFE', 60*5);
@@ -13,10 +13,10 @@
 define('EDITAM_SITE_NAME', 'Editam website');
 define('EDITAM_CACHE_PREFERENCES_ON_SESSION', false);
 
-
 define('AK_CACHE_HANDLER', 1); // 1 file based, 2 database based
 define('AK_ACTION_CONTROLLER_DEFAULT_REQUEST_TYPE', 'web_request');
-define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');\n$1"
+define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');
+
+"
             )
     );
-?>
diff --git a/installer/filemods/data/config/environments/testing.php b/installer/filemods/data/config/environments/testing.php
@@ -1,9 +1,11 @@
 <?php
     $search_replace = array(
             array(
-                "searched" => "/(\s*\?\>)/",
+                "searched" => "/(\<\?php\s*)/",
                 "detect_modified" => "/define\('EDITAM_SITE_THEME'/",
-                "replaced" => "\n//\$GLOBALS['ak_test_db_dns'] = isset(\$dsn) ? \$dsn : \$testing_database;
+                "replaced" => "$1
+
+//\$GLOBALS['ak_test_db_dns'] = isset(\$dsn) ? \$dsn : \$testing_database;
 
 define('EDITAM_SITE_THEME', '#003366');
 define('EDITAM_CACHE_LIFE', 60*5);
@@ -13,10 +15,11 @@
 define('EDITAM_SITE_NAME', 'Editam website');
 define('EDITAM_CACHE_PREFERENCES_ON_SESSION', false);
 
-
 //define('AK_CACHE_HANDLER', 1); // 1 file based, 2 database based
 define('AK_ACTION_CONTROLLER_DEFAULT_REQUEST_TYPE', 'web_request');
-define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');\n$1"
+define('AK_ACTION_CONTROLLER_DEFAULT_ACTION', 'index');
+
+"
             )
     );
 ?>
diff --git a/installer/filemods/data/config/routes.php b/installer/filemods/data/config/routes.php
@@ -8,4 +8,3 @@
 \$Map->connect('/'.AK_EDITAM_PUBLIC_SITE_URL_SUFFIX.'/*url', array('controller' => 'site', 'action' => 'show_page', 'module' => 'editam'));\n"
             )
     );
-?>