diff --git a/README.md b/README.md index 810dd16..8d0bcd4 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,14 @@ Just a basic Questions & Answers. + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Questions and Answers](https://www.vdm.io/) + *First Build*: 30th January, 2017 -+ *Last Build*: 24th April, 2018 ++ *Last Build*: 5th May, 2018 + *Version*: 1.0.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **27783** ++ *Line count*: **28377** + *File count*: **201** + *Folder count*: **62** diff --git a/admin/README.txt b/admin/README.txt index 810dd16..8d0bcd4 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -12,14 +12,14 @@ Just a basic Questions & Answers. + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Questions and Answers](https://www.vdm.io/) + *First Build*: 30th January, 2017 -+ *Last Build*: 24th April, 2018 ++ *Last Build*: 5th May, 2018 + *Version*: 1.0.x + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **27783** ++ *Line count*: **28377** + *File count*: **201** + *Folder count*: **62** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 6612667..6bcb81e 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage admin.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index f78c6f3..809a505 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage dashboard.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 6de9487..eddd073 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 91fa3c6..77e4608 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_documents.css diff --git a/admin/assets/css/question_and_answer.css b/admin/assets/css/question_and_answer.css index d7d0f50..b6e94d3 100644 --- a/admin/assets/css/question_and_answer.css +++ b/admin/assets/css/question_and_answer.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.css diff --git a/admin/assets/css/questions_and_answers.css b/admin/assets/css/questions_and_answers.css index a1ccefe..d93dc50 100644 --- a/admin/assets/css/questions_and_answers.css +++ b/admin/assets/css/questions_and_answers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questions_and_answers.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index f8b75b5..1fe4df4 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index 66ea572..40c8c6a 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index fddee14..0aa3606 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage ajax.json.php diff --git a/admin/controllers/download.php b/admin/controllers/download.php index 00a329e..249afd3 100644 --- a/admin/controllers/download.php +++ b/admin/controllers/download.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage download.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 59f5458..01e2f57 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index c8cf3e2..20143b8 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index c54cb02..c4db6c3 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index dcc8d78..593ef83 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage import.php diff --git a/admin/controllers/question_and_answer.php b/admin/controllers/question_and_answer.php index deb17f5..4547fa7 100644 --- a/admin/controllers/question_and_answer.php +++ b/admin/controllers/question_and_answer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.php diff --git a/admin/controllers/questions_and_answers.php b/admin/controllers/questions_and_answers.php index 1cbdbb1..3d3bef4 100644 --- a/admin/controllers/questions_and_answers.php +++ b/admin/controllers/questions_and_answers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questions_and_answers.php diff --git a/admin/controllers/questionsanswers.php b/admin/controllers/questionsanswers.php index 3f4829f..91fc23a 100644 --- a/admin/controllers/questionsanswers.php +++ b/admin/controllers/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 67942ad..b9fcf21 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index ef9b1a9..ee0065f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage batch_.php diff --git a/admin/helpers/questionsanswers.php b/admin/helpers/questionsanswers.php index c371e39..b6b51cf 100644 --- a/admin/helpers/questionsanswers.php +++ b/admin/helpers/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php @@ -2244,8 +2244,15 @@ abstract class QuestionsanswersHelper return false; } - public static function jsonToString($value, $sperator = ", ", $table = null) + public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name') { + // do some table foot work + $external = false; + if (strpos($table, '#__') !== false) + { + $external = true; + $table = str_replace('#__', '', $table); + } // check if string is JSON $result = json_decode($value, true); if (json_last_error() === JSON_ERROR_NONE) @@ -2258,9 +2265,19 @@ abstract class QuestionsanswersHelper $names = array(); foreach ($result as $val) { - if ($name = self::getVar($table, $val, 'id', 'name')) + if ($external) { - $names[] = $name; + if ($name = self::getVar(null, $val, $id, $name, '=', $table)) + { + $names[] = $name; + } + } + else + { + if ($name = self::getVar($table, $val, $id, $name)) + { + $names[] = $name; + } } } if (self::checkArray($names)) diff --git a/admin/language/en-GB/en-GB.com_questionsanswers.sys.ini b/admin/language/en-GB/en-GB.com_questionsanswers.sys.ini index a2d0f9e..135588e 100644 --- a/admin/language/en-GB/en-GB.com_questionsanswers.sys.ini +++ b/admin/language/en-GB/en-GB.com_questionsanswers.sys.ini @@ -34,7 +34,7 @@ COM_QUESTIONSANSWERS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu" COM_QUESTIONSANSWERS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to update the submenu of the help document" COM_QUESTIONSANSWERS_IMPORT_DATA="Import Data" COM_QUESTIONSANSWERS_IMPORT_DATA_DESC=" Allows users in this group to import data." -COM_QUESTIONSANSWERS_MENU="» Questions and Answers" +COM_QUESTIONSANSWERS_MENU="Questions and Answers" COM_QUESTIONSANSWERS_MENU_CATEGORY_DESC="Questions and answers category" COM_QUESTIONSANSWERS_MENU_CATEGORY_OPTION="Q&A Category" COM_QUESTIONSANSWERS_MENU_CATEGORY_TITLE="Q&A Category" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 578431e..5492a00 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage batchselection.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index e2fe8cd..7dd82b0 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 0b4f0b1..31149b1 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 1b2cf51..d86270c 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 7f26414..45fdb45 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 6d3624b..fb6a0dc 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 7005bc3..4135ae0 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 783519a..7e7109a 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage publlshing.php diff --git a/admin/layouts/question_and_answer/details_fullwidth.php b/admin/layouts/question_and_answer/details_fullwidth.php index 05e9775..138446b 100644 --- a/admin/layouts/question_and_answer/details_fullwidth.php +++ b/admin/layouts/question_and_answer/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_fullwidth.php diff --git a/admin/layouts/question_and_answer/details_rightside.php b/admin/layouts/question_and_answer/details_rightside.php index 379f7d8..b57a062 100644 --- a/admin/layouts/question_and_answer/details_rightside.php +++ b/admin/layouts/question_and_answer/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_rightside.php diff --git a/admin/layouts/question_and_answer/details_under.php b/admin/layouts/question_and_answer/details_under.php index 89e7fde..614eed6 100644 --- a/admin/layouts/question_and_answer/details_under.php +++ b/admin/layouts/question_and_answer/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_under.php diff --git a/admin/layouts/question_and_answer/metadata.php b/admin/layouts/question_and_answer/metadata.php index 66a4b15..34d0c0a 100644 --- a/admin/layouts/question_and_answer/metadata.php +++ b/admin/layouts/question_and_answer/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage metadata.php diff --git a/admin/layouts/question_and_answer/publishing.php b/admin/layouts/question_and_answer/publishing.php index 819e30f..8e915b6 100644 --- a/admin/layouts/question_and_answer/publishing.php +++ b/admin/layouts/question_and_answer/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage publishing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index a1617fe..38223a4 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage ajax.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index d5b30ab..01aa83c 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index e711361..b870a64 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage articles.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 1d2c1ed..5bf561b 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage siteviewfolderlist.php diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 061ec70..28a924c 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_document.js diff --git a/admin/models/forms/question_and_answer.js b/admin/models/forms/question_and_answer.js index 0883e72..7a1b781 100644 --- a/admin/models/forms/question_and_answer.js +++ b/admin/models/forms/question_and_answer.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.js diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 082d5c8..bf084de 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 341b62d..d7012a7 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 606ee3c..77c90e2 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage import.php diff --git a/admin/models/question_and_answer.php b/admin/models/question_and_answer.php index b44606a..82bd65c 100644 --- a/admin/models/question_and_answer.php +++ b/admin/models/question_and_answer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.php diff --git a/admin/models/questions_and_answers.php b/admin/models/questions_and_answers.php index 7b096b6..e04f2a8 100644 --- a/admin/models/questions_and_answers.php +++ b/admin/models/questions_and_answers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questions_and_answers.php diff --git a/admin/models/questionsanswers.php b/admin/models/questionsanswers.php index d61a8a1..6c1a0e5 100644 --- a/admin/models/questionsanswers.php +++ b/admin/models/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php diff --git a/admin/questionsanswers.php b/admin/questionsanswers.php index 8bd93a5..2121c3e 100644 --- a/admin/questionsanswers.php +++ b/admin/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index e2353c3..3f983db 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help_document.php @@ -323,29 +323,29 @@ class QuestionsanswersTableHelp_document extends JTable $asset->loadByName('com_questionsanswers'); return $asset->id; - } - - /** - * Generate a valid alias from title / date. - * Remains public to be able to check for duplicated alias before saving - * - * @return string - */ - public function generateAlias() - { - if (empty($this->alias)) - { - $this->alias = $this->name; - } - - $this->alias = JApplication::stringURLSafe($this->alias); - - if (trim(str_replace('-', '', $this->alias)) == '') - { - $this->alias = JFactory::getDate()->format("Y-m-d-H-i-s"); - } - - return $this->alias; + } + + /** + * Generate a valid alias from title / date. + * Remains public to be able to check for duplicated alias before saving + * + * @return string + */ + public function generateAlias() + { + if (empty($this->alias)) + { + $this->alias = $this->title; + } + + $this->alias = JApplication::stringURLSafe($this->alias); + + if (trim(str_replace('-', '', $this->alias)) == '') + { + $this->alias = JFactory::getDate()->format('Y-m-d-H-i-s'); + } + + return $this->alias; } } diff --git a/admin/tables/question_and_answer.php b/admin/tables/question_and_answer.php index fcd8f56..b9b1738 100644 --- a/admin/tables/question_and_answer.php +++ b/admin/tables/question_and_answer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.php @@ -323,29 +323,16 @@ class QuestionsanswersTableQuestion_and_answer extends JTable $asset->loadByName('com_questionsanswers'); return $asset->id; - } - - /** - * Generate a valid alias from title / date. - * Remains public to be able to check for duplicated alias before saving - * - * @return string - */ - public function generateAlias() - { - if (empty($this->alias)) - { - $this->alias = $this->name; - } - - $this->alias = JApplication::stringURLSafe($this->alias); - - if (trim(str_replace('-', '', $this->alias)) == '') - { - $this->alias = JFactory::getDate()->format("Y-m-d-H-i-s"); - } - - return $this->alias; + } + + /** + * This view does not actually have an alias + * + * @return bool + */ + public function generateAlias() + { + return false; } } diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index c3c7933..a4479f8 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 5752a29..b0f766e 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index c36c1e0..8e2e630 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 9017c8d..075c510 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 30f45eb..2dfbd2a 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 74292dc..446aa7d 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 e50fcd0..16499cf 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 5f6d2b6..213fa52 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 a9abddc..b8dfa5a 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @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 fdcf0e2..ec03d31 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 082073a..64ef978 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index dc09f3e..9f31155 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index eb4d6eb..66d9a76 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/admin/views/question_and_answer/submitbutton.js b/admin/views/question_and_answer/submitbutton.js index 724c0dc..cbf2723 100644 --- a/admin/views/question_and_answer/submitbutton.js +++ b/admin/views/question_and_answer/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage submitbutton.js diff --git a/admin/views/question_and_answer/tmpl/edit.php b/admin/views/question_and_answer/tmpl/edit.php index 03bc55b..52d6b9d 100644 --- a/admin/views/question_and_answer/tmpl/edit.php +++ b/admin/views/question_and_answer/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage edit.php diff --git a/admin/views/question_and_answer/view.html.php b/admin/views/question_and_answer/view.html.php index 4164abc..6a30776 100644 --- a/admin/views/question_and_answer/view.html.php +++ b/admin/views/question_and_answer/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/admin/views/questions_and_answers/tmpl/default.php b/admin/views/questions_and_answers/tmpl/default.php index e9dc7f8..c54caa6 100644 --- a/admin/views/questions_and_answers/tmpl/default.php +++ b/admin/views/questions_and_answers/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/admin/views/questions_and_answers/tmpl/default_batch_body.php b/admin/views/questions_and_answers/tmpl/default_batch_body.php index 5abdc6d..ed656bb 100644 --- a/admin/views/questions_and_answers/tmpl/default_batch_body.php +++ b/admin/views/questions_and_answers/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_batch_body.php diff --git a/admin/views/questions_and_answers/tmpl/default_batch_footer.php b/admin/views/questions_and_answers/tmpl/default_batch_footer.php index 9f929bf..7b4781b 100644 --- a/admin/views/questions_and_answers/tmpl/default_batch_footer.php +++ b/admin/views/questions_and_answers/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_batch_footer.php diff --git a/admin/views/questions_and_answers/tmpl/default_body.php b/admin/views/questions_and_answers/tmpl/default_body.php index c83da59..dd42481 100644 --- a/admin/views/questions_and_answers/tmpl/default_body.php +++ b/admin/views/questions_and_answers/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_body.php diff --git a/admin/views/questions_and_answers/tmpl/default_foot.php b/admin/views/questions_and_answers/tmpl/default_foot.php index b4ceee4..c5de63d 100644 --- a/admin/views/questions_and_answers/tmpl/default_foot.php +++ b/admin/views/questions_and_answers/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_foot.php diff --git a/admin/views/questions_and_answers/tmpl/default_head.php b/admin/views/questions_and_answers/tmpl/default_head.php index bf11855..66a769c 100644 --- a/admin/views/questions_and_answers/tmpl/default_head.php +++ b/admin/views/questions_and_answers/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_head.php diff --git a/admin/views/questions_and_answers/tmpl/default_toolbar.php b/admin/views/questions_and_answers/tmpl/default_toolbar.php index 2beb3f0..6c179d1 100644 --- a/admin/views/questions_and_answers/tmpl/default_toolbar.php +++ b/admin/views/questions_and_answers/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_toolbar.php diff --git a/admin/views/questions_and_answers/view.html.php b/admin/views/questions_and_answers/view.html.php index 7f9f682..f5982ae 100644 --- a/admin/views/questions_and_answers/view.html.php +++ b/admin/views/questions_and_answers/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/admin/views/questionsanswers/tmpl/default.php b/admin/views/questionsanswers/tmpl/default.php index b999240..95365b6 100644 --- a/admin/views/questionsanswers/tmpl/default.php +++ b/admin/views/questionsanswers/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/admin/views/questionsanswers/tmpl/default_main.php b/admin/views/questionsanswers/tmpl/default_main.php index 5bfb0bf..ed8bcd7 100644 --- a/admin/views/questionsanswers/tmpl/default_main.php +++ b/admin/views/questionsanswers/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_main.php diff --git a/admin/views/questionsanswers/tmpl/default_readme_information.php b/admin/views/questionsanswers/tmpl/default_readme_information.php index 67e2baa..434fd4e 100644 --- a/admin/views/questionsanswers/tmpl/default_readme_information.php +++ b/admin/views/questionsanswers/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_readme_information.php diff --git a/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php b/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php index 20e9b45..e8b37e4 100644 --- a/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/questionsanswers/tmpl/default_vdm.php b/admin/views/questionsanswers/tmpl/default_vdm.php index 2c7acc4..029d96b 100644 --- a/admin/views/questionsanswers/tmpl/default_vdm.php +++ b/admin/views/questionsanswers/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_vdm.php diff --git a/admin/views/questionsanswers/view.html.php b/admin/views/questionsanswers/view.html.php index 262a7c0..12d0783 100644 --- a/admin/views/questionsanswers/view.html.php +++ b/admin/views/questionsanswers/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/media/css/A4.print.css b/media/css/A4.print.css index 6226e7f..3c34d08 100644 --- a/media/css/A4.print.css +++ b/media/css/A4.print.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage A4.print.css diff --git a/questionsanswers.xml b/questionsanswers.xml index fcbc076..4c9a198 100644 --- a/questionsanswers.xml +++ b/questionsanswers.xml @@ -1,7 +1,7 @@ COM_QUESTIONSANSWERS - 24th April, 2018 + 5th May, 2018 Llewellyn van der Merwe joomla@vdm.io https://www.vdm.io/ diff --git a/script.php b/script.php index db94200..72a2216 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage script.php diff --git a/site/assets/css/category.css b/site/assets/css/category.css index fd73e6e..284a588 100644 --- a/site/assets/css/category.css +++ b/site/assets/css/category.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage category.css diff --git a/site/assets/css/downloads.css b/site/assets/css/downloads.css index c88597f..1cd9007 100644 --- a/site/assets/css/downloads.css +++ b/site/assets/css/downloads.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage downloads.css diff --git a/site/assets/css/question_and_answer.css b/site/assets/css/question_and_answer.css index d7d0f50..b6e94d3 100644 --- a/site/assets/css/question_and_answer.css +++ b/site/assets/css/question_and_answer.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.css diff --git a/site/assets/css/questions_and_answers.css b/site/assets/css/questions_and_answers.css index c97faae..6515529 100644 --- a/site/assets/css/questions_and_answers.css +++ b/site/assets/css/questions_and_answers.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questions_and_answers.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index b94da5c..2090224 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 3530f0b..5574fd4 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage site.js diff --git a/site/controller.php b/site/controller.php index 2ea77d0..2fb6822 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 501e1ae..a86307a 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage ajax.json.php diff --git a/site/controllers/download.php b/site/controllers/download.php index 00a329e..249afd3 100644 --- a/site/controllers/download.php +++ b/site/controllers/download.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage download.php diff --git a/site/controllers/help.php b/site/controllers/help.php index ccb06e9..4c1bb17 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage help.php diff --git a/site/controllers/question_and_answer.php b/site/controllers/question_and_answer.php index 76b3b12..5c62275 100644 --- a/site/controllers/question_and_answer.php +++ b/site/controllers/question_and_answer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.php diff --git a/site/helpers/category.php b/site/helpers/category.php index 5f98874..2767aed 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage category.php diff --git a/site/helpers/categoryquestions_and_answers.php b/site/helpers/categoryquestions_and_answers.php index 9286c1a..03beeb5 100644 --- a/site/helpers/categoryquestions_and_answers.php +++ b/site/helpers/categoryquestions_and_answers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage categoryquestions_and_answers.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 67942ad..b9fcf21 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage headercheck.php diff --git a/site/helpers/questionsanswers.php b/site/helpers/questionsanswers.php index 54df1a9..0e4e6e4 100644 --- a/site/helpers/questionsanswers.php +++ b/site/helpers/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php @@ -1693,8 +1693,15 @@ abstract class QuestionsanswersHelper return 'application/octet-stream'; } - public static function jsonToString($value, $sperator = ", ", $table = null) + public static function jsonToString($value, $sperator = ", ", $table = null, $id = 'id', $name = 'name') { + // do some table foot work + $external = false; + if (strpos($table, '#__') !== false) + { + $external = true; + $table = str_replace('#__', '', $table); + } // check if string is JSON $result = json_decode($value, true); if (json_last_error() === JSON_ERROR_NONE) @@ -1707,9 +1714,19 @@ abstract class QuestionsanswersHelper $names = array(); foreach ($result as $val) { - if ($name = self::getVar($table, $val, 'id', 'name')) + if ($external) { - $names[] = $name; + if ($name = self::getVar(null, $val, $id, $name, '=', $table)) + { + $names[] = $name; + } + } + else + { + if ($name = self::getVar($table, $val, $id, $name)) + { + $names[] = $name; + } } } if (self::checkArray($names)) diff --git a/site/helpers/route.php b/site/helpers/route.php index 4f66ef5..3ccdc3c 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage route.php diff --git a/site/layouts/question_and_answer/details_fullwidth.php b/site/layouts/question_and_answer/details_fullwidth.php index 05e9775..138446b 100644 --- a/site/layouts/question_and_answer/details_fullwidth.php +++ b/site/layouts/question_and_answer/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_fullwidth.php diff --git a/site/layouts/question_and_answer/details_rightside.php b/site/layouts/question_and_answer/details_rightside.php index 379f7d8..b57a062 100644 --- a/site/layouts/question_and_answer/details_rightside.php +++ b/site/layouts/question_and_answer/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_rightside.php diff --git a/site/layouts/question_and_answer/details_under.php b/site/layouts/question_and_answer/details_under.php index 89e7fde..614eed6 100644 --- a/site/layouts/question_and_answer/details_under.php +++ b/site/layouts/question_and_answer/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage details_under.php diff --git a/site/layouts/question_and_answer/metadata.php b/site/layouts/question_and_answer/metadata.php index 66a4b15..34d0c0a 100644 --- a/site/layouts/question_and_answer/metadata.php +++ b/site/layouts/question_and_answer/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage metadata.php diff --git a/site/layouts/question_and_answer/publishing.php b/site/layouts/question_and_answer/publishing.php index 819e30f..8e915b6 100644 --- a/site/layouts/question_and_answer/publishing.php +++ b/site/layouts/question_and_answer/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage publishing.php diff --git a/site/models/ajax.php b/site/models/ajax.php index ff507b8..b996e55 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage ajax.php diff --git a/site/models/category.php b/site/models/category.php index e40c7ac..3e0996e 100644 --- a/site/models/category.php +++ b/site/models/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage category.php diff --git a/site/models/downloads.php b/site/models/downloads.php index 490f238..b03d358 100644 --- a/site/models/downloads.php +++ b/site/models/downloads.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage downloads.php diff --git a/site/models/forms/question_and_answer.js b/site/models/forms/question_and_answer.js index 0883e72..7a1b781 100644 --- a/site/models/forms/question_and_answer.js +++ b/site/models/forms/question_and_answer.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.js diff --git a/site/models/question_and_answer.php b/site/models/question_and_answer.php index b44606a..82bd65c 100644 --- a/site/models/question_and_answer.php +++ b/site/models/question_and_answer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage question_and_answer.php diff --git a/site/models/questions_and_answers.php b/site/models/questions_and_answers.php index b3f0661..4d92cdd 100644 --- a/site/models/questions_and_answers.php +++ b/site/models/questions_and_answers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questions_and_answers.php diff --git a/site/questionsanswers.php b/site/questionsanswers.php index 716ef84..4e5f005 100644 --- a/site/questionsanswers.php +++ b/site/questionsanswers.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage questionsanswers.php diff --git a/site/router.php b/site/router.php index 3fb3b9b..522600d 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage router.php diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php index f7f9ffd..af2782f 100644 --- a/site/views/category/tmpl/default.php +++ b/site/views/category/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/site/views/category/tmpl/default_qna-table.php b/site/views/category/tmpl/default_qna-table.php index da71618..acf0e65 100644 --- a/site/views/category/tmpl/default_qna-table.php +++ b/site/views/category/tmpl/default_qna-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_qna-table.php diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php index 4f30ac0..432eb89 100644 --- a/site/views/category/view.html.php +++ b/site/views/category/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/site/views/downloads/tmpl/default.php b/site/views/downloads/tmpl/default.php index ed16fe6..993932e 100644 --- a/site/views/downloads/tmpl/default.php +++ b/site/views/downloads/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/site/views/downloads/tmpl/default_qna-downloads-table.php b/site/views/downloads/tmpl/default_qna-downloads-table.php index 45144fe..fc94f0c 100644 --- a/site/views/downloads/tmpl/default_qna-downloads-table.php +++ b/site/views/downloads/tmpl/default_qna-downloads-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_qna-downloads-table.php diff --git a/site/views/downloads/view.html.php b/site/views/downloads/view.html.php index 6a7c9f3..4982902 100644 --- a/site/views/downloads/view.html.php +++ b/site/views/downloads/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/site/views/question_and_answer/submitbutton.js b/site/views/question_and_answer/submitbutton.js index 724c0dc..cbf2723 100644 --- a/site/views/question_and_answer/submitbutton.js +++ b/site/views/question_and_answer/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage submitbutton.js diff --git a/site/views/question_and_answer/tmpl/edit.php b/site/views/question_and_answer/tmpl/edit.php index 6846b37..52d374d 100644 --- a/site/views/question_and_answer/tmpl/edit.php +++ b/site/views/question_and_answer/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage edit.php diff --git a/site/views/question_and_answer/view.html.php b/site/views/question_and_answer/view.html.php index a1ca620..fe1c58e 100644 --- a/site/views/question_and_answer/view.html.php +++ b/site/views/question_and_answer/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php diff --git a/site/views/questions_and_answers/tmpl/default.php b/site/views/questions_and_answers/tmpl/default.php index f7f9ffd..af2782f 100644 --- a/site/views/questions_and_answers/tmpl/default.php +++ b/site/views/questions_and_answers/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default.php diff --git a/site/views/questions_and_answers/tmpl/default_qna-table.php b/site/views/questions_and_answers/tmpl/default_qna-table.php index 0d63d95..2299b45 100644 --- a/site/views/questions_and_answers/tmpl/default_qna-table.php +++ b/site/views/questions_and_answers/tmpl/default_qna-table.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage default_qna-table.php diff --git a/site/views/questions_and_answers/view.html.php b/site/views/questions_and_answers/view.html.php index 062a725..0b01437 100644 --- a/site/views/questions_and_answers/view.html.php +++ b/site/views/questions_and_answers/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.x - @build 24th April, 2018 + @build 5th May, 2018 @created 30th January, 2017 @package Questions and Answers @subpackage view.html.php