From 031d9a611c71cd516a449b6d79eec58f2e10d9aa Mon Sep 17 00:00:00 2001
From: Andrey Kutejko <andy128k@gmail.com>
Date: Wed, 3 Sep 2014 08:54:27 +0300
Subject: [PATCH] cleanup

---
 ipf.php                                       | 55 +++++++------------
 ipf/exception/image.php                       |  3 -
 ipf/exception/panic.php                       |  3 -
 ipf/exception/settings.php                    |  3 -
 .../form.php => form/exception.php}           |  0
 ipf/{ => form}/form.php                       |  0
 ipf/form/widget/htmlinput.php                 |  7 ++-
 ipf/legacy_orm/app.php                        | 10 ----
 8 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100644 ipf/exception/image.php
 delete mode 100644 ipf/exception/panic.php
 delete mode 100644 ipf/exception/settings.php
 rename ipf/{exception/form.php => form/exception.php} (100%)
 rename ipf/{ => form}/form.php (100%)

diff --git a/ipf.php b/ipf.php
index 96378fc..57d8f96 100644
--- a/ipf.php
+++ b/ipf.php
@@ -17,6 +17,8 @@ final class IPF
         'dir_permission'    => 0777,
         'file_permission'   => 0666,
         'time_zone'         => 'America/Toronto',
+        'tmp'               => '/tmp',
+        'admin_title'       => 'IPF Administration',
     );
 
     private static function applySettings($settings)
@@ -30,46 +32,32 @@ final class IPF
         $settings_file = IPF::$settings['project_path'].DIRECTORY_SEPARATOR.'settings.php';
         IPF::$settings['settings_file'] = $settings_file;
 
-        if (file_exists($settings_file))
-            IPF::applySettings(require $settings_file);
-        else
-            throw new IPF_Exception_Settings('Configuration file does not exist: '.$settings_file);
+        if (!file_exists($settings_file))
+            die('Configuration file does not exist: '.$settings_file);
+
+        IPF::applySettings(require $settings_file);
 
         $settings_local_file = IPF::$settings['project_path'].DIRECTORY_SEPARATOR.'settings_local.php';
         if (file_exists($settings_local_file))
             IPF::applySettings(require $settings_local_file);
 
-        if (!isset(IPF::$settings['dsn']) && !isset(IPF::$settings['database']))
-            throw new IPF_Exception_Settings('Please specify database parameters or DSN in settings file');
-
-        if (isset(IPF::$settings['database']) && !is_array(IPF::$settings['database']))
-            throw new IPF_Exception_Settings('Database must be array with keys: driver, host, port (optional), database, username, password, options (optional)');
+        if (!isset(IPF::$settings['database']))
+            die('Please specify database parameters in settings file');
 
-        if (isset(IPF::$settings['dsn']) && !is_string(IPF::$settings['dsn']))
-            throw new IPF_Exception_Settings('DSN must be string');
+        if (!is_array(IPF::$settings['database']))
+            die('Database must be array with keys: driver, host, port (optional), database, username, password');
 
-        if (!isset(IPF::$settings['tmp']))
-            IPF::$settings['tmp'] = '/tmp';
-        else
-            if (!is_string(IPF::$settings['tmp']))
-                throw new IPF_Exception_Settings('TMP must be string');
+        if (!is_string(IPF::$settings['tmp']))
+            die('TMP must be string');
 
         if (!isset(IPF::$settings['applications']))
-            throw new IPF_Exception_Settings('Please specify application list');
-        if (!is_array(IPF::$settings['applications']))
-            throw new IPF_Exception_Settings('applications must be array of string');
-
-        if (!isset(IPF::$settings['admin_title'])){
-            IPF::$settings['admin_title'] = 'IPF Administration';
-        }
+            die('Please specify application list');
 
-        if (!isset(IPF::$settings['tiny_mce_url'])){
-            IPF::$settings['tiny_mce_url'] =  IPF::$settings['static_url'] . 'admin/tiny_mce/';
-        }
+        if (!is_array(IPF::$settings['applications']))
+            die('applications must be array of string');
 
-        if (!isset(IPF::$settings['urls'])){
-            throw new IPF_Exception_Settings('Specify site url routes');
-        }
+        if (!isset(IPF::$settings['urls']))
+            die('Specify site url routes');
     }
 
     private static function requestedFileExists()
@@ -88,12 +76,9 @@ final class IPF
         IPF::$settings['project_path'] = $project_path;
         IPF::$settings['document_root'] = $document_root;
 
-        try {
-            IPF::loadSettings();
-            date_default_timezone_set(IPF::$settings['time_zone']);
-        } catch (IPF_Exception_Settings $e) {
-            die('Setting Error: '.$e->getMessage()."\n");
-        }
+        IPF::loadSettings();
+        date_default_timezone_set(IPF::$settings['time_zone']);
+
         return true;
     }
 
diff --git a/ipf/exception/image.php b/ipf/exception/image.php
deleted file mode 100644
index 907545c..0000000
--- a/ipf/exception/image.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class IPF_Exception_Image extends IPF_Exception{}
diff --git a/ipf/exception/panic.php b/ipf/exception/panic.php
deleted file mode 100644
index 9cd6178..0000000
--- a/ipf/exception/panic.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class IPF_Exception_Panic extends IPF_Exception{}
diff --git a/ipf/exception/settings.php b/ipf/exception/settings.php
deleted file mode 100644
index 50c4cbe..0000000
--- a/ipf/exception/settings.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-class IPF_Exception_Settings extends IPF_Exception{}
diff --git a/ipf/exception/form.php b/ipf/form/exception.php
similarity index 100%
rename from ipf/exception/form.php
rename to ipf/form/exception.php
diff --git a/ipf/form.php b/ipf/form/form.php
similarity index 100%
rename from ipf/form.php
rename to ipf/form/form.php
diff --git a/ipf/form/widget/htmlinput.php b/ipf/form/widget/htmlinput.php
index b255a53..197d998 100644
--- a/ipf/form/widget/htmlinput.php
+++ b/ipf/form/widget/htmlinput.php
@@ -13,7 +13,10 @@ class IPF_Form_Widget_HTMLInput extends IPF_Form_Widget
 
     public function __construct($attrs=array())
     {
-        $this->tinymce_url          = \PFF\Arr::pop($attrs, 'tinymce_url');
+        $this->tinymce_url = \PFF\Arr::pop($attrs, 'tinymce_url',
+            IPF::get('tiny_mce_url',
+            IPF::get('static_url').'admin/tiny_mce/'));
+
         $this->mode                 = \PFF\Arr::pop($attrs, 'mode',                 'textareas');
         $this->theme                = \PFF\Arr::pop($attrs, 'theme',                'simple');
         $this->include_tinymce      = \PFF\Arr::pop($attrs, 'include_tinymce',      true);
@@ -51,7 +54,7 @@ class IPF_Form_Widget_HTMLInput extends IPF_Form_Widget
     public function extra_js()
     {
         return array(
-            '<script type="text/javascript" src="'.IPF::get('tiny_mce_url').'tiny_mce.js"></script>',
+            '<script type="text/javascript" src="'.$this->tiny_mce_url.'tiny_mce.js"></script>',
             '<script type="text/javascript">
 function ipf_filebrowser(field_name, url, type, win) {
   var cmsURL = "/admin/filebrowser/";
diff --git a/ipf/legacy_orm/app.php b/ipf/legacy_orm/app.php
index 4cc3472..8db81a0 100644
--- a/ipf/legacy_orm/app.php
+++ b/ipf/legacy_orm/app.php
@@ -20,16 +20,6 @@ class IPF_Legacy_ORM_App extends IPF_Application
                 // nothing to do
             }
 
-            // reorder models according to a given option
-            if (method_exists($app, 'admin_models_order')) {
-                $ordered = $app->admin_models_order();
-                foreach ($ordered as $modelname) {
-                    if (!in_array($modelname, $models))
-                        throw new IPF_Exception_Panic("Model \"$modelname\" does not exist.");
-                }
-                $models = array_merge($ordered, array_diff($models, $ordered));
-            }
-
             self::$appModels[$app->getName()] = $models;
         }
         return self::$appModels[$app->getName()];
-- 
2.49.0