simplify default settings

diff --git a/ipf.php b/ipf.php
index c70afa2d90875e4fa8d3bd13f74959e70abafc99..6123db765c3f0040d35f6e58b0e8250c954ce0a9 100644 (file)
--- a/ipf.php
+++ b/ipf.php
@@ -2,11 +2,20 @@
 
 final class IPF
 {
-    private static $settings = array();
+    private static $settings = array(
+        'app_base'          => '',
+        'debug'             => false,
+        'media_url'         => '/media/',
+        'static_url'        => '/static/',
+        'session_cookie_id' => 'sessionid',
+        'dir_permission'    => 0777,
+        'file_permission'   => 0666,
+        'time_zone'         => 'America/Toronto',
+    );
 
     private static function applySettings($settings)
     {
-        foreach($settings as $key=>$val)
+        foreach ($settings as $key => $val)
             IPF::$settings[strtolower($key)] = $val;
     }
 
@@ -51,51 +60,17 @@ final class IPF
                 IPF::$settings['template_dirs'][] = IPF::$settings['ipf_path'].DIRECTORY_SEPARATOR.'ipf'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'templates';
         }
 
-        if (!isset(IPF::$settings['debug'])){
-            IPF::$settings['debug'] = false;
-        }
-
         if (!isset(IPF::$settings['admin_title'])){
             IPF::$settings['admin_title'] = 'IPF Administration';
         }
 
-        if (!isset(IPF::$settings['app_base'])){
-            IPF::$settings['app_base'] = '/index.php';
-        }
-
-        if (!isset(IPF::$settings['append_slash'])){
-            IPF::$settings['append_slash'] = true;
-        }
-
-        if (!isset(IPF::$settings['media_url'])){
-            IPF::$settings['media_url'] = '/media/';
-        }
-
-        if (!isset(IPF::$settings['static_url'])){
-            IPF::$settings['static_url'] = '/static/';
-        }
-
         if (!isset(IPF::$settings['tiny_mce_url'])){
-            IPF::$settings['tiny_mce_url'] = '/static/admin/tiny_mce/';
+            IPF::$settings['tiny_mce_url'] =  IPF::$settings['static_url'] . 'admin/tiny_mce/';
         }
 
         if (!isset(IPF::$settings['urls'])){
             throw new IPF_Exception_Settings('Specify site url routes');
         }
-
-        if (!isset(IPF::$settings['session_cookie_id'])){
-            IPF::$settings['session_cookie_id'] = 'sessionid';
-        }
-
-        if (!isset(IPF::$settings['dir_permission']))
-            IPF::$settings['dir_permission'] = 0777;
-
-        if (!isset(IPF::$settings['file_permission']))
-            IPF::$settings['file_permission'] = 0666;
-
-        if (!isset(IPF::$settings['time_zone'])){
-            IPF::$settings['time_zone'] = 'America/Toronto';
-        }
     }
 
     private static function requestedFileExists()

diff --git a/ipf/middleware/common.php b/ipf/middleware/common.php
index 8826459650a3674d4f3f913cc035088c27ff1c15..389d3cd52a41ad2965886bfb9f0b3ae11a0aada7 100644 (file)
--- a/ipf/middleware/common.php
+++ b/ipf/middleware/common.php
@@ -4,9 +4,9 @@ class IPF_Middleware_Common
 {
     function processRequest(&$request)
     {
-        if (IPF::get('append_slash')){
-            $url = $request->http_host.IPF_HTTP_URL::getAction();
-            if (substr($url,-1)!='/'){
+        if (IPF::get('append_slash', true)) {
+            $url = $request->http_host . IPF_HTTP_URL::getAction();
+            if (substr($url,-1)!='/') {
                 $url = $request->addUrlrotocol($url).'/';
                 return new IPF_HTTP_Response_Redirect($url);
             }

diff --git a/t/project/project/settings.php b/t/project/project/settings.php
index da2bad6842dc1e34df09097baa5cbbed65d080d1..a4994211df364658290d4169341c5b6109653819 100644 (file)
--- a/t/project/project/settings.php
+++ b/t/project/project/settings.php
@@ -9,8 +9,6 @@ $set['tmp'] = $project_root . '/tmp';
 
 $set['upload_url'] = '/media/upload/';
 $set['upload_path'] = $project_root . '/htdocs/media/upload/';
-$set['media_path'] = $project_root . '/htdocs/media/';
-$set['media_url'] = '/media/';
 
 $set['secret_key'] = '123456';