From 8ac350e62b1a11a3b5e673f6d1da899c8c3ccd07 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 15 Dec 2017 02:26:45 +0200 Subject: [PATCH] Fixed format typo that remove a string --- README.md | 4 ++-- admin/README.txt | 4 ++-- admin/compiler/joomla_3/JViewLegacy_edit.php | 16 ++++++++-------- admin/compiler/joomla_3/JViewLegacy_list.php | 1 + admin/views/admin_fields/view.html.php | 18 +++++++++--------- .../admin_fields_conditions/view.html.php | 18 +++++++++--------- admin/views/admin_view/view.html.php | 18 +++++++++--------- admin/views/admin_views/view.html.php | 5 +++-- admin/views/admins_fields/view.html.php | 5 +++-- .../admins_fields_conditions/view.html.php | 5 +++-- .../views/component_admin_views/view.html.php | 18 +++++++++--------- admin/views/component_config/view.html.php | 18 +++++++++--------- .../component_custom_admin_menus/view.html.php | 18 +++++++++--------- .../component_custom_admin_views/view.html.php | 18 +++++++++--------- admin/views/component_dashboard/view.html.php | 18 +++++++++--------- .../component_files_folders/view.html.php | 18 +++++++++--------- .../views/component_mysql_tweaks/view.html.php | 18 +++++++++--------- admin/views/component_site_views/view.html.php | 18 +++++++++--------- admin/views/component_updates/view.html.php | 18 +++++++++--------- .../views/components_admin_views/view.html.php | 5 +++-- admin/views/components_config/view.html.php | 5 +++-- .../view.html.php | 5 +++-- .../view.html.php | 5 +++-- admin/views/components_dashboard/view.html.php | 5 +++-- .../components_files_folders/view.html.php | 5 +++-- .../components_mysql_tweaks/view.html.php | 5 +++-- .../views/components_site_views/view.html.php | 5 +++-- admin/views/components_updates/view.html.php | 5 +++-- admin/views/custom_admin_view/view.html.php | 18 +++++++++--------- admin/views/custom_admin_views/view.html.php | 5 +++-- admin/views/custom_code/view.html.php | 18 +++++++++--------- admin/views/custom_codes/view.html.php | 5 +++-- admin/views/dynamic_get/view.html.php | 18 +++++++++--------- admin/views/dynamic_gets/view.html.php | 5 +++-- admin/views/field/view.html.php | 18 +++++++++--------- admin/views/fields/view.html.php | 5 +++-- admin/views/fieldtype/view.html.php | 18 +++++++++--------- admin/views/fieldtypes/view.html.php | 5 +++-- admin/views/ftp/view.html.php | 18 +++++++++--------- admin/views/ftps/view.html.php | 5 +++-- admin/views/help_document/view.html.php | 18 +++++++++--------- admin/views/help_documents/view.html.php | 5 +++-- admin/views/joomla_component/view.html.php | 18 +++++++++--------- admin/views/joomla_components/view.html.php | 5 +++-- admin/views/language/view.html.php | 18 +++++++++--------- admin/views/language_translation/view.html.php | 18 +++++++++--------- .../views/language_translations/view.html.php | 5 +++-- admin/views/languages/view.html.php | 5 +++-- admin/views/layout/view.html.php | 18 +++++++++--------- admin/views/layouts/view.html.php | 5 +++-- admin/views/libraries/view.html.php | 5 +++-- admin/views/libraries_config/view.html.php | 5 +++-- .../libraries_files_folders_urls/view.html.php | 5 +++-- admin/views/library/view.html.php | 18 +++++++++--------- admin/views/library_config/view.html.php | 18 +++++++++--------- .../library_files_folders_urls/view.html.php | 18 +++++++++--------- admin/views/site_view/view.html.php | 18 +++++++++--------- admin/views/site_views/view.html.php | 5 +++-- admin/views/snippet/view.html.php | 18 +++++++++--------- admin/views/snippet_type/view.html.php | 18 +++++++++--------- admin/views/snippet_types/view.html.php | 5 +++-- admin/views/snippets/view.html.php | 5 +++-- admin/views/template/view.html.php | 18 +++++++++--------- admin/views/templates/view.html.php | 5 +++-- componentbuilder.xml | 2 +- 65 files changed, 374 insertions(+), 343 deletions(-) diff --git a/README.md b/README.md index 2075284fc..062d113f7 100644 --- a/README.md +++ b/README.md @@ -111,11 +111,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 14th December, 2017 ++ *Last Build*: 15th December, 2017 + *Version*: 2.6.7 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **178213** ++ *Line count*: **178243** + *File count*: **1145** + *Folder count*: **184** diff --git a/admin/README.txt b/admin/README.txt index 2075284fc..062d113f7 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -111,11 +111,11 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 14th December, 2017 ++ *Last Build*: 15th December, 2017 + *Version*: 2.6.7 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **178213** ++ *Line count*: **178243** + *File count*: **1145** + *Folder count*: **184** diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/JViewLegacy_edit.php index 1ec6b6b92..16cfce227 100644 --- a/admin/compiler/joomla_3/JViewLegacy_edit.php +++ b/admin/compiler/joomla_3/JViewLegacy_edit.php @@ -48,22 +48,22 @@ class ###Component###View###View### extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ###Component###Helper::getActions('###view###',$this->item); // get input $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; }###LINKEDVIEWITEMS### // Set the toolbar diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php index 9103cf8b6..3ee03feb1 100644 --- a/admin/compiler/joomla_3/JViewLegacy_list.php +++ b/admin/compiler/joomla_3/JViewLegacy_list.php @@ -56,6 +56,7 @@ class ###Component###View###Views### extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ###Component###Helper::getActions('###view###');###JVIEWLISTCANDO### diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index e7a4bea6d..f020e6554 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index d0ee015e8..3657bc549 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 9d8dc9499..81f49589b 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_view',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 3856c4974..e1d82ac1d 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_view'); $this->canEdit = $this->canDo->get('admin_view.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('admin_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index 2af5b8da8..dd9a265f0 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); $this->canEdit = $this->canDo->get('admin_fields.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('admins_fields'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index f3aea1e2b..a670f490d 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); $this->canEdit = $this->canDo->get('admin_fields_conditions.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('admins_fields_conditions'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php index df8294237..b0f0d8447 100644 --- a/admin/views/component_admin_views/view.html.php +++ b/admin/views/component_admin_views/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_admin_views',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php index fde6282cf..66f091374 100644 --- a/admin/views/component_config/view.html.php +++ b/admin/views/component_config/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_config extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_config',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php index 696d41677..3e67791f8 100644 --- a/admin/views/component_custom_admin_menus/view.html.php +++ b/admin/views/component_custom_admin_menus/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_menus',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php index 57b42086c..a054b09ad 100644 --- a/admin/views/component_custom_admin_views/view.html.php +++ b/admin/views/component_custom_admin_views/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_views',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php index 60ade7b2e..fe4236e3d 100644 --- a/admin/views/component_dashboard/view.html.php +++ b/admin/views/component_dashboard/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_dashboard extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_dashboard',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php index 33faaf38a..8755248bf 100644 --- a/admin/views/component_files_folders/view.html.php +++ b/admin/views/component_files_folders/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_files_folders extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_files_folders',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php index e30294048..dfc0726da 100644 --- a/admin/views/component_mysql_tweaks/view.html.php +++ b/admin/views/component_mysql_tweaks/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_mysql_tweaks',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php index 05d7e065d..d347a2290 100644 --- a/admin/views/component_site_views/view.html.php +++ b/admin/views/component_site_views/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_site_views extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_site_views',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php index 07f974670..bf3db7457 100644 --- a/admin/views/component_updates/view.html.php +++ b/admin/views/component_updates/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewComponent_updates extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('component_updates',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php index a154fa83d..9170379c2 100644 --- a/admin/views/components_admin_views/view.html.php +++ b/admin/views/components_admin_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_admin_views'); $this->canEdit = $this->canDo->get('component_admin_views.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_admin_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php index 9fc786771..4275049c0 100644 --- a/admin/views/components_config/view.html.php +++ b/admin/views/components_config/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_config extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_config'); $this->canEdit = $this->canDo->get('component_config.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_config extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_config'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php index 0ca3d1784..cdcc71dfd 100644 --- a/admin/views/components_custom_admin_menus/view.html.php +++ b/admin/views/components_custom_admin_menus/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_menus'); $this->canEdit = $this->canDo->get('component_custom_admin_menus.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_menus'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php index aad46a102..b5389f1cd 100644 --- a/admin/views/components_custom_admin_views/view.html.php +++ b/admin/views/components_custom_admin_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_custom_admin_views'); $this->canEdit = $this->canDo->get('component_custom_admin_views.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_custom_admin_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php index ce333ece9..0e6085bd5 100644 --- a/admin/views/components_dashboard/view.html.php +++ b/admin/views/components_dashboard/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_dashboard'); $this->canEdit = $this->canDo->get('component_dashboard.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_dashboard'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php index 6de7f3014..6b0967bea 100644 --- a/admin/views/components_files_folders/view.html.php +++ b/admin/views/components_files_folders/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_files_folders'); $this->canEdit = $this->canDo->get('component_files_folders.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_files_folders'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php index 91e658f9a..688d477d4 100644 --- a/admin/views/components_mysql_tweaks/view.html.php +++ b/admin/views/components_mysql_tweaks/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_mysql_tweaks'); $this->canEdit = $this->canDo->get('component_mysql_tweaks.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_mysql_tweaks'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php index 52ca8a78a..e8fdd2cc7 100644 --- a/admin/views/components_site_views/view.html.php +++ b/admin/views/components_site_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_site_views'); $this->canEdit = $this->canDo->get('component_site_views.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_site_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php index 9eb42947b..be887eeec 100644 --- a/admin/views/components_updates/view.html.php +++ b/admin/views/components_updates/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('component_updates'); $this->canEdit = $this->canDo->get('component_updates.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('components_updates'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php index 33c5430fb..36487de48 100644 --- a/admin/views/custom_admin_view/view.html.php +++ b/admin/views/custom_admin_view/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('custom_admin_view',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php index dde11f8a1..fe4d09532 100644 --- a/admin/views/custom_admin_views/view.html.php +++ b/admin/views/custom_admin_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('custom_admin_view'); $this->canEdit = $this->canDo->get('core.edit'); @@ -163,13 +164,13 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('custom_admin_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index b43322782..a91dc8f50 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewCustom_code extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('custom_code',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index d4970e9a2..18a19def3 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('custom_code'); $this->canEdit = $this->canDo->get('custom_code.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('custom_codes'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php index f8f393a18..5b47e508a 100644 --- a/admin/views/dynamic_get/view.html.php +++ b/admin/views/dynamic_get/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('dynamic_get',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php index 1fac6ca56..c1574fb14 100644 --- a/admin/views/dynamic_gets/view.html.php +++ b/admin/views/dynamic_gets/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('dynamic_get'); $this->canEdit = $this->canDo->get('dynamic_get.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('dynamic_gets'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php index 5c9548e22..711c8e7dc 100644 --- a/admin/views/field/view.html.php +++ b/admin/views/field/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewField extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('field',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php index f5f77420d..666e09b9e 100644 --- a/admin/views/fields/view.html.php +++ b/admin/views/fields/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewFields extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('field'); $this->canEdit = $this->canDo->get('field.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewFields extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('fields'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php index a49ac5bb5..41b51e6b9 100644 --- a/admin/views/fieldtype/view.html.php +++ b/admin/views/fieldtype/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewFieldtype extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('fieldtype',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Get Linked view data diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php index 5e7cfb038..12499cc49 100644 --- a/admin/views/fieldtypes/view.html.php +++ b/admin/views/fieldtypes/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('fieldtype'); $this->canEdit = $this->canDo->get('fieldtype.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('fieldtypes'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/ftp/view.html.php b/admin/views/ftp/view.html.php index 072e12ab0..1b76bd35e 100644 --- a/admin/views/ftp/view.html.php +++ b/admin/views/ftp/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewFtp extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('ftp',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Get Linked view data diff --git a/admin/views/ftps/view.html.php b/admin/views/ftps/view.html.php index 263c04c08..5bbaf7e58 100644 --- a/admin/views/ftps/view.html.php +++ b/admin/views/ftps/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewFtps extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('ftp'); $this->canEdit = $this->canDo->get('ftp.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewFtps extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('ftps'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 01dc27840..c60d41889 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewHelp_document extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('help_document',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 06b829962..b668ec6e2 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('help_document'); $this->canEdit = $this->canDo->get('help_document.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('help_documents'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index f94a17c99..5bc54dd32 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('joomla_component',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Get Linked view data diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 3b47a2f74..3fbb6bb18 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('joomla_component'); $this->canEdit = $this->canDo->get('joomla_component.edit'); @@ -173,13 +174,13 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('joomla_components'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php index d8e7041ff..59695c765 100644 --- a/admin/views/language/view.html.php +++ b/admin/views/language/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLanguage extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('language',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index 776e842e5..658e58bbc 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('language_translation',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index 55eb903cb..fadf47a71 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('language_translation'); $this->canEdit = $this->canDo->get('language_translation.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('language_translations'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php index 558a8002b..ca4c0ac7f 100644 --- a/admin/views/languages/view.html.php +++ b/admin/views/languages/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLanguages extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('language'); $this->canEdit = $this->canDo->get('language.edit'); @@ -158,13 +159,13 @@ class ComponentbuilderViewLanguages extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('languages'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php index 47edffe31..c16c04dcc 100644 --- a/admin/views/layout/view.html.php +++ b/admin/views/layout/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLayout extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('layout',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php index cc285d174..ab8ee01e5 100644 --- a/admin/views/layouts/view.html.php +++ b/admin/views/layouts/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLayouts extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('layout'); $this->canEdit = $this->canDo->get('core.edit'); @@ -163,13 +164,13 @@ class ComponentbuilderViewLayouts extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('layouts'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php index 14d45803c..096743c74 100644 --- a/admin/views/libraries/view.html.php +++ b/admin/views/libraries/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLibraries extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('library'); $this->canEdit = $this->canDo->get('library.edit'); @@ -153,13 +154,13 @@ class ComponentbuilderViewLibraries extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('libraries'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php index c07fbceab..560e82470 100644 --- a/admin/views/libraries_config/view.html.php +++ b/admin/views/libraries_config/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('library_config'); $this->canEdit = $this->canDo->get('library_config.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewLibraries_config extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('libraries_config'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php index 823d167f8..a6cd67a65 100644 --- a/admin/views/libraries_files_folders_urls/view.html.php +++ b/admin/views/libraries_files_folders_urls/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('library_files_folders_urls'); $this->canEdit = $this->canDo->get('library_files_folders_urls.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewLibraries_files_folders_urls extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('libraries_files_folders_urls'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/library/view.html.php b/admin/views/library/view.html.php index 4677426d5..d0d3fbb8d 100644 --- a/admin/views/library/view.html.php +++ b/admin/views/library/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLibrary extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('library',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/library_config/view.html.php b/admin/views/library_config/view.html.php index 51550c0cb..7e0acac19 100644 --- a/admin/views/library_config/view.html.php +++ b/admin/views/library_config/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLibrary_config extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('library_config',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/library_files_folders_urls/view.html.php b/admin/views/library_files_folders_urls/view.html.php index 2f0d5f24f..eb0a1854c 100644 --- a/admin/views/library_files_folders_urls/view.html.php +++ b/admin/views/library_files_folders_urls/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewLibrary_files_folders_urls extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('library_files_folders_urls',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php index 7ae95bba2..f1fcdad5d 100644 --- a/admin/views/site_view/view.html.php +++ b/admin/views/site_view/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewSite_view extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('site_view',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php index 0d44789c2..aa5945a76 100644 --- a/admin/views/site_views/view.html.php +++ b/admin/views/site_views/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewSite_views extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('site_view'); $this->canEdit = $this->canDo->get('core.edit'); @@ -163,13 +164,13 @@ class ComponentbuilderViewSite_views extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('site_views'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php index 546d5d566..5b5ed1077 100644 --- a/admin/views/snippet/view.html.php +++ b/admin/views/snippet/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewSnippet extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('snippet',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php index d3e930697..2482b9ff1 100644 --- a/admin/views/snippet_type/view.html.php +++ b/admin/views/snippet_type/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewSnippet_type extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('snippet_type',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php index 031526c9e..00304a8e0 100644 --- a/admin/views/snippet_types/view.html.php +++ b/admin/views/snippet_types/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('snippet_type'); $this->canEdit = $this->canDo->get('snippet_type.edit'); @@ -148,13 +149,13 @@ class ComponentbuilderViewSnippet_types extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('snippet_types'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php index 19eaa269c..a8abf5c21 100644 --- a/admin/views/snippets/view.html.php +++ b/admin/views/snippets/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewSnippets extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('snippet'); $this->canEdit = $this->canDo->get('core.edit'); @@ -168,13 +169,13 @@ class ComponentbuilderViewSnippets extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('snippets'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php index 222ce53ba..1ecfb96f0 100644 --- a/admin/views/template/view.html.php +++ b/admin/views/template/view.html.php @@ -45,22 +45,22 @@ class ComponentbuilderViewTemplate extends JViewLegacy $this->item = $this->get('Item'); $this->script = $this->get('Script'); $this->state = $this->get('State'); - // get action permissions + // get action permissions $this->canDo = ComponentbuilderHelper::getActions('template',$this->item); // get input - $jinput = JFactory::getApplication()->input; - $this->ref = $jinput->get('ref', 0, 'word'); - $this->refid = $jinput->get('refid', 0, 'int'); - $this->referral = ''; + $jinput = JFactory::getApplication()->input; + $this->ref = $jinput->get('ref', 0, 'word'); + $this->refid = $jinput->get('refid', 0, 'int'); + $this->referral = ''; if ($this->refid) { - // return to the item that refered to this item - $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; + // return to the item that refered to this item + $this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid; } elseif($this->ref) { - // return to the list view that refered to this item - $this->referral = '&ref='.(string)$this->ref; + // return to the list view that refered to this item + $this->referral = '&ref='.(string)$this->ref; } // Set the toolbar diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php index 36bf8a563..f22406d84 100644 --- a/admin/views/templates/view.html.php +++ b/admin/views/templates/view.html.php @@ -53,6 +53,7 @@ class ComponentbuilderViewTemplates extends JViewLegacy $this->user = JFactory::getUser(); $this->listOrder = $this->escape($this->state->get('list.ordering')); $this->listDirn = $this->escape($this->state->get('list.direction')); + $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('template'); $this->canEdit = $this->canDo->get('core.edit'); @@ -163,13 +164,13 @@ class ComponentbuilderViewTemplates extends JViewLegacy $help_url = ComponentbuilderHelper::getHelpUrl('templates'); if (ComponentbuilderHelper::checkString($help_url)) { - JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); + JToolbarHelper::help('COM_COMPONENTBUILDER_HELP_MANAGER', false, $help_url); } // add the options comp button if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) { - JToolBarHelper::preferences('com_componentbuilder'); + JToolBarHelper::preferences('com_componentbuilder'); } if ($this->canState) diff --git a/componentbuilder.xml b/componentbuilder.xml index d09bc2c11..2371e11a3 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 14th December, 2017 + 15th December, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder