From 149f1b07d4be2f9377a8623032367d0dc13adaff Mon Sep 17 00:00:00 2001 From: Mark Fleeson Date: Wed, 4 Dec 2024 14:05:02 +0000 Subject: [PATCH 1/2] Update TODO --- TODO | 169 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 86 insertions(+), 83 deletions(-) diff --git a/TODO b/TODO index 3cafc89..76bcb13 100644 --- a/TODO +++ b/TODO @@ -1,83 +1,86 @@ -Initial list by nikosdion - -Remove duplicate code in the models. I have only touched the ExtensionModel, really. - -Router - Only very few views are currently routable - -All generated links - Links to categories (view=extensions) and single extensions (view=extension) MUST have the parent catid for routing to work - -Image uploads (logos and regular images) - You need to resize them and upload them to the CDN. - Ideally put this behind an option so that testing with sample data on a dev site is actually possible - Then, the \Jed\Component\Jed\Site\Helper\JedHelper::formatImage method must be updated - -Add the following component parameters to config.xml - use_cdn 0/1 Use CDN for images? - cdn_url URL The base URL of the CDN, e.g. https://extensionscdn.joomla.org - You need media management (e.g. uploading to a CDN), as noted above - -Extension page - The layout is messy an unintuitive; JXT needs to show a lot of TLC on this page — once functional issues are addressed - No images, no video is displayed anywhere - Links to website, demo, etc: if an item is empty don't render an empty link! - No reviews are shown and links to reviews are dummies - Report and Share buttons are dummies? - "Get extension" is a dummy button?! - The heart (favourite) button is a dummy button?! - "Other extensions" is dummy data(!!!) — commented out for now - "You might also be interested in" is dummy data(!!!) — commented out for now - -Varied data should allow for different titles, e.g. Foobar Lite for the free version and Foobar PLus for the paid version - -Sample video content (mixed bag!). We need a helper to convert them to video links. They cannot be used in a carousel — unless we remove all old videos and ask developers to provide a URL to an MP4 or WebM file which is impractical. - {youtube}Zv1dMynbm2o{/youtube} - {youtube}GZs1q5TYM-g{/youtube} - https://www.youtube.com/watch?v=MMD9LksoXmg - {youtube}AsIqvWObfLc{/youtube} - https://www.youtube.com/embed/PDrsU0u2l6A - https://www.akeeba.com/videos/1212-akeeba-backup/1615-abtc01-installation-first-backup.html - {vimeo}51714844{/vimeo} - {youtube}w-Ra88GJ7bs{/youtube} - {youtube}odIoUyv-ncE{/youtube} - https://www.youtube.com/watch?v=mVgcMiBDnGM - {youtube}djVjU47fmjc{/youtube} - {youtube}ZvHinHEO_6A{/youtube} - https://www.youtube.com/embed/kuZtyHG0OGQ?VQ=HD720 - {youtube}YrBIK23eiUg{/youtube} - http://www.joomlarulez.com/images/stories/video/01QO7fTM-1753142.mp4 - {youtube}77zqqY-KL3U{/youtube} - {vimeo}30132555{/vimeo} - {youtube}58QMSW5bbCs{/youtube} - {youtube}Bfi7_Tb72X4{/youtube} - {youtube}J8UWw5wnCtU{/youtube} - {youtube}bdqWhYgJC9o{/youtube} - {youtube}zv27p11NRUU{/youtube} - {youtube}U25zbfwFDE8{/youtube} - {youtube}mOdl9xbQAEw{/youtube} - youtube.com/watch?v=P6qFVbklzGw - https://www.youtube.com/watch?v=FQpH5FxPlew - {youtube}wsThLArwO-U{/youtube} - https://www.youtube.com/watch?v=UFRrG7N8DHQ - {youtube}Ef3vzioNWEE{/youtube} - {youtube}hJMlbJA_VwM{/youtube} - https://www.youtube.com/watch?v=qa2mr8JAktQ&t=1s - https://www.youtube.com/watch?v=ykHkxV3zBps - https://vimeo.com/64957551 - https://www.youtube.com/watch?v=qJ9ciSHK_Jw - https://www.youtube.com/watch?v=AyQ8lkmR4Sk - {youtube}Wk5M-xOj9eI{/youtube} - {youtube}JCnN4ghTLPA{/youtube} - {youtube}ET7ky_lryFw{/youtube} - {youtube}mgz2qRu1ABU{/youtube} - https://vimeo.com/138867865 - {youtube}K0Vf14kMeZU{/youtube} - {youtube}8QK4RnUfQeQ{/youtube} - https://www.youtube.com/watch?feature=player_embedded&v=uE0FvJL4un8 - {youtube}GEHkdCQr1BA{/youtube} - {youtube}ERq2eYj26rc{/youtube} - https://www.youtube.com/channel/UCXISDdtJ70gx-PtdQgmEPlg - {youtube}7gpl3LEJVRY{/youtube} - https://www.youtube.com/watch?v=_wINKeqXuwI&list=PL3M1w_AGnChPWpp1eTadr4A6uLLNd5hPJ - https://www.youtube.com/watch?v=hObBFDYiaq0 +Updated 04-12-24 +Fix drone build + +Initial list by nikosdion + +Remove duplicate code in the models. I have only touched the ExtensionModel, really. + +Router + Only very few views are currently routable + +All generated links + Links to categories (view=extensions) and single extensions (view=extension) MUST have the parent catid for routing to work + +Image uploads (logos and regular images) + You need to resize them and upload them to the CDN. + Ideally put this behind an option so that testing with sample data on a dev site is actually possible + Then, the \Jed\Component\Jed\Site\Helper\JedHelper::formatImage method must be updated + +Add the following component parameters to config.xml + use_cdn 0/1 Use CDN for images? + cdn_url URL The base URL of the CDN, e.g. https://extensionscdn.joomla.org + You need media management (e.g. uploading to a CDN), as noted above + +Extension page + The layout is messy an unintuitive; JXT needs to show a lot of TLC on this page — once functional issues are addressed + No images, no video is displayed anywhere + Links to website, demo, etc: if an item is empty don't render an empty link! + No reviews are shown and links to reviews are dummies + Report and Share buttons are dummies? + "Get extension" is a dummy button?! + The heart (favourite) button is a dummy button?! + "Other extensions" is dummy data(!!!) — commented out for now + "You might also be interested in" is dummy data(!!!) — commented out for now + +Varied data should allow for different titles, e.g. Foobar Lite for the free version and Foobar PLus for the paid version + +Sample video content (mixed bag!). We need a helper to convert them to video links. They cannot be used in a carousel — unless we remove all old videos and ask developers to provide a URL to an MP4 or WebM file which is impractical. + {youtube}Zv1dMynbm2o{/youtube} + {youtube}GZs1q5TYM-g{/youtube} + https://www.youtube.com/watch?v=MMD9LksoXmg + {youtube}AsIqvWObfLc{/youtube} + https://www.youtube.com/embed/PDrsU0u2l6A + https://www.akeeba.com/videos/1212-akeeba-backup/1615-abtc01-installation-first-backup.html + {vimeo}51714844{/vimeo} + {youtube}w-Ra88GJ7bs{/youtube} + {youtube}odIoUyv-ncE{/youtube} + https://www.youtube.com/watch?v=mVgcMiBDnGM + {youtube}djVjU47fmjc{/youtube} + {youtube}ZvHinHEO_6A{/youtube} + https://www.youtube.com/embed/kuZtyHG0OGQ?VQ=HD720 + {youtube}YrBIK23eiUg{/youtube} + http://www.joomlarulez.com/images/stories/video/01QO7fTM-1753142.mp4 + {youtube}77zqqY-KL3U{/youtube} + {vimeo}30132555{/vimeo} + {youtube}58QMSW5bbCs{/youtube} + {youtube}Bfi7_Tb72X4{/youtube} + {youtube}J8UWw5wnCtU{/youtube} + {youtube}bdqWhYgJC9o{/youtube} + {youtube}zv27p11NRUU{/youtube} + {youtube}U25zbfwFDE8{/youtube} + {youtube}mOdl9xbQAEw{/youtube} + youtube.com/watch?v=P6qFVbklzGw + https://www.youtube.com/watch?v=FQpH5FxPlew + {youtube}wsThLArwO-U{/youtube} + https://www.youtube.com/watch?v=UFRrG7N8DHQ + {youtube}Ef3vzioNWEE{/youtube} + {youtube}hJMlbJA_VwM{/youtube} + https://www.youtube.com/watch?v=qa2mr8JAktQ&t=1s + https://www.youtube.com/watch?v=ykHkxV3zBps + https://vimeo.com/64957551 + https://www.youtube.com/watch?v=qJ9ciSHK_Jw + https://www.youtube.com/watch?v=AyQ8lkmR4Sk + {youtube}Wk5M-xOj9eI{/youtube} + {youtube}JCnN4ghTLPA{/youtube} + {youtube}ET7ky_lryFw{/youtube} + {youtube}mgz2qRu1ABU{/youtube} + https://vimeo.com/138867865 + {youtube}K0Vf14kMeZU{/youtube} + {youtube}8QK4RnUfQeQ{/youtube} + https://www.youtube.com/watch?feature=player_embedded&v=uE0FvJL4un8 + {youtube}GEHkdCQr1BA{/youtube} + {youtube}ERq2eYj26rc{/youtube} + https://www.youtube.com/channel/UCXISDdtJ70gx-PtdQgmEPlg + {youtube}7gpl3LEJVRY{/youtube} + https://www.youtube.com/watch?v=_wINKeqXuwI&list=PL3M1w_AGnChPWpp1eTadr4A6uLLNd5hPJ + https://www.youtube.com/watch?v=hObBFDYiaq0 From 7fc8a4a1731dcf0eb762cbabe47701bd8c5908e3 Mon Sep 17 00:00:00 2001 From: Mark Fleeson Date: Wed, 4 Dec 2024 16:15:54 +0000 Subject: [PATCH 2/2] Fixing Format Errors --- .../com_jed/src/Field/ApprovedField.php | 1 + .../com_jed/src/Field/ForeignkeyField.php | 2 +- .../com_jed/src/Field/JedcategoryField.php | 3 - .../com_jed/src/Field/JoomlaversionField.php | 1 + .../com_jed/src/Helper/JedHelper.php | 6 +- .../com_jed/src/View/Ticket/HtmlView.php | 1 - .../com_jed/tmpl/copyjed3data/default.php | 2 +- .../com_jed/tmpl/extension/edit.php | 92 +++++----- .../com_jed/tmpl/extensionimages/default.php | 4 +- .../com_jed/tmpl/extensions/default.php | 62 +++---- .../com_jed/tmpl/extensionscores/default.php | 4 +- .../tmpl/extensionsupplyoptions/default.php | 14 +- .../tmpl/extensionvarieddata/default.php | 4 +- .../com_jed/tmpl/messagetemplates/default.php | 2 +- .../com_jed/tmpl/reviews/default.php | 4 +- .../com_jed/tmpl/reviewscomments/default.php | 4 +- .../com_jed/tmpl/setupdemo/default.php | 2 +- .../components/com_jed/tmpl/ticket/edit.php | 146 +++++++-------- .../tmpl/ticketallocatedgroups/default.php | 2 +- .../com_jed/tmpl/ticketcategories/default.php | 2 +- .../tmpl/ticketinternalnotes/default.php | 2 +- .../tmpl/ticketlinkeditemtypes/default.php | 2 +- .../com_jed/tmpl/ticketmessages/default.php | 2 +- .../com_jed/tmpl/tickets/default.php | 4 +- .../tmpl/velabandonedreports/default.php | 6 +- .../tmpl/veldeveloperupdates/default.php | 4 +- .../com_jed/tmpl/velreports/default.php | 4 +- .../com_jed/tmpl/velvulnerableitem/edit.php | 46 ++--- .../Controller/ExtensionformController.php | 6 +- .../src/Controller/ReviewController.php | 2 - .../com_jed/src/Field/ForeignkeyField.php | 4 +- .../com_jed/src/Field/JedcategoryField.php | 3 - .../com_jed/src/Field/JoomlaversionField.php | 1 + .../com_jed/src/Helper/JedHelper.php | 6 +- .../com_jed/src/Model/CategoryModel.php | 1 - .../com_jed/src/Model/ExtensionformModel.php | 10 +- .../src/Model/ExtensionvarieddatumModel.php | 5 +- .../com_jed/src/Model/VelreportformModel.php | 2 - .../src/View/Extensionform/HtmlView.php | 4 +- .../com_jed/tmpl/categories/default.php | 2 +- .../com_jed/tmpl/category/default.php | 2 +- .../com_jed/tmpl/extension/default.php | 82 ++++----- .../com_jed/tmpl/extensionform/default.php | 42 ++--- .../com_jed/tmpl/reviewform/default.php | 42 ++--- .../com_jed/tmpl/tickets/default.php | 2 +- .../tmpl/velabandonedreportform/default.php | 86 ++++----- .../tmpl/velabandonedreports/default.php | 4 +- .../tmpl/veldeveloperupdateform/default.php | 124 ++++++------- .../tmpl/veldeveloperupdates/default.php | 4 +- .../com_jed/tmpl/velreportform/default.php | 166 +++++++++--------- .../com_jed/tmpl/velreports/default.php | 4 +- src/test-todo.php | 3 +- 52 files changed, 505 insertions(+), 530 deletions(-) diff --git a/src/administrator/components/com_jed/src/Field/ApprovedField.php b/src/administrator/components/com_jed/src/Field/ApprovedField.php index 3d93fcb..e255872 100644 --- a/src/administrator/components/com_jed/src/Field/ApprovedField.php +++ b/src/administrator/components/com_jed/src/Field/ApprovedField.php @@ -1,4 +1,5 @@ value, $row->text, 'value', 'text'); $opt->attr = ' data-level="' . $row->level . '"'; $opts[] = $opt; - } @@ -163,6 +162,4 @@ private function getCategories(): array return $this->cats; } - - } diff --git a/src/administrator/components/com_jed/src/Field/JoomlaversionField.php b/src/administrator/components/com_jed/src/Field/JoomlaversionField.php index fdf8139..8a67313 100644 --- a/src/administrator/components/com_jed/src/Field/JoomlaversionField.php +++ b/src/administrator/components/com_jed/src/Field/JoomlaversionField.php @@ -1,4 +1,5 @@ 1) { echo ''; } - if(key_exists('supply_type', $fs)) { - $st = '_'.$fs['supply_type']; + if (key_exists('supply_type', $fs)) { + $st = '_' . $fs['supply_type']; } else { $st = ''; }; - echo '
' . $fs['title'] . ''; + echo '
' . $fs['title'] . ''; } if ($fs['description'] <> '') { echo $fs['description']; diff --git a/src/administrator/components/com_jed/src/View/Ticket/HtmlView.php b/src/administrator/components/com_jed/src/View/Ticket/HtmlView.php index 82e2313..000e7ac 100644 --- a/src/administrator/components/com_jed/src/View/Ticket/HtmlView.php +++ b/src/administrator/components/com_jed/src/View/Ticket/HtmlView.php @@ -262,7 +262,6 @@ public function display($tpl = null): void $this->linked_extension_varieddata_form->bind($this->linked_extension_varieddata); $this->linked_extension_data->varied_form = $this->linked_extension_varieddata_form; - } if ($this->linked_item_type === 4) { // VEL Report $this->linked_item_Model = new VelreportModel(); diff --git a/src/administrator/components/com_jed/tmpl/copyjed3data/default.php b/src/administrator/components/com_jed/tmpl/copyjed3data/default.php index eaff363..2836613 100644 --- a/src/administrator/components/com_jed/tmpl/copyjed3data/default.php +++ b/src/administrator/components/com_jed/tmpl/copyjed3data/default.php @@ -65,7 +65,7 @@ } } } -?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/extension/edit.php b/src/administrator/components/com_jed/tmpl/extension/edit.php index 09a0225..124beb2 100644 --- a/src/administrator/components/com_jed/tmpl/extension/edit.php +++ b/src/administrator/components/com_jed/tmpl/extension/edit.php @@ -69,20 +69,20 @@ 'general', 'recall' => true, 'breakpoint' => 768]); -foreach ($this->form->getFieldsets() as $fieldset) : - echo HTMLHelper::_('uitab.addTab', 'extensionTab', $fieldset->name, Text::_($fieldset->label)); - ?> + foreach ($this->form->getFieldsets() as $fieldset) : + echo HTMLHelper::_('uitab.addTab', 'extensionTab', $fieldset->name, Text::_($fieldset->label)); + ?>
form->renderFieldset($fieldset->name); ?>
+ echo HTMLHelper::_('uitab.endTab'); ?> extension->varied as $st) { - echo HTMLHelper::_('uitab.addTab', 'extensionTab', 'varied-'.$st->supply_option_id, Text::_($st->supply_option_type)); + echo HTMLHelper::_('uitab.addTab', 'extensionTab', 'varied-' . $st->supply_option_id, Text::_($st->supply_option_type)); $varied_form = $this->extension->varied_form; $varied_form->bind($st); $fieldsets = []; @@ -115,31 +115,31 @@
- extension->reviews as $rtype) { - foreach($rtype as $review) { - $review = (object)$review; - if ($review->published === 1) { - $ico = ''; - } else { - $ico = ''; - } - echo HTMLHelper::_( - 'bootstrap.addSlide', - 'extension_'.$type.'_reviews_group', - $type.' '.$review->id . ' - ' . $review->title . ' ' . - JedHelper::prettyDate($review->created_on) . ' ', - 'extension_'.$type.'_reviews_group' . '_slide' . ($slideid++) - ); - $review_model = new ReviewModel(); - $linked_form = $review_model->getForm($review, false, 'review'); - $linked_form->bind($review); - ?> -
+ $slideid = 0; + foreach ($this->extension->reviews as $rtype) { + foreach ($rtype as $review) { + $review = (object)$review; + if ($review->published === 1) { + $ico = ''; + } else { + $ico = ''; + } + echo HTMLHelper::_( + 'bootstrap.addSlide', + 'extension_' . $type . '_reviews_group', + $type . ' ' . $review->id . ' - ' . $review->title . ' ' . + JedHelper::prettyDate($review->created_on) . ' ', + 'extension_' . $type . '_reviews_group' . '_slide' . ($slideid++) + ); + $review_model = new ReviewModel(); + $linked_form = $review_model->getForm($review, false, 'review'); + $linked_form->bind($review); + ?> +

Status - renderField('published', null, null, $headerlabeloptions); ?>   

@@ -199,7 +199,7 @@

ease_of_use; ?>

- renderField('ease_of_use_comment', null, null, $headerlabeloptions); ?> + renderField('ease_of_use_comment', null, null, $headerlabeloptions); ?>
@@ -207,7 +207,7 @@

support; ?>

- renderField('support_comment', null, null, $headerlabeloptions); ?> + renderField('support_comment', null, null, $headerlabeloptions); ?>
@@ -215,7 +215,7 @@

documentation; ?>

- renderField('documentation_comment', null, null, $headerlabeloptions); ?> + renderField('documentation_comment', null, null, $headerlabeloptions); ?>
@@ -223,7 +223,7 @@

value_for_money; ?>

- renderField('value_for_money_comment', null, null, $headerlabeloptions); ?> + renderField('value_for_money_comment', null, null, $headerlabeloptions); ?>
@@ -235,25 +235,19 @@ - ip_address; ?>
- + ?> - item->varied) echo HTMLHelper::_('uitab.endTab'); diff --git a/src/administrator/components/com_jed/tmpl/extensionimages/default.php b/src/administrator/components/com_jed/tmpl/extensionimages/default.php index f1a9cef..3738426 100644 --- a/src/administrator/components/com_jed/tmpl/extensionimages/default.php +++ b/src/administrator/components/com_jed/tmpl/extensionimages/default.php @@ -85,7 +85,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -107,7 +107,7 @@ } elseif (!$saveOrder) { $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); } - ?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/extensions/default.php b/src/administrator/components/com_jed/tmpl/extensions/default.php index dac79c5..9671c86 100644 --- a/src/administrator/components/com_jed/tmpl/extensions/default.php +++ b/src/administrator/components/com_jed/tmpl/extensions/default.php @@ -355,32 +355,32 @@ $icon = 'pending'; break; } - echo ''; - ?> + echo ''; + ?> approved) { - // Rejected - case '-1': - $icon = 'unpublish'; - break; - // Approved - case '1': - $icon = 'publish'; - break; - // Awaiting response - case '2': - $icon = 'expired'; - break; - // Pending - case '0': - default: - $icon = 'pending'; - break; - } - echo ''; - ?> + switch ($item->approved) { + // Rejected + case '-1': + $icon = 'unpublish'; + break; + // Approved + case '1': + $icon = 'publish'; + break; + // Awaiting response + case '2': + $icon = 'expired'; + break; + // Pending + case '0': + default: + $icon = 'pending'; + break; + } + echo ''; + ?>
@@ -402,14 +402,14 @@ modified_on)) { - echo HTMLHelper::_( - 'date', - $item->modified_on, - Text::_('COM_JED_GENERAL_DATETIME_FORMAT') - ); - } - ?> + if (!is_null($item->modified_on)) { + echo HTMLHelper::_( + 'date', + $item->modified_on, + Text::_('COM_JED_GENERAL_DATETIME_FORMAT') + ); + } + ?> diff --git a/src/administrator/components/com_jed/tmpl/extensionscores/default.php b/src/administrator/components/com_jed/tmpl/extensionscores/default.php index 9eab4ad..69a69c1 100644 --- a/src/administrator/components/com_jed/tmpl/extensionscores/default.php +++ b/src/administrator/components/com_jed/tmpl/extensionscores/default.php @@ -109,7 +109,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -131,7 +131,7 @@ } elseif (!$saveOrder) { $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); } - ?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/extensionsupplyoptions/default.php b/src/administrator/components/com_jed/tmpl/extensionsupplyoptions/default.php index 67b15c9..7cb7718 100644 --- a/src/administrator/components/com_jed/tmpl/extensionsupplyoptions/default.php +++ b/src/administrator/components/com_jed/tmpl/extensionsupplyoptions/default.php @@ -88,7 +88,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -105,12 +105,12 @@ + if (!$canChange) { + $iconClass = ' inactive'; + } elseif (!$saveOrder) { + $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); + } + ?> diff --git a/src/administrator/components/com_jed/tmpl/extensionvarieddata/default.php b/src/administrator/components/com_jed/tmpl/extensionvarieddata/default.php index 72aa28f..0b3b6a5 100644 --- a/src/administrator/components/com_jed/tmpl/extensionvarieddata/default.php +++ b/src/administrator/components/com_jed/tmpl/extensionvarieddata/default.php @@ -136,7 +136,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -158,7 +158,7 @@ } elseif (!$saveOrder) { $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); } - ?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/messagetemplates/default.php b/src/administrator/components/com_jed/tmpl/messagetemplates/default.php index 99e9bb9..91aa089 100644 --- a/src/administrator/components/com_jed/tmpl/messagetemplates/default.php +++ b/src/administrator/components/com_jed/tmpl/messagetemplates/default.php @@ -109,7 +109,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); diff --git a/src/administrator/components/com_jed/tmpl/reviews/default.php b/src/administrator/components/com_jed/tmpl/reviews/default.php index 76784f8..be3f38d 100644 --- a/src/administrator/components/com_jed/tmpl/reviews/default.php +++ b/src/administrator/components/com_jed/tmpl/reviews/default.php @@ -142,7 +142,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -164,7 +164,7 @@ } elseif (!$saveOrder) { $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); } - ?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/reviewscomments/default.php b/src/administrator/components/com_jed/tmpl/reviewscomments/default.php index 4aa9a3e..18cb347 100644 --- a/src/administrator/components/com_jed/tmpl/reviewscomments/default.php +++ b/src/administrator/components/com_jed/tmpl/reviewscomments/default.php @@ -97,7 +97,7 @@ class="js-draggable" data-url="" data-direction="" > + endif; ?>> items as $i => $item) : $ordering = ($listOrder == 'a.ordering'); $canCreate = $user->authorise('core.create', 'com_jed'); @@ -119,7 +119,7 @@ } elseif (!$saveOrder) { $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); } - ?> + ?> diff --git a/src/administrator/components/com_jed/tmpl/setupdemo/default.php b/src/administrator/components/com_jed/tmpl/setupdemo/default.php index 8a13513..af75651 100644 --- a/src/administrator/components/com_jed/tmpl/setupdemo/default.php +++ b/src/administrator/components/com_jed/tmpl/setupdemo/default.php @@ -417,7 +417,7 @@ } } -?> + ?>
diff --git a/src/administrator/components/com_jed/tmpl/ticket/edit.php b/src/administrator/components/com_jed/tmpl/ticket/edit.php index 709b4e5..98c3b2c 100644 --- a/src/administrator/components/com_jed/tmpl/ticket/edit.php +++ b/src/administrator/components/com_jed/tmpl/ticket/edit.php @@ -84,23 +84,23 @@ class="form-validate form-horizontal"> $slidesOptions = ["active" => 'ticket_messages_group' . '_slide' . count($this->ticket_messages), // It is the ID of the active tab. ]; -echo HTMLHelper::_('bootstrap.startAccordion', 'ticket_messages_group', $slidesOptions); - -$slideid = 0; -foreach ($this->ticket_messages as $ticketMessage) { - if ($ticketMessage->message_direction == 0) { - $inout = "jed-ticket-message-out"; - } else { - $inout = "jed-ticket-message-in"; - } + echo HTMLHelper::_('bootstrap.startAccordion', 'ticket_messages_group', $slidesOptions); - echo HTMLHelper::_('bootstrap.addSlide', 'ticket_messages_group', '' . $ticketMessage->subject . ' - ' . JedHelper::prettyDate($ticketMessage->created_on) . '', 'ticket_messages_group' . '_slide' . ($slideid++)); - echo $ticketMessage->message ; - echo HTMLHelper::_('bootstrap.endSlide'); -} -echo HTMLHelper::_('bootstrap.endAccordion'); + $slideid = 0; + foreach ($this->ticket_messages as $ticketMessage) { + if ($ticketMessage->message_direction == 0) { + $inout = "jed-ticket-message-out"; + } else { + $inout = "jed-ticket-message-in"; + } -?> + echo HTMLHelper::_('bootstrap.addSlide', 'ticket_messages_group', '' . $ticketMessage->subject . ' - ' . JedHelper::prettyDate($ticketMessage->created_on) . '', 'ticket_messages_group' . '_slide' . ($slideid++)); + echo $ticketMessage->message ; + echo HTMLHelper::_('bootstrap.endSlide'); + } + echo HTMLHelper::_('bootstrap.endAccordion'); + + ?> @@ -147,12 +147,12 @@ class="form-validate form-horizontal">
form->renderField('created_by', null, null, $headerlabeloptions); ?>
item->created_on); + echo JedHelper::prettyDate($this->item->created_on); -?>
+ ?>
@@ -171,18 +171,18 @@ class="form-validate form-horizontal"> "slide0" // It is the ID of the active tab. -echo HTMLHelper::_('bootstrap.startAccordion', 'internal_notes_group', $slidesOptions); + echo HTMLHelper::_('bootstrap.startAccordion', 'internal_notes_group', $slidesOptions); -$slideid = 0; -foreach ($this->internal_notes as $internalNote) { - $user = JedHelper::getUserById($internalNote->created_by); - echo HTMLHelper::_('bootstrap.addSlide', 'internal_notes_group', '' . $internalNote->summary . ' - ' . JedHelper::prettyDate($internalNote->created_on) . ' by ' . $user->name, 'internal_notes_group' . '_slide' . ($slideid++)); - echo "

" . $internalNote->note . "

"; - echo HTMLHelper::_('bootstrap.endSlide'); -} -echo HTMLHelper::_('bootstrap.endAccordion'); + $slideid = 0; + foreach ($this->internal_notes as $internalNote) { + $user = JedHelper::getUserById($internalNote->created_by); + echo HTMLHelper::_('bootstrap.addSlide', 'internal_notes_group', '' . $internalNote->summary . ' - ' . JedHelper::prettyDate($internalNote->created_on) . ' by ' . $user->name, 'internal_notes_group' . '_slide' . ($slideid++)); + echo "

" . $internalNote->note . "

"; + echo HTMLHelper::_('bootstrap.endSlide'); + } + echo HTMLHelper::_('bootstrap.endAccordion'); -?> + ?>

Add Note   

VELLinkedReports['velreport']['data'] as $velreport) { - $velcounter++; + $velcounter = 0; + foreach ($this->VELLinkedReports['velreport']['data'] as $velreport) { + $velcounter++; - echo HTMLHelper::_('uitab.addTab', 'myTab', 'report' . $velcounter, 'Report:' . JedHelper::prettyDate($velreport->created)); ?> + echo HTMLHelper::_('uitab.addTab', 'myTab', 'report' . $velcounter, 'Report:' . JedHelper::prettyDate($velreport->created)); ?>
- VELLinkedReports['velreport']['form']); ?> + VELLinkedReports['velreport']['form']); ?>
- VELLinkedReports['veldeveloperupdate']['data'] as $veldeveloperupdate) { - $velcounter++; - echo HTMLHelper::_('uitab.addTab', 'myTab', 'devupdate' . $velcounter, 'Developer Update:' . JedHelper::prettyDate($veldeveloperupdate->created)); ?> + VELLinkedReports['veldeveloperupdate']['data'] as $veldeveloperupdate) { + $velcounter++; + echo HTMLHelper::_('uitab.addTab', 'myTab', 'devupdate' . $velcounter, 'Developer Update:' . JedHelper::prettyDate($veldeveloperupdate->created)); ?>
- VELLinkedReports['veldeveloperupdate']['form']); ?> + VELLinkedReports['veldeveloperupdate']['form']); ?>
- VELLinkedReports['velabandonware']['data'] as $velabandonware) { - $velcounter++; - echo HTMLHelper::_('uitab.addTab', 'myTab', 'abandonware' . $velcounter, 'Abandoned Report:' . JedHelper::prettyDate($velabandonware->created)); ?> + VELLinkedReports['velabandonware']['data'] as $velabandonware) { + $velcounter++; + echo HTMLHelper::_('uitab.addTab', 'myTab', 'abandonware' . $velcounter, 'Abandoned Report:' . JedHelper::prettyDate($velabandonware->created)); ?>
- VELLinkedReports['velabandonware']['form']); ?> + VELLinkedReports['velabandonware']['form']); ?>
- + diff --git a/src/components/com_jed/src/Controller/ExtensionformController.php b/src/components/com_jed/src/Controller/ExtensionformController.php index 8afc384..7c41d65 100644 --- a/src/components/com_jed/src/Controller/ExtensionformController.php +++ b/src/components/com_jed/src/Controller/ExtensionformController.php @@ -81,7 +81,7 @@ public function save($key = null, $urlVar = null): void $this->checkToken(); $isLoggedIn = JedHelper::IsLoggedIn(); - if($isLoggedIn) { + if ($isLoggedIn) { // Initialise variables. $app = Factory::getApplication(); $model = $this->getModel('Extensionform', 'Site'); @@ -93,7 +93,7 @@ public function save($key = null, $urlVar = null): void //Translate/Fill out default values $data['joomla_versions'] = json_encode($data['joomla_versions']); $data['includes'] = json_encode($data['includes']); - if($data['download_integration_type'] == 2) { + if ($data['download_integration_type'] == 2) { $data['requires_registration'] = 1; } else { $data['requires_registration'] = 0; @@ -118,8 +118,6 @@ public function save($key = null, $urlVar = null): void if (!$form) { throw new Exception($model->getError(), 500); } - - } else { throw new Exception(Text::_("JERROR_ALERTNOAUTHOR"), 401); } diff --git a/src/components/com_jed/src/Controller/ReviewController.php b/src/components/com_jed/src/Controller/ReviewController.php index 7de926a..2a86d20 100644 --- a/src/components/com_jed/src/Controller/ReviewController.php +++ b/src/components/com_jed/src/Controller/ReviewController.php @@ -156,6 +156,4 @@ public function checkin(): bool throw new Exception(Text::_('JERROR_ALERTNOAUTHOR'), 403); } } - - } diff --git a/src/components/com_jed/src/Field/ForeignkeyField.php b/src/components/com_jed/src/Field/ForeignkeyField.php index d5094e9..f7b3bfc 100644 --- a/src/components/com_jed/src/Field/ForeignkeyField.php +++ b/src/components/com_jed/src/Field/ForeignkeyField.php @@ -230,7 +230,7 @@ protected function getOptions(): array $db->setQuery($this->processQuery()); $results = $db->loadObjectList(); } catch (ExecutionFailureException $e) { - Factory::getApplication()->enqueueMessage(Text::_('JERROR_AN_ERROR_HAS_OCCURRED').' '.$e->getMessage(), 'error'); + Factory::getApplication()->enqueueMessage(Text::_('JERROR_AN_ERROR_HAS_OCCURRED') . ' ' . $e->getMessage(), 'error'); } // Add header. @@ -238,7 +238,7 @@ protected function getOptions(): array $options[] = (object) ["value" => '', "text" => Text::_($this->header)]; } - if(!empty($this->option_value_field) || !empty($this->option_key_field)) { + if (!empty($this->option_value_field) || !empty($this->option_key_field)) { $options[] = (object) ["value" => $this->option_key_field, "text" => Text::_($this->option_value_field)]; } diff --git a/src/components/com_jed/src/Field/JedcategoryField.php b/src/components/com_jed/src/Field/JedcategoryField.php index 6924eee..eccebeb 100644 --- a/src/components/com_jed/src/Field/JedcategoryField.php +++ b/src/components/com_jed/src/Field/JedcategoryField.php @@ -77,7 +77,6 @@ protected function getInput($options = []): string $opt = HTMLHelper::_('select.option', $row->value, $row->text, 'value', 'text'); $opt->attr = ' data-level="' . $row->level . '"'; $opts[] = $opt; - } @@ -163,6 +162,4 @@ private function getCategories(): array return $this->cats; } - - } diff --git a/src/components/com_jed/src/Field/JoomlaversionField.php b/src/components/com_jed/src/Field/JoomlaversionField.php index 04076cd..59265f5 100644 --- a/src/components/com_jed/src/Field/JoomlaversionField.php +++ b/src/components/com_jed/src/Field/JoomlaversionField.php @@ -1,4 +1,5 @@ 1) { echo '
'; } - if(key_exists('supply_type', $fs)) { - $st = '_'.$fs['supply_type']; + if (key_exists('supply_type', $fs)) { + $st = '_' . $fs['supply_type']; } else { $st = ''; }; - echo '
' . $fs['title'] . ''; + echo '
' . $fs['title'] . ''; } if ($fs['description'] <> '') { echo $fs['description']; diff --git a/src/components/com_jed/src/Model/CategoryModel.php b/src/components/com_jed/src/Model/CategoryModel.php index a96ad87..1adafb4 100644 --- a/src/components/com_jed/src/Model/CategoryModel.php +++ b/src/components/com_jed/src/Model/CategoryModel.php @@ -379,7 +379,6 @@ public function getItems(): mixed if (!empty($item->logo)) { //$item->logo = JedHelper::formatImage($item->logo, ImageSize::SMALL); $item->logo = 'https://extensions.joomla.org/cache/fab_image/' . str_replace('.png', '', $item->logo) . '_resizeDown400px175px16.png'; - } $item->scores = $this->getScores($item->id); diff --git a/src/components/com_jed/src/Model/ExtensionformModel.php b/src/components/com_jed/src/Model/ExtensionformModel.php index 39790f8..28f0b75 100644 --- a/src/components/com_jed/src/Model/ExtensionformModel.php +++ b/src/components/com_jed/src/Model/ExtensionformModel.php @@ -40,6 +40,7 @@ class ExtensionformModel extends FormModel { use ExtensionUtilities; + /** * The item object * @@ -513,19 +514,18 @@ public function getvariedItem(int $pk = null, int $supply_option_type = 0) if (is_null($this->item->primary_category_id)) { $this->item->category_hierarchy = ""; } else { - // $this->item->category_hierarchy = ExtensionUtilities::getCategoryHierarchy($this->item->primary_category_id); + // $this->item->category_hierarchy = ExtensionUtilities::getCategoryHierarchy($this->item->primary_category_id); } /* Load Varied Data */ //$s = $item->getTableProperties(); - // $this->item->varied_data = $this->getVariedData($this->item->id, $supply_option_type); + // $this->item->varied_data = $this->getVariedData($this->item->id, $supply_option_type); $supply_types = $this->getSupplyTypes(); $vi = new ExtensionvarieddatumModel(); - foreach($supply_types as $st) { - + foreach ($supply_types as $st) { $keys['extension_id'] = $this->item->id; $keys['supply_option_id'] = $st->supply_id; $vi = new ExtensionvarieddatumModel(); @@ -533,7 +533,7 @@ public function getvariedItem(int $pk = null, int $supply_option_type = 0) //echo "
";print_r($vitem);echo "
";exit(); //if($st->supply_type==='Free') { - // $vitem->is_default_data=1; + // $vitem->is_default_data=1; //} $this->item->varied[$st->supply_id] = $vitem; } diff --git a/src/components/com_jed/src/Model/ExtensionvarieddatumModel.php b/src/components/com_jed/src/Model/ExtensionvarieddatumModel.php index 9a477ef..847fa0e 100644 --- a/src/components/com_jed/src/Model/ExtensionvarieddatumModel.php +++ b/src/components/com_jed/src/Model/ExtensionvarieddatumModel.php @@ -143,8 +143,7 @@ public function getItem($pk = null): stdClass if ($table !== false && $table->load($pk) && !empty($table->id)) { $user = Factory::getApplication()->getIdentity(); $pk = $table->id; - if(empty($pk) || JedHelper::isAdminOrSuperUser() || $table->created_by == Factory::getUser()->id) { - + if (empty($pk) || JedHelper::isAdminOrSuperUser() || $table->created_by == Factory::getUser()->id) { $canEdit = $user->authorise('core.edit', 'com_jed') || $user->authorise('core.create', 'com_jed'); if (!$canEdit && $user->authorise('core.edit.own', 'com_jed')) { @@ -169,7 +168,6 @@ public function getItem($pk = null): stdClass if (isset($this->item->catid) && is_object($this->item->catid)) { $this->item->catid = ArrayHelper::fromObject($this->item->catid); } - } else { throw new \Exception(Text::_("JERROR_ALERTNOAUTHOR"), 401); } @@ -177,7 +175,6 @@ public function getItem($pk = null): stdClass } return $this->item; - } /** diff --git a/src/components/com_jed/src/Model/VelreportformModel.php b/src/components/com_jed/src/Model/VelreportformModel.php index e15eb77..833b36f 100644 --- a/src/components/com_jed/src/Model/VelreportformModel.php +++ b/src/components/com_jed/src/Model/VelreportformModel.php @@ -262,8 +262,6 @@ protected function loadFormData(): array } if ($data) { - - return (array)$data; } diff --git a/src/components/com_jed/src/View/Extensionform/HtmlView.php b/src/components/com_jed/src/View/Extensionform/HtmlView.php index d5610c7..35a7501 100644 --- a/src/components/com_jed/src/View/Extensionform/HtmlView.php +++ b/src/components/com_jed/src/View/Extensionform/HtmlView.php @@ -69,11 +69,11 @@ public function display($tpl = null): void //echo "
";print_r($this->item);echo "
";exit(); - foreach($this->supply_types as $st) { + foreach ($this->supply_types as $st) { $this->supply_forms[$st->supply_id] = $extensionvarieddatum->getForm( $this->item->varied[$st->supply_id], false, - 'jf_varieddata_form_'.$st->supply_id + 'jf_varieddata_form_' . $st->supply_id ); $this->supply_forms[$st->supply_id]->bind($this->item->varied[$st->supply_id]); } diff --git a/src/components/com_jed/tmpl/categories/default.php b/src/components/com_jed/tmpl/categories/default.php index 936b31e..71477e9 100644 --- a/src/components/com_jed/tmpl/categories/default.php +++ b/src/components/com_jed/tmpl/categories/default.php @@ -57,7 +57,7 @@ numitems; ?> + } ?> diff --git a/src/components/com_jed/tmpl/category/default.php b/src/components/com_jed/tmpl/category/default.php index 80a29bb..81f2ff8 100644 --- a/src/components/com_jed/tmpl/category/default.php +++ b/src/components/com_jed/tmpl/category/default.php @@ -75,7 +75,7 @@ getNumItems(true); ?> + } ?> diff --git a/src/components/com_jed/tmpl/extension/default.php b/src/components/com_jed/tmpl/extension/default.php index 60e7b1a..50754e9 100644 --- a/src/components/com_jed/tmpl/extension/default.php +++ b/src/components/com_jed/tmpl/extension/default.php @@ -47,15 +47,15 @@

- escape($this->item->title) ?>

By item->created_by_name ?>
+ echo $this->item->created_by_name ?>
- item->score_string ?>
- item->category_hierarchy ?>
- getIdentity()->authorise('core.manage', 'com_jed.' . $this->item->id); ?> - + echo Route::_('index.php?option=com_jed&task=extension.edit&id=' . $this->item->id) ?>"> - - - Support -
@@ -97,7 +97,7 @@ class="rounded img-fluid mx-auto d-block" style="max-height: 525px">
- item->intro_text ?>
@@ -110,14 +110,14 @@ class="rounded img-fluid mx-auto d-block" style="max-height: 525px">
Last updated
- item->modified_on, 'M j Y') ?>
Date added
- item->created_on, 'M j Y') ?>
@@ -145,40 +145,40 @@ class="btn btn-outline-success">
- - item->varied_data; -$tabid = 0; -foreach ($varieddata as $vr) { - // echo "
";print_r($vr);echo "
"; - echo HTMLHelper::_('uitab.addTab', 'supply_option_tabs', 'supply_tab_' . $vr->supply_type, $vr->supply_type); - $subItemId = md5(serialize($vr)); - ?> + $tabid = 0; + foreach ($varieddata as $vr) { + // echo "
";print_r($vr);echo "
"; + echo HTMLHelper::_('uitab.addTab', 'supply_option_tabs', 'supply_tab_' . $vr->supply_type, $vr->supply_type); + $subItemId = md5(serialize($vr)); + ?>
- logo) : ?> + logo) : ?> <?php echo $this->escape($this->item->title) ?> - +
- intro_text ?> - description)))) : ?> - + intro_text ?> + description)))) : ?> + - +
- description ?> + description ?>

@@ -215,9 +215,9 @@ class="rounded img-fluid mx-auto d-block" style="max-height: 525px">

- item->supply_type, $this->item->supply_type); ?> -
+ item->supply_type, $this->item->supply_type); ?> +
item->logo) : ?> @@ -290,10 +290,10 @@ class="rounded img-fluid mx-auto d-block" style="max-height: 525px">
-
- +
+ @@ -308,23 +308,23 @@ class="rounded img-fluid mx-auto d-block" style="max-height: 525px"> -item->checked_out > 0) : ?> - getIdentity()->authorise('core.delete', 'com_jed.extension.' . $this->item->id)) : ?> - - Text::sprintf('COM_JED_GENERAL_DELETE_CONFIRM_LABEL', $this->item->id) ) ?> - diff --git a/src/components/com_jed/tmpl/extensionform/default.php b/src/components/com_jed/tmpl/extensionform/default.php index 7c34b77..a35a37b 100644 --- a/src/components/com_jed/tmpl/extensionform/default.php +++ b/src/components/com_jed/tmpl/extensionform/default.php @@ -34,7 +34,7 @@ ->useScript('com_jed.extensionTestUpload') ->useStyle('com_jed.submitextension') ->useScript('com_jed.extensionform') - ->useScript('com_jed.form_validate'); + ->useScript('com_jed.form_validate'); // Load admin language file @@ -116,40 +116,34 @@
- enqueueMessage(Text::_('COM_JED_EXTENSION_NO_ACCESS_LABEL'), 'success'); - $app->redirect($redirectURL); + $app->enqueueMessage(Text::_('COM_JED_EXTENSION_NO_ACCESS_LABEL'), 'success'); + $app->redirect($redirectURL); } catch (Exception $e) { echo $e->getMessage(); } - - } else { - - - ?> -

-

- -

- ' . '
'; $fieldsets['overview']['fields'] = [['title','alias'],'version',['primary_category_id', 'tags']]; @@ -173,7 +167,7 @@ $fieldsets['extensionfile']['supply_type'] = $st->supply_type; $fieldsets['extensionfile']['title'] = ''; - $fieldsets['extensionfile']['description'] = Text::_('COM_JED_EXTENSION_EXTENSIONFILE_LABEL').'
'.Text::_('COM_JED_EXTENSION_EXTENSIONFILE_EXTRA'); + $fieldsets['extensionfile']['description'] = Text::_('COM_JED_EXTENSION_EXTENSIONFILE_LABEL') . '
' . Text::_('COM_JED_EXTENSION_EXTENSIONFILE_EXTRA'); $fieldsets['extensionfile']['fields'] = ['file']; $fieldsets['extensionfile']['hidden'] = []; $fieldsets['links']['supply_type'] = $st->supply_type; @@ -215,22 +209,22 @@
- canSave) : ?> - " title=""> + echo Text::_('JCANCEL'); ?>"> -
@@ -239,10 +233,10 @@ - -
diff --git a/src/components/com_jed/tmpl/reviewform/default.php b/src/components/com_jed/tmpl/reviewform/default.php index 8cde456..f469a8f 100644 --- a/src/components/com_jed/tmpl/reviewform/default.php +++ b/src/components/com_jed/tmpl/reviewform/default.php @@ -146,30 +146,30 @@ '') { - if ($fscount > 1) { - echo '
'; + foreach ($fieldsets as $fs) { + $fscount = $fscount + 1; + if ($fs['title'] <> '') { + if ($fscount > 1) { + echo '
'; + } + + echo '
' . $fs['title'] . ''; } - - echo '
' . $fs['title'] . ''; - } - if ($fs['description'] <> '') { - echo $fs['description']; - } - $fields = $fs['fields']; - $hiddenFields = $fs['hidden']; - foreach ($fields as $field) { - if (in_array($field, $hiddenFields)) { - $this->form->setFieldAttribute($field, 'type', 'hidden'); + if ($fs['description'] <> '') { + echo $fs['description']; + } + $fields = $fs['fields']; + $hiddenFields = $fs['hidden']; + foreach ($fields as $field) { + if (in_array($field, $hiddenFields)) { + $this->form->setFieldAttribute($field, 'type', 'hidden'); + } + + echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - - echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - } - ?> + ?>
@@ -207,7 +207,7 @@
+ ?> format("d M y H:i"); } catch (Exception $e) { } - ?> + ?> diff --git a/src/components/com_jed/tmpl/velabandonedreportform/default.php b/src/components/com_jed/tmpl/velabandonedreportform/default.php index 6bbf4e1..ccb37b3 100644 --- a/src/components/com_jed/tmpl/velabandonedreportform/default.php +++ b/src/components/com_jed/tmpl/velabandonedreportform/default.php @@ -64,54 +64,54 @@ '') { - if ($fscount > 1) { - echo '
'; + $fieldsets['overview']['description'] = Text::_('COM_JED_VEL_ABANDONEDREPORTS_OVERVIEW_DESCRIPTION'); + $fieldsets['overview']['fields'] = []; + + + $fieldsets['aboutyou']['title'] = Text::_('COM_JED_VEL_GENERAL_ABOUT_YOU_LABEL'); + $fieldsets['aboutyou']['description'] = ""; + $fieldsets['aboutyou']['fields'] = [ + 'reporter_fullname', + 'reporter_email', + 'reporter_organisation']; + + $fieldsets['extensiondetails']['title'] = Text::_('COM_JED_VEL_ABANDONEDREPORTS_EXTENSION_TITLE'); + $fieldsets['extensiondetails']['description'] = ""; + $fieldsets['extensiondetails']['fields'] = [ + 'extension_name', + 'developer_name', + 'extension_version', + 'extension_url', + 'abandoned_reason', + 'consent_to_process']; + $fscount = 0; + + + foreach ($fieldsets as $fs) { + $fscount = $fscount + 1; + if ($fs['title'] <> '') { + if ($fscount > 1) { + echo '
'; + } + + echo '
' . $fs['title'] . ''; } - - echo '
' . $fs['title'] . ''; - } - if ($fs['description'] <> '') { - echo $fs['description']; - } - $fields = $fs['fields']; - $hiddenFields = ['user_ip']; - foreach ($fields as $field) { - if (in_array($field, $hiddenFields)) { - $this->form->setFieldAttribute($field, 'type', 'hidden'); + if ($fs['description'] <> '') { + echo $fs['description']; + } + $fields = $fs['fields']; + $hiddenFields = ['user_ip']; + foreach ($fields as $field) { + if (in_array($field, $hiddenFields)) { + $this->form->setFieldAttribute($field, 'type', 'hidden'); + } + + echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - - echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - } - ?> + ?>
diff --git a/src/components/com_jed/tmpl/velabandonedreports/default.php b/src/components/com_jed/tmpl/velabandonedreports/default.php index e69fd69..9cb3496 100644 --- a/src/components/com_jed/tmpl/velabandonedreports/default.php +++ b/src/components/com_jed/tmpl/velabandonedreports/default.php @@ -171,8 +171,8 @@ date_submitted; - echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; - ?> + echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; + ?> diff --git a/src/components/com_jed/tmpl/veldeveloperupdateform/default.php b/src/components/com_jed/tmpl/veldeveloperupdateform/default.php index 8ca6ed4..774db57 100644 --- a/src/components/com_jed/tmpl/veldeveloperupdateform/default.php +++ b/src/components/com_jed/tmpl/veldeveloperupdateform/default.php @@ -61,77 +61,77 @@ method="post" class="form-validate form-horizontal" enctype="multipart/form-data"> '') { - if ($fscount > 1) { - echo '
'; + $fieldsets['overview']['description'] = Text::_('COM_JED_VEL_DEVELOPERUPDATES_FORM_OVERVIEW_DESCR'); + $fieldsets['overview']['fields'] = []; + + $fieldsets['aboutyou']['title'] = Text::_('COM_JED_VEL_GENERAL_ABOUT_YOU_LABEL'); + $fieldsets['aboutyou']['description'] = ""; + $fieldsets['aboutyou']['fields'] = [ + 'contact_fullname', + 'contact_organisation', + 'contact_email']; + + $fieldsets['vulnerabilitydetails']['title'] = Text::_('COM_JED_VEL_DEVELOPERUPDATES_FORM_VULNERABILITY_DETAILS_TITLE'); + $fieldsets['vulnerabilitydetails']['description'] = ""; + $fieldsets['vulnerabilitydetails']['fields'] = [ + 'vulnerable_item_name', + 'vulnerable_item_version', + 'extension_update', + 'new_version_number']; + + $fieldsets['vulnerabilitydetails2']['title'] = ""; + $fieldsets['vulnerabilitydetails2']['description'] = Text::_('COM_JED_VEL_DEVELOPERUPDATES_FORM_VULNERABILITY_DETAILS_2_DESCR'); + $fieldsets['vulnerabilitydetails2']['fields'] = [ + 'update_notice_url', + 'changelog_url']; + + $fieldsets['vulnerabilitydetails3']['title'] = ""; + $fieldsets['vulnerabilitydetails3']['description'] = Text::_('COM_JED_VEL_DEVELOPERUPDATES_FORM_VULNERABILITY_DETAILS_3_DESCR'); + $fieldsets['vulnerabilitydetails3']['fields'] = [ + 'download_url', + 'consent_to_process']; + + + $fieldsets['final']['title'] = ""; + $fieldsets['final']['description'] = Text::_('COM_JED_VEL_DEVELOPERUPDATES_FINAL_DESCRIPTION'); + + $fieldsets['final']['fields'] = ['captcha']; + $fscount = 0; + + + foreach ($fieldsets as $fs) { + $fscount = $fscount + 1; + if ($fs['title'] <> '') { + if ($fscount > 1) { + echo '
'; + } + + echo '
' . $fs['title'] . ''; + } + if ($fs['description'] <> '') { + echo $fs['description']; } - echo '
' . $fs['title'] . ''; - } - if ($fs['description'] <> '') { - echo $fs['description']; - } - - $fields = $fs['fields']; + $fields = $fs['fields']; - foreach ($fields as $field) { - echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); + foreach ($fields as $field) { + echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); + } } - } - $hiddenfields = ['vel_item_id', - 'update_data_source', - 'update_date_submitted', - 'data_source', - 'update_user_ip']; + $hiddenfields = ['vel_item_id', + 'update_data_source', + 'update_date_submitted', + 'data_source', + 'update_user_ip']; - foreach ($hiddenfields as $field) { - $this->form->setFieldAttribute($field, 'type', 'hidden'); - } - ?> + foreach ($hiddenfields as $field) { + $this->form->setFieldAttribute($field, 'type', 'hidden'); + } + ?>
diff --git a/src/components/com_jed/tmpl/veldeveloperupdates/default.php b/src/components/com_jed/tmpl/veldeveloperupdates/default.php index e23d833..0b03fc2 100644 --- a/src/components/com_jed/tmpl/veldeveloperupdates/default.php +++ b/src/components/com_jed/tmpl/veldeveloperupdates/default.php @@ -134,8 +134,8 @@ update_date_submitted; - echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; - ?> + echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; + ?> diff --git a/src/components/com_jed/tmpl/velreportform/default.php b/src/components/com_jed/tmpl/velreportform/default.php index 3ddc459..08a4195 100644 --- a/src/components/com_jed/tmpl/velreportform/default.php +++ b/src/components/com_jed/tmpl/velreportform/default.php @@ -61,94 +61,94 @@ '') { - if ($fscount > 1) { - echo '
'; + $fieldsets['overview']['description'] = Text::_('COM_JED_VEL_REPORTS_OVERVIEW_DESCR'); + $fieldsets['overview']['fields'] = []; + + + $fieldsets['aboutyou']['title'] = Text::_('COM_JED_VEL_GENERAL_ABOUT_YOU_LABEL'); + $fieldsets['aboutyou']['description'] = ""; + $fieldsets['aboutyou']['fields'] = [ + 'reporter_fullname', + 'reporter_email', + 'reporter_organisation', + 'pass_details_ok']; + + $fieldsets['vulnerabilitydetails']['title'] = Text::_('COM_JED_VEL_GENERAL_VULNERABILITY_DETAILS_TITLE'); + $fieldsets['vulnerabilitydetails']['description'] = ""; + $fieldsets['vulnerabilitydetails']['fields'] = [ + 'vulnerability_type', + 'vulnerable_item_name', + 'vulnerable_item_version', + 'exploit_type', + 'exploit_other_description', + 'vulnerability_description', + 'vulnerability_how_found', + 'vulnerability_actively_exploited', + 'vulnerability_publicly_available', + 'vulnerability_publicly_url', + 'vulnerability_specific_impact']; + + $fieldsets['developerdetails']['title'] = Text::_('COM_JED_VEL_REPORTS_DEVELOPER_DETAILS_TITLE'); + $fieldsets['developerdetails']['description'] = Text::_('COM_JED_VEL_REPORTS_DEVELOPER_DETAILS_DESCRIPTION'); + $fieldsets['developerdetails']['fields'] = [ + 'developer_communication_type', + 'developer_patch_download_url']; + + $fieldsets['moredeveloperdetails']['title'] = ""; + $fieldsets['moredeveloperdetails']['description'] = Text::_('COM_JED_VEL_REPORTS_FORM_DEVELOPER_DETAILS_MORE_DESCR'); + $fieldsets['moredeveloperdetails']['fields'] = [ + 'developer_name', + 'developer_contact_email', + 'jed_url', + 'tracking_db_name', + 'tracking_db_id']; + + + $fieldsets['additionaldeveloperdetails']['title'] = Text::_('COM_JED_VEL_REPORTS_DEVELOPER_DETAILS_ADDITIONAL_TITLE_LABEL'); + $fieldsets['additionaldeveloperdetails']['description'] = ""; + $fieldsets['additionaldeveloperdetails']['fields'] = [ + 'developer_additional_info']; + + $fieldsets['filelocation']['title'] = Text::_('COM_JED_VEL_REPORTS_FILELOCATION_TITLE'); + $fieldsets['filelocation']['description'] = ""; + $fieldsets['filelocation']['fields'] = [ + 'download_url', + 'consent_to_process']; + + $fieldsets['final']['title'] = ""; + $fieldsets['final']['description'] = Text::_('COM_JED_VEL_REPORTS_FORM_FINAL_DESCR'); + + $fieldsets['final']['fields'] = ['captcha', 'passed_to_vel', + 'date_submitted', + 'data_source']; + $fscount = 0; + + + foreach ($fieldsets as $fs) { + $fscount = $fscount + 1; + if ($fs['title'] <> '') { + if ($fscount > 1) { + echo '
'; + } + + echo '
' . $fs['title'] . ''; } - - echo '
' . $fs['title'] . ''; - } - if ($fs['description'] <> '') { - echo $fs['description']; - } - $fields = $fs['fields']; - $hiddenFields = ['user_ip']; - foreach ($fields as $field) { - if (in_array($field, $hiddenFields)) { - $this->form->setFieldAttribute($field, 'type', 'hidden'); + if ($fs['description'] <> '') { + echo $fs['description']; + } + $fields = $fs['fields']; + $hiddenFields = ['user_ip']; + foreach ($fields as $field) { + if (in_array($field, $hiddenFields)) { + $this->form->setFieldAttribute($field, 'type', 'hidden'); + } + + echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - - echo $this->form->renderField($field, null, null, ['class' => 'control-wrapper-' . $field]); } - } - ?> + ?>
diff --git a/src/components/com_jed/tmpl/velreports/default.php b/src/components/com_jed/tmpl/velreports/default.php index f8e1070..a07a5f0 100644 --- a/src/components/com_jed/tmpl/velreports/default.php +++ b/src/components/com_jed/tmpl/velreports/default.php @@ -152,8 +152,8 @@ date_submitted; - echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; - ?> + echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC6')) : '-'; + ?> diff --git a/src/test-todo.php b/src/test-todo.php index 7c3bc66..03ca8b6 100644 --- a/src/test-todo.php +++ b/src/test-todo.php @@ -1,7 +1,8 @@