cleanup

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index 527e4606271508ce71670edaa81a792e6e8c4a9c..f471f26d7366e38191c1edacbbdc8c7f56eb3198 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -397,27 +397,24 @@ function IPF_Admin_Views_FileBrowser($request, $match)
                 continue;
             if (($curr_dir=='') && ($file=='..'))
                 continue;
-            if (filetype($_dir . $file)=='dir'){
+
+            if (filetype($_dir . $file)=='dir') {
                 $dirs[] = array('id'=>$id, 'name'=>$file);
                 $id++;
-            }
-            else{
-                
+            } else {
                 $sx = getimagesize($_dir.$file);
-                if ($sx){
+                if ($sx) {
                     $image = '1';
                     $type = str_replace('image/','',$sx['mime']).' '.$sx[0].'x'.$sx[1];
-                    if ($sx[0]<=200){
+                    if ($sx[0]<=200) {
                         $zw = $sx[0];
                         $zh = $sx[1];
-                    }
-                    else {
+                    } else {
                         $zw = 200;
                         $prop = (float)$sx[1] / (float)$sx[0];
                         $zh = (int)(200.0 * $prop);
                     }
-                }
-                else {
+                } else {
                     $image = '0';
                     $type = 'binary';
                     $zw = 200;

diff --git a/ipf/auth/app.php b/ipf/auth/app.php
index 8ff7be88021f8d4a52a163c9c3a0b6f7a8042a21..9f362d8c661427d46a54b923e2eff601ae58fbcf 100644 (file)
--- a/ipf/auth/app.php
+++ b/ipf/auth/app.php
@@ -1,9 +1,5 @@
 <?php
 
-// preload permission model
-require_once(dirname(__FILE__) . '/models/_generated/BasePermission.php');
-require_once(dirname(__FILE__) . '/models/Permission.php');
-
 class IPF_Auth_App extends IPF_Application
 {
     public function __construct()
@@ -35,7 +31,7 @@ class IPF_Auth_App extends IPF_Application
 
     static function createPermissionsFromModels()
     {
-        $permsTable = IPF_ORM::getTable('Permission');
+        $permsTable = Permission::table();
 
         $project = IPF_Project::getInstance();
         $project->loadAllModels();
@@ -173,3 +169,4 @@ class IPF_Auth_App extends IPF_Application
         return $app->getTitle().' | '.$admin->verbose_name().' | '.ucfirst($parts[2]);
     }    
 }
+

diff --git a/ipf/orm/table.php b/ipf/orm/table.php
index 706cfc42ebb72554aa251b15ef9949457f2ae4ef..416102adbf9eee9b7fb19734d4108a9aa1d4e9b2 100644 (file)
--- a/ipf/orm/table.php
+++ b/ipf/orm/table.php
@@ -45,8 +45,10 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
 
     public function __construct($name, IPF_ORM_Connection $conn, $initDefinition = false)
     {
-        $this->_conn = $conn;
+        if (empty($name) || !class_exists($name))
+            throw new IPF_ORM_Exception("Couldn't find class " . $name);
 
+        $this->_conn = $conn;
         $this->setParent($this->_conn);
 
         $this->_options['name'] = $name;
@@ -70,9 +72,6 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
     public function initDefinition()
     {
         $name = $this->_options['name'];
-        if ( ! class_exists($name) || empty($name)) {
-            throw new IPF_ORM_Exception("Couldn't find class " . $name);
-        }
         $record = new $name($this);
 
         $names = array();
@@ -82,17 +81,15 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
         // get parent classes
 
         do {
-            if ($class === 'IPF_ORM_Record') {
+            if ($class === 'IPF_ORM_Record')
                 break;
-            }
 
             $name = $class;
             $names[] = $name;
         } while ($class = get_parent_class($class));
 
-        if ($class === false) {
+        if ($class === false)
             throw new IPF_ORM_Exception('Class "' . $name . '" must be a child class of IPF_ORM_Record');
-        }
 
         // reverse names
         $names = array_reverse($names);