diff --git a/README.md b/README.md index 51c5a3f..4047285 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*: 5th March, 2016 ++ *Last Build*: 10th March, 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*: **16658** ++ *Line count*: **16672** + *File count*: **152** + *Folder count*: **50** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index e3f915c..7f2fceb 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 c7a65e9..a5d6457 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 8802097..02b2201 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 b19688e..ffc8c2b 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 2fcb389..25f0928 100644 --- a/admin/assets/css/look.css +++ b/admin/assets/css/look.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 4a82356..10f8ad0 100644 --- a/admin/assets/css/looks.css +++ b/admin/assets/css/looks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage looks.css diff --git a/admin/controller.php b/admin/controller.php index 51acb59..3421373 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage controller.php diff --git a/admin/controllers/demo.php b/admin/controllers/demo.php index b4b1b66..d46e343 100644 --- a/admin/controllers/demo.php +++ b/admin/controllers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 64c004a..6d95396 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 43ae9cd..f93ec91 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 ac4e43d..143b10e 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 2fe133c..bd47f72 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage import.php diff --git a/admin/controllers/look.php b/admin/controllers/look.php index 0bd4912..6e99cce 100644 --- a/admin/controllers/look.php +++ b/admin/controllers/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage look.php diff --git a/admin/controllers/looks.php b/admin/controllers/looks.php index c94c802..4a755d0 100644 --- a/admin/controllers/looks.php +++ b/admin/controllers/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage looks.php diff --git a/admin/demo.php b/admin/demo.php index 3ec2dba..1465e4f 100644 --- a/admin/demo.php +++ b/admin/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/admin/helpers/demo.php b/admin/helpers/demo.php index 4ff7c00..eb95d82 100644 --- a/admin/helpers/demo.php +++ b/admin/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php @@ -813,6 +813,16 @@ abstract class DemoHelper return $button->input; } + + public static function checkJson($string) + { + if (self::checkString($string)) + { + json_decode($string); + return (json_last_error() === JSON_ERROR_NONE); + } + return false; + } public static function checkObject($object) { diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 416d4da..fd3176f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage batch_.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 7a7ae78..53a9829 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 55e9ca1..ed6489f 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 5th March, 2016 + @build 10th March, 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 d01a664..f962525 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 5th March, 2016 + @build 10th March, 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 7607870..3b120d5 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 5th March, 2016 + @build 10th March, 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 9cfb1a3..1fff92a 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 5th March, 2016 + @build 10th March, 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 8eec686..6ab627b 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 5th March, 2016 + @build 10th March, 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 2e5cd44..e2f010e 100644 --- a/admin/layouts/help_document/metadata.php +++ b/admin/layouts/help_document/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 6085413..b8f306f 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 d23d9bc..1261771 100644 --- a/admin/layouts/look/details_above.php +++ b/admin/layouts/look/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 6b95d46..b336f74 100644 --- a/admin/layouts/look/details_left.php +++ b/admin/layouts/look/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 3e6fe7a..3efd77a 100644 --- a/admin/layouts/look/details_right.php +++ b/admin/layouts/look/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 8eec686..6ab627b 100644 --- a/admin/layouts/look/details_under.php +++ b/admin/layouts/look/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 2e5cd44..e2f010e 100644 --- a/admin/layouts/look/metadata.php +++ b/admin/layouts/look/metadata.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 6085413..b8f306f 100644 --- a/admin/layouts/look/publishing.php +++ b/admin/layouts/look/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 5527b1e..13deb15 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 5th March, 2016 + @build 10th March, 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 0bfc275..717e6fb 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 5th March, 2016 + @build 10th March, 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 4cf96ca..965b496 100644 --- a/admin/models/demo.php +++ b/admin/models/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 87fb223..dd30f9e 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 7cbd09d..5893803 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.js diff --git a/admin/models/forms/look.js b/admin/models/forms/look.js index e7ea334..1820099 100644 --- a/admin/models/forms/look.js +++ b/admin/models/forms/look.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage look.js diff --git a/admin/models/help_document.php b/admin/models/help_document.php index b2b6f2d..78203b3 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 64dd24e..b38d226 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 381e654..4de4599 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage import.php @@ -503,7 +503,6 @@ class DemoModelImport extends JModelLegacy // reset all buckets $query = $db->getQuery(true); $fields = array(); - $version = false; // Fields to update. foreach($row as $key => $cell) { @@ -526,7 +525,6 @@ class DemoModelImport extends JModelLegacy if ('version' == $target[$key]) { $cell = (int) $version + 1; - $version = true; } // verify publish authority if ('published' == $target[$key] && !$canState) @@ -551,10 +549,6 @@ class DemoModelImport extends JModelLegacy // load the defaults $fields[] = $db->quoteName('modified_by') . ' = ' . $db->quote($user->id); $fields[] = $db->quoteName('modified') . ' = ' . $db->quote($todayDate); - if (!$version) - { - $fields[] = $db->quoteName('version') . " = " . (int) $version + 1; - } // Conditions for which records should be updated. $conditions = array( $db->quoteName('id') . ' = ' . $id diff --git a/admin/models/look.php b/admin/models/look.php index 0547838..7f79fa9 100644 --- a/admin/models/look.php +++ b/admin/models/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage look.php diff --git a/admin/models/looks.php b/admin/models/looks.php index 571d583..ebdcc3f 100644 --- a/admin/models/looks.php +++ b/admin/models/looks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage looks.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 05a23ad..8d31219 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help_document.php diff --git a/admin/tables/look.php b/admin/tables/look.php index 7fae4c0..166041c 100644 --- a/admin/tables/look.php +++ b/admin/tables/look.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage look.php diff --git a/admin/views/demo/tmpl/default.php b/admin/views/demo/tmpl/default.php index 1bb003b..21bf6f7 100644 --- a/admin/views/demo/tmpl/default.php +++ b/admin/views/demo/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default.php diff --git a/admin/views/demo/tmpl/default_main.php b/admin/views/demo/tmpl/default_main.php index cff1575..d0730c5 100644 --- a/admin/views/demo/tmpl/default_main.php +++ b/admin/views/demo/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default_main.php diff --git a/admin/views/demo/tmpl/default_vdm.php b/admin/views/demo/tmpl/default_vdm.php index 98ae2b1..308b269 100644 --- a/admin/views/demo/tmpl/default_vdm.php +++ b/admin/views/demo/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default_vdm.php diff --git a/admin/views/demo/view.html.php b/admin/views/demo/view.html.php index 4e82bae..56022ef 100644 --- a/admin/views/demo/view.html.php +++ b/admin/views/demo/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 9f4faa6..364f904 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index d299eef..cc93c2a 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index b99bb73..ba574b3 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 1337b5d..9d12807 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index bf65a2f..4d10c00 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index ebc6b7d..7046f45 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index cc11667..a152356 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 5th March, 2016 + @build 10th March, 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 05734c3..20099c7 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 5th March, 2016 + @build 10th March, 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 9a4e9ee..4afb0c9 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 5th March, 2016 + @build 10th March, 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 0d9e9a2..a046dfa 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 5th March, 2016 + @build 10th March, 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 71812dc..e78a1bf 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 5th March, 2016 + @build 10th March, 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 9a9953e..13327f8 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 b4aff8c..f6450e6 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 9a881e1..6652908 100644 --- a/admin/views/look/submitbutton.js +++ b/admin/views/look/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 2044513..a1d7f95 100644 --- a/admin/views/look/tmpl/edit.php +++ b/admin/views/look/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 7407150..f3abf24 100644 --- a/admin/views/look/view.html.php +++ b/admin/views/look/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 0f2e25a..7352469 100644 --- a/admin/views/looks/tmpl/default.php +++ b/admin/views/looks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 5a23eab..8a835c4 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 5th March, 2016 + @build 10th March, 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 b579ec7..1935038 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 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage default_batch_footer.php diff --git a/admin/views/looks/tmpl/default_body.php b/admin/views/looks/tmpl/default_body.php index 4bb44f1..d1a2b1f 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 5th March, 2016 + @build 10th March, 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 1d8760d..6263f54 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 5th March, 2016 + @build 10th March, 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 a4c78bf..dfc5b01 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 5th March, 2016 + @build 10th March, 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 21a3d21..a8a1e01 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 5th March, 2016 + @build 10th March, 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 eb418d2..dffc807 100644 --- a/admin/views/looks/view.html.php +++ b/admin/views/looks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage view.html.php diff --git a/demo.xml b/demo.xml index 61ef942..fa47559 100644 --- a/demo.xml +++ b/demo.xml @@ -1,7 +1,7 @@ COM_DEMO - 5th March, 2016 + 10th March, 2016 Llewellyn van der Merwe info@vdm.io https://www.vdm.io/ diff --git a/script.php b/script.php index 8d810a4..b7030d4 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 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 1eef9d3..d98c022 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 2189a82..560f03e 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage controller.php diff --git a/site/controllers/help.php b/site/controllers/help.php index a385f90..754f5cc 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage help.php diff --git a/site/demo.php b/site/demo.php index 587e75e..0cf2633 100644 --- a/site/demo.php +++ b/site/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php diff --git a/site/helpers/demo.php b/site/helpers/demo.php index 445e0bd..7003135 100644 --- a/site/helpers/demo.php +++ b/site/helpers/demo.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage demo.php @@ -588,6 +588,16 @@ abstract class DemoHelper } return $result; } + + public static function checkJson($string) + { + if (self::checkString($string)) + { + json_decode($string); + return (json_last_error() === JSON_ERROR_NONE); + } + return false; + } public static function checkObject($object) { diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index de0a0ee..2974b7b 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 67d4f4e..d07a44a 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage route.php diff --git a/site/router.php b/site/router.php index 75161ae..e988277 100644 --- a/site/router.php +++ b/site/router.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.5 - @build 5th March, 2016 + @build 10th March, 2016 @created 5th August, 2015 @package Demo @subpackage router.php