cleanup

diff --git a/ipf/admin/templates/admin/index.html b/ipf/admin/templates/admin/index.html
index 34f7272e5b4b4732eee9acfef1dee51b817b1b70..50bfc1fe46e06a2e24302cbf6ff34b8b2eab2677 100644 (file)
--- a/ipf/admin/templates/admin/index.html
+++ b/ipf/admin/templates/admin/index.html
@@ -18,11 +18,6 @@
             <td><a class="changelink" href="{url 'IPF_Admin_Views_ListItems', array($app.path, $component->slug())}">{trans 'Change'}</a></td>
         </tr>
         {/foreach}
-        {foreach $app.additions as $item}
-        <tr>
-            <th colspan="3" scope="row"><a href="{$item['url']}">{$item['title']}</a></th>
-        </tr>
-        {/foreach}
         </tbody>
         </table>
                </div>

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index e65d44b92decf771ac754c85a41137901202c4d3..f5b725bc0a11f664f9693853f1cf4f02d133a64b 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -19,7 +19,6 @@ function IPF_Admin_Views_Index($request, $match)
             $app_list[] = (object)array(
                 'name' => $app->getTitle(),
                 'path' => $app->slug(),
-                'additions' => $app->getAdditions(),
                 'components' => $components,
             );
         }

diff --git a/ipf/application.php b/ipf/application.php
index fc138f4b846f222e4aa2b11c6377d36a584dcbec..1fe3efe67725db45c75ac64f997c3c3ea3bade6b 100644 (file)
--- a/ipf/application.php
+++ b/ipf/application.php
@@ -6,7 +6,7 @@ abstract class IPF_Application
 
     public function __construct($data=array())
     {
-        $this->name = str_replace('_App', '', get_class($this));
+        $this->name = preg_replace('/_App$/', '', get_class($this));
 
         $rc = new ReflectionClass($this);
         $this->path = dirname($rc->getFileName()).DIRECTORY_SEPARATOR;
@@ -17,16 +17,6 @@ abstract class IPF_Application
         return $this->name;
     }
 
-    public function getLabel()
-    {
-        return str_replace('ipf_','',strtolower($this->name));
-    }
-
-    public function getAdditions()
-    {
-        return array();
-    }
-
     public function getTitle()
     {
         return $this->name;

diff --git a/ipf/command/migrate.php b/ipf/command/migrate.php
index cb6b949770193ee625e0ce1eef145445ac2df298..ac7ddd484baa63abb4553e559103dd0ca13a4c44 100644 (file)
--- a/ipf/command/migrate.php
+++ b/ipf/command/migrate.php
@@ -10,7 +10,7 @@ class IPF_Command_Migrate
         $project = IPF_Project::getInstance();
 
         $paths = array(IPF::get('project_path').'/db/migrations');
-        foreach ($project->frameworkApps() as $app) {
+        foreach ($project->appList() as $app) {
             $paths[] = $app->getPath() . 'migrations';
         }
 

diff --git a/ipf/legacy_orm/app.php b/ipf/legacy_orm/app.php
index 8aa0019e82b7e04507cedf3e7ff86f5676f3059a..4cc34722a84aab8192c2f25cf82f9e09a5f2437a 100644 (file)
--- a/ipf/legacy_orm/app.php
+++ b/ipf/legacy_orm/app.php
@@ -39,7 +39,6 @@ class IPF_Legacy_ORM_App extends IPF_Application
     {
         return array(
             new IPF_Legacy_ORM_Command_BuildModels,
-            new IPF_Legacy_ORM_Command_BuildContribModels,
             new IPF_Legacy_ORM_Command_Sql,
             new IPF_Legacy_ORM_Command_SyncDB,
             new IPF_Legacy_ORM_Command_Fixtures,

diff --git a/ipf/legacy_orm/commands/buildcontribmodels.php b/ipf/legacy_orm/commands/buildcontribmodels.php
deleted file mode 100644 (file)
index 4ffd5f3..0000000
--- a/ipf/legacy_orm/commands/buildcontribmodels.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class IPF_Legacy_ORM_Command_BuildContribModels
-{
-    public $command = 'buildcontribmodels';
-    public $description = 'Build all contrib model classes';
-
-    public function run($args=null)
-    {
-        print "Build all contrib model classes\n";
-
-        $project = IPF_Project::getInstance();
-
-        $extraAllwedReferences = array();
-        foreach ($project->frameworkApps() as $app) {
-            $models = IPF_ORM::generateModelsFromYaml($app->path, $extraAllwedReferences);
-            $extraAllwedReferences = array_merge($extraAllwedReferences, $models);
-        }
-    }
-}
-

diff --git a/ipf/legacy_orm/commands/buildmodels.php b/ipf/legacy_orm/commands/buildmodels.php
index 0e2e9b895fd68558241d0c6b1404d95b448b9898..9dca874a3758dec1844ac214d230772596e97a87 100644 (file)
--- a/ipf/legacy_orm/commands/buildmodels.php
+++ b/ipf/legacy_orm/commands/buildmodels.php
@@ -12,19 +12,10 @@ class IPF_Legacy_ORM_Command_BuildModels
         $project = IPF_Project::getInstance();
 
         $paths = array();
-        foreach ($project->customApps() as $app)
+        foreach ($project->appList() as $app)
             $paths[] = $app->getPath();
 
-        $extraAllowedReferences = $this->frameworkModels($project);
-        IPF_ORM::generateModelsFromYaml($paths, $extraAllowedReferences);
-    }
-
-    private function frameworkModels($project)
-    {
-        $models = array();
-        foreach ($project->frameworkApps() as $app)
-            $models = array_merge($models, IPF_Legacy_ORM_App::appModelList($app));
-        return $models;
+        IPF_ORM::generateModelsFromYaml($paths, array());
     }
 }
 

diff --git a/ipf/legacy_orm/commands/fixtures.php b/ipf/legacy_orm/commands/fixtures.php
index 0b5689a3387a4d4fa095aeae0c15d39081e04d76..3c6e279291b49385090b02b015d2381e77995d94 100644 (file)
--- a/ipf/legacy_orm/commands/fixtures.php
+++ b/ipf/legacy_orm/commands/fixtures.php
@@ -12,7 +12,7 @@ class IPF_Legacy_ORM_Command_Fixtures
         $project = IPF_Project::getInstance();
 
         $paths = array(IPF::get('project_path'));
-        foreach ($project->customApps() as $app)
+        foreach ($project->appList() as $app)
             $paths[] = $app->path;
 
         $fixtures = array();

diff --git a/ipf/legacy_orm/commands/sql.php b/ipf/legacy_orm/commands/sql.php
index 5bc9c2d050761c7186d20ff5445db9dfebdf65de..31f55c9e3f13e0a682bf12de2497cb6c399cad7e 100644 (file)
--- a/ipf/legacy_orm/commands/sql.php
+++ b/ipf/legacy_orm/commands/sql.php
@@ -9,17 +9,8 @@ class IPF_Legacy_ORM_Command_Sql
     {
         print "Show all SQL DDL from model classes\n";
 
-        $project = IPF_Project::getInstance();
-
-        $sql = '';
-
-        foreach ($project->frameworkApps() as $app)
-            $sql .= IPF_ORM::generateSqlFromModels($app)."\n";
-
-        foreach ($project->customApps() as $app)
-            $sql .= IPF_ORM::generateSqlFromModels($app)."\n";
-
-        print $sql;
+        foreach (IPF_Project::getInstance()->appList() as $app)
+            print IPF_ORM::generateSqlFromModels($app)."\n";
     }
 }
 

diff --git a/ipf/legacy_orm/orm.php b/ipf/legacy_orm/orm.php
index 660c0a97f26ca69b451248b8b325a0e73004d6c6..f5fb91615a4874803f0d734f4e2df4c8dbce2592 100644 (file)
--- a/ipf/legacy_orm/orm.php
+++ b/ipf/legacy_orm/orm.php
@@ -243,5 +243,13 @@ final class IPF_ORM
 
         return implode("\n", $ret);
     }
+
+    public static function GetObjectOr404($object, $id)
+    {
+        $obj = IPF_ORM::getTable($object)->findOneById($id);
+        if ($obj)
+            return $obj;
+        throw new IPF_HTTP_Error404();
+    }
 }
 

diff --git a/ipf/project.php b/ipf/project.php
index 8bb7ded5bfee671165b02a69f303d8d11a146d6e..ff9c303d9a5240b2819b4771f61237ada63957ee 100644 (file)
--- a/ipf/project.php
+++ b/ipf/project.php
@@ -17,11 +17,9 @@ final class IPF_Project
 
     private function __construct()
     {
-        $applist = IPF::get('applications');
-        foreach ($applist as &$appname) {
-            if (!IPF_Utils::isValidName($appname))
-                throw new IPF_Exception_Panic("Application name \"$name\" is incorrect");
-            $this->apps[$appname] = null;
+        foreach (IPF::get('applications') as $name) {
+            $className = $name.'_App';
+            $this->apps[$name] = new $className;
         }
         $this->router = new IPF_Router;
     }
@@ -32,46 +30,9 @@ final class IPF_Project
 
     public function appList()
     {
-        foreach($this->apps as $appName => &$app) {
-            if ($app == null) {
-                $app = $this->getApp($appName);
-            }
-        }
         return $this->apps;
     }
 
-    // Lazy Application Loader
-    public function getApp($name)
-    {
-        if (!array_key_exists($name, $this->apps))
-            throw new IPF_Exception_Panic("Application \"$name\" not found");
-        if ($this->apps[$name] == null) {
-            $className = $name.'_App';
-            $this->apps[$name] = new $className;
-        }
-        return $this->apps[$name];
-    }
-
-    public function frameworkApps()
-    {
-        $result = array();
-        foreach ($this->apps as $appname => &$app) {
-            if (substr($appname, 0, 4) === 'IPF_')
-                $result[] = $this->getApp($appname);
-        }
-        return $result;
-    }
-
-    public function customApps()
-    {
-        $result = array();
-        foreach ($this->apps as $appname => &$app) {
-            if (substr($appname, 0, 4) !== 'IPF_')
-                $result[] = $this->getApp($appname);
-        }
-        return $result;
-    }
-
     public function run()
     {
         \PFF\Container::setFactory('databaseConnection', array('IPF_Database', 'connect'));

diff --git a/ipf/shortcuts.php b/ipf/shortcuts.php
index f3609ad8932136a02cc698a3244efcb13b1a2331..6c1093c90c12b1eb2fbd3de8d43df9d87c255a99 100644 (file)
--- a/ipf/shortcuts.php
+++ b/ipf/shortcuts.php
@@ -2,14 +2,6 @@
 
 final class IPF_Shortcuts
 {
-    public static function GetObjectOr404($object, $id)
-    {
-        $obj = IPF_ORM::getTable($object)->findOneById($id);
-        if ($obj)
-            return $obj;
-        throw new IPF_HTTP_Error404();
-    }
-
     public static function RenderToResponse($tplfile, $params=array(), $request=null)
     {
         return new IPF_HTTP_Response(IPF_Shortcuts::RenderToString($tplfile, $params, $request));