From b18917e93ddb652e0898791e5f5b70697da7672b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 24 Jun 2016 15:32:36 +0100 Subject: [PATCH] Removed $_GET from all callback response and used JInput instead --- README.md | 4 ++-- admin/assets/css/admin.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/look.css | 2 +- admin/assets/css/looks.css | 2 +- admin/controller.php | 2 +- admin/controllers/demo.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/look.php | 2 +- admin/controllers/looks.php | 2 +- admin/demo.php | 2 +- admin/helpers/demo.php | 12 +++++++--- admin/helpers/html/batch_.php | 2 +- admin/language/en-GB/en-GB.com_demo.ini | 24 ++++++++++++------- admin/layouts/batchselection.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/metadata.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/look/details_above.php | 2 +- admin/layouts/look/details_left.php | 2 +- admin/layouts/look/details_right.php | 2 +- admin/layouts/look/details_under.php | 2 +- admin/layouts/look/metadata.php | 2 +- admin/layouts/look/publishing.php | 2 +- admin/layouts/look/repetable_numbers_left.php | 2 +- .../layouts/look/repetable_numbers_right.php | 2 +- admin/models/demo.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/forms/help_document.js | 2 +- admin/models/forms/help_document.xml | 5 ++-- admin/models/forms/look.js | 2 +- admin/models/forms/look.xml | 5 ++-- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 4 +++- admin/models/import.php | 2 +- admin/models/look.php | 2 +- admin/models/looks.php | 4 +++- admin/tables/help_document.php | 2 +- admin/tables/look.php | 2 +- admin/views/demo/tmpl/default.php | 2 +- admin/views/demo/tmpl/default_main.php | 2 +- admin/views/demo/tmpl/default_vdm.php | 2 +- admin/views/demo/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 4 ++-- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/look/submitbutton.js | 2 +- admin/views/look/tmpl/edit.php | 2 +- admin/views/look/view.html.php | 2 +- admin/views/looks/tmpl/default.php | 2 +- admin/views/looks/tmpl/default_batch_body.php | 2 +- .../views/looks/tmpl/default_batch_footer.php | 4 ++-- admin/views/looks/tmpl/default_body.php | 2 +- admin/views/looks/tmpl/default_foot.php | 2 +- admin/views/looks/tmpl/default_head.php | 2 +- admin/views/looks/tmpl/default_toolbar.php | 2 +- admin/views/looks/view.html.php | 2 +- demo.xml | 2 +- script.php | 2 +- site/assets/css/site.css | 2 +- site/controller.php | 2 +- site/controllers/help.php | 2 +- site/demo.php | 2 +- site/helpers/demo.php | 14 +++++++---- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- 86 files changed, 129 insertions(+), 103 deletions(-) diff --git a/README.md b/README.md index 5411597..044a3fc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Just a basic demo of the most basic implementations of the [Joomla] (http://www. + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io) + *Name*: [Demo] (https://www.vdm.io/) + *First Build*: 5th August, 2015 -+ *Last Build*: 2nd June, 2016 ++ *Last Build*: 24th June, 2016 + *Version*: 1.0.5 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -23,7 +23,7 @@ due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builde > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **16832** ++ *Line count*: **16858** + *File count*: **152** + *Folder count*: **50** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index dc9987b..e8f820a 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index abfea2a..140cca2 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage dashboard.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index c45a8a2..734ced3 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 9b3f1f6..e5cf423 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help_documents.css diff --git a/admin/assets/css/look.css b/admin/assets/css/look.css index b8b5ade..dc1211c 100644 --- a/admin/assets/css/look.css +++ b/admin/assets/css/look.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage look.css diff --git a/admin/assets/css/looks.css b/admin/assets/css/looks.css index c02f139..97eb51f 100644 --- a/admin/assets/css/looks.css +++ b/admin/assets/css/looks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage looks.css diff --git a/admin/controller.php b/admin/controller.php index ca127ed..c411cba 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage controller.php diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php index a8be6d0..47bb45c 100644 --- a/admin/controllers/demo.php +++ b/admin/controllers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index c3ef0ad..0dd0643 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 2902ae1..25467f6 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index a83d0d5..215269e 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 52e8dc0..54cccc8 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage import.php diff --git a/admin/controllers/look.php b/admin/controllers/look.php index 2780b9f..36c3bb7 100644 --- a/admin/controllers/look.php +++ b/admin/controllers/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage look.php diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php index 9223d3e..cda9ff0 100644 --- a/admin/controllers/looks.php +++ b/admin/controllers/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage looks.php diff --git a/admin/demo.php b/admin/demo.php index d6b8e01..8ee32c1 100644 --- a/admin/demo.php +++ b/admin/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php index 1ddc356..70580be 100644 --- a/admin/helpers/demo.php +++ b/admin/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php @@ -352,9 +352,15 @@ abstract class DemoHelper $db = JFactory::getDbo(); // Create a new query object. $query = $db->getQuery(true); - $query->select($db->quoteName(array($what))); - $query->from($db->quoteName('#__'.$main.'_'.$table)); + if (empty($table)) + { + $query->from($db->quoteName('#__'.$main)); + } + else + { + $query->from($db->quoteName('#__'.$main.'_'.$table)); + } if (is_numeric($where)) { $query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where); diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 4ada539..12513f2 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage batch_.php diff --git a/admin/language/en-GB/en-GB.com_demo.ini b/admin/language/en-GB/en-GB.com_demo.ini index 1e257a2..b26a7c3 100644 --- a/admin/language/en-GB/en-GB.com_demo.ini +++ b/admin/language/en-GB/en-GB.com_demo.ini @@ -92,10 +92,10 @@ COM_DEMO_HELP_DOCUMENT_ARTICLE="Article" COM_DEMO_HELP_DOCUMENT_ARTICLE_LABEL="Article" COM_DEMO_HELP_DOCUMENT_CONTENT="Content" COM_DEMO_HELP_DOCUMENT_CONTENT_LABEL="Content" -COM_DEMO_HELP_DOCUMENT_CREATED_BY_DESC="The user that created the Help Document." -COM_DEMO_HELP_DOCUMENT_CREATED_BY_LABEL="Created by" -COM_DEMO_HELP_DOCUMENT_CREATED_DATE_DESC="The date Help Document was created." -COM_DEMO_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date" +COM_DEMO_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document." +COM_DEMO_HELP_DOCUMENT_CREATED_BY_LABEL="Created By" +COM_DEMO_HELP_DOCUMENT_CREATED_DATE_DESC="The date this Help Document was created." +COM_DEMO_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date" COM_DEMO_HELP_DOCUMENT_DETAILS="Details" COM_DEMO_HELP_DOCUMENT_EDIT="Editing the Help Document" COM_DEMO_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias." @@ -107,6 +107,10 @@ COM_DEMO_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article" COM_DEMO_HELP_DOCUMENT_LOCATION="Location" COM_DEMO_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location." COM_DEMO_HELP_DOCUMENT_LOCATION_LABEL="Location" +COM_DEMO_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document." +COM_DEMO_HELP_DOCUMENT_MODIFIED_BY_LABEL="Modified By" +COM_DEMO_HELP_DOCUMENT_MODIFIED_DATE_DESC="The date this Help Document was modified." +COM_DEMO_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date" COM_DEMO_HELP_DOCUMENT_NEW="A New Help Document" COM_DEMO_HELP_DOCUMENT_NOT_REQUIRED="Not Required" COM_DEMO_HELP_DOCUMENT_ORDERING_LABEL="Ordering" @@ -246,10 +250,10 @@ COM_DEMO_LOOK_AGE_LABEL="Age Group" COM_DEMO_LOOK_ALIAS="Alias" COM_DEMO_LOOK_ALIAS_HINT="Auto-generated from name" COM_DEMO_LOOK_ALIAS_LABEL="Alias" -COM_DEMO_LOOK_CREATED_BY_DESC="The user that created the Look." -COM_DEMO_LOOK_CREATED_BY_LABEL="Created by" -COM_DEMO_LOOK_CREATED_DATE_DESC="The date Look was created." -COM_DEMO_LOOK_CREATED_DATE_LABEL="Created date" +COM_DEMO_LOOK_CREATED_BY_DESC="The user that created this Look." +COM_DEMO_LOOK_CREATED_BY_LABEL="Created By" +COM_DEMO_LOOK_CREATED_DATE_DESC="The date this Look was created." +COM_DEMO_LOOK_CREATED_DATE_LABEL="Created Date" COM_DEMO_LOOK_DESCRIPTION="Description" COM_DEMO_LOOK_DESCRIPTION_DESCRIPTION="Add Description Here" COM_DEMO_LOOK_DESCRIPTION_HINT="Add Description Here" @@ -269,6 +273,10 @@ COM_DEMO_LOOK_ID="Id" COM_DEMO_LOOK_MALE="Male" COM_DEMO_LOOK_MALE_DESCRIPTION="Here you can add males data." COM_DEMO_LOOK_MALE_SELECT="Edit/Add" +COM_DEMO_LOOK_MODIFIED_BY_DESC="The last user that modified this Look." +COM_DEMO_LOOK_MODIFIED_BY_LABEL="Modified By" +COM_DEMO_LOOK_MODIFIED_DATE_DESC="The date this Look was modified." +COM_DEMO_LOOK_MODIFIED_DATE_LABEL="Modified Date" COM_DEMO_LOOK_NAME="Name" COM_DEMO_LOOK_NAME_DESCRIPTION="Enter Name Here" COM_DEMO_LOOK_NAME_HINT="Name Here" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index a5aba4c..55f5e73 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage batchselection.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 0048674..52588e8 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 2e4050f..bbff867 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 3fde33a..9911d86 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 438ef63..d9f3af6 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 11bcf83..a33d6c8 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_under.php diff --git a/admin/layouts/help_document/metadata.php b/admin/layouts/help_document/metadata.php index 8b4ddc1..71d50b8 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage metadata.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 88ae46f..48775cf 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage publishing.php diff --git a/admin/layouts/look/details_above.php b/admin/layouts/look/details_above.php index 8aa7ebc..e90a46c 100644 --- a/admin/layouts/look/details_above.php +++ b/admin/layouts/look/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_above.php diff --git a/admin/layouts/look/details_left.php b/admin/layouts/look/details_left.php index 716437f..229e9b2 100644 --- a/admin/layouts/look/details_left.php +++ b/admin/layouts/look/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_left.php diff --git a/admin/layouts/look/details_right.php b/admin/layouts/look/details_right.php index db2b1b9..7da4b74 100644 --- a/admin/layouts/look/details_right.php +++ b/admin/layouts/look/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_right.php diff --git a/admin/layouts/look/details_under.php b/admin/layouts/look/details_under.php index 11bcf83..a33d6c8 100644 --- a/admin/layouts/look/details_under.php +++ b/admin/layouts/look/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage details_under.php diff --git a/admin/layouts/look/metadata.php b/admin/layouts/look/metadata.php index 8b4ddc1..71d50b8 100644 --- a/admin/layouts/look/metadata.php +++ b/admin/layouts/look/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage metadata.php diff --git a/admin/layouts/look/publishing.php b/admin/layouts/look/publishing.php index 88ae46f..48775cf 100644 --- a/admin/layouts/look/publishing.php +++ b/admin/layouts/look/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage publishing.php diff --git a/admin/layouts/look/repetable_numbers_left.php b/admin/layouts/look/repetable_numbers_left.php index f94cc43..2a2c49a 100644 --- a/admin/layouts/look/repetable_numbers_left.php +++ b/admin/layouts/look/repetable_numbers_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage repetable_numbers_left.php diff --git a/admin/layouts/look/repetable_numbers_right.php b/admin/layouts/look/repetable_numbers_right.php index fc505d9..f0c0afc 100644 --- a/admin/layouts/look/repetable_numbers_right.php +++ b/admin/layouts/look/repetable_numbers_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage repetable_numbers_right.php diff --git a/admin/models/demo.php b/admin/models/demo.php index 84046dd..35a94b5 100644 --- a/admin/models/demo.php +++ b/admin/models/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 9a2032c..21926b0 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage articles.php diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 2f84a3c..9d26c2d 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.js diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index 0a83c90..d7fccf6 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -47,11 +47,12 @@ - diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 738b235..fd66494 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index a264a8e..95cde49 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 67cc229..6892e34 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 9e99d5b..138fc04 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index a7fa74c..bc7e9ec 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 216e0e6..50d82b3 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 4afd86e..9af9622 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/admin/views/look/submitbutton.js b/admin/views/look/submitbutton.js index 4e6aa52..5027a17 100644 --- a/admin/views/look/submitbutton.js +++ b/admin/views/look/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage submitbutton.js diff --git a/admin/views/look/tmpl/edit.php b/admin/views/look/tmpl/edit.php index 8bd496f..e2e327d 100644 --- a/admin/views/look/tmpl/edit.php +++ b/admin/views/look/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage edit.php diff --git a/admin/views/look/view.html.php b/admin/views/look/view.html.php index 1264f47..885e5ca 100644 --- a/admin/views/look/view.html.php +++ b/admin/views/look/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/admin/views/looks/tmpl/default.php b/admin/views/looks/tmpl/default.php index 1f3a07a..ea814d6 100644 --- a/admin/views/looks/tmpl/default.php +++ b/admin/views/looks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default.php diff --git a/admin/views/looks/tmpl/default_batch_body.php b/admin/views/looks/tmpl/default_batch_body.php index 8237d0b..ae2125d 100644 --- a/admin/views/looks/tmpl/default_batch_body.php +++ b/admin/views/looks/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_batch_body.php diff --git a/admin/views/looks/tmpl/default_batch_footer.php b/admin/views/looks/tmpl/default_batch_footer.php index 02292b7..82d9d24 100644 --- a/admin/views/looks/tmpl/default_batch_footer.php +++ b/admin/views/looks/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_batch_footer.php @@ -23,7 +23,7 @@ defined('_JEXEC') or die('Restricted access'); ?> - diff --git a/admin/views/looks/tmpl/default_body.php b/admin/views/looks/tmpl/default_body.php index 41883d3..268b925 100644 --- a/admin/views/looks/tmpl/default_body.php +++ b/admin/views/looks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_body.php diff --git a/admin/views/looks/tmpl/default_foot.php b/admin/views/looks/tmpl/default_foot.php index 28dec0f..a7c8f15 100644 --- a/admin/views/looks/tmpl/default_foot.php +++ b/admin/views/looks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_foot.php diff --git a/admin/views/looks/tmpl/default_head.php b/admin/views/looks/tmpl/default_head.php index 923506e..7846325 100644 --- a/admin/views/looks/tmpl/default_head.php +++ b/admin/views/looks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_head.php diff --git a/admin/views/looks/tmpl/default_toolbar.php b/admin/views/looks/tmpl/default_toolbar.php index 3a52860..75a663e 100644 --- a/admin/views/looks/tmpl/default_toolbar.php +++ b/admin/views/looks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage default_toolbar.php diff --git a/admin/views/looks/view.html.php b/admin/views/looks/view.html.php index 9b10ead..de4fb9c 100644 --- a/admin/views/looks/view.html.php +++ b/admin/views/looks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/demo.xml b/demo.xml index 0cf5b14..eb17ba3 100644 --- a/demo.xml +++ b/demo.xml @@ -1,7 +1,7 @@ COM_DEMO - 2nd June, 2016 + 24th June, 2016 Llewellyn van der Merwe info@vdm.io https://www.vdm.io/ diff --git a/script.php b/script.php index f33e8fd..cb453fb 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage script.php diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 15b9820..83ab105 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 3db1fc8..d0fc616 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage controller.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 89196ba..60b5ed2 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage help.php diff --git a/site/demo.php b/site/demo.php index c5f5ad5..f13184b 100644 --- a/site/demo.php +++ b/site/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/site/helpers/demo.php b/site/helpers/demo.php index ef64082..3823a73 100644 --- a/site/helpers/demo.php +++ b/site/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php @@ -340,9 +340,15 @@ abstract class DemoHelper $db = JFactory::getDbo(); // Create a new query object. $query = $db->getQuery(true); - - $query->select($db->quoteName(array($what))); - $query->from($db->quoteName('#__'.$main.'_'.$table)); + $query->select($db->quoteName(array($what))); + if (empty($table)) + { + $query->from($db->quoteName('#__'.$main)); + } + else + { + $query->from($db->quoteName('#__'.$main.'_'.$table)); + } if (is_numeric($where)) { $query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where); diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index d205560..dfd83cf 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 957cb5e..751b602 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage route.php diff --git a/site/router.php b/site/router.php index a8d3844..abe5d81 100644 --- a/site/router.php +++ b/site/router.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 2nd June, 2016 + @build 24th June, 2016 @created 5th August, 2015 @package Demo @subpackage router.php