6 files changed, 56 insertions, 72 deletions
diff --git a/public/app/models/cms/Course_model.php b/public/app/models/Cms_model.php
index 6614993..fad11b8 100644
--- a/public/app/models/cms/Course_model.php
+++ b/public/app/models/Cms_model.php
@@ -1,10 +1,10 @@
 <?php 
-namespace app\models\cms;
+namespace app\models;
 
 use \Registry;
 
 
-class Course_model {
+class Cms_model {
     
     /** COURSES
      * -------------------------------------------------------------------------
@@ -143,7 +143,7 @@ class Course_model {
      * 
      * NOTE:
      * ---
-     * Course_model::all_breadcrumbs returns an indexed super-array;
+     * Cms_model::all_breadcrumbs returns an indexed super-array;
      * each array item includes a banch of information: [
      *    breadcrumb,
      *    rec: [ id , title ],
diff --git a/public/app/models/admin/User_model.php b/public/app/models/User_model.php
index 2885dc1..f799dd9 100644
--- a/public/app/models/admin/User_model.php
+++ b/public/app/models/User_model.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace app\models\admin;
+namespace app\models;
 
 use \Registry;
-use app\models\admin\History_model as History;
+use app\models\admin\History_model;
 
 class User_model
 {
 
+    ## User methods
+    ## -------------------------------------------------------------------------
+
     /** check user (by index key)
      * 
      * @param $indexKey (string) : key for user identification
@@ -165,7 +168,7 @@ class User_model
         self::set_user_role($new_user_id, 5);
 
         // update history
-        History::trackUserAccess($new_user_id, TRACK_ACCOUNT, 'Create User Account');
+        History_model::trackUserAccess($new_user_id, TRACK_ACCOUNT, 'Create User Account');
 
         // return success and user id
 		return [
@@ -176,6 +179,11 @@ class User_model
     }
 
 
+
+    ## Set permission methods
+    ## -------------------------------------------------------------------------
+
+
     /** set_user_privileges
      * 
      * @param $privileges (array)
@@ -236,13 +244,17 @@ class User_model
         );
 
         // update history
-        History::trackUserAccess($user['id'], TRACK_ACCOUNT, 'User Account Activated');
+        History_model::trackUserAccess($user['id'], TRACK_ACCOUNT, 'User Account Activated');
 
         return true;
 
     }
 
 
+    ## documention methods
+    ## methods related to properties that determin user's access
+    ##--------------------------------------------------------------------------
+
 }
 
 /* example query getUser (super-array)
diff --git a/public/app/models/cms/Media_model.php b/public/app/models/cms/Media_model.php
deleted file mode 100644
index 6a4a681..0000000
--- a/public/app/models/cms/Media_model.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace app\models\cms;
-
-use \Registry;
-
-
-class Media_model
-{
-    public static function serve($type, $id, $ticket)
-    {
-
-        // get media data
-        // [ type =>, rights =>, path =>  ]
-
-        // validate ticket
-        // ValidateAccess::for($ticket)
-
-        // serve
-        // header("Content-type: type");
-        // passthru('cat $media_path');
-
-
-        return Registry::use('database')->query(
-            "SELECT * FROM pages
-                WHERE FullFriendlyUrl = :url AND IsActive = 1",
-            [ ':url' => $url ]
-        )->getFirst();
-    }
-
-}
-
-
-
-// check:
-// https://stackoverflow.com/questions/1353850/serve-image-with-php-script-vs-direct-loading-an-image
-\ No newline at end of file
diff --git a/public/app/models/cms/Page_model.php b/public/app/models/cms/Page_model.php
deleted file mode 100644
index fda5fb1..0000000
--- a/public/app/models/cms/Page_model.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace app\models\cms;
-
-use \Registry;
-
-class Page_model
-{
-    public static function fromUrl($url)
-    {
-        return Registry::use('database')->query(
-            "SELECT * FROM pages
-                WHERE FullFriendlyUrl = :url AND IsActive = 1",
-            [ ':url' => $url ]
-        )->getFirst();
-    }
-
-}
-\ No newline at end of file
diff --git a/public/app/models/ideas.md b/public/app/models/ideas.md
new file mode 100644
index 0000000..300612d
--- /dev/null
+++ b/public/app/models/ideas.md
@@ -0,0 +1,24 @@
+# interesting projects
+
+projects for brainstorming
+
+## php ORM projects
+
+* [riverside\php-orm](https://github.com/riverside/php-orm) seems the lightest and most promissing
+
+* https://github.com/mareimorsy/DB
+
+* https://propelorm.org/
+
+* https://redbeanphp.com/index.php?p=/download
+
+* you can find more in a [related github topic](https://github.com/topics/php-orm)
+
+
+Thoughts:   
+create a DatabaseModel class (??) based on the riverside\php-orm then use it in anom framerok
+
+
+## php micro-framework
+
+* [riverside\php-express](https://github.com/riverside/php-express) seems quite interesting
diff --git a/public/app/models/todo.md b/public/app/models/todo.md
index 89ea113..5a18f38 100644
--- a/public/app/models/todo.md
+++ b/public/app/models/todo.md
@@ -3,36 +3,38 @@ Rearange
 
 -- #1 --
 
-app\controllers\cms\Course -> [*] app\controllers\Course
+[ok] app\controllers\cms\Course -> [*] app\controllers\Course
 
-app\controllers\admin\Users_admin -> [delete]
+[ok] app\controllers\admin\Users_admin -> [delete]
 
-app\controllers\Admin -> [delete]
+[ok] app\controllers\Admin -> [delete]
 
-app\controllers\admin\Course_admin -> [*] app\controllers\Course_admin
+[ok] app\controllers\admin\Course_admin -> [*] app\controllers\Course_admin
 
-app\models\admin\User_model -> [*] app\models\User_model
+[ok] app\models\admin\User_model -> [*] app\models\User_model
 
 app\models\admin\Privilege_model -> [merge_to] -> [**] app\models\User_model
 
 app\models\admin\History_model -> [*] app\models\History_model
 
-app\models\cms\Page_model -> [delete]
+[ok] app\models\cms\Page_model -> [delete]
 
-app\models\cms\Media_model -> [delete]
+[ok] app\models\cms\Media_model -> [delete]
 
-app\models\cms\Course_model -> [*] app\models\Course_model
+[ok] app\models\cms\Course_model -> [*] app\models\Course_model
 
 [*] = move
 
 
 -- #2 --
 
-app\controllers\Course -> [r] app\controllers\Cms
+[ok] app\controllers\Course -> [rename] app\controllers\Cms
+
+[ok] app\controllers\Course_admin -> [rename] app\controllers\CmsAdmin
+
+[ok] app\models\Course_model -> [rename] app\models\Cms_model
 
-app\controllers\Course_admin -> [r] app\controllers\Cms_admin
 
-app\models\Course_model -> app\models\Cms_model