From 906bec446fb3a7368c15710912e38b8a9ed09473 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren"
Date: Thu, 4 Jun 2015 15:46:30 -0400
Subject: [PATCH] More simplification
---
app/classes/controller.php | 37 --------
app/classes/index.html | 0
.../meta => }/controllers/category.php | 2 +-
app/{modules/meta => }/controllers/genre.php | 26 +++---
.../meta => }/controllers/section.php | 2 +-
app/{modules/meta => }/models/data_model.php | 0
.../meta => }/views/category_detail.php | 0
app/{modules/meta => }/views/edit_form.php | 0
app/{modules/meta => }/views/genre_detail.php | 0
app/{modules/meta => }/views/genres.php | 0
app/views/header.php | 1 +
app/{modules/meta => }/views/outline.php | 0
.../meta => }/views/section_detail.php | 1 -
composer.json | 4 +-
index.php | 9 +-
sys/common.php | 84 +------------------
sys/core/Controller.php | 12 ++-
sys/core/Page.php | 15 +---
sys/db | 1 -
19 files changed, 39 insertions(+), 155 deletions(-)
delete mode 100755 app/classes/controller.php
delete mode 100644 app/classes/index.html
rename app/{modules/meta => }/controllers/category.php (97%)
rename app/{modules/meta => }/controllers/genre.php (97%)
rename app/{modules/meta => }/controllers/section.php (97%)
rename app/{modules/meta => }/models/data_model.php (100%)
rename app/{modules/meta => }/views/category_detail.php (100%)
rename app/{modules/meta => }/views/edit_form.php (100%)
rename app/{modules/meta => }/views/genre_detail.php (100%)
rename app/{modules/meta => }/views/genres.php (100%)
rename app/{modules/meta => }/views/outline.php (100%)
rename app/{modules/meta => }/views/section_detail.php (96%)
delete mode 120000 sys/db
diff --git a/app/classes/controller.php b/app/classes/controller.php
deleted file mode 100755
index 7a699c4..0000000
--- a/app/classes/controller.php
+++ /dev/null
@@ -1,37 +0,0 @@
-load_model('meta\data_model');
- $db = \miniMVC\db::get_instance();
-
- $this->page->queries =& $db->queries;
- }
-
-}
diff --git a/app/classes/index.html b/app/classes/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/app/modules/meta/controllers/category.php b/app/controllers/category.php
similarity index 97%
rename from app/modules/meta/controllers/category.php
rename to app/controllers/category.php
index 27b2052..7d53944 100755
--- a/app/modules/meta/controllers/category.php
+++ b/app/controllers/category.php
@@ -18,7 +18,7 @@
*
* @package meta
*/
-class category extends meta\controller {
+class category extends \miniMVC\Controller {
/**
* Initialize the Controller
diff --git a/app/modules/meta/controllers/genre.php b/app/controllers/genre.php
similarity index 97%
rename from app/modules/meta/controllers/genre.php
rename to app/controllers/genre.php
index 1837d54..7d0bc1a 100755
--- a/app/modules/meta/controllers/genre.php
+++ b/app/controllers/genre.php
@@ -18,7 +18,7 @@
*
* @package meta
*/
-class genre extends meta\controller {
+class genre extends \miniMVC\Controller {
/**
* Default controller method
@@ -32,7 +32,7 @@ class genre extends meta\controller {
return;
}
-
+
// --------------------------------------------------------------------------
/**
@@ -58,7 +58,7 @@ class genre extends meta\controller {
// Render the basic page
$this->index();
}
-
+
// --------------------------------------------------------------------------
/**
@@ -74,7 +74,7 @@ class genre extends meta\controller {
// is a valid integer
$id = (int) miniMVC\get_last_segment();
}
-
+
$genre = $this->data_model->get_genre_by_id($id);
$categories = $this->data_model->get_categories($id);
@@ -86,7 +86,7 @@ class genre extends meta\controller {
$this->render('genre_detail', $data);
}
-
+
// --------------------------------------------------------------------------
/**
@@ -112,7 +112,7 @@ class genre extends meta\controller {
$this->detail($id);
}
-
+
// --------------------------------------------------------------------------
/**
@@ -144,10 +144,10 @@ class genre extends meta\controller {
public function delete()
{
$type = strip_tags($_POST['type']);
-
+
$valid_types = ['genre', 'category', 'section', 'data'];
-
- $res = (in_array($type, $valid_types))
+
+ $res = (in_array($type, $valid_types))
? $this->data_model->delete($type, (int) $_POST['id'])
: 0;
@@ -184,7 +184,7 @@ class genre extends meta\controller {
$type = strip_tags($_POST['type']);
$name = strip_tags($_POST['name']);
$val = (isset($_POST['val'])) ? $_POST['val'] : NULL;
-
+
if ($this->data_model->is_valid_type($type))
{
if ($type != 'data')
@@ -195,12 +195,12 @@ class genre extends meta\controller {
{
$res = $this->data_model->update_data($id, $name, $val);
}
-
+
$res = (int) $res;
-
+
exit(mb_trim($res));
}
-
+
exit(0);
}
}
diff --git a/app/modules/meta/controllers/section.php b/app/controllers/section.php
similarity index 97%
rename from app/modules/meta/controllers/section.php
rename to app/controllers/section.php
index 1c33efb..e6537ee 100755
--- a/app/modules/meta/controllers/section.php
+++ b/app/controllers/section.php
@@ -18,7 +18,7 @@
*
* @package meta
*/
-class section extends meta\controller {
+class section extends \miniMVC\Controller {
/**
* Constructor
diff --git a/app/modules/meta/models/data_model.php b/app/models/data_model.php
similarity index 100%
rename from app/modules/meta/models/data_model.php
rename to app/models/data_model.php
diff --git a/app/modules/meta/views/category_detail.php b/app/views/category_detail.php
similarity index 100%
rename from app/modules/meta/views/category_detail.php
rename to app/views/category_detail.php
diff --git a/app/modules/meta/views/edit_form.php b/app/views/edit_form.php
similarity index 100%
rename from app/modules/meta/views/edit_form.php
rename to app/views/edit_form.php
diff --git a/app/modules/meta/views/genre_detail.php b/app/views/genre_detail.php
similarity index 100%
rename from app/modules/meta/views/genre_detail.php
rename to app/views/genre_detail.php
diff --git a/app/modules/meta/views/genres.php b/app/views/genres.php
similarity index 100%
rename from app/modules/meta/views/genres.php
rename to app/views/genres.php
diff --git a/app/views/header.php b/app/views/header.php
index 8e685b1..85b8ad7 100755
--- a/app/views/header.php
+++ b/app/views/header.php
@@ -7,6 +7,7 @@
= $head_tags ?>
= $head_tags ?>
+
= $head_js ?>
= (!empty($body_id)) ? " id=\"" . $body_id . "\"" : ""; ?>>
diff --git a/app/modules/meta/views/outline.php b/app/views/outline.php
similarity index 100%
rename from app/modules/meta/views/outline.php
rename to app/views/outline.php
diff --git a/app/modules/meta/views/section_detail.php b/app/views/section_detail.php
similarity index 96%
rename from app/modules/meta/views/section_detail.php
rename to app/views/section_detail.php
index edb1885..197a6d8 100755
--- a/app/modules/meta/views/section_detail.php
+++ b/app/views/section_detail.php
@@ -4,7 +4,6 @@
= $p['category'] ?> >
= $section ?>
-