From a9341bbd38b51ff0af49e28cfda6bb92dfdf4c11 Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Tue, 10 Mar 2015 10:48:04 +0100 Subject: [PATCH 1/3] re #4 - remove com_banners --- administrator/components/com_admin/script.php | 2 - .../com_admin/sql/updates/mysql/3.2.0.sql | 3 - .../components/com_banners/access.xml | 17 - .../components/com_banners/banners.php | 21 - .../components/com_banners/banners.xml | 68 -- .../components/com_banners/config.xml | 100 --- .../components/com_banners/controller.php | 65 -- .../com_banners/controllers/banner.php | 114 ---- .../com_banners/controllers/banners.php | 109 ---- .../com_banners/controllers/client.php | 27 - .../com_banners/controllers/clients.php | 45 -- .../com_banners/controllers/index.html | 1 - .../com_banners/controllers/tracks.php | 96 --- .../com_banners/controllers/tracks.raw.php | 113 ---- .../com_banners/helpers/banners.php | 190 ------ .../com_banners/helpers/html/banner.php | 116 ---- .../com_banners/helpers/html/index.html | 1 - .../components/com_banners/helpers/index.html | 1 - .../components/com_banners/index.html | 1 - .../components/com_banners/models/banner.php | 589 ------------------ .../components/com_banners/models/banners.php | 275 -------- .../components/com_banners/models/client.php | 158 ----- .../components/com_banners/models/clients.php | 194 ------ .../com_banners/models/download.php | 84 --- .../models/fields/bannerclient.php | 46 -- .../com_banners/models/fields/clicks.php | 45 -- .../com_banners/models/fields/impmade.php | 45 -- .../com_banners/models/fields/imptotal.php | 50 -- .../com_banners/models/fields/index.html | 1 - .../com_banners/models/forms/banner.xml | 220 ------- .../com_banners/models/forms/client.xml | 114 ---- .../com_banners/models/forms/download.xml | 19 - .../models/forms/filter_banners.xml | 92 --- .../models/forms/filter_clients.xml | 71 --- .../com_banners/models/forms/index.html | 1 - .../components/com_banners/models/index.html | 1 - .../components/com_banners/models/tracks.php | 542 ---------------- .../components/com_banners/sql/index.html | 1 - .../com_banners/sql/install.mysql.utf8.sql | 69 -- .../com_banners/sql/uninstall.mysql.utf8.sql | 6 - .../components/com_banners/tables/banner.php | 375 ----------- .../components/com_banners/tables/client.php | 126 ---- .../components/com_banners/tables/index.html | 1 - .../com_banners/views/banner/index.html | 1 - .../com_banners/views/banner/tmpl/edit.php | 91 --- .../com_banners/views/banner/tmpl/index.html | 1 - .../com_banners/views/banner/view.html.php | 113 ---- .../com_banners/views/banners/index.html | 1 - .../views/banners/tmpl/default.php | 213 ------- .../views/banners/tmpl/default_batch.php | 51 -- .../com_banners/views/banners/tmpl/index.html | 1 - .../com_banners/views/banners/view.html.php | 173 ----- .../com_banners/views/client/index.html | 1 - .../com_banners/views/client/tmpl/edit.php | 60 -- .../com_banners/views/client/tmpl/index.html | 1 - .../com_banners/views/client/view.html.php | 112 ---- .../com_banners/views/clients/index.html | 1 - .../views/clients/tmpl/default.php | 158 ----- .../com_banners/views/clients/tmpl/index.html | 1 - .../com_banners/views/clients/view.html.php | 125 ---- .../com_banners/views/download/index.html | 1 - .../views/download/tmpl/default.php | 32 - .../views/download/tmpl/index.html | 1 - .../com_banners/views/download/view.html.php | 44 -- .../components/com_banners/views/index.html | 1 - .../com_banners/views/tracks/index.html | 1 - .../com_banners/views/tracks/tmpl/default.php | 145 ----- .../com_banners/views/tracks/tmpl/index.html | 1 - .../com_banners/views/tracks/view.html.php | 129 ---- .../com_banners/views/tracks/view.raw.php | 48 -- .../language/en-GB/en-GB.com_banners.ini | 221 ------- .../language/en-GB/en-GB.com_banners.sys.ini | 13 - administrator/language/en-GB/en-GB.ini | 1 - administrator/language/en-GB/install.xml | 2 - .../hathor/html/com_banners/banner/edit.php | 113 ---- .../hathor/html/com_banners/banner/index.html | 1 - .../html/com_banners/banners/default.php | 228 ------- .../html/com_banners/banners/index.html | 1 - .../hathor/html/com_banners/client/edit.php | 100 --- .../hathor/html/com_banners/client/index.html | 1 - .../html/com_banners/clients/default.php | 143 ----- .../html/com_banners/clients/index.html | 1 - .../hathor/html/com_banners/index.html | 1 - .../html/com_banners/tracks/default.php | 130 ---- .../hathor/html/com_banners/tracks/index.html | 1 - components/com_banners/banners.php | 14 - components/com_banners/controller.php | 40 -- components/com_banners/helpers/banner.php | 48 -- components/com_banners/helpers/category.php | 35 -- components/com_banners/helpers/index.html | 1 - components/com_banners/index.html | 1 - components/com_banners/models/banner.php | 209 ------- components/com_banners/models/banners.php | 312 ---------- components/com_banners/models/index.html | 1 - components/com_banners/router.php | 145 ----- installation/sql/mysql/joomla.sql | 12 - language/en-GB/en-GB.mod_banners.ini | 28 - language/en-GB/en-GB.mod_banners.sys.ini | 9 - media/com_banners/banner.js | 20 - modules/mod_banners/helper.php | 50 -- modules/mod_banners/index.html | 1 - modules/mod_banners/mod_banners.php | 23 - modules/mod_banners/mod_banners.xml | 147 ----- modules/mod_banners/tmpl/default.php | 114 ---- modules/mod_banners/tmpl/index.html | 1 - plugins/content/joomla/joomla.php | 1 - 106 files changed, 7891 deletions(-) delete mode 100644 administrator/components/com_banners/access.xml delete mode 100644 administrator/components/com_banners/banners.php delete mode 100644 administrator/components/com_banners/banners.xml delete mode 100644 administrator/components/com_banners/config.xml delete mode 100644 administrator/components/com_banners/controller.php delete mode 100644 administrator/components/com_banners/controllers/banner.php delete mode 100644 administrator/components/com_banners/controllers/banners.php delete mode 100644 administrator/components/com_banners/controllers/client.php delete mode 100644 administrator/components/com_banners/controllers/clients.php delete mode 100644 administrator/components/com_banners/controllers/index.html delete mode 100644 administrator/components/com_banners/controllers/tracks.php delete mode 100644 administrator/components/com_banners/controllers/tracks.raw.php delete mode 100644 administrator/components/com_banners/helpers/banners.php delete mode 100644 administrator/components/com_banners/helpers/html/banner.php delete mode 100644 administrator/components/com_banners/helpers/html/index.html delete mode 100644 administrator/components/com_banners/helpers/index.html delete mode 100644 administrator/components/com_banners/index.html delete mode 100644 administrator/components/com_banners/models/banner.php delete mode 100644 administrator/components/com_banners/models/banners.php delete mode 100644 administrator/components/com_banners/models/client.php delete mode 100644 administrator/components/com_banners/models/clients.php delete mode 100644 administrator/components/com_banners/models/download.php delete mode 100644 administrator/components/com_banners/models/fields/bannerclient.php delete mode 100644 administrator/components/com_banners/models/fields/clicks.php delete mode 100644 administrator/components/com_banners/models/fields/impmade.php delete mode 100644 administrator/components/com_banners/models/fields/imptotal.php delete mode 100644 administrator/components/com_banners/models/fields/index.html delete mode 100644 administrator/components/com_banners/models/forms/banner.xml delete mode 100644 administrator/components/com_banners/models/forms/client.xml delete mode 100644 administrator/components/com_banners/models/forms/download.xml delete mode 100644 administrator/components/com_banners/models/forms/filter_banners.xml delete mode 100644 administrator/components/com_banners/models/forms/filter_clients.xml delete mode 100644 administrator/components/com_banners/models/forms/index.html delete mode 100644 administrator/components/com_banners/models/index.html delete mode 100644 administrator/components/com_banners/models/tracks.php delete mode 100644 administrator/components/com_banners/sql/index.html delete mode 100644 administrator/components/com_banners/sql/install.mysql.utf8.sql delete mode 100644 administrator/components/com_banners/sql/uninstall.mysql.utf8.sql delete mode 100644 administrator/components/com_banners/tables/banner.php delete mode 100644 administrator/components/com_banners/tables/client.php delete mode 100644 administrator/components/com_banners/tables/index.html delete mode 100644 administrator/components/com_banners/views/banner/index.html delete mode 100644 administrator/components/com_banners/views/banner/tmpl/edit.php delete mode 100644 administrator/components/com_banners/views/banner/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/banner/view.html.php delete mode 100644 administrator/components/com_banners/views/banners/index.html delete mode 100644 administrator/components/com_banners/views/banners/tmpl/default.php delete mode 100644 administrator/components/com_banners/views/banners/tmpl/default_batch.php delete mode 100644 administrator/components/com_banners/views/banners/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/banners/view.html.php delete mode 100644 administrator/components/com_banners/views/client/index.html delete mode 100644 administrator/components/com_banners/views/client/tmpl/edit.php delete mode 100644 administrator/components/com_banners/views/client/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/client/view.html.php delete mode 100644 administrator/components/com_banners/views/clients/index.html delete mode 100644 administrator/components/com_banners/views/clients/tmpl/default.php delete mode 100644 administrator/components/com_banners/views/clients/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/clients/view.html.php delete mode 100644 administrator/components/com_banners/views/download/index.html delete mode 100644 administrator/components/com_banners/views/download/tmpl/default.php delete mode 100644 administrator/components/com_banners/views/download/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/download/view.html.php delete mode 100644 administrator/components/com_banners/views/index.html delete mode 100644 administrator/components/com_banners/views/tracks/index.html delete mode 100644 administrator/components/com_banners/views/tracks/tmpl/default.php delete mode 100644 administrator/components/com_banners/views/tracks/tmpl/index.html delete mode 100644 administrator/components/com_banners/views/tracks/view.html.php delete mode 100644 administrator/components/com_banners/views/tracks/view.raw.php delete mode 100644 administrator/language/en-GB/en-GB.com_banners.ini delete mode 100644 administrator/language/en-GB/en-GB.com_banners.sys.ini delete mode 100644 administrator/templates/hathor/html/com_banners/banner/edit.php delete mode 100644 administrator/templates/hathor/html/com_banners/banner/index.html delete mode 100644 administrator/templates/hathor/html/com_banners/banners/default.php delete mode 100644 administrator/templates/hathor/html/com_banners/banners/index.html delete mode 100644 administrator/templates/hathor/html/com_banners/client/edit.php delete mode 100644 administrator/templates/hathor/html/com_banners/client/index.html delete mode 100644 administrator/templates/hathor/html/com_banners/clients/default.php delete mode 100644 administrator/templates/hathor/html/com_banners/clients/index.html delete mode 100644 administrator/templates/hathor/html/com_banners/index.html delete mode 100644 administrator/templates/hathor/html/com_banners/tracks/default.php delete mode 100644 administrator/templates/hathor/html/com_banners/tracks/index.html delete mode 100644 components/com_banners/banners.php delete mode 100644 components/com_banners/controller.php delete mode 100644 components/com_banners/helpers/banner.php delete mode 100644 components/com_banners/helpers/category.php delete mode 100644 components/com_banners/helpers/index.html delete mode 100644 components/com_banners/index.html delete mode 100644 components/com_banners/models/banner.php delete mode 100644 components/com_banners/models/banners.php delete mode 100644 components/com_banners/models/index.html delete mode 100644 components/com_banners/router.php delete mode 100644 language/en-GB/en-GB.mod_banners.ini delete mode 100644 language/en-GB/en-GB.mod_banners.sys.ini delete mode 100644 media/com_banners/banner.js delete mode 100644 modules/mod_banners/helper.php delete mode 100644 modules/mod_banners/index.html delete mode 100644 modules/mod_banners/mod_banners.php delete mode 100644 modules/mod_banners/mod_banners.xml delete mode 100644 modules/mod_banners/tmpl/default.php delete mode 100644 modules/mod_banners/tmpl/index.html diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 8d6f889d47..4ad657b25b 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -95,7 +95,6 @@ protected function updateManifestCaches() $extensions[] = array('component', 'com_wrapper', '', 0); $extensions[] = array('component', 'com_admin', '', 1); $extensions[] = array('component', 'com_ajax', '', 1); - $extensions[] = array('component', 'com_banners', '', 1); $extensions[] = array('component', 'com_cache', '', 1); $extensions[] = array('component', 'com_categories', '', 1); $extensions[] = array('component', 'com_checkin', '', 1); @@ -962,7 +961,6 @@ public function deleteUnexistingFiles() '/media/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js', '/media/editors/tinymce/jscripts/tiny_mce/utils/mctabs.js', '/media/editors/tinymce/jscripts/tiny_mce/utils/validate.js', - '/administrator/components/com_banners/models/fields/ordering.php', '/administrator/components/com_contact/models/fields/ordering.php', '/administrator/components/com_newsfeeds/models/fields/ordering.php', '/administrator/components/com_plugins/models/fields/ordering.php', diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql index d9d61a2d47..40eda35f1f 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql @@ -10,9 +10,6 @@ UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administ UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_tags\\/models\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE `type_alias` = 'com_tags.tag'; INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES -('Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'), -('Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'), -('Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'), ('User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'), ('User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'); diff --git a/administrator/components/com_banners/access.xml b/administrator/components/com_banners/access.xml deleted file mode 100644 index 0a8b8b395e..0000000000 --- a/administrator/components/com_banners/access.xml +++ /dev/null @@ -1,17 +0,0 @@ - - -
- - - - - - -
-
- - - - -
- diff --git a/administrator/components/com_banners/banners.php b/administrator/components/com_banners/banners.php deleted file mode 100644 index c0d5c6fb8b..0000000000 --- a/administrator/components/com_banners/banners.php +++ /dev/null @@ -1,21 +0,0 @@ -authorise('core.manage', 'com_banners')) -{ - return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR')); -} - -// Execute the task. -$controller = JControllerLegacy::getInstance('Banners'); -$controller->execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); diff --git a/administrator/components/com_banners/banners.xml b/administrator/components/com_banners/banners.xml deleted file mode 100644 index f7ac8c3e5f..0000000000 --- a/administrator/components/com_banners/banners.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - com_banners - Joomla! Project - April 2006 - (C) 2005 - 2014 Open Source Matters. All rights reserved. - - GNU General Public License version 2 or later; see - LICENSE.txt - admin@joomla.org - www.joomla.org - 3.0.0 - COM_BANNERS_XML_DESCRIPTION - - - - sql/install.mysql.utf8.sql - - - - - sql/uninstall.mysql.utf8.sql - - - - - banners.php - controller.php - index.html - router.php - helpers - models - - - com_banners - - - com_banners_banners - com_banners_categories - com_banners_clients - com_banners_tracks - - - access.xml - banners.php - config.xml - controller.php - index.html - controllers - helpers - models - tables - views - - - language/en-GB.com_banners.ini - language/en-GB.com_banners.sys.ini - - - - diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml deleted file mode 100644 index 1e056e3777..0000000000 --- a/administrator/components/com_banners/config.xml +++ /dev/null @@ -1,100 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
- -
- - -
- diff --git a/administrator/components/com_banners/controller.php b/administrator/components/com_banners/controller.php deleted file mode 100644 index 0c8e9236cc..0000000000 --- a/administrator/components/com_banners/controller.php +++ /dev/null @@ -1,65 +0,0 @@ -input->get('view', 'banners'); - $layout = $this->input->get('layout', 'default'); - $id = $this->input->getInt('id'); - - // Check for edit form. - if ($view == 'banner' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.banner', $id)) - { - - // Somehow the person just went to the form - we don't allow that. - $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); - $this->setMessage($this->getError(), 'error'); - $this->setRedirect(JRoute::_('index.php?option=com_banners&view=banners', false)); - - return false; - } - elseif ($view == 'client' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.client', $id)) - { - - // Somehow the person just went to the form - we don't allow that. - $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); - $this->setMessage($this->getError(), 'error'); - $this->setRedirect(JRoute::_('index.php?option=com_banners&view=clients', false)); - - return false; - } - - parent::display(); - - return $this; - } -} diff --git a/administrator/components/com_banners/controllers/banner.php b/administrator/components/com_banners/controllers/banner.php deleted file mode 100644 index 4b32be74ab..0000000000 --- a/administrator/components/com_banners/controllers/banner.php +++ /dev/null @@ -1,114 +0,0 @@ -input->getInt('filter_category_id'); - $categoryId = JArrayHelper::getValue($data, 'catid', $filter, 'int'); - $allow = null; - - if ($categoryId) - { - // If the category has been passed in the URL check it. - $allow = $user->authorise('core.create', $this->option . '.category.' . $categoryId); - } - - if ($allow === null) - { - // In the absence of better information, revert to the component permissions. - return parent::allowAdd($data); - } - else - { - return $allow; - } - } - - /** - * Method override to check if you can edit an existing record. - * - * @param array $data An array of input data. - * @param string $key The name of the key for the primary key. - * - * @return boolean - * - * @since 1.6 - */ - protected function allowEdit($data = array(), $key = 'id') - { - $user = JFactory::getUser(); - $recordId = (int) isset($data[$key]) ? $data[$key] : 0; - $categoryId = 0; - - if ($recordId) - { - $categoryId = (int) $this->getModel()->getItem($recordId)->catid; - } - - if ($categoryId) - { - // The category has been set. Check the category permissions. - return $user->authorise('core.edit', $this->option . '.category.' . $categoryId); - } - else - { - // Since there is no asset tracking, revert to the component permissions. - return parent::allowEdit($data, $key); - } - } - - /** - * Method to run batch operations. - * - * @param string $model The model - * - * @return boolean True on success. - * - * @since 2.5 - */ - public function batch($model = null) - { - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - // Set the model - $model = $this->getModel('Banner', '', array()); - - // Preset the redirect - $this->setRedirect(JRoute::_('index.php?option=com_banners&view=banners' . $this->getRedirectToListAppend(), false)); - - return parent::batch($model); - } -} diff --git a/administrator/components/com_banners/controllers/banners.php b/administrator/components/com_banners/controllers/banners.php deleted file mode 100644 index bb147df43f..0000000000 --- a/administrator/components/com_banners/controllers/banners.php +++ /dev/null @@ -1,109 +0,0 @@ -registerTask('sticky_unpublish', 'sticky_publish'); - } - - /** - * Proxy for getModel. - * - * @param string $name The model name. Optional. - * @param string $prefix The class prefix. Optional. - * @param array $config Configuration array for model. Optional. - * - * @return object The model. - * - * @since 1.6 - */ - public function getModel($name = 'Banner', $prefix = 'BannersModel', $config = array('ignore_request' => true)) - { - $model = parent::getModel($name, $prefix, $config); - - return $model; - } - - /** - * Stick items - * - * @return void - * - * @since 1.6 - */ - public function sticky_publish() - { - // Check for request forgeries. - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - $ids = $this->input->get('cid', array(), 'array'); - $values = array('sticky_publish' => 1, 'sticky_unpublish' => 0); - $task = $this->getTask(); - $value = JArrayHelper::getValue($values, $task, 0, 'int'); - - if (empty($ids)) - { - JError::raiseWarning(500, JText::_('COM_BANNERS_NO_BANNERS_SELECTED')); - } - else - { - // Get the model. - $model = $this->getModel(); - - // Change the state of the records. - if (!$model->stick($ids, $value)) - { - JError::raiseWarning(500, $model->getError()); - } - else - { - if ($value == 1) - { - $ntext = 'COM_BANNERS_N_BANNERS_STUCK'; - } - else - { - $ntext = 'COM_BANNERS_N_BANNERS_UNSTUCK'; - } - - $this->setMessage(JText::plural($ntext, count($ids))); - } - } - - $this->setRedirect('index.php?option=com_banners&view=banners'); - } -} diff --git a/administrator/components/com_banners/controllers/client.php b/administrator/components/com_banners/controllers/client.php deleted file mode 100644 index 1554db24ce..0000000000 --- a/administrator/components/com_banners/controllers/client.php +++ /dev/null @@ -1,27 +0,0 @@ - true)) - { - $model = parent::getModel($name, $prefix, $config); - - return $model; - } -} diff --git a/administrator/components/com_banners/controllers/index.html b/administrator/components/com_banners/controllers/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/controllers/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/controllers/tracks.php b/administrator/components/com_banners/controllers/tracks.php deleted file mode 100644 index 0c2905bc8a..0000000000 --- a/administrator/components/com_banners/controllers/tracks.php +++ /dev/null @@ -1,96 +0,0 @@ - true)) - { - $model = parent::getModel($name, $prefix, $config); - - return $model; - } - - /** - * Method to remove a record. - * - * @return void - * - * @since 1.6 - */ - public function delete() - { - // Check for request forgeries. - JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); - - // Get the model. - $model = $this->getModel(); - - // Load the filter state. - $app = JFactory::getApplication(); - - $type = $app->getUserState($this->context . '.filter.type'); - $model->setState('filter.type', $type); - - $begin = $app->getUserState($this->context . '.filter.begin'); - $model->setState('filter.begin', $begin); - - $end = $app->getUserState($this->context . '.filter.end'); - $model->setState('filter.end', $end); - - $categoryId = $app->getUserState($this->context . '.filter.category_id'); - $model->setState('filter.category_id', $categoryId); - - $clientId = $app->getUserState($this->context . '.filter.client_id'); - $model->setState('filter.client_id', $clientId); - - $model->setState('list.limit', 0); - $model->setState('list.start', 0); - - $count = $model->getTotal(); - - // Remove the items. - if (!$model->delete()) - { - JError::raiseWarning(500, $model->getError()); - } - else - { - $this->setMessage(JText::plural('COM_BANNERS_TRACKS_N_ITEMS_DELETED', $count)); - } - - $this->setRedirect('index.php?option=com_banners&view=tracks'); - } -} diff --git a/administrator/components/com_banners/controllers/tracks.raw.php b/administrator/components/com_banners/controllers/tracks.raw.php deleted file mode 100644 index 6b9db7052e..0000000000 --- a/administrator/components/com_banners/controllers/tracks.raw.php +++ /dev/null @@ -1,113 +0,0 @@ - true)); - - return $model; - } - - /** - * Display method for the raw track data. - * - * @param boolean $cachable If true, the view output will be cached - * @param array $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. - * - * @return JController This object to support chaining. - * - * @since 1.5 - * @todo This should be done as a view, not here! - */ - public function display($cachable = false, $urlparams = false) - { - // Get the document object. - $document = JFactory::getDocument(); - $vName = 'tracks'; - $vFormat = 'raw'; - - // Get and render the view. - if ($view = $this->getView($vName, $vFormat)) - { - // Get the model for the view. - $model = $this->getModel($vName); - - // Load the filter state. - $app = JFactory::getApplication(); - - $type = $app->getUserState($this->context . '.filter.type'); - $model->setState('filter.type', $type); - - $begin = $app->getUserState($this->context . '.filter.begin'); - $model->setState('filter.begin', $begin); - - $end = $app->getUserState($this->context . '.filter.end'); - $model->setState('filter.end', $end); - - $categoryId = $app->getUserState($this->context . '.filter.category_id'); - $model->setState('filter.category_id', $categoryId); - - $clientId = $app->getUserState($this->context . '.filter.client_id'); - $model->setState('filter.client_id', $clientId); - - $model->setState('list.limit', 0); - $model->setState('list.start', 0); - - $input = JFactory::getApplication()->input; - $form = $input->get('jform', array(), 'array'); - - $model->setState('basename', $form['basename']); - $model->setState('compressed', $form['compressed']); - - $config = JFactory::getConfig(); - $cookie_domain = $config->get('cookie_domain', ''); - $cookie_path = $config->get('cookie_path', '/'); - - setcookie(JApplication::getHash($this->context . '.basename'), $form['basename'], time() + 365 * 86400, $cookie_path, $cookie_domain); - setcookie(JApplication::getHash($this->context . '.compressed'), $form['compressed'], time() + 365 * 86400, $cookie_path, $cookie_domain); - - // Push the model into the view (as default). - $view->setModel($model, true); - - // Push document object into the view. - $view->document = $document; - - $view->display(); - } - } -} diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php deleted file mode 100644 index f127522b81..0000000000 --- a/administrator/components/com_banners/helpers/banners.php +++ /dev/null @@ -1,190 +0,0 @@ -getNullDate(); - $now = JFactory::getDate(); - $query = $db->getQuery(true) - ->select('*') - ->from('#__banners') - ->where($db->quote($now) . ' >= ' . $db->quote('reset')) - ->where($db->quoteName('reset') . ' != ' . $db->quote($nullDate) . ' AND ' . $db->quoteName('reset') . '!=NULL') - ->where('(' . $db->quoteName('checked_out') . ' = 0 OR ' . $db->quoteName('checked_out') . ' = ' . (int) $db->quote($user->id) . ')'); - $db->setQuery($query); - - try - { - $rows = $db->loadObjectList(); - } - catch (RuntimeException $e) - { - JError::raiseWarning(500, $e->getMessage()); - - return false; - } - - JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables'); - - foreach ($rows as $row) - { - $purchase_type = $row->purchase_type; - - if ($purchase_type < 0 && $row->cid) - { - $client = JTable::getInstance('Client', 'BannersTable'); - $client->load($row->cid); - $purchase_type = $client->purchase_type; - } - - if ($purchase_type < 0) - { - $params = JComponentHelper::getParams('com_banners'); - $purchase_type = $params->get('purchase_type'); - } - - switch ($purchase_type) - { - case 1: - $reset = $nullDate; - break; - case 2: - $date = JFactory::getDate('+1 year ' . date('Y-m-d', strtotime('now'))); - $reset = $db->quote($date->toSql()); - break; - case 3: - $date = JFactory::getDate('+1 month ' . date('Y-m-d', strtotime('now'))); - $reset = $db->quote($date->toSql()); - break; - case 4: - $date = JFactory::getDate('+7 day ' . date('Y-m-d', strtotime('now'))); - $reset = $db->quote($date->toSql()); - break; - case 5: - $date = JFactory::getDate('+1 day ' . date('Y-m-d', strtotime('now'))); - $reset = $db->quote($date->toSql()); - break; - } - - // Update the row ordering field. - $query->clear() - ->update($db->quoteName('#__banners')) - ->set($db->quoteName('reset') . ' = ' . $db->quote($reset)) - ->set($db->quoteName('impmade') . ' = ' . $db->quote(0)) - ->set($db->quoteName('clicks') . ' = ' . $db->quote(0)) - ->where($db->quoteName('id') . ' = ' . $db->quote($row->id)); - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseWarning(500, $db->getMessage()); - - return false; - } - } - - return true; - } - - /** - * Get client list in text/value format for a select field - * - * @return array - */ - public static function getClientOptions() - { - $options = array(); - - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('id As value, name As text') - ->from('#__banner_clients AS a') - ->where('a.state = 1') - ->order('a.name'); - - // Get the options. - $db->setQuery($query); - - try - { - $options = $db->loadObjectList(); - } - catch (RuntimeException $e) - { - JError::raiseWarning(500, $e->getMessage()); - } - - // Merge any additional options in the XML definition. - // $options = array_merge(parent::getOptions(), $options); - - array_unshift($options, JHtml::_('select.option', '0', JText::_('COM_BANNERS_NO_CLIENT'))); - - return $options; - } -} diff --git a/administrator/components/com_banners/helpers/html/banner.php b/administrator/components/com_banners/helpers/html/banner.php deleted file mode 100644 index 30ee8a60bf..0000000000 --- a/administrator/components/com_banners/helpers/html/banner.php +++ /dev/null @@ -1,116 +0,0 @@ -', - JText::_('COM_BANNERS_BATCH_CLIENT_LABEL'), - '', - '' - ); - - return implode("\n", $lines); - } - - /** - * Method to get the field options. - * - * @return array The field option objects. - * - * @since 1.6 - */ - public static function clientlist() - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('id As value, name As text') - ->from('#__banner_clients AS a') - ->order('a.name'); - - // Get the options. - $db->setQuery($query); - - try - { - $options = $db->loadObjectList(); - } - catch (RuntimeException $e) - { - JError::raiseWarning(500, $e->getMessage()); - } - - return $options; - } - - /** - * Returns a pinned state on a grid - * - * @param integer $value The state value. - * @param integer $i The row index - * @param boolean $enabled An optional setting for access control on the action. - * @param string $checkbox An optional prefix for checkboxes. - * - * @return string The Html code - * - * @see JHtmlJGrid::state - * - * @since 2.5.5 - */ - public static function pinned($value, $i, $enabled = true, $checkbox = 'cb') - { - $states = array( - 1 => array( - 'sticky_unpublish', - 'COM_BANNERS_BANNERS_PINNED', - 'COM_BANNERS_BANNERS_HTML_PIN_BANNER', - 'COM_BANNERS_BANNERS_PINNED', - true, - 'publish', - 'publish' - ), - 0 => array( - 'sticky_publish', - 'COM_BANNERS_BANNERS_UNPINNED', - 'COM_BANNERS_BANNERS_HTML_UNPIN_BANNER', - 'COM_BANNERS_BANNERS_UNPINNED', - true, - 'unpublish', - 'unpublish' - ), - ); - - return JHtml::_('jgrid.state', $states, $value, $i, 'banners.', $enabled, true, $checkbox); - } -} diff --git a/administrator/components/com_banners/helpers/html/index.html b/administrator/components/com_banners/helpers/html/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/helpers/html/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/helpers/index.html b/administrator/components/com_banners/helpers/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/helpers/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/index.html b/administrator/components/com_banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php deleted file mode 100644 index 54948fc342..0000000000 --- a/administrator/components/com_banners/models/banner.php +++ /dev/null @@ -1,589 +0,0 @@ -setError(JText::_('JGLOBAL_NO_ITEM_SELECTED')); - - return false; - } - - $done = false; - - if (!empty($commands['category_id'])) - { - $cmd = JArrayHelper::getValue($commands, 'move_copy', 'c'); - - if ($cmd == 'c') - { - $result = $this->batchCopy($commands['category_id'], $pks, $contexts); - - if (is_array($result)) - { - $pks = $result; - } - else - { - return false; - } - } - elseif ($cmd == 'm' && !$this->batchMove($commands['category_id'], $pks, $contexts)) - { - return false; - } - - $done = true; - } - - if (strlen($commands['client_id']) > 0) - { - if (!$this->batchClient($commands['client_id'], $pks, $contexts)) - { - return false; - } - - $done = true; - } - - if (!empty($commands['language_id'])) - { - if (!$this->batchLanguage($commands['language_id'], $pks, $contexts)) - { - return false; - } - - $done = true; - } - - if (!$done) - { - $this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION')); - - return false; - } - - // Clear the cache - $this->cleanCache(); - - return true; - } - - /** - * Batch client changes for a group of banners. - * - * @param string $value The new value matching a client. - * @param array $pks An array of row IDs. - * @param array $contexts An array of item contexts. - * - * @return boolean True if successful, false otherwise and internal error is set. - * - * @since 2.5 - */ - protected function batchClient($value, $pks, $contexts) - { - // Set the variables - $user = JFactory::getUser(); - $table = $this->getTable(); - - foreach ($pks as $pk) - { - if ($user->authorise('core.edit', $contexts[$pk])) - { - $table->reset(); - $table->load($pk); - $table->cid = (int) $value; - - if (!$table->store()) - { - $this->setError($table->getError()); - - return false; - } - } - else - { - $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); - - return false; - } - } - - // Clean the cache - $this->cleanCache(); - - return true; - } - - /** - * Batch copy items to a new category or current. - * - * @param integer $value The new category. - * @param array $pks An array of row IDs. - * @param array $contexts An array of item contexts. - * - * @return mixed An array of new IDs on success, boolean false on failure. - * - * @since 2.5 - */ - protected function batchCopy($value, $pks, $contexts) - { - $categoryId = (int) $value; - - $table = $this->getTable(); - $i = 0; - - // Check that the category exists - if ($categoryId) - { - $categoryTable = JTable::getInstance('Category'); - - if (!$categoryTable->load($categoryId)) - { - if ($error = $categoryTable->getError()) - { - // Fatal error - $this->setError($error); - - return false; - } - else - { - $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND')); - - return false; - } - } - } - - if (empty($categoryId)) - { - $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND')); - - return false; - } - - // Check that the user has create permission for the component - $user = JFactory::getUser(); - - if (!$user->authorise('core.create', 'com_banners.category.' . $categoryId)) - { - $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE')); - - return false; - } - - // Parent exists so we let's proceed - while (!empty($pks)) - { - // Pop the first ID off the stack - $pk = array_shift($pks); - - $table->reset(); - - // Check that the row actually exists - if (!$table->load($pk)) - { - if ($error = $table->getError()) - { - // Fatal error - $this->setError($error); - - return false; - } - else - { - // Not fatal error - $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk)); - continue; - } - } - - // Alter the title & alias - $data = $this->generateNewTitle($categoryId, $table->alias, $table->name); - $table->name = $data['0']; - $table->alias = $data['1']; - - // Reset the ID because we are making a copy - $table->id = 0; - - // New category ID - $table->catid = $categoryId; - - // TODO: Deal with ordering? - // $table->ordering = 1; - - // Check the row. - if (!$table->check()) - { - $this->setError($table->getError()); - - return false; - } - - // Store the row. - if (!$table->store()) - { - $this->setError($table->getError()); - - return false; - } - - // Get the new item ID - $newId = $table->get('id'); - - // Add the new ID to the array - $newIds[$i] = $newId; - $i++; - } - - // Clean the cache - $this->cleanCache(); - - return $newIds; - } - - /** - * Method to test whether a record can be deleted. - * - * @param object $record A record object. - * - * @return boolean True if allowed to delete the record. Defaults to the permission set in the component. - * - * @since 1.6 - */ - protected function canDelete($record) - { - if (!empty($record->id)) - { - if ($record->state != -2) - { - return; - } - - $user = JFactory::getUser(); - - if (!empty($record->catid)) - { - return $user->authorise('core.delete', 'com_banners.category.' . (int) $record->catid); - } - else - { - return parent::canDelete($record); - } - } - } - - /** - * Method to test whether a record can have its state changed. - * - * @param object $record A record object. - * - * @return boolean True if allowed to change the state of the record. Defaults to the permission set in the component. - * - * @since 1.6 - */ - protected function canEditState($record) - { - $user = JFactory::getUser(); - - // Check against the category. - if (!empty($record->catid)) - { - return $user->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid); - } - // Default to component settings if category not known. - else - { - return parent::canEditState($record); - } - } - - /** - * Returns a JTable object, always creating it. - * - * @param string $type The table type to instantiate. [optional] - * @param string $prefix A prefix for the table class name. [optional] - * @param array $config Configuration array for model. [optional] - * - * @return JTable A database object - * - * @since 1.6 - */ - public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = array()) - { - return JTable::getInstance($type, $prefix, $config); - } - - /** - * Method to get the record form. - * - * @param array $data Data for the form. [optional] - * @param boolean $loadData True if the form is to load its own data (default case), false if not. [optional] - * - * @return mixed A JForm object on success, false on failure - * - * @since 1.6 - */ - public function getForm($data = array(), $loadData = true) - { - // Get the form. - $form = $this->loadForm('com_banners.banner', 'banner', array('control' => 'jform', 'load_data' => $loadData)); - - if (empty($form)) - { - return false; - } - - // Determine correct permissions to check. - if ($this->getState('banner.id')) - { - // Existing record. Can only edit in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.edit'); - } - else - { - // New record. Can only create in selected categories. - $form->setFieldAttribute('catid', 'action', 'core.create'); - } - - // Modify the form based on access controls. - if (!$this->canEditState((object) $data)) - { - // Disable fields for display. - $form->setFieldAttribute('ordering', 'disabled', 'true'); - $form->setFieldAttribute('publish_up', 'disabled', 'true'); - $form->setFieldAttribute('publish_down', 'disabled', 'true'); - $form->setFieldAttribute('state', 'disabled', 'true'); - $form->setFieldAttribute('sticky', 'disabled', 'true'); - - // Disable fields while saving. - // The controller has already verified this is a record you can edit. - $form->setFieldAttribute('ordering', 'filter', 'unset'); - $form->setFieldAttribute('publish_up', 'filter', 'unset'); - $form->setFieldAttribute('publish_down', 'filter', 'unset'); - $form->setFieldAttribute('state', 'filter', 'unset'); - $form->setFieldAttribute('sticky', 'filter', 'unset'); - } - - return $form; - } - - /** - * Method to get the data that should be injected in the form. - * - * @return mixed The data for the form. - * - * @since 1.6 - */ - protected function loadFormData() - { - // Check the session for previously entered form data. - $app = JFactory::getApplication(); - $data = $app->getUserState('com_banners.edit.banner.data', array()); - - if (empty($data)) - { - $data = $this->getItem(); - - // Prime some default values. - if ($this->getState('banner.id') == 0) - { - $filters = (array) $app->getUserState('com_banners.banners.filter'); - $filterCatId = isset($filters['category_id']) ? $filters['category_id'] : null; - - $data->set('catid', $app->input->getInt('catid', $filterCatId)); - } - } - - $this->preprocessData('com_banners.banner', $data); - - return $data; - } - - /** - * Method to stick records. - * - * @param array &$pks The ids of the items to publish. - * @param integer $value The value of the published state - * - * @return boolean True on success. - * - * @since 1.6 - */ - public function stick(&$pks, $value = 1) - { - $user = JFactory::getUser(); - $table = $this->getTable(); - $pks = (array) $pks; - - // Access checks. - foreach ($pks as $i => $pk) - { - if ($table->load($pk)) - { - if (!$this->canEditState($table)) - { - // Prune items that you can't change. - unset($pks[$i]); - JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); - } - } - } - - // Attempt to change the state of the records. - if (!$table->stick($pks, $value, $user->get('id'))) - { - $this->setError($table->getError()); - - return false; - } - - return true; - } - - /** - * A protected method to get a set of ordering conditions. - * - * @param JTable $table A record object. - * - * @return array An array of conditions to add to add to ordering queries. - * - * @since 1.6 - */ - protected function getReorderConditions($table) - { - $condition = array(); - $condition[] = 'catid = ' . (int) $table->catid; - $condition[] = 'state >= 0'; - - return $condition; - } - - /** - * Prepare and sanitise the table prior to saving. - * - * @param JTable $table A JTable object. - * - * @return void - * - * @since 1.6 - */ - protected function prepareTable($table) - { - $date = JFactory::getDate(); - $user = JFactory::getUser(); - - if (empty($table->id)) - { - // Set the values - $table->created = $date->toSql(); - - // Set ordering to the last item if not set - if (empty($table->ordering)) - { - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->select('MAX(ordering)') - ->from('#__banners'); - - $db->setQuery($query); - $max = $db->loadResult(); - - $table->ordering = $max + 1; - } - } - else - { - // Set the values - $table->modified = $date->toSql(); - $table->modified_by = $user->get('id'); - } - // Increment the content version number. - $table->version++; - } - - /** - * Method to save the form data. - * - * @param array $data The form data. - * - * @return boolean True on success. - * - * @since 1.6 - */ - - public function save($data) - { - $app = JFactory::getApplication(); - - // Alter the name for save as copy - if ($app->input->get('task') == 'save2copy') - { - list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']); - $data['name'] = $name; - $data['alias'] = $alias; - $data['state'] = 0; - } - - if (parent::save($data)) - { - return true; - } - - return false; - } -} diff --git a/administrator/components/com_banners/models/banners.php b/administrator/components/com_banners/models/banners.php deleted file mode 100644 index 75b4809e76..0000000000 --- a/administrator/components/com_banners/models/banners.php +++ /dev/null @@ -1,275 +0,0 @@ -cache['categoryorders'])) - { - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select('MAX(ordering) as ' . $db->quoteName('max') . ', catid') - ->select('catid') - ->from('#__banners') - ->group('catid'); - $db->setQuery($query); - $this->cache['categoryorders'] = $db->loadAssocList('catid', 0); - } - - return $this->cache['categoryorders']; - } - - /** - * Build an SQL query to load the list data. - * - * @return JDatabaseQuery - * - * @since 1.6 - */ - protected function getListQuery() - { - $db = $this->getDbo(); - $query = $db->getQuery(true); - - // Select the required fields from the table. - $query->select( - $this->getState( - 'list.select', - 'a.id AS id, a.name AS name, a.alias AS alias,' . - 'a.checked_out AS checked_out,' . - 'a.checked_out_time AS checked_out_time, a.catid AS catid,' . - 'a.clicks AS clicks, a.metakey AS metakey, a.sticky AS sticky,' . - 'a.impmade AS impmade, a.imptotal AS imptotal,' . - 'a.state AS state, a.ordering AS ordering,' . - 'a.purchase_type as purchase_type,' . - 'a.language, a.publish_up, a.publish_down' - ) - ); - $query->from($db->quoteName('#__banners') . ' AS a'); - - // Join over the language - $query->select('l.title AS language_title') - ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); - - // Join over the users for the checked out user. - $query->select('uc.name AS editor') - ->join('LEFT', '#__users AS uc ON uc.id=a.checked_out'); - - // Join over the categories. - $query->select('c.title AS category_title') - ->join('LEFT', '#__categories AS c ON c.id = a.catid'); - - // Join over the clients. - $query->select('cl.name AS client_name,cl.purchase_type as client_purchase_type') - ->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid'); - - // Filter by published state - $published = $this->getState('filter.state'); - - if (is_numeric($published)) - { - $query->where('a.state = ' . (int) $published); - } - elseif ($published === '') - { - $query->where('(a.state IN (0, 1))'); - } - - // Filter by category. - $categoryId = $this->getState('filter.category_id'); - - if (is_numeric($categoryId)) - { - $query->where('a.catid = ' . (int) $categoryId); - } - - // Filter by client. - $clientId = $this->getState('filter.client_id'); - - if (is_numeric($clientId)) - { - $query->where('a.cid = ' . (int) $clientId); - } - - // Filter by search in title - $search = $this->getState('filter.search'); - - if (!empty($search)) - { - if (stripos($search, 'id:') === 0) - { - $query->where('a.id = ' . (int) substr($search, 3)); - } - else - { - $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); - $query->where('(a.name LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')'); - } - } - - // Filter on the language. - if ($language = $this->getState('filter.language')) - { - $query->where('a.language = ' . $db->quote($language)); - } - - // Add the list ordering clause. - $orderCol = $this->state->get('list.ordering', 'ordering'); - $orderDirn = $this->state->get('list.direction', 'ASC'); - - if ($orderCol == 'ordering' || $orderCol == 'category_title') - { - $orderCol = 'c.title ' . $orderDirn . ', a.ordering'; - } - - if ($orderCol == 'client_name') - { - $orderCol = 'cl.name'; - } - - $query->order($db->escape($orderCol . ' ' . $orderDirn)); - - return $query; - } - - /** - * Method to get a store id based on model configuration state. - * - * This is necessary because the model is used by the component and - * different modules that might need different sets of data or different - * ordering requirements. - * - * @param string $id A prefix for the store id. - * - * @return string A store id. - * - * @since 1.6 - */ - protected function getStoreId($id = '') - { - // Compile the store id. - $id .= ':' . $this->getState('filter.search'); - $id .= ':' . $this->getState('filter.access'); - $id .= ':' . $this->getState('filter.state'); - $id .= ':' . $this->getState('filter.category_id'); - $id .= ':' . $this->getState('filter.language'); - - return parent::getStoreId($id); - } - - /** - * Returns a reference to the a Table object, always creating it. - * - * @param string $type The table type to instantiate - * @param string $prefix A prefix for the table class name. Optional. - * @param array $config Configuration array for model. Optional. - * - * @return JTable A database object - * - * @since 1.6 - */ - public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = array()) - { - return JTable::getInstance($type, $prefix, $config); - } - - /** - * Method to auto-populate the model state. - * - * Note. Calling getState in this method will result in recursion. - * - * @param string $ordering An optional ordering field. - * @param string $direction An optional direction (asc|desc). - * - * @return void - * - * @since 1.6 - */ - protected function populateState($ordering = null, $direction = null) - { - // Load the filter state. - $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); - - $state = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'); - $this->setState('filter.state', $state); - - $categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', ''); - $this->setState('filter.category_id', $categoryId); - - $clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', ''); - $this->setState('filter.client_id', $clientId); - - $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', ''); - $this->setState('filter.language', $language); - - // Load the parameters. - $params = JComponentHelper::getParams('com_banners'); - $this->setState('params', $params); - - // List state information. - parent::populateState('a.name', 'asc'); - } -} diff --git a/administrator/components/com_banners/models/client.php b/administrator/components/com_banners/models/client.php deleted file mode 100644 index 69a46619a8..0000000000 --- a/administrator/components/com_banners/models/client.php +++ /dev/null @@ -1,158 +0,0 @@ -id)) - { - if ($record->state != -2) - { - return; - } - - $user = JFactory::getUser(); - - if (!empty($record->catid)) - { - return $user->authorise('core.delete', 'com_banners.category.' . (int) $record->catid); - } - else - { - return $user->authorise('core.delete', 'com_banners'); - } - } - } - - /** - * Method to test whether a record can be deleted. - * - * @param object $record A record object. - * - * @return boolean True if allowed to change the state of the record. - * Defaults to the permission set in the component. - * - * @since 1.6 - */ - protected function canEditState($record) - { - $user = JFactory::getUser(); - - if (!empty($record->catid)) - { - return $user->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid); - } - else - { - return $user->authorise('core.edit.state', 'com_banners'); - } - } - - /** - * Returns a reference to the a Table object, always creating it. - * - * @param string $type The table type to instantiate - * @param string $prefix A prefix for the table class name. Optional. - * @param array $config Configuration array for model. Optional. - * - * @return JTable A database object - * - * @since 1.6 - */ - public function getTable($type = 'Client', $prefix = 'BannersTable', $config = array()) - { - return JTable::getInstance($type, $prefix, $config); - } - - /** - * Method to get the record form. - * - * @param array $data Data for the form. - * @param boolean $loadData True if the form is to load its own data (default case), false if not. - * - * @return mixed A JForm object on success, false on failure - * - * @since 1.6 - */ - public function getForm($data = array(), $loadData = true) - { - // Get the form. - $form = $this->loadForm('com_banners.client', 'client', array('control' => 'jform', 'load_data' => $loadData)); - - if (empty($form)) - { - return false; - } - - return $form; - } - - /** - * Method to get the data that should be injected in the form. - * - * @return mixed The data for the form. - * - * @since 1.6 - */ - protected function loadFormData() - { - // Check the session for previously entered form data. - $data = JFactory::getApplication()->getUserState('com_banners.edit.client.data', array()); - - if (empty($data)) - { - $data = $this->getItem(); - } - - $this->preprocessData('com_banners.client', $data); - - return $data; - } - - /** - * Prepare and sanitise the table prior to saving. - * - * @param JTable $table A JTable object. - * - * @return void - * - * @since 1.6 - */ - protected function prepareTable($table) - { - $table->name = htmlspecialchars_decode($table->name, ENT_QUOTES); - } -} diff --git a/administrator/components/com_banners/models/clients.php b/administrator/components/com_banners/models/clients.php deleted file mode 100644 index 511b831ae5..0000000000 --- a/administrator/components/com_banners/models/clients.php +++ /dev/null @@ -1,194 +0,0 @@ -getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); - - $state = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'); - $this->setState('filter.state', $state); - - // Load the parameters. - $params = JComponentHelper::getParams('com_banners'); - $this->setState('params', $params); - - // List state information. - parent::populateState('a.name', 'asc'); - } - - /** - * Method to get a store id based on model configuration state. - * - * This is necessary because the model is used by the component and - * different modules that might need different sets of data or different - * ordering requirements. - * - * @param string $id A prefix for the store id. - * - * @return string A store id. - */ - protected function getStoreId($id = '') - { - // Compile the store id. - $id .= ':' . $this->getState('filter.search'); - $id .= ':' . $this->getState('filter.access'); - $id .= ':' . $this->getState('filter.state'); - - return parent::getStoreId($id); - } - - /** - * Build an SQL query to load the list data. - * - * @return JDatabaseQuery - */ - protected function getListQuery() - { - // Create a new query object. - $db = $this->getDbo(); - $query = $db->getQuery(true); - - $params = JComponentHelper::getParams('com_banners'); - $defaultPurchase = $params->get('purchase_type', 3); - - // Select the required fields from the table. - $query->select( - $this->getState( - 'list.select', - 'a.id AS id,' . - 'a.name AS name,' . - 'a.contact AS contact,' . - 'a.checked_out AS checked_out,' . - 'a.checked_out_time AS checked_out_time, ' . - 'a.state AS state,' . - 'a.metakey AS metakey,' . - 'a.purchase_type as purchase_type' - ) - ); - - $query->from($db->quoteName('#__banner_clients') . ' AS a'); - - // Join over the banners for counting - $query->select('COUNT(b.id) as nbanners') - ->join('LEFT', '#__banners AS b ON a.id = b.cid'); - - // Join over the users for the checked out user. - $query->select('uc.name AS editor') - ->join('LEFT', '#__users AS uc ON uc.id=a.checked_out'); - - // Filter by published state - $published = $this->getState('filter.state'); - - if (is_numeric($published)) - { - $query->where('a.state = ' . (int) $published); - } - elseif ($published === '') - { - $query->where('(a.state IN (0, 1))'); - } - - $query->group('a.id, a.name, a.contact, a.checked_out, a.checked_out_time, a.state, a.metakey, a.purchase_type, uc.name'); - - // Filter by search in title - $search = $this->getState('filter.search'); - - if (!empty($search)) - { - if (stripos($search, 'id:') === 0) - { - $query->where('a.id = ' . (int) substr($search, 3)); - } - else - { - $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%')); - $query->where('a.name LIKE ' . $search); - } - } - - // Filter by purchase type - $purchaseType = $this->getState('filter.purchase_type'); - - if (!empty($purchaseType)) - { - if ($defaultPurchase == $purchaseType) - { - $query->where('(a.purchase_type = ' . (int) $purchaseType . ' OR a.purchase_type = -1)'); - } - else - { - $query->where('a.purchase_type = ' . (int) $purchaseType); - } - } - - $ordering = $this->getState('list.ordering', 'ordering'); - - if ($ordering == 'nbanners') - { - $ordering = 'COUNT(b.id)'; - } - - // Add the list ordering clause. - $query->order($db->escape($ordering) . ' ' . $db->escape($this->getState('list.direction', 'ASC'))); - - return $query; - } -} diff --git a/administrator/components/com_banners/models/download.php b/administrator/components/com_banners/models/download.php deleted file mode 100644 index 81cb8038a6..0000000000 --- a/administrator/components/com_banners/models/download.php +++ /dev/null @@ -1,84 +0,0 @@ -input; - - $basename = $input->cookie->getString(JApplication::getHash($this->_context . '.basename'), '__SITE__'); - $this->setState('basename', $basename); - - $compressed = $input->cookie->getInt(JApplication::getHash($this->_context . '.compressed'), 1); - $this->setState('compressed', $compressed); - } - - /** - * Method to get the record form. - * - * @param array $data Data for the form. - * @param boolean $loadData True if the form is to load its own data (default case), false if not. - * - * @return mixed A JForm object on success, false on failure - * - * @since 1.6 - */ - public function getForm($data = array(), $loadData = true) - { - // Get the form. - $form = $this->loadForm('com_banners.download', 'download', array('control' => 'jform', 'load_data' => $loadData)); - - if (empty($form)) - { - return false; - } - - return $form; - } - - /** - * Method to get the data that should be injected in the form. - * - * @return mixed The data for the form. - * - * @since 1.6 - */ - protected function loadFormData() - { - $data = array( - 'basename' => $this->getState('basename'), - 'compressed' => $this->getState('compressed') - ); - - $this->preprocessData('com_banners.download', $data); - - return $data; - } -} diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php deleted file mode 100644 index 8f0b257b99..0000000000 --- a/administrator/components/com_banners/models/fields/bannerclient.php +++ /dev/null @@ -1,46 +0,0 @@ -id . '\').value=\'0\';"'; - - return - ' ' - . JText::_('COM_BANNERS_RESET_CLICKS') . ''; - } -} diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php deleted file mode 100644 index 908b888943..0000000000 --- a/administrator/components/com_banners/models/fields/impmade.php +++ /dev/null @@ -1,45 +0,0 @@ -id . '\').value=\'0\';"'; - - return - ' ' - . JText::_('COM_BANNERS_RESET_IMPMADE') . ''; - } -} diff --git a/administrator/components/com_banners/models/fields/imptotal.php b/administrator/components/com_banners/models/fields/imptotal.php deleted file mode 100644 index 8f42f5c2fb..0000000000 --- a/administrator/components/com_banners/models/fields/imptotal.php +++ /dev/null @@ -1,50 +0,0 @@ -id . '_unlimited\').checked=document.id(\'' . $this->id . '\').value==\'\';"'; - $onclick = ' onclick="if (document.id(\'' . $this->id . '_unlimited\').checked) document.id(\'' . $this->id . '\').value=\'\';"'; - $value = empty($this->value) ? '' : $this->value; - $checked = empty($this->value) ? ' checked="checked"' : ''; - - return - '' - . '
' - . '
'; - } -} diff --git a/administrator/components/com_banners/models/fields/index.html b/administrator/components/com_banners/models/fields/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/models/fields/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml deleted file mode 100644 index 14477f34b0..0000000000 --- a/administrator/components/com_banners/models/forms/banner.xml +++ /dev/null @@ -1,220 +0,0 @@ - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - -
- -
- - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - -
- - -
- - - - - - - -
- - -
- -
- -
diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml deleted file mode 100644 index 2cb0d4f932..0000000000 --- a/administrator/components/com_banners/models/forms/client.xml +++ /dev/null @@ -1,114 +0,0 @@ - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - -
- -
- - - -
-
diff --git a/administrator/components/com_banners/models/forms/download.xml b/administrator/components/com_banners/models/forms/download.xml deleted file mode 100644 index 688c8a129d..0000000000 --- a/administrator/components/com_banners/models/forms/download.xml +++ /dev/null @@ -1,19 +0,0 @@ - -
-
- - - - - - - - -
-
diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/administrator/components/com_banners/models/forms/filter_banners.xml deleted file mode 100644 index ef9e6aaf0c..0000000000 --- a/administrator/components/com_banners/models/forms/filter_banners.xml +++ /dev/null @@ -1,92 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/administrator/components/com_banners/models/forms/filter_clients.xml b/administrator/components/com_banners/models/forms/filter_clients.xml deleted file mode 100644 index 368dd71d7b..0000000000 --- a/administrator/components/com_banners/models/forms/filter_clients.xml +++ /dev/null @@ -1,71 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/administrator/components/com_banners/models/forms/index.html b/administrator/components/com_banners/models/forms/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/models/forms/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/models/index.html b/administrator/components/com_banners/models/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/models/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php deleted file mode 100644 index 13b58efc07..0000000000 --- a/administrator/components/com_banners/models/tracks.php +++ /dev/null @@ -1,542 +0,0 @@ -getUserStateFromRequest($this->context . '.filter.type', 'filter_type'); - $this->setState('filter.type', $type); - - $begin = $this->getUserStateFromRequest($this->context . '.filter.begin', 'filter_begin', '', 'string'); - $this->setState('filter.begin', $begin); - - $end = $this->getUserStateFromRequest($this->context . '.filter.end', 'filter_end', '', 'string'); - $this->setState('filter.end', $end); - - $categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', ''); - $this->setState('filter.category_id', $categoryId); - - $clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', ''); - $this->setState('filter.client_id', $clientId); - - // Load the parameters. - $params = JComponentHelper::getParams('com_banners'); - $this->setState('params', $params); - - // List state information. - parent::populateState('b.name', 'asc'); - } - - /** - * Build an SQL query to load the list data. - * - * @return JDatabaseQuery - * - * @since 1.6 - */ - protected function getListQuery() - { - require_once JPATH_COMPONENT . '/helpers/banners.php'; - - // Create a new query object. - $db = $this->getDbo(); - $query = $db->getQuery(true); - - // Select the required fields from the table. - $query->select( - 'a.track_date as track_date,' - . 'a.track_type as track_type,' - . $db->quoteName('a.count') . ' as ' . $db->quoteName('count') - ); - $query->from($db->quoteName('#__banner_tracks') . ' AS a'); - - // Join with the banners - $query->join('LEFT', $db->quoteName('#__banners') . ' as b ON b.id=a.banner_id') - ->select('b.name as name'); - - // Join with the client - $query->join('LEFT', $db->quoteName('#__banner_clients') . ' as cl ON cl.id=b.cid') - ->select('cl.name as client_name'); - - // Join with the category - $query->join('LEFT', $db->quoteName('#__categories') . ' as cat ON cat.id=b.catid') - ->select('cat.title as category_title'); - - // Filter by type - $type = $this->getState('filter.type'); - - if (!empty($type)) - { - $query->where('a.track_type = ' . (int) $type); - } - - // Filter by client - $clientId = $this->getState('filter.client_id'); - - if (is_numeric($clientId)) - { - $query->where('b.cid = ' . (int) $clientId); - } - - // Filter by category - $catedoryId = $this->getState('filter.category_id'); - - if (is_numeric($catedoryId)) - { - $query->where('b.catid = ' . (int) $catedoryId); - } - - // Filter by begin date - - $begin = $this->getState('filter.begin'); - - if (!empty($begin)) - { - $query->where('a.track_date >= ' . $db->quote($begin)); - } - - // Filter by end date - $end = $this->getState('filter.end'); - - if (!empty($end)) - { - $query->where('a.track_date <= ' . $db->quote($end)); - } - - // Add the list ordering clause. - $orderCol = $this->getState('list.ordering', 'name'); - $query->order($db->escape($orderCol) . ' ' . $db->escape($this->getState('list.direction', 'ASC'))); - - return $query; - } - - /** - * Method to delete rows. - * - * @return boolean Returns true on success, false on failure. - */ - public function delete() - { - $user = JFactory::getUser(); - $categoryId = $this->getState('category_id'); - - // Access checks. - if ($categoryId) - { - $allow = $user->authorise('core.delete', 'com_banners.category.' . (int) $categoryId); - } - else - { - $allow = $user->authorise('core.delete', 'com_banners'); - } - - if ($allow) - { - // Delete tracks from this banner - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->delete($db->quoteName('#__banner_tracks')); - - // Filter by type - $type = $this->getState('filter.type'); - - if (!empty($type)) - { - $query->where('track_type = ' . (int) $type); - } - - // Filter by begin date - $begin = $this->getState('filter.begin'); - - if (!empty($begin)) - { - $query->where('track_date >= ' . $db->quote($begin)); - } - - // Filter by end date - $end = $this->getState('filter.end'); - - if (!empty($end)) - { - $query->where('track_date <= ' . $db->quote($end)); - } - - $where = '1'; - - // Filter by client - $clientId = $this->getState('filter.client_id'); - - if (!empty($clientId)) - { - $where .= ' AND cid = ' . (int) $clientId; - } - - // Filter by category - if (!empty($categoryId)) - { - $where .= ' AND catid = ' . (int) $categoryId; - } - - $query->where('banner_id IN (SELECT id FROM ' . $db->quoteName('#__banners') . ' WHERE ' . $where . ')'); - - $db->setQuery($query); - $this->setError((string) $query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - $this->setError($e->getMessage()); - - return false; - } - } - else - { - JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED')); - } - - return true; - } - - /** - * Get file name - * - * @return string The file name - * - * @since 1.6 - */ - public function getBaseName() - { - if (!isset($this->basename)) - { - $app = JFactory::getApplication(); - $basename = $this->getState('basename'); - $basename = str_replace('__SITE__', $app->get('sitename'), $basename); - $categoryId = $this->getState('filter.category_id'); - - if (is_numeric($categoryId)) - { - if ($categoryId > 0) - { - $basename = str_replace('__CATID__', $categoryId, $basename); - } - else - { - $basename = str_replace('__CATID__', '', $basename); - } - - $categoryName = $this->getCategoryName(); - $basename = str_replace('__CATNAME__', $categoryName, $basename); - } - else - { - $basename = str_replace('__CATID__', '', $basename); - $basename = str_replace('__CATNAME__', '', $basename); - } - - $clientId = $this->getState('filter.client_id'); - - if (is_numeric($clientId)) - { - if ($clientId > 0) - { - $basename = str_replace('__CLIENTID__', $clientId, $basename); - } - else - { - $basename = str_replace('__CLIENTID__', '', $basename); - } - - $clientName = $this->getClientName(); - $basename = str_replace('__CLIENTNAME__', $clientName, $basename); - } - else - { - $basename = str_replace('__CLIENTID__', '', $basename); - $basename = str_replace('__CLIENTNAME__', '', $basename); - } - - $type = $this->getState('filter.type'); - - if ($type > 0) - { - $basename = str_replace('__TYPE__', $type, $basename); - $typeName = JText::_('COM_BANNERS_TYPE' . $type); - $basename = str_replace('__TYPENAME__', $typeName, $basename); - } - else - { - $basename = str_replace('__TYPE__', '', $basename); - $basename = str_replace('__TYPENAME__', '', $basename); - } - - $begin = $this->getState('filter.begin'); - - if (!empty($begin)) - { - $basename = str_replace('__BEGIN__', $begin, $basename); - } - else - { - $basename = str_replace('__BEGIN__', '', $basename); - } - - $end = $this->getState('filter.end'); - - if (!empty($end)) - { - $basename = str_replace('__END__', $end, $basename); - } - else - { - $basename = str_replace('__END__', '', $basename); - } - - $this->basename = $basename; - } - - return $this->basename; - } - - /** - * Get the category name. - * - * @return string The category name - * - * @since 1.6 - */ - protected function getCategoryName() - { - $categoryId = $this->getState('filter.category_id'); - - if ($categoryId) - { - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select('title') - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('id') . '=' . $db->quote($categoryId)); - $db->setQuery($query); - - try - { - $name = $db->loadResult(); - } - catch (RuntimeException $e) - { - $this->setError($e->getMessage()); - - return false; - } - } - else - { - $name = JText::_('COM_BANNERS_NOCATEGORYNAME'); - } - - return $name; - } - - /** - * Get the category name - * - * @return string The category name. - * - * @since 1.6 - */ - protected function getClientName() - { - $clientId = $this->getState('filter.client_id'); - - if ($clientId) - { - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select('name') - ->from($db->quoteName('#__banner_clients')) - ->where($db->quoteName('id') . '=' . $db->quote($clientId)); - $db->setQuery($query); - - try - { - $name = $db->loadResult(); - } - catch (RuntimeException $e) - { - $this->setError($e->getMessage()); - - return false; - } - } - else - { - $name = JText::_('COM_BANNERS_NOCLIENTNAME'); - } - - return $name; - } - - /** - * Get the file type. - * - * @return string The file type - * - * @since 1.6 - */ - public function getFileType() - { - return $this->getState('compressed') ? 'zip' : 'csv'; - } - - /** - * Get the mime type. - * - * @return string The mime type. - * - * @since 1.6 - */ - public function getMimeType() - { - return $this->getState('compressed') ? 'application/zip' : 'text/csv'; - } - - /** - * Get the content - * - * @return string The content. - * - * @since 1.6 - */ - public function getContent() - { - if (!isset($this->content)) - { - $this->content = ''; - $this->content .= - '"' . str_replace('"', '""', JText::_('COM_BANNERS_HEADING_NAME')) . '","' . - str_replace('"', '""', JText::_('COM_BANNERS_HEADING_CLIENT')) . '","' . - str_replace('"', '""', JText::_('JCATEGORY')) . '","' . - str_replace('"', '""', JText::_('COM_BANNERS_HEADING_TYPE')) . '","' . - str_replace('"', '""', JText::_('COM_BANNERS_HEADING_COUNT')) . '","' . - str_replace('"', '""', JText::_('JDATE')) . '"' . "\n"; - - foreach ($this->getItems() as $item) - { - $this->content .= - '"' . str_replace('"', '""', $item->name) . '","' . - str_replace('"', '""', $item->client_name) . '","' . - str_replace('"', '""', $item->category_title) . '","' . - str_replace('"', '""', ($item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'))) . '","' . - str_replace('"', '""', $item->count) . '","' . - str_replace('"', '""', $item->track_date) . '"' . "\n"; - } - - if ($this->getState('compressed')) - { - $app = JFactory::getApplication('administrator'); - - $files = array(); - $files['track'] = array(); - $files['track']['name'] = $this->getBasename() . '.csv'; - $files['track']['data'] = $this->content; - $files['track']['time'] = time(); - $ziproot = $app->get('tmp_path') . '/' . uniqid('banners_tracks_') . '.zip'; - - // Run the packager - jimport('joomla.filesystem.folder'); - jimport('joomla.filesystem.file'); - $delete = JFolder::files($app->get('tmp_path') . '/', uniqid('banners_tracks_'), false, true); - - if (!empty($delete)) - { - if (!JFile::delete($delete)) - { - // JFile::delete throws an error - $this->setError(JText::_('COM_BANNERS_ERR_ZIP_DELETE_FAILURE')); - - return false; - } - } - - if (!$packager = JArchive::getAdapter('zip')) - { - $this->setError(JText::_('COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE')); - - return false; - } - elseif (!$packager->create($ziproot, $files)) - { - $this->setError(JText::_('COM_BANNERS_ERR_ZIP_CREATE_FAILURE')); - - return false; - } - - $this->content = file_get_contents($ziproot); - } - } - - return $this->content; - } -} diff --git a/administrator/components/com_banners/sql/index.html b/administrator/components/com_banners/sql/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/sql/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/sql/install.mysql.utf8.sql b/administrator/components/com_banners/sql/install.mysql.utf8.sql deleted file mode 100644 index e123c0cc36..0000000000 --- a/administrator/components/com_banners/sql/install.mysql.utf8.sql +++ /dev/null @@ -1,69 +0,0 @@ -CREATE TABLE `#__banners` ( - `id` INTEGER NOT NULL auto_increment, - `cid` INTEGER NOT NULL DEFAULT '0', - `type` INTEGER NOT NULL DEFAULT '0', - `name` VARCHAR(255) NOT NULL DEFAULT '', - `alias` VARCHAR(255) NOT NULL DEFAULT '', - `imptotal` INTEGER NOT NULL DEFAULT '0', - `impmade` INTEGER NOT NULL DEFAULT '0', - `clicks` INTEGER NOT NULL DEFAULT '0', - `clickurl` VARCHAR(200) NOT NULL DEFAULT '', - `state` TINYINT(3) NOT NULL DEFAULT '0', - `catid` INTEGER UNSIGNED NOT NULL DEFAULT 0, - `description` TEXT NOT NULL, - `custombannercode` VARCHAR(2048) NOT NULL, - `sticky` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, - `ordering` INTEGER NOT NULL DEFAULT 0, - `metakey` TEXT NOT NULL, - `params` TEXT NOT NULL, - `own_prefix` TINYINT(1) NOT NULL DEFAULT '0', - `metakey_prefix` VARCHAR(255) NOT NULL DEFAULT '', - `purchase_type` TINYINT NOT NULL DEFAULT '-1', - `track_clicks` TINYINT NOT NULL DEFAULT '-1', - `track_impressions` TINYINT NOT NULL DEFAULT '-1', - `checked_out` INTEGER UNSIGNED NOT NULL DEFAULT '0', - `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `publish_up` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `publish_down` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `reset` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - `language` char(7) NOT NULL DEFAULT '', - PRIMARY KEY (`id`), - INDEX `idx_state` (`state`), - INDEX `idx_own_prefix` (`own_prefix`), - INDEX `idx_metakey_prefix` (`metakey_prefix`), - INDEX `idx_banner_catid`(`catid`), - INDEX `idx_language` (`language`) -) DEFAULT CHARSET=utf8; - -CREATE TABLE `#__banner_clients` ( - `id` INTEGER NOT NULL auto_increment, - `name` VARCHAR(255) NOT NULL DEFAULT '', - `contact` VARCHAR(255) NOT NULL DEFAULT '', - `email` VARCHAR(255) NOT NULL DEFAULT '', - `extrainfo` TEXT NOT NULL, - `state` TINYINT(3) NOT NULL DEFAULT '0', - `checked_out` INTEGER UNSIGNED NOT NULL DEFAULT '0', - `checked_out_time` DATETIME NOT NULL default '0000-00-00 00:00:00', - `metakey` TEXT NOT NULL, - `own_prefix` TINYINT NOT NULL DEFAULT '0', - `metakey_prefix` VARCHAR(255) NOT NULL default '', - `purchase_type` TINYINT NOT NULL DEFAULT '-1', - `track_clicks` TINYINT NOT NULL DEFAULT '-1', - `track_impressions` TINYINT NOT NULL DEFAULT '-1', - PRIMARY KEY (`id`), - INDEX `idx_own_prefix` (`own_prefix`), - INDEX `idx_metakey_prefix` (`metakey_prefix`) -) DEFAULT CHARSET=utf8; - -CREATE TABLE `#__banner_tracks` ( - `track_date` DATETIME NOT NULL, - `track_type` INTEGER UNSIGNED NOT NULL, - `banner_id` INTEGER UNSIGNED NOT NULL, - `count` INTEGER UNSIGNED NOT NULL DEFAULT '0', - PRIMARY KEY (`track_date`, `track_type`, `banner_id`), - INDEX `idx_track_date` (`track_date`), - INDEX `idx_track_type` (`track_type`), - INDEX `idx_banner_id` (`banner_id`) -) DEFAULT CHARSET=utf8; - diff --git a/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql b/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql deleted file mode 100644 index 19fc08f865..0000000000 --- a/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql +++ /dev/null @@ -1,6 +0,0 @@ -DROP TABLE IF EXISTS `#__banners`; - -DROP TABLE IF EXISTS `#__banner_clients`; - -DROP TABLE IF EXISTS `#__banner_tracks`; - diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php deleted file mode 100644 index 4fb4efc57f..0000000000 --- a/administrator/components/com_banners/tables/banner.php +++ /dev/null @@ -1,375 +0,0 @@ - 'com_banners.banner')); - - $date = JFactory::getDate(); - $this->created = $date->toSql(); - } - - /** - * Increase click count - * - * @return void - */ - public function clicks() - { - $query = 'UPDATE #__banners' - . ' SET clicks = (clicks + 1)' - . ' WHERE id = ' . (int) $this->id; - - $this->_db->setQuery($query); - $this->_db->execute(); - } - - /** - * Overloaded check function - * - * @return boolean - * - * @see JTable::check - * @since 1.5 - */ - public function check() - { - // Set name - $this->name = htmlspecialchars_decode($this->name, ENT_QUOTES); - - // Set alias - $this->alias = JApplication::stringURLSafe($this->alias); - - if (empty($this->alias)) - { - $this->alias = JApplication::stringURLSafe($this->name); - } - - // Check the publish down date is not earlier than publish up. - if ($this->publish_down > $this->_db->getNullDate() && $this->publish_down < $this->publish_up) - { - $this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH')); - - return false; - } - - // Set ordering - if ($this->state < 0) - { - // Set ordering to 0 if state is archived or trashed - $this->ordering = 0; - } - elseif (empty($this->ordering)) - { - // Set ordering to last if ordering was 0 - $this->ordering = self::getNextOrder($this->_db->quoteName('catid') . '=' . $this->_db->quote($this->catid) . ' AND state>=0'); - } - - return true; - } - - /** - * Overloaded bind function - * - * @param array $array Named array to bind - * @param mixed $ignore An optional array or space separated list of properties to ignore while binding. - * - * @return mixed Null if operation was satisfactory, otherwise returns an error - * - * @since 1.5 - */ - public function bind($array, $ignore = array()) - { - if (isset($array['params']) && is_array($array['params'])) - { - $registry = new JRegistry; - $registry->loadArray($array['params']); - - if ((int) $registry->get('width', 0) < 0) - { - $this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_WIDTH_LABEL'))); - - return false; - } - - if ((int) $registry->get('height', 0) < 0) - { - $this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_HEIGHT_LABEL'))); - - return false; - } - - // Converts the width and height to an absolute numeric value: - $width = abs((int) $registry->get('width', 0)); - $height = abs((int) $registry->get('height', 0)); - - // Sets the width and height to an empty string if = 0 - $registry->set('width', ($width ? $width : '')); - $registry->set('height', ($height ? $height : '')); - - $array['params'] = (string) $registry; - } - - if (isset($array['imptotal'])) - { - $array['imptotal'] = abs((int) $array['imptotal']); - } - - return parent::bind($array, $ignore); - } - - /** - * Method to store a row - * - * @param boolean $updateNulls True to update fields even if they are null. - * - * @return boolean True on success, false on failure. - */ - public function store($updateNulls = false) - { - if (empty($this->id)) - { - $purchase_type = $this->purchase_type; - - if ($purchase_type < 0 && $this->cid) - { - $client = JTable::getInstance('Client', 'BannersTable'); - $client->load($this->cid); - $purchase_type = $client->purchase_type; - } - - if ($purchase_type < 0) - { - $params = JComponentHelper::getParams('com_banners'); - $purchase_type = $params->get('purchase_type'); - } - - switch ($purchase_type) - { - case 1: - $this->reset = $this->_db->getNullDate(); - break; - case 2: - $date = JFactory::getDate('+1 year ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); - break; - case 3: - $date = JFactory::getDate('+1 month ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); - break; - case 4: - $date = JFactory::getDate('+7 day ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); - break; - case 5: - $date = JFactory::getDate('+1 day ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); - break; - } - // Store the row - parent::store($updateNulls); - } - else - { - // Get the old row - $oldrow = JTable::getInstance('Banner', 'BannersTable'); - - if (!$oldrow->load($this->id) && $oldrow->getError()) - { - $this->setError($oldrow->getError()); - } - - // Verify that the alias is unique - $table = JTable::getInstance('Banner', 'BannersTable'); - - if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0)) - { - $this->setError(JText::_('COM_BANNERS_ERROR_UNIQUE_ALIAS')); - - return false; - } - - // Store the new row - parent::store($updateNulls); - - // Need to reorder ? - if ($oldrow->state >= 0 && ($this->state < 0 || $oldrow->catid != $this->catid)) - { - // Reorder the oldrow - $this->reorder($this->_db->quoteName('catid') . '=' . $this->_db->quote($oldrow->catid) . ' AND state>=0'); - } - } - - return count($this->getErrors()) == 0; - } - - /** - * Method to set the publishing state for a row or list of rows in the database - * table. The method respects checked out rows by other users and will attempt - * to checkin rows that it can after adjustments are made. - * - * @param mixed $pks An optional array of primary key values to update. If not set the instance property value is used. - * @param integer $state The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed] - * @param integer $userId The user id of the user performing the operation. - * - * @return boolean True on success. - * - * @since 1.6 - */ - public function publish($pks = null, $state = 1, $userId = 0) - { - $k = $this->_tbl_key; - - // Sanitize input. - JArrayHelper::toInteger($pks); - $userId = (int) $userId; - $state = (int) $state; - - // If there are no primary keys set check to see if the instance key is set. - if (empty($pks)) - { - if ($this->$k) - { - $pks = array($this->$k); - } - // Nothing to set publishing state on, return false. - else - { - $this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); - - return false; - } - } - - // Get an instance of the table - $table = JTable::getInstance('Banner', 'BannersTable'); - - // For all keys - foreach ($pks as $pk) - { - // Load the banner - if (!$table->load($pk)) - { - $this->setError($table->getError()); - } - - // Verify checkout - if ($table->checked_out == 0 || $table->checked_out == $userId) - { - // Change the state - $table->state = $state; - $table->checked_out = 0; - $table->checked_out_time = $this->_db->getNullDate(); - - // Check the row - $table->check(); - - // Store the row - if (!$table->store()) - { - $this->setError($table->getError()); - } - } - } - - return count($this->getErrors()) == 0; - } - - /** - * Method to set the sticky state for a row or list of rows in the database - * table. The method respects checked out rows by other users and will attempt - * to checkin rows that it can after adjustments are made. - * - * @param mixed $pks An optional array of primary key values to update. If not set the instance property value is used. - * @param integer $state The sticky state. eg. [0 = unsticked, 1 = sticked] - * @param integer $userId The user id of the user performing the operation. - * - * @return boolean True on success. - * - * @since 1.6 - */ - public function stick($pks = null, $state = 1, $userId = 0) - { - $k = $this->_tbl_key; - - // Sanitize input. - JArrayHelper::toInteger($pks); - $userId = (int) $userId; - $state = (int) $state; - - // If there are no primary keys set check to see if the instance key is set. - if (empty($pks)) - { - if ($this->$k) - { - $pks = array($this->$k); - } - // Nothing to set publishing state on, return false. - else - { - $this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); - - return false; - } - } - - // Get an instance of the table - $table = JTable::getInstance('Banner', 'BannersTable'); - - // For all keys - foreach ($pks as $pk) - { - // Load the banner - if (!$table->load($pk)) - { - $this->setError($table->getError()); - } - - // Verify checkout - if ($table->checked_out == 0 || $table->checked_out == $userId) - { - // Change the state - $table->sticky = $state; - $table->checked_out = 0; - $table->checked_out_time = $this->_db->getNullDate(); - - // Check the row - $table->check(); - - // Store the row - if (!$table->store()) - { - $this->setError($table->getError()); - } - } - } - - return count($this->getErrors()) == 0; - } -} diff --git a/administrator/components/com_banners/tables/client.php b/administrator/components/com_banners/tables/client.php deleted file mode 100644 index 98a40692b2..0000000000 --- a/administrator/components/com_banners/tables/client.php +++ /dev/null @@ -1,126 +0,0 @@ -checked_out_time = $_db->getNullDate(); - parent::__construct('#__banner_clients', 'id', $_db); - - JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_banners.client')); - } - - /** - * Method to set the publishing state for a row or list of rows in the database - * table. The method respects checked out rows by other users and will attempt - * to checkin rows that it can after adjustments are made. - * - * @param mixed $pks An optional array of primary key values to update. If not set the instance property value is used. - * @param integer $state The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed] - * @param integer $userId The user id of the user performing the operation. - * - * @return boolean True on success. - * - * @since 1.0.4 - */ - public function publish($pks = null, $state = 1, $userId = 0) - { - $k = $this->_tbl_key; - - // Sanitize input. - JArrayHelper::toInteger($pks); - $userId = (int) $userId; - $state = (int) $state; - - // If there are no primary keys set check to see if the instance key is set. - if (empty($pks)) - { - if ($this->$k) - { - $pks = array($this->$k); - } - // Nothing to set publishing state on, return false. - else - { - $this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED')); - - return false; - } - } - - // Build the WHERE clause for the primary keys. - $where = $k . '=' . implode(' OR ' . $k . '=', $pks); - - // Determine if there is checkin support for the table. - if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time')) - { - $checkin = ''; - } - else - { - $checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')'; - } - - // Update the publishing state for rows with the given primary keys. - $this->_db->setQuery( - 'UPDATE ' . $this->_db->quoteName($this->_tbl) . - ' SET ' . $this->_db->quoteName('state') . ' = ' . (int) $state . - ' WHERE (' . $where . ')' . - $checkin - ); - - try - { - $this->_db->execute(); - } - catch (RuntimeException $e) - { - $this->setError($e->getMessage()); - - return false; - } - - // If checkin is supported and all rows were adjusted, check them in. - if ($checkin && (count($pks) == $this->_db->getAffectedRows())) - { - // Checkin the rows. - foreach ($pks as $pk) - { - $this->checkin($pk); - } - } - - // If the JTable instance value is in the list of primary keys that were set, set the instance. - if (in_array($this->$k, $pks)) - { - $this->state = $state; - } - - $this->setError(''); - - return true; - } -} diff --git a/administrator/components/com_banners/tables/index.html b/administrator/components/com_banners/tables/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/tables/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/banner/index.html b/administrator/components/com_banners/views/banner/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/banner/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php deleted file mode 100644 index 8b11c41889..0000000000 --- a/administrator/components/com_banners/views/banner/tmpl/edit.php +++ /dev/null @@ -1,91 +0,0 @@ -addScriptDeclaration($script); -?> - - - diff --git a/administrator/components/com_banners/views/banner/tmpl/index.html b/administrator/components/com_banners/views/banner/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/banner/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php deleted file mode 100644 index 1055ee7c95..0000000000 --- a/administrator/components/com_banners/views/banner/view.html.php +++ /dev/null @@ -1,113 +0,0 @@ -form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - $this->addToolbar(); - JHtml::_('jquery.framework'); - JHtml::_('script', 'media/com_banners/banner.js'); - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - JFactory::getApplication()->input->set('hidemainmenu', true); - - $user = JFactory::getUser(); - $userId = $user->get('id'); - $isNew = ($this->item->id == 0); - $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId); - - // Since we don't track these assets at the item level, use the category id. - $canDo = JHelperContent::getActions('com_banners', 'category', $this->item->catid); - - JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'bookmark banners'); - - // If not checked out, can save the item. - if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0)) - { - JToolbarHelper::apply('banner.apply'); - JToolbarHelper::save('banner.save'); - - if ($canDo->get('core.create')) - { - JToolbarHelper::save2new('banner.save2new'); - } - } - - // If an existing item, can save to a copy. - if (!$isNew && $canDo->get('core.create')) - { - JToolbarHelper::save2copy('banner.save2copy'); - } - - if (empty($this->item->id)) - { - JToolbarHelper::cancel('banner.cancel'); - } - else - { - if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit')) - { - JToolbarHelper::versions('com_banners.banner', $this->item->id); - } - - JToolbarHelper::cancel('banner.cancel', 'JTOOLBAR_CLOSE'); - } - - JToolbarHelper::divider(); - JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_BANNERS_EDIT'); - } -} diff --git a/administrator/components/com_banners/views/banners/index.html b/administrator/components/com_banners/views/banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php deleted file mode 100644 index 7bf98cc0b3..0000000000 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ /dev/null @@ -1,213 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -$canOrder = $user->authorise('core.edit.state', 'com_banners.category'); -$archived = $this->state->get('filter.state') == 2 ? true : false; -$trashed = $this->state->get('filter.state') == -2 ? true : false; -$params = (isset($this->state->params)) ? $this->state->params : new JObject; -$saveOrder = $listOrder == 'a.ordering'; - -if ($saveOrder) -{ - $saveOrderingUrl = 'index.php?option=com_banners&task=banners.saveOrderAjax&tmpl=component'; - JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); -} - -$sortFields = $this->getSortFields(); -?> - -
-
- sidebar; ?> -
-
- $this)); - ?> - items)) : ?> -
- -
- - - - - - - - - - - - - - - - - - - - - - - items as $i => $item) : - $ordering = ($listOrder == 'ordering'); - $item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid); - $canCreate = $user->authorise('core.create', 'com_banners.category.' . $item->catid); - $canEdit = $user->authorise('core.edit', 'com_banners.category.' . $item->catid); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin; - ?> - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- pagination->getListFooter(); ?> -
- - - - - - - - - id); ?> - -
- state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> - escape($item->name)); - ?> -
- 		-
- checked_out) : ?> - editor, $item->checked_out_time, 'banners.', $canCheckin); ?> - - - - escape($item->name); ?> - - escape($item->name); ?> - - - escape($item->alias)); ?> - -
- escape($item->category_title); ?> -
-
- 		- sticky, $i, $canChange); ?> - - client_name; ?> - - impmade, $item->imptotal ? $item->imptotal : JText::_('COM_BANNERS_UNLIMITED')); ?> - - clicks; ?> - - impmade ? 100 * $item->clicks / $item->impmade : 0); ?> - - language == '*'): ?> - - - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - - - id; ?> -
- - - loadTemplate('batch'); ?> - - - - -
-
diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch.php b/administrator/components/com_banners/views/banners/tmpl/default_batch.php deleted file mode 100644 index 3f212bb016..0000000000 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch.php +++ /dev/null @@ -1,51 +0,0 @@ -state->get('filter.published'); -?> - diff --git a/administrator/components/com_banners/views/banners/tmpl/index.html b/administrator/components/com_banners/views/banners/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/banners/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php deleted file mode 100644 index 27c31b604a..0000000000 --- a/administrator/components/com_banners/views/banners/view.html.php +++ /dev/null @@ -1,173 +0,0 @@ -categories = $this->get('CategoryOrders'); - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - BannersHelper::addSubmenu('banners'); - - $this->addToolbar(); - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; - - // Include the component HTML helpers. - JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - - $this->sidebar = JHtmlSidebar::render(); - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - require_once JPATH_COMPONENT . '/helpers/banners.php'; - - $canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id')); - $user = JFactory::getUser(); - - // Get the toolbar object instance - $bar = JToolBar::getInstance('toolbar'); - - JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_BANNERS'), 'bookmark banners'); - - if (count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0) - { - JToolbarHelper::addNew('banner.add'); - } - - if (($canDo->get('core.edit'))) - { - JToolbarHelper::editList('banner.edit'); - } - - if ($canDo->get('core.edit.state')) - { - if ($this->state->get('filter.state') != 2) - { - JToolbarHelper::publish('banners.publish', 'JTOOLBAR_PUBLISH', true); - JToolbarHelper::unpublish('banners.unpublish', 'JTOOLBAR_UNPUBLISH', true); - } - - if ($this->state->get('filter.state') != -1) - { - if ($this->state->get('filter.state') != 2) - { - JToolbarHelper::archiveList('banners.archive'); - } - elseif ($this->state->get('filter.state') == 2) - { - JToolbarHelper::unarchiveList('banners.publish'); - } - } - } - - if ($canDo->get('core.edit.state')) - { - JToolbarHelper::checkin('banners.checkin'); - } - - if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) - { - JToolbarHelper::deleteList('', 'banners.delete', 'JTOOLBAR_EMPTY_TRASH'); - } - elseif ($canDo->get('core.edit.state')) - { - JToolbarHelper::trash('banners.trash'); - } - - // Add a batch button - if ($user->authorise('core.create', 'com_banners') && $user->authorise('core.edit', 'com_banners') && $user->authorise('core.edit.state', 'com_banners')) - { - JHtml::_('bootstrap.modal', 'collapseModal'); - $title = JText::_('JTOOLBAR_BATCH'); - - // Instantiate a new JLayoutFile instance and render the batch button - $layout = new JLayoutFile('joomla.toolbar.batch'); - - $dhtml = $layout->render(array('title' => $title)); - $bar->appendButton('Custom', $dhtml, 'batch'); - } - - if ($user->authorise('core.admin', 'com_banners')) - { - JToolbarHelper::preferences('com_banners'); - } - - JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_BANNERS'); - } - - /** - * Returns an array of fields the table can be sorted by - * - * @return array Array containing the field name to sort by as the key and display text as value - * - * @since 3.0 - */ - protected function getSortFields() - { - return array( - 'ordering' => JText::_('JGRID_HEADING_ORDERING'), - 'a.state' => JText::_('JSTATUS'), - 'a.name' => JText::_('COM_BANNERS_HEADING_NAME'), - 'a.sticky' => JText::_('COM_BANNERS_HEADING_STICKY'), - 'client_name' => JText::_('COM_BANNERS_HEADING_CLIENT'), - 'impmade' => JText::_('COM_BANNERS_HEADING_IMPRESSIONS'), - 'clicks' => JText::_('COM_BANNERS_HEADING_CLICKS'), - 'a.language' => JText::_('JGRID_HEADING_LANGUAGE'), - 'a.id' => JText::_('JGRID_HEADING_ID') - ); - } -} diff --git a/administrator/components/com_banners/views/client/index.html b/administrator/components/com_banners/views/client/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/client/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php deleted file mode 100644 index d4fefa90f7..0000000000 --- a/administrator/components/com_banners/views/client/tmpl/edit.php +++ /dev/null @@ -1,60 +0,0 @@ - - - -
- - - -
- 'general')); ?> - - item->id) ? JText::_('COM_BANNERS_NEW_CLIENT', true) : JText::_('COM_BANNERS_EDIT_CLIENT', true)); ?> -
-
- form->getControlGroup('contact'); - echo $this->form->getControlGroup('email'); - echo $this->form->getControlGroup('purchase_type'); - echo $this->form->getControlGroup('track_impressions'); - echo $this->form->getControlGroup('track_clicks'); - echo $this->form->getControlGroups('extra'); - ?> -
-
- -
-
- - - - form->getControlGroups('metadata'); ?> - - - -
- - - -
diff --git a/administrator/components/com_banners/views/client/tmpl/index.html b/administrator/components/com_banners/views/client/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/client/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php deleted file mode 100644 index 542eb280d4..0000000000 --- a/administrator/components/com_banners/views/client/view.html.php +++ /dev/null @@ -1,112 +0,0 @@ -form = $this->get('Form'); - $this->item = $this->get('Item'); - $this->state = $this->get('State'); - $this->canDo = JHelperContent::getActions('com_banners'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - $this->addToolbar(); - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - JFactory::getApplication()->input->set('hidemainmenu', true); - - $user = JFactory::getUser(); - $isNew = ($this->item->id == 0); - $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); - $canDo = $this->canDo; - - JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'bookmark banners-clients'); - - // If not checked out, can save the item. - if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create'))) - { - JToolbarHelper::apply('client.apply'); - JToolbarHelper::save('client.save'); - } - - if (!$checkedOut && $canDo->get('core.create')) - { - JToolbarHelper::save2new('client.save2new'); - } - // If an existing item, can save to a copy. - if (!$isNew && $canDo->get('core.create')) - { - JToolbarHelper::save2copy('client.save2copy'); - } - - if (empty($this->item->id)) - { - JToolbarHelper::cancel('client.cancel'); - } - else - { - if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit')) - { - JToolbarHelper::versions('com_banners.client', $this->item->id); - } - - JToolbarHelper::cancel('client.cancel', 'JTOOLBAR_CLOSE'); - } - - JToolbarHelper::divider(); - JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT'); - } -} diff --git a/administrator/components/com_banners/views/clients/index.html b/administrator/components/com_banners/views/clients/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/clients/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php deleted file mode 100644 index c498aceeb4..0000000000 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ /dev/null @@ -1,158 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -$params = (isset($this->state->params)) ? $this->state->params : new JObject; -$archived = $this->state->get('filter.state') == 2 ? true : false; -$trashed = $this->state->get('filter.state') == -2 ? true : false; -$sortFields = $this->getSortFields(); -?> - -
-
- sidebar; ?> -
-
- $this)); - ?> - items)) : ?> -
- -
- - - - - - - - - - - - - - - - - - - - items as $i => $item) : - $ordering = ($listOrder == 'ordering'); - $canCreate = $user->authorise('core.create', 'com_banners'); - $canEdit = $user->authorise('core.edit', 'com_banners'); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin; - ?> - - - - - - - - - - - -
- - - - - - - - - - - - - -
- pagination->getListFooter(); ?> -
- id); ?> - -
- state, $i, 'clients.', $canChange); ?> - escape($item->name)); - ?> -
- 		-
- checked_out) : ?> - editor, $item->checked_out_time, 'clients.', $canCheckin); ?> - - - - escape($item->name); ?> - - escape($item->name); ?> - -
- 		- contact; ?> - - nbanners; ?> - - purchase_type < 0): ?> - get('purchase_type'))); ?> - - purchase_type); ?> - - - id; ?> -
- - - - - -
-
diff --git a/administrator/components/com_banners/views/clients/tmpl/index.html b/administrator/components/com_banners/views/clients/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/clients/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php deleted file mode 100644 index 5c114f3a06..0000000000 --- a/administrator/components/com_banners/views/clients/view.html.php +++ /dev/null @@ -1,125 +0,0 @@ -items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - BannersHelper::addSubmenu('clients'); - - $this->addToolbar(); - $this->sidebar = JHtmlSidebar::render(); - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - require_once JPATH_COMPONENT . '/helpers/banners.php'; - - $canDo = JHelperContent::getActions('com_banners'); - - JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_CLIENTS'), 'bookmark banners-clients'); - - if ($canDo->get('core.create')) - { - JToolbarHelper::addNew('client.add'); - } - - if ($canDo->get('core.edit')) - { - JToolbarHelper::editList('client.edit'); - } - - if ($canDo->get('core.edit.state')) - { - JToolbarHelper::publish('clients.publish', 'JTOOLBAR_PUBLISH', true); - JToolbarHelper::unpublish('clients.unpublish', 'JTOOLBAR_UNPUBLISH', true); - JToolbarHelper::archiveList('clients.archive'); - JToolbarHelper::checkin('clients.checkin'); - } - - if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) - { - JToolbarHelper::deleteList('', 'clients.delete', 'JTOOLBAR_EMPTY_TRASH'); - } - elseif ($canDo->get('core.edit.state')) - { - JToolbarHelper::trash('clients.trash'); - } - - if ($canDo->get('core.admin')) - { - JToolbarHelper::preferences('com_banners'); - } - - JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_CLIENTS'); - } - - /** - * Returns an array of fields the table can be sorted by - * - * @return array Array containing the field name to sort by as the key and display text as value - * - * @since 3.0 - */ - protected function getSortFields() - { - return array( - 'a.status' => JText::_('JSTATUS'), - 'a.name' => JText::_('COM_BANNERS_HEADING_CLIENT'), - 'contact' => JText::_('COM_BANNERS_HEADING_CONTACT'), - 'client_name' => JText::_('COM_BANNERS_HEADING_CLIENT'), - 'nbanners' => JText::_('COM_BANNERS_HEADING_ACTIVE'), - 'a.id' => JText::_('JGRID_HEADING_ID') - ); - } -} diff --git a/administrator/components/com_banners/views/download/index.html b/administrator/components/com_banners/views/download/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/download/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php deleted file mode 100644 index 9a1f249a24..0000000000 --- a/administrator/components/com_banners/views/download/tmpl/default.php +++ /dev/null @@ -1,32 +0,0 @@ - -
-
- - - form->getFieldset() as $field) : ?> - hidden) : ?> - label; ?> - - input; ?> - -
- - - -
-
diff --git a/administrator/components/com_banners/views/download/tmpl/index.html b/administrator/components/com_banners/views/download/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/download/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/download/view.html.php b/administrator/components/com_banners/views/download/view.html.php deleted file mode 100644 index 7a56a70746..0000000000 --- a/administrator/components/com_banners/views/download/view.html.php +++ /dev/null @@ -1,44 +0,0 @@ -form = $this->get('Form'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - parent::display($tpl); - } -} diff --git a/administrator/components/com_banners/views/index.html b/administrator/components/com_banners/views/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/tracks/index.html b/administrator/components/com_banners/views/tracks/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/tracks/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php deleted file mode 100644 index cc459991c5..0000000000 --- a/administrator/components/com_banners/views/tracks/tmpl/default.php +++ /dev/null @@ -1,145 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -$sortFields = $this->getSortFields(); -?> - -
-
- sidebar; ?> -
-
-
-
- - state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()")); ?> -
-
- - state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()")); ?> -
-
- - pagination->getLimitBox(); ?> -
-
- - -
-
- - -
-
-
- items)) : ?> -
- -
- - - - - - - - - - - - - - - - - - items as $i => $item) : ?> - - - - - - - - - -
- - - - - - - - - -
- pagination->getListFooter(); ?> -
- name; ?> -
- category_title; ?> -
- 		- client_name; ?> - - track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'); ?> - - count; ?> - - track_date, JText::_('DATE_FORMAT_LC4') . ' H:i'); ?> -
- - - - - - - -
-
diff --git a/administrator/components/com_banners/views/tracks/tmpl/index.html b/administrator/components/com_banners/views/tracks/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/components/com_banners/views/tracks/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php deleted file mode 100644 index 9eb2e8b0fc..0000000000 --- a/administrator/components/com_banners/views/tracks/view.html.php +++ /dev/null @@ -1,129 +0,0 @@ -items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - BannersHelper::addSubmenu('tracks'); - - $this->addToolbar(); - - require_once JPATH_COMPONENT . '/models/fields/bannerclient.php'; - - $this->sidebar = JHtmlSidebar::render(); - - parent::display($tpl); - } - - /** - * Add the page title and toolbar. - * - * @return void - * - * @since 1.6 - */ - protected function addToolbar() - { - require_once JPATH_COMPONENT . '/helpers/banners.php'; - - $canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id')); - - JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'bookmark banners-tracks'); - - $bar = JToolBar::getInstance('toolbar'); - $bar->appendButton('Popup', 'download', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&view=download&tmpl=component', 600, 300); - - if ($canDo->get('core.delete')) - { - $bar->appendButton('Confirm', 'COM_BANNERS_DELETE_MSG', 'delete', 'COM_BANNERS_TRACKS_DELETE', 'tracks.delete', false); - JToolbarHelper::divider(); - } - - if ($canDo->get('core.admin')) - { - JToolbarHelper::preferences('com_banners'); - JToolbarHelper::divider(); - } - - JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_TRACKS'); - - JHtmlSidebar::setAction('index.php?option=com_banners&view=tracks'); - - JHtmlSidebar::addFilter( - JText::_('COM_BANNERS_SELECT_CLIENT'), - 'filter_client_id', - JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id')) - ); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_CATEGORY'), - 'filter_category_id', - JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $this->state->get('filter.category_id')) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_BANNERS_SELECT_TYPE'), - 'filter_type', - JHtml::_('select.options', array(JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type')) - ); - } - - /** - * Returns an array of fields the table can be sorted by - * - * @return array Array containing the field name to sort by as the key and display text as value - * - * @since 3.0 - */ - protected function getSortFields() - { - return array( - 'b.name' => JText::_('COM_BANNERS_HEADING_NAME'), - 'cl.name' => JText::_('COM_BANNERS_HEADING_CLIENT'), - 'track_type' => JText::_('COM_BANNERS_HEADING_TYPE'), - 'count' => JText::_('COM_BANNERS_HEADING_COUNT'), - 'track_date' => JText::_('JDATE') - ); - } -} diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php deleted file mode 100644 index 742faeafa7..0000000000 --- a/administrator/components/com_banners/views/tracks/view.raw.php +++ /dev/null @@ -1,48 +0,0 @@ -get('BaseName'); - $filetype = $this->get('FileType'); - $mimetype = $this->get('MimeType'); - $content = $this->get('Content'); - - // Check for errors. - if (count($errors = $this->get('Errors'))) - { - JError::raiseError(500, implode("\n", $errors)); - - return false; - } - - $document = JFactory::getDocument(); - $document->setMimeEncoding($mimetype); - JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"', true); - echo $content; - } -} diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini deleted file mode 100644 index 8cf8678319..0000000000 --- a/administrator/language/en-GB/en-GB.com_banners.ini +++ /dev/null @@ -1,221 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - -COM_BANNERS="Banners" -COM_BANNERS_BANNER_DETAILS="Details" -COM_BANNERS_BANNER_SAVE_SUCCESS="Banner successfully saved" -COM_BANNERS_BANNERS_HTML_PIN_BANNER="Pinned banner" -COM_BANNERS_BANNERS_HTML_UNPIN_BANNER="Unpinned banner" -COM_BANNERS_BANNERS_N_ITEMS_ARCHIVED="%d banners successfully archived" -COM_BANNERS_BANNERS_N_ITEMS_ARCHIVED_1="%d banner successfully archived" -COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_0="No banner successfully checked in" -COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_1="%d banner successfully checked in" -COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_MORE="%d banners successfully checked in" -COM_BANNERS_BANNERS_N_ITEMS_DELETED="%d banners successfully deleted" -COM_BANNERS_BANNERS_N_ITEMS_DELETED_1="%d banner successfully deleted" -COM_BANNERS_BANNERS_N_ITEMS_PUBLISHED="%d banners successfully published" -COM_BANNERS_BANNERS_N_ITEMS_PUBLISHED_1="%d banner successfully published" -COM_BANNERS_BANNERS_N_ITEMS_TRASHED="%d banners successfully trashed" -COM_BANNERS_BANNERS_N_ITEMS_TRASHED_1="%d banner successfully trashed" -COM_BANNERS_BANNERS_N_ITEMS_UNPUBLISHED="%d banners successfully unpublished" -COM_BANNERS_BANNERS_N_ITEMS_UNPUBLISHED_1="%d banner successfully unpublished" -COM_BANNERS_BANNERS_NO_ITEM_SELECTED="No Banners selected" -COM_BANNERS_BANNERS_PINNED="Pinned Banner" -COM_BANNERS_BANNERS_UNPINNED="Unpinned Banner" -COM_BANNERS_BATCH_CLIENT_LABEL="Set Client" -COM_BANNERS_BATCH_CLIENT_LABEL_DESC="Not making a selection will keep the original client when processing." -COM_BANNERS_BATCH_CLIENT_NOCHANGE="- Keep original Client -" -COM_BANNERS_BATCH_OPTIONS="Batch process the selected banners" -COM_BANNERS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved banners. Otherwise, all actions are applied to the selected banners." -COM_BANNERS_BEGIN_LABEL="Begin date:" -COM_BANNERS_CANCEL="Cancel" -COM_BANNERS_CLICK="Click" -COM_BANNERS_CLIENT_SAVE_SUCCESS="Client successfully saved" -COM_BANNERS_CLIENTS_N_ITEMS_ARCHIVED="%d clients successfully archived" -COM_BANNERS_CLIENTS_N_ITEMS_ARCHIVED_1="%d client successfully archived" -COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_0="No client successfully checked in" -COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_1="%d client successfully checked in" -COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_MORE="%d clients successfully checked in" -COM_BANNERS_CLIENTS_N_ITEMS_DELETED="%d clients successfully deleted" -COM_BANNERS_CLIENTS_N_ITEMS_DELETED_1="%d client successfully deleted" -COM_BANNERS_CLIENTS_N_ITEMS_PUBLISHED="%d clients successfully published" -COM_BANNERS_CLIENTS_N_ITEMS_PUBLISHED_1="%d client successfully published" -COM_BANNERS_CLIENTS_N_ITEMS_TRASHED="%d clients successfully trashed" -COM_BANNERS_CLIENTS_N_ITEMS_TRASHED_1="%d client successfully trashed" -COM_BANNERS_CLIENTS_N_ITEMS_UNPUBLISHED="%d clients successfully unpublished" -COM_BANNERS_CLIENTS_N_ITEMS_UNPUBLISHED_1="%d client successfully unpublished" -COM_BANNERS_CLIENTS_NO_ITEM_SELECTED="No clients selected" -COM_BANNERS_CONFIGURATION="Banner Manager Options" -COM_BANNERS_DEFAULT="Default (%s)" -COM_BANNERS_DELETE_MSG="Are you sure you want to delete all these tracks?" -COM_BANNERS_EDIT_BANNER="Edit Banner" -COM_BANNERS_EDIT_CLIENT="Details" -COM_BANNERS_END_LABEL="End date:" -COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE="Zip adapter failure" -COM_BANNERS_ERR_ZIP_CREATE_FAILURE="Zip create failure" -COM_BANNERS_ERR_ZIP_DELETE_FAILURE="Zip delete failure" -COM_BANNERS_ERROR_UNIQUE_ALIAS="Another Banner from this category has the same alias" -COM_BANNERS_EXTRA="Additional Information" -COM_BANNERS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each banner in the same category." -COM_BANNERS_FIELD_ALT_DESC="Alternative text for the banner image." -COM_BANNERS_FIELD_ALT_LABEL="Alternative Text" -COM_BANNERS_FIELD_BANNEROWNPREFIX_DESC="Use own prefix or the client prefix" -COM_BANNERS_FIELD_BANNEROWNPREFIX_LABEL="Use Own Prefix" -COM_BANNERS_FIELD_BASENAME_DESC="Filename pattern which can contain
__SITE__ for the site name
__CATID__ for the category ID
__CATNAME__ for the category name
__CLIENTID__ for the client ID
__CLIENTNAME__ for the client name
__TYPE__ for the type
__TYPENAME__ for the type name
__BEGIN__ for the begin date
__END__ for the end date" -COM_BANNERS_FIELD_BASENAME_LABEL="Filename" -COM_BANNERS_FIELD_CATEGORY_DESC="Choose a category for this banner" -COM_BANNERS_FIELD_CLICKS_DESC="Displays the number of clicks on the banner. Click on reset if desired." -COM_BANNERS_FIELD_CLICKS_LABEL="Total Clicks" -COM_BANNERS_FIELD_CLICKURL_DESC="The URL used when the banner is clicked on." -COM_BANNERS_FIELD_CLICKURL_LABEL="Click URL" -COM_BANNERS_FIELD_CLIENT_DESC="Choose a client for this banner" -COM_BANNERS_FIELD_CLIENT_LABEL="Client" -COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_DESC="When matching Meta Keywords, only search for Meta Keywords with this prefix (improves performance)." -COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_LABEL="Meta Keyword Prefix" -COM_BANNERS_FIELD_CLIENT_METAKEYWORDS_DESC="Enter the meta keywords for the clients' banners" -COM_BANNERS_FIELD_CLIENT_NAME_DESC="Enter a name for the client" -COM_BANNERS_FIELD_CLIENT_NAME_LABEL="Client Name" -COM_BANNERS_FIELD_CLIENT_STATE_DESC="Defines the status of the client" -COM_BANNERS_FIELD_CLIENTOWNPREFIX_DESC="Use own prefix or the component prefix" -COM_BANNERS_FIELD_CLIENTOWNPREFIX_LABEL="Use Own Prefix" -COM_BANNERS_FIELD_COMPRESSED_DESC="Option to compress file for export" -COM_BANNERS_FIELD_COMPRESSED_LABEL="Compressed" -COM_BANNERS_FIELD_CONTACT_DESC="Enter the Name of a user as contact" -COM_BANNERS_FIELD_CONTACT_LABEL="Contact Name" -COM_BANNERS_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the banner." -COM_BANNERS_FIELD_CREATED_BY_ALIAS_LABEL="Created by alias" -COM_BANNERS_FIELD_CREATED_BY_DESC="Select the name of the user who created the banner." -COM_BANNERS_FIELD_CREATED_BY_LABEL="Created by" -COM_BANNERS_FIELD_CREATED_DESC="Banner created date" -COM_BANNERS_FIELD_CREATED_LABEL="Created Date" -COM_BANNERS_FIELD_CUSTOMCODE_DESC="Enter your custom code for the banner" -COM_BANNERS_FIELD_CUSTOMCODE_LABEL="Custom Code" -COM_BANNERS_FIELD_DESCRIPTION_DESC="Enter a description for the banner" -COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact email" -COM_BANNERS_FIELD_EMAIL_LABEL="Contact email" -COM_BANNERS_FIELD_EXTRAINFO_DESC="Enter extra information for this client." -COM_BANNERS_FIELD_EXTRAINFO_LABEL="Additional Information" -COM_BANNERS_FIELD_HEIGHT_DESC="The height of the banner" -COM_BANNERS_FIELD_HEIGHT_LABEL="Height" -COM_BANNERS_FIELD_IMAGE_DESC="Select an image for this banner. Images have to be in the /images/banners/ directory." -COM_BANNERS_FIELD_IMAGE_LABEL="Image" -COM_BANNERS_FIELD_IMPMADE_DESC="Displays the number of impressions made for the banner." -COM_BANNERS_FIELD_IMPMADE_LABEL="Total Impressions" -COM_BANNERS_FIELD_IMPTOTAL_DESC="Total limit of impressions defined for the banner." -COM_BANNERS_FIELD_IMPTOTAL_LABEL="Max. Impressions" -COM_BANNERS_FIELD_LANGUAGE_DESC="Assign a language to this banner" -COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC="When matching Meta Keywords, only search for Meta Keywords with this prefix (improves performance)." -COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL="Meta Keyword Prefix" -COM_BANNERS_FIELD_METAKEYWORDS_DESC="Enter the meta keywords for the banner" -COM_BANNERS_FIELD_NAME_DESC="Enter a name for the banner" -COM_BANNERS_FIELD_NAME_LABEL="Name" -COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the banner." -COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing" -COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the banner." -COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Start Publishing" -COM_BANNERS_FIELD_PURCHASETYPE_DESC="Select the type of purchase in the list." -COM_BANNERS_FIELD_PURCHASETYPE_LABEL="Purchase Type" -COM_BANNERS_FIELD_STATE_DESC="Defines the status of the banner" -COM_BANNERS_FIELD_STICKY_DESC="Whether or not the Banner is 'sticky'. If one or more Banners in a Category are sticky, they will take priority over Banners that are not sticky. For example, if two Banners in a Category are sticky and a third Banner is not sticky, the third Banner will not display if the module setting is 'Sticky, Randomise'. Only the two sticky Banners will display." -COM_BANNERS_FIELD_STICKY_LABEL="Sticky" -COM_BANNERS_FIELD_TRACKCLICK_DESC="Record the number of clicks on the banners on a daily basis." -COM_BANNERS_FIELD_TRACKCLICK_LABEL="Track Clicks" -COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the banners on a daily basis." -COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions" -COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image from /images/banners/ directory. Select Custom to enter you custom code." -COM_BANNERS_FIELD_TYPE_LABEL="Type" -COM_BANNERS_FIELD_VALUE_1="Unlimited" -COM_BANNERS_FIELD_VALUE_2="Yearly" -COM_BANNERS_FIELD_VALUE_3="Monthly" -COM_BANNERS_FIELD_VALUE_4="Weekly" -COM_BANNERS_FIELD_VALUE_5="Daily" -COM_BANNERS_FIELD_VALUE_CUSTOM="Custom" -COM_BANNERS_FIELD_VALUE_IMAGE="Image" -COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --" -COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT="-- Use Component Default --" -COM_BANNERS_FIELD_VERSION_LABEL="Revision" -COM_BANNERS_FIELD_VERSION_DESC="A count of the number of times this article has been revised." -COM_BANNERS_FIELD_WIDTH_LABEL="Width" -COM_BANNERS_FIELD_WIDTH_DESC="The width of the banner" -COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_DESC="These settings apply to version history for Banners, Banner Categories, and Banner Clients." -COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL="History Options" -COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL="Client Options" -COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC="These settings apply for all clients unless they are changed for a specific client." -COM_BANNERS_FILENAME="%1$s-banners-tracks-%2$s" -COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS="Publishing Options" -COM_BANNERS_GROUP_LABEL_BANNER_DETAILS="Banner Details" -COM_BANNERS_HEADING_ACTIVE="Active" -COM_BANNERS_HEADING_ACTIVE_ASC="Active ascending" -COM_BANNERS_HEADING_ACTIVE_DESC="Active descending" -COM_BANNERS_HEADING_BANNERS="Banners" -COM_BANNERS_HEADING_BANNERS_ASC="Banners ascending" -COM_BANNERS_HEADING_BANNERS_DESC="Banners descending" -COM_BANNERS_HEADING_CLICKS="Clicks" -COM_BANNERS_HEADING_CLICKS_ASC="Clicks ascending" -COM_BANNERS_HEADING_CLICKS_DESC="Clicks descending" -COM_BANNERS_HEADING_CLIENT="Client" -COM_BANNERS_HEADING_CLIENT_ASC="Client ascending" -COM_BANNERS_HEADING_CLIENT_DESC="Client descending" -COM_BANNERS_HEADING_CONTACT="Contact" -COM_BANNERS_HEADING_CONTACT_ASC="Contact ascending" -COM_BANNERS_HEADING_CONTACT_DESC="Contact descending" -COM_BANNERS_HEADING_COUNT="Count" -COM_BANNERS_HEADING_IMPRESSIONS="Impressions" -COM_BANNERS_HEADING_IMPRESSIONS_ASC="Impressions ascending" -COM_BANNERS_HEADING_IMPRESSIONS_DESC="Impressions descending" -COM_BANNERS_HEADING_METAKEYWORDS="Meta Keywords" -COM_BANNERS_HEADING_NAME="Name" -COM_BANNERS_HEADING_NAME_ASC="Name ascending" -COM_BANNERS_HEADING_NAME_DESC="Name descending" -COM_BANNERS_HEADING_PURCHASETYPE="Purchase Type" -COM_BANNERS_HEADING_PURCHASETYPE_ASC="Purchase Type ascending" -COM_BANNERS_HEADING_PURCHASETYPE_DESC="Purchase Type descending" -COM_BANNERS_HEADING_STICKY="Sticky" -COM_BANNERS_HEADING_STICKY_ASC="Sticky ascending" -COM_BANNERS_HEADING_STICKY_DESC="Sticky descending" -COM_BANNERS_HEADING_TYPE="Type" -COM_BANNERS_IMPRESSION="Impression" -COM_BANNERS_IMPRESSIONS="%1$s of %2$s" -COM_BANNERS_MANAGER="Banner Manager" -COM_BANNERS_MANAGER_BANNER_EDIT="Banner Manager: Edit Banner" -COM_BANNERS_MANAGER_BANNER_NEW="Banner Manager: New Banner" -COM_BANNERS_MANAGER_BANNERS="Banner Manager: Banners" -COM_BANNERS_MANAGER_CLIENT_EDIT="Banner Manager: Edit Client" -COM_BANNERS_MANAGER_CLIENT_NEW="Banner Manager: New Client" -COM_BANNERS_MANAGER_CLIENTS="Banner Manager: Clients" -COM_BANNERS_MANAGER_TRACKS="Banner Manager: Tracks" -COM_BANNERS_METADATA="Metadata" -COM_BANNERS_FIELD_MODIFIED_DESC="The date and time that the banner was last modified." -COM_BANNERS_N_BANNERS_STUCK="%d banners successfully stickied." -COM_BANNERS_N_BANNERS_STUCK_1="%d banner successfully stickied." -COM_BANNERS_N_BANNERS_UNSTUCK="%d banners successfully unstickied." -COM_BANNERS_N_BANNERS_UNSTUCK_1="%d banner successfully unstickied." -COM_BANNERS_NEW_BANNER="New Banner" -COM_BANNERS_NEW_CLIENT="New Client" -COM_BANNERS_NO_BANNERS_SELECTED="No banners selected" -COM_BANNERS_NO_CLIENT="- No client -" -COM_BANNERS_NO_CLIENTS_SELECTED="No clients selected" -COM_BANNERS_NOCATEGORYNAME="No category" -COM_BANNERS_NOCLIENTNAME="No client" -COM_BANNERS_RESET_CLICKS="Reset clicks" -COM_BANNERS_RESET_IMPMADE="Reset impressions" -COM_BANNERS_SEARCH_IN_TITLE="Search in title" -COM_BANNERS_SELECT_CLIENT="- Select Client -" -COM_BANNERS_SELECT_TYPE="- Type -" -COM_BANNERS_SUBMENU_BANNERS="Banners" -COM_BANNERS_SUBMENU_CATEGORIES="Categories" -COM_BANNERS_SUBMENU_CLIENTS="Clients" -COM_BANNERS_SUBMENU_TRACKS="Tracks" -COM_BANNERS_TRACKS_DELETE="Delete Tracks" -COM_BANNERS_TRACKS_DOWNLOAD="Download tracks" -COM_BANNERS_TRACKS_EXPORT="Export" -COM_BANNERS_TRACKS_N_ITEMS_DELETED="%d tracks successfully deleted" -COM_BANNERS_TRACKS_N_ITEMS_DELETED_1="%d track successfully deleted" -COM_BANNERS_TYPE1="Impressions" -COM_BANNERS_TYPE2="Clicks" -COM_BANNERS_UNLIMITED="Unlimited" -COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." - diff --git a/administrator/language/en-GB/en-GB.com_banners.sys.ini b/administrator/language/en-GB/en-GB.com_banners.sys.ini deleted file mode 100644 index 16c70dce99..0000000000 --- a/administrator/language/en-GB/en-GB.com_banners.sys.ini +++ /dev/null @@ -1,13 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - -COM_BANNERS="Banners" -COM_BANNERS_BANNERS="Banners" -COM_BANNERS_CATEGORY_ADD_TITLE="Category Manager: Add A New Banners Category" -COM_BANNERS_CATEGORY_EDIT_TITLE="Category Manager: Edit A Banners Category" -COM_BANNERS_CATEGORIES="Categories" -COM_BANNERS_CLIENTS="Clients" -COM_BANNERS_TRACKS="Tracks" -COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients" \ No newline at end of file diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 6042f49ad9..60d9b3a7a7 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -576,7 +576,6 @@ JHELP_COMPONENTS_BANNERS_CLIENTS="Components_Banners_Clients" JHELP_COMPONENTS_BANNERS_TRACKS="Components_Banners_Tracks" JHELP_COMPONENTS_CACHE_MANAGER_SETTINGS="Components_Cache_Manager_Settings" JHELP_COMPONENTS_CHECK-IN_CONFIGURATION="Components_Check-in_Configuration" -JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Components_Banner_Manager_Options" JHELP_COMPONENTS_COM_CACHE_OPTIONS="Components_Cache_Manager_Settings" JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Components_Check_in_Configuration" JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Components_Contact_Manager_Options" diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index cc40192f05..8cc1fc88fb 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -13,8 +13,6 @@ en-GB.com_admin.ini en-GB.com_admin.sys.ini - en-GB.com_banners.ini - en-GB.com_banners.sys.ini en-GB.com_ajax.ini en-GB.com_ajax.sys.ini en-GB.com_cache.ini diff --git a/administrator/templates/hathor/html/com_banners/banner/edit.php b/administrator/templates/hathor/html/com_banners/banner/edit.php deleted file mode 100644 index 925d561fb0..0000000000 --- a/administrator/templates/hathor/html/com_banners/banner/edit.php +++ /dev/null @@ -1,113 +0,0 @@ - - - - diff --git a/administrator/templates/hathor/html/com_banners/banner/index.html b/administrator/templates/hathor/html/com_banners/banner/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/banner/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/templates/hathor/html/com_banners/banners/default.php b/administrator/templates/hathor/html/com_banners/banners/default.php deleted file mode 100644 index b8c5640363..0000000000 --- a/administrator/templates/hathor/html/com_banners/banners/default.php +++ /dev/null @@ -1,228 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -$canOrder = $user->authorise('core.edit.state', 'com_banners.category'); -$saveOrder = $listOrder == 'ordering'; -?> -
-sidebar)) : ?> -
- sidebar; ?> -
-
- -
- -
- -
- - - - -
- -
- - - - - - - - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - items as $i => $item) : - $ordering = ($listOrder == 'ordering'); - $item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid); - $canCreate = $user->authorise('core.create', 'com_banners.category.' . $item->catid); - $canEdit = $user->authorise('core.edit', 'com_banners.category.' . $item->catid); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin; - ?> - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - items, 'filesave.png', 'banners.saveorder'); ?> - - - - - - - - - - - state->get('list.direction'), $this->state->get('list.ordering')); ?> - - -
- id); ?> - - checked_out) : ?> - editor, $item->checked_out_time, 'banners.', $canCheckin); ?> - - - - escape($item->name); ?> - - escape($item->name); ?> - -

- escape($item->alias));?>

- 		- state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> - - sticky, $i, $canChange);?> - - client_name;?> - - escape($item->category_title); ?> - - - - - pagination->orderUpIcon($i, (@$this->items[$i - 1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?> - pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i + 1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?> - - pagination->orderUpIcon($i, (@$this->items[$i - 1]->catid == $item->catid), 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?> - pagination->orderDownIcon($i, $this->pagination->total, (@$this->items[$i + 1]->catid == $item->catid), 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?> - - - - class="text-area-order" title="name; ?> order" /> - - ordering; ?> - - - impmade, $item->imptotal ? $item->imptotal : JText::_('COM_BANNERS_UNLIMITED'));?> - - clicks;?> - - impmade ? 100 * $item->clicks / $item->impmade : 0);?> - - metakey; ?> - - purchase_type < 0):?> - client_purchase_type > 0) ? JText::_('COM_BANNERS_FIELD_VALUE_'.$item->client_purchase_type) : JText::_('COM_BANNERS_FIELD_VALUE_'.$this->state->params->get('purchase_type')));?> - - purchase_type);?> - - - language == '*'):?> - - - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - - - id; ?> -
- - pagination->getListFooter(); ?> -
- - - loadTemplate('batch'); ?> - - - - - - -
- diff --git a/administrator/templates/hathor/html/com_banners/banners/index.html b/administrator/templates/hathor/html/com_banners/banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/templates/hathor/html/com_banners/client/edit.php b/administrator/templates/hathor/html/com_banners/client/edit.php deleted file mode 100644 index bbeb45be50..0000000000 --- a/administrator/templates/hathor/html/com_banners/client/edit.php +++ /dev/null @@ -1,100 +0,0 @@ - - - -
- -
-
- item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::sprintf('COM_BANNERS_EDIT_CLIENT', $this->item->id); ?> -
    -
  • form->getLabel('name'); ?> - form->getInput('name'); ?>
    • - -
  • form->getLabel('contact'); ?> - form->getInput('contact'); ?>
    • - -
  • form->getLabel('email'); ?> - form->getInput('email'); ?>
    • - - get('core.edit.state')) : ?> -
  • form->getLabel('state'); ?> - form->getInput('state'); ?>
    • - - -
  • form->getLabel('purchase_type'); ?> - form->getInput('purchase_type'); ?>
    • - -
  • form->getLabel('track_impressions'); ?> - form->getInput('track_impressions'); ?>
    • - -
  • form->getLabel('track_clicks'); ?> - form->getInput('track_clicks'); ?>
    • - -
  • form->getLabel('id'); ?> - form->getInput('id'); ?>
    • -
- -
-
- -
- item->id, array('useCookie' => 1)); ?> - - -
- -
    - form->getFieldset('metadata') as $field) : ?> -
  • - hidden) : ?> - label; ?> - - input; ?> -
    • - -
-
- - -
- -
    - form->getFieldset('extra') as $field) : ?> -
  • hidden) : ?> - label; ?> - - input; ?>
    • - -
-
- - - - - -
- -
-
diff --git a/administrator/templates/hathor/html/com_banners/client/index.html b/administrator/templates/hathor/html/com_banners/client/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/client/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/templates/hathor/html/com_banners/clients/default.php b/administrator/templates/hathor/html/com_banners/clients/default.php deleted file mode 100644 index af082dcb75..0000000000 --- a/administrator/templates/hathor/html/com_banners/clients/default.php +++ /dev/null @@ -1,143 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -?> - -
-sidebar)) : ?> -
- sidebar; ?> -
-
- -
- -
- -
- - - - -
- -
- - - - -
-
-
- - - - - - - - - - - - - - - - - items as $i => $item) : - $ordering = ($listOrder == 'ordering'); - $canCreate = $user->authorise('core.create', 'com_banners'); - $canEdit = $user->authorise('core.edit', 'com_banners'); - $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0; - $canChange = $user->authorise('core.edit.state', 'com_banners') && $canCheckin; - ?> - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- id); ?> - - checked_out) : ?> - editor, $item->checked_out_time, 'clients.', $canCheckin); ?> - - - - escape($item->name); ?> - - escape($item->name); ?> - - - contact;?> - - state, $i, 'clients.', $canChange);?> - - nbanners; ?> - - metakey; ?> - - purchase_type < 0):?> - state->params->get('purchase_type')));?> - - purchase_type);?> - - - id; ?> -
- - pagination->getListFooter(); ?> - - - - - - -
- diff --git a/administrator/templates/hathor/html/com_banners/clients/index.html b/administrator/templates/hathor/html/com_banners/clients/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/clients/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/templates/hathor/html/com_banners/index.html b/administrator/templates/hathor/html/com_banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/templates/hathor/html/com_banners/tracks/default.php b/administrator/templates/hathor/html/com_banners/tracks/default.php deleted file mode 100644 index 6dca549e80..0000000000 --- a/administrator/templates/hathor/html/com_banners/tracks/default.php +++ /dev/null @@ -1,130 +0,0 @@ -get('id'); -$listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); -?> -
-sidebar)) : ?> -
- sidebar; ?> -
-
- -
- -
- -
- - state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10));?> - - - state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10));?> -
- -
- - - - - state->get('filter.category_id');?> - - - - - - -
-
-
- - - - - - - - - - - - - - - items as $i => $item) :?> - - - - - - - - - - -
- - - - - - - - - - - -
- name;?> - - client_name;?> - - category_title;?> - - track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?> - - count;?> - - track_date, JText::_('DATE_FORMAT_LC4').' H:i');?> -
- - pagination->getListFooter(); ?> - - - - - - -
- diff --git a/administrator/templates/hathor/html/com_banners/tracks/index.html b/administrator/templates/hathor/html/com_banners/tracks/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/administrator/templates/hathor/html/com_banners/tracks/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/com_banners/banners.php b/components/com_banners/banners.php deleted file mode 100644 index 31d8d974ef..0000000000 --- a/components/com_banners/banners.php +++ /dev/null @@ -1,14 +0,0 @@ -execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); diff --git a/components/com_banners/controller.php b/components/com_banners/controller.php deleted file mode 100644 index 336aa7bbc7..0000000000 --- a/components/com_banners/controller.php +++ /dev/null @@ -1,40 +0,0 @@ -input->getInt('id', 0); - - if ($id) - { - $model = $this->getModel('Banner', 'BannersModel', array('ignore_request' => true)); - $model->setState('banner.id', $id); - $model->click(); - $this->setRedirect($model->getUrl()); - } - } -} diff --git a/components/com_banners/helpers/banner.php b/components/com_banners/helpers/banner.php deleted file mode 100644 index 6cc3a012da..0000000000 --- a/components/com_banners/helpers/banner.php +++ /dev/null @@ -1,48 +0,0 @@ - diff --git a/components/com_banners/index.html b/components/com_banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/components/com_banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/com_banners/models/banner.php b/components/com_banners/models/banner.php deleted file mode 100644 index 6887b45f34..0000000000 --- a/components/com_banners/models/banner.php +++ /dev/null @@ -1,209 +0,0 @@ -getState('banner.id'); - - // Update click count - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->update('#__banners') - ->set('clicks = (clicks + 1)') - ->where('id = ' . (int) $id); - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - - $item = $this->getItem(); - - // Track clicks - $trackClicks = $item->track_clicks; - - if ($trackClicks < 0 && $item->cid) - { - $trackClicks = $item->client_track_clicks; - } - - if ($trackClicks < 0) - { - $config = JComponentHelper::getParams('com_banners'); - $trackClicks = $config->get('track_clicks'); - } - - if ($trackClicks > 0) - { - $trackDate = JFactory::getDate()->format('Y-m-d H'); - - $query->clear() - ->select($db->quoteName('count')) - ->from('#__banner_tracks') - ->where('track_type=2') - ->where('banner_id=' . (int) $id) - ->where('track_date=' . $db->quote($trackDate)); - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - - $count = $db->loadResult(); - - $query->clear(); - - if ($count) - { - // Update count - $query->update('#__banner_tracks') - ->set($db->quoteName('count') . ' = (' . $db->quoteName('count') . ' + 1)') - ->where('track_type=2') - ->where('banner_id=' . (int) $id) - ->where('track_date=' . $db->quote($trackDate)); - } - else - { - // Insert new count - $query->insert('#__banner_tracks') - ->columns( - array( - $db->quoteName('count'), $db->quoteName('track_type'), - $db->quoteName('banner_id'), $db->quoteName('track_date') - ) - ) - ->values('1, 2,' . (int) $id . ',' . $db->quote($trackDate)); - } - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - } - } - - /** - * Get the data for a banner. - * - * @return object - * - * @since 1.6 - */ - public function &getItem() - { - if (!isset($this->_item)) - { - $cache = JFactory::getCache('com_banners', ''); - - $id = $this->getState('banner.id'); - - $this->_item = $cache->get($id); - - if ($this->_item === false) - { - // Redirect to banner url - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select( - 'a.clickurl as clickurl,' . - 'a.cid as cid,' . - 'a.track_clicks as track_clicks' - ) - ->from('#__banners as a') - ->where('a.id = ' . (int) $id) - - ->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid') - ->select('cl.track_clicks as client_track_clicks'); - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - - $this->_item = $db->loadObject(); - $cache->store($this->_item, $id); - } - } - - return $this->_item; - } - - /** - * Get the URL for a banner - * - * @return string - * - * @since 1.5 - */ - public function getUrl() - { - $item = $this->getItem(); - $url = $item->clickurl; - - // Check for links - if (!preg_match('#http[s]?://|index[2]?\.php#', $url)) - { - $url = "http://$url"; - } - - return $url; - } -} diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php deleted file mode 100644 index 82fcccccba..0000000000 --- a/components/com_banners/models/banners.php +++ /dev/null @@ -1,312 +0,0 @@ -getState('filter.search'); - $id .= ':' . $this->getState('filter.tag_search'); - $id .= ':' . $this->getState('filter.client_id'); - $id .= ':' . serialize($this->getState('filter.category_id')); - $id .= ':' . serialize($this->getState('filter.keywords')); - - return parent::getStoreId($id); - } - - /** - * Method to get a JDatabaseQuery object for retrieving the data set from a database. - * - * @return JDatabaseQuery A JDatabaseQuery object to retrieve the data set. - * - * @since 1.6 - */ - protected function getListQuery() - { - $db = $this->getDbo(); - $query = $db->getQuery(true); - $ordering = $this->getState('filter.ordering'); - $tagSearch = $this->getState('filter.tag_search'); - $cid = $this->getState('filter.client_id'); - $categoryId = $this->getState('filter.category_id'); - $keywords = $this->getState('filter.keywords'); - $randomise = ($ordering == 'random'); - $nullDate = $db->quote($db->getNullDate()); - - $query->select( - 'a.id as id,' . - 'a.type as type,' . - 'a.name as name,' . - 'a.clickurl as clickurl,' . - 'a.cid as cid,' . - 'a.description as description,' . - 'a.params as params,' . - 'a.custombannercode as custombannercode,' . - 'a.track_impressions as track_impressions,' . - 'cl.track_impressions as client_track_impressions' - ) - ->from('#__banners as a') - ->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid') - ->where('a.state=1') - ->where('(' . $query->currentTimestamp() . ' >= a.publish_up OR a.publish_up = ' . $nullDate . ')') - ->where('(' . $query->currentTimestamp() . ' <= a.publish_down OR a.publish_down = ' . $nullDate . ')') - ->where('(a.imptotal = 0 OR a.impmade <= a.imptotal)'); - - if ($cid) - { - $query->join('LEFT', '#__categories as cat ON a.catid = cat.id') - ->where('a.cid = ' . (int) $cid) - ->where('cl.state = 1'); - } - - // Filter by a single or group of categories - if (is_numeric($categoryId)) - { - $type = $this->getState('filter.category_id.include', true) ? '= ' : '<> '; - - // Add subcategory check - $includeSubcategories = $this->getState('filter.subcategories', false); - $categoryEquals = 'a.catid ' . $type . (int) $categoryId; - - if ($includeSubcategories) - { - $levels = (int) $this->getState('filter.max_category_levels', '1'); - - // Create a subquery for the subcategory list - $subQuery = $db->getQuery(true); - $subQuery->select('sub.id') - ->from('#__categories as sub') - ->join('INNER', '#__categories as this ON sub.lft > this.lft AND sub.rgt < this.rgt') - ->where('this.id = ' . (int) $categoryId) - ->where('sub.level <= this.level + ' . $levels); - - // Add the subquery to the main query - $query->where('(' . $categoryEquals . ' OR a.catid IN (' . $subQuery->__toString() . '))'); - } - else - { - $query->where($categoryEquals); - } - } - elseif ((is_array($categoryId)) && (count($categoryId) > 0)) - { - JArrayHelper::toInteger($categoryId); - $categoryId = implode(',', $categoryId); - - if ($categoryId != '0') - { - $type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN'; - $query->where('a.catid ' . $type . ' (' . $categoryId . ')'); - } - } - - if ($tagSearch) - { - if (count($keywords) == 0) - { - $query->where('0'); - } - else - { - $temp = array(); - $config = JComponentHelper::getParams('com_banners'); - $prefix = $config->get('metakey_prefix'); - - foreach ($keywords as $keyword) - { - $keyword = trim($keyword); - $condition1 = "a.own_prefix=1 AND a.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH( a.metakey_prefix)) OR a.own_prefix=0 AND cl.own_prefix=1 AND cl.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH(cl.metakey_prefix)) OR a.own_prefix=0 AND cl.own_prefix=0 AND " . ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0'); - - $condition2 = "a.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'"; - - if ($cid) - { - $condition2 .= " OR cl.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'"; - } - - if ($categoryId) - { - $condition2 .= " OR cat.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'"; - } - - $temp[] = "($condition1) AND ($condition2)"; - } - - $query->where('(' . implode(' OR ', $temp) . ')'); - } - } - - // Filter by language - if ($this->getState('filter.language')) - { - $query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')'); - } - - $query->order('a.sticky DESC,' . ($randomise ? 'RAND()' : 'a.ordering')); - - return $query; - } - - /** - * Get a list of banners. - * - * @return array - * - * @since 1.6 - */ - public function getItems() - { - if (!isset($this->cache['items'])) - { - $this->cache['items'] = parent::getItems(); - - foreach ($this->cache['items'] as &$item) - { - $parameters = new JRegistry; - $parameters->loadString($item->params); - $item->params = $parameters; - } - } - - return $this->cache['items']; - } - - /** - * Makes impressions on a list of banners - * - * @return void - * - * @since 1.6 - */ - public function impress() - { - $trackDate = JFactory::getDate()->format('Y-m-d H'); - $items = $this->getItems(); - $db = $this->getDbo(); - $query = $db->getQuery(true); - - foreach ($items as $item) - { - // Increment impression made - $id = $item->id; - $query->clear() - ->update('#__banners') - ->set('impmade = (impmade + 1)') - ->where('id = ' . (int) $id); - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - - // Track impressions - $trackImpressions = $item->track_impressions; - - if ($trackImpressions < 0 && $item->cid) - { - $trackImpressions = $item->client_track_impressions; - } - - if ($trackImpressions < 0) - { - $config = JComponentHelper::getParams('com_banners'); - $trackImpressions = $config->get('track_impressions'); - } - - if ($trackImpressions > 0) - { - // Is track already created? - $query->clear() - ->select($db->quoteName('count')) - ->from('#__banner_tracks') - ->where('track_type=1') - ->where('banner_id=' . (int) $id) - ->where('track_date=' . $db->quote($trackDate)); - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - - $count = $db->loadResult(); - - $query->clear(); - - if ($count) - { - // Update count - $query->update('#__banner_tracks') - ->set($db->quoteName('count') . ' = (' . $db->quoteName('count') . ' + 1)') - ->where('track_type=1') - ->where('banner_id=' . (int) $id) - ->where('track_date=' . $db->quote($trackDate)); - } - else - { - // Insert new count - $query->insert('#__banner_tracks') - ->columns( - array( - $db->quoteName('count'), $db->quoteName('track_type'), - $db->quoteName('banner_id'), $db->quoteName('track_date') - ) - ) - ->values('1, 1, ' . (int) $id . ', ' . $db->quote($trackDate)); - } - - $db->setQuery($query); - - try - { - $db->execute(); - } - catch (RuntimeException $e) - { - JError::raiseError(500, $e->getMessage()); - } - } - } - } -} diff --git a/components/com_banners/models/index.html b/components/com_banners/models/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/components/com_banners/models/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/com_banners/router.php b/components/com_banners/router.php deleted file mode 100644 index 2a9e578278..0000000000 --- a/components/com_banners/router.php +++ /dev/null @@ -1,145 +0,0 @@ -build($query); -} - -/** - * Parse the segments of a URL. - * - * This function is a proxy for the new router interface - * for old SEF extensions. - * - * @param array $segments The segments of the URL to parse. - * - * @return array The URL attributes to be used by the application. - * - * @since 3.3 - * @deprecated 4.0 Use Class based routers instead - */ -function BannersParseRoute($segments) -{ - $router = new BannersRouter; - - return $router->parse($segments); -} diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 61a412d7ba..8be7e8b311 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -33,7 +33,6 @@ CREATE TABLE IF NOT EXISTS `#__assets` ( INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 0, 105, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 9, 10, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 11, 12, 1, 'com_config', 'com_config', '{}'), @@ -57,7 +56,6 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl (24, 1, 83, 86, 1, 'com_users', 'com_users', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (26, 1, 91, 92, 1, 'com_wrapper', 'com_wrapper', '{}'), (27, 8, 18, 19, 2, 'com_content.category.2', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 72, 73, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (32, 24, 84, 85, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -240,7 +238,6 @@ CREATE TABLE IF NOT EXISTS `#__categories` ( INSERT INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`, `version`) VALUES (1, 0, 0, 0, 13, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '{}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1); @@ -412,9 +409,6 @@ INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, (7, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContactHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'), (8, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'), (10, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}', 'TagsHelperRoute::getTagRoute', '{"formFile":"administrator\\/components\\/com_tags\\/models\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'), -(11, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'), -(12, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'), -(13, 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'), (14, 'User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'), (15, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'); @@ -488,7 +482,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (1, 'com_mailto', 'component', 'com_mailto', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (2, 'com_wrapper', 'component', 'com_wrapper', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (3, 'com_admin', 'component', 'com_admin', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(4, 'com_banners', 'component', 'com_banners', '', 1, 1, 1, 0, '', '{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":"","save_history":"1","history_limit":10}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (5, 'com_cache', 'component', 'com_cache', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (6, 'com_categories', 'component', 'com_categories', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (7, 'com_checkin', 'component', 'com_checkin', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), @@ -1253,11 +1246,6 @@ CREATE TABLE IF NOT EXISTS `#__menu` ( INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 49, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini deleted file mode 100644 index 470565d940..0000000000 --- a/language/en-GB/en-GB.mod_banners.ini +++ /dev/null @@ -1,28 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - No BOM - -COM_BANNERS_NO_CLIENT="- No client -" -MOD_BANNERS="Banners" -MOD_BANNERS_BANNER="Banner" -MOD_BANNERS_FIELD_BANNERCLIENT_DESC="Select banners only from a single client." -MOD_BANNERS_FIELD_BANNERCLIENT_LABEL="Client" -MOD_BANNERS_FIELD_CACHETIME_DESC="The time before the module is recached" -MOD_BANNERS_FIELD_CACHETIME_LABEL="Cache Time" -MOD_BANNERS_FIELD_CATEGORY_DESC="Select banners from a specific Category or a set of Categories. If no selection then it will show all categories as default." -MOD_BANNERS_FIELD_COUNT_DESC="The number of banners to display (default 5)" -MOD_BANNERS_FIELD_COUNT_LABEL="Count" -MOD_BANNERS_FIELD_FOOTER_DESC="Text or HTML to display after the group of banners" -MOD_BANNERS_FIELD_FOOTER_LABEL="Footer Text" -MOD_BANNERS_FIELD_HEADER_DESC="Text or HTML to display before the group of banners" -MOD_BANNERS_FIELD_HEADER_LABEL="Header Text" -MOD_BANNERS_FIELD_RANDOMISE_DESC="Randomise the ordering of the banners" -MOD_BANNERS_FIELD_RANDOMISE_LABEL="Randomise" -MOD_BANNERS_FIELD_TAG_DESC="Banner is selected by matching the banner tags to the current document meta keywords." -MOD_BANNERS_FIELD_TAG_LABEL="Search by Meta Keyword" -MOD_BANNERS_FIELD_TARGET_DESC="Target window when the link is clicked" -MOD_BANNERS_FIELD_TARGET_LABEL="Target" -MOD_BANNERS_VALUE_STICKYORDERING="Sticky, Ordering" -MOD_BANNERS_VALUE_STICKYRANDOMISE="Sticky, Randomise" -MOD_BANNERS_XML_DESCRIPTION="The Banner Module displays the active Banners from the Component." diff --git a/language/en-GB/en-GB.mod_banners.sys.ini b/language/en-GB/en-GB.mod_banners.sys.ini deleted file mode 100644 index d685f74b18..0000000000 --- a/language/en-GB/en-GB.mod_banners.sys.ini +++ /dev/null @@ -1,9 +0,0 @@ -; Joomla! Project -; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note : All ini files need to be saved as UTF-8 - No BOM - -MOD_BANNERS="Banners" -MOD_BANNERS_XML_DESCRIPTION="The Banner Module displays the active Banners from the Component." -MOD_BANNERS_LAYOUT_DEFAULT="Default" - diff --git a/media/com_banners/banner.js b/media/com_banners/banner.js deleted file mode 100644 index 1488b70173..0000000000 --- a/media/com_banners/banner.js +++ /dev/null @@ -1,20 +0,0 @@ -var jQuery; - (function ($) { - $(document).ready(function () { - $('#jform_type').on('change', function (a, params) { - var v = typeof(params) !== 'object' ? $('#jform_type').val() : params.selected; - switch (v) { - case '0': - // Image - $('#image, #url').show(); - $('#custom').hide(); - break; - case '1': - // Custom - $('#image, #url').hide(); - $('#custom').show(); - break; - } - }); - }); - })(jQuery); \ No newline at end of file diff --git a/modules/mod_banners/helper.php b/modules/mod_banners/helper.php deleted file mode 100644 index d7277dbbf5..0000000000 --- a/modules/mod_banners/helper.php +++ /dev/null @@ -1,50 +0,0 @@ -getMetaData('keywords')); - - $model = JModelLegacy::getInstance('Banners', 'BannersModel', array('ignore_request' => true)); - $model->setState('filter.client_id', (int) $params->get('cid')); - $model->setState('filter.category_id', $params->get('catid', array())); - $model->setState('list.limit', (int) $params->get('count', 1)); - $model->setState('list.start', 0); - $model->setState('filter.ordering', $params->get('ordering')); - $model->setState('filter.tag_search', $params->get('tag_search')); - $model->setState('filter.keywords', $keywords); - $model->setState('filter.language', $app->getLanguageFilter()); - - $banners = $model->getItems(); - $model->impress(); - - return $banners; - } -} diff --git a/modules/mod_banners/index.html b/modules/mod_banners/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/modules/mod_banners/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/modules/mod_banners/mod_banners.php b/modules/mod_banners/mod_banners.php deleted file mode 100644 index 156348d63d..0000000000 --- a/modules/mod_banners/mod_banners.php +++ /dev/null @@ -1,23 +0,0 @@ -get('header_text')); -$footerText = trim($params->get('footer_text')); - -require_once JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php'; -BannersHelper::updateReset(); -$list = &ModBannersHelper::getList($params); -$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx')); - -require JModuleHelper::getLayoutPath('mod_banners', $params->get('layout', 'default')); diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml deleted file mode 100644 index 6f9dc91214..0000000000 --- a/modules/mod_banners/mod_banners.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - mod_banners - Joomla! Project - July 2006 - Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. - GNU General Public License version 2 or later; see LICENSE.txt - admin@joomla.org - www.joomla.org - 3.0.0 - MOD_BANNERS_XML_DESCRIPTION - - mod_banners.php - tmpl - helper.php - index.html - mod_banners.xml - - - en-GB.mod_banners.ini - en-GB.mod_banners.sys.ini - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - -
- - - diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php deleted file mode 100644 index 37dae0b77e..0000000000 --- a/modules/mod_banners/tmpl/default.php +++ /dev/null @@ -1,114 +0,0 @@ - -
- - - - - -
- id);?> - type == 1) :?> - - name), $item->custombannercode);?> - - params->get('imageurl');?> - params->get('width');?> - params->get('height');?> - - - params->get('alt');?> - name; ?> - - clickurl) :?> - - get('target', 1);?> - - - - <?php echo $alt;?> - - /> - - - - - <?php echo $alt;?> - - /> - - - - - <?php echo $alt;?> - - /> - - - - - <?php echo $alt;?> - - /> - - - - - > - - - - /> - - - -
-
- - - -
- -
- -
diff --git a/modules/mod_banners/tmpl/index.html b/modules/mod_banners/tmpl/index.html deleted file mode 100644 index 2efb97f319..0000000000 --- a/modules/mod_banners/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php index 0292ab6463..87bf193f6e 100644 --- a/plugins/content/joomla/joomla.php +++ b/plugins/content/joomla/joomla.php @@ -125,7 +125,6 @@ public function onContentBeforeDelete($context, $data) $result = true; $tableInfo = array( - 'com_banners' => array('table_name' => '#__banners'), 'com_contact' => array('table_name' => '#__contact_details'), 'com_content' => array('table_name' => '#__content'), 'com_newsfeeds' => array('table_name' => '#__newsfeeds'), From 46d8edf99ce976f984f7119f5bdb010eab4fba3a Mon Sep 17 00:00:00 2001 From: Mati Kochen Date: Tue, 10 Mar 2015 10:53:17 +0100 Subject: [PATCH 2/3] re #4 - remove com_banners --- administrator/components/com_admin/script.php | 1 - .../com_admin/sql/updates/mysql/3.0.0.sql | 9 -- .../language/en-GB/en-GB.com_admin.ini | 7 -- .../language/en-GB/en-GB.com_tags.sys.ini | 3 - administrator/language/en-GB/en-GB.ini | 9 -- installation/sql/mysql/joomla.sql | 93 ------------------- installation/sql/mysql/sample_blog.sql | 8 -- installation/sql/mysql/sample_learn.sql | 11 --- installation/sql/mysql/sample_testing.sql | 11 --- language/en-GB/install.xml | 2 - 10 files changed, 154 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 4ad657b25b..8cbec950ef 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -133,7 +133,6 @@ protected function updateManifestCaches() $extensions[] = array('module', 'mod_articles_archive', '', 0); $extensions[] = array('module', 'mod_articles_latest', '', 0); $extensions[] = array('module', 'mod_articles_popular', '', 0); - $extensions[] = array('module', 'mod_banners', '', 0); $extensions[] = array('module', 'mod_breadcrumbs', '', 0); $extensions[] = array('module', 'mod_custom', '', 0); $extensions[] = array('module', 'mod_feed', '', 0); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql index 35cd42ed50..e58c57bb6a 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql @@ -22,7 +22,6 @@ UPDATE `#__extensions` SET protected = 0 WHERE `name` = 'com_search' OR `name` = 'mod_articles_archive' OR `name` = 'mod_articles_latest' OR -`name` = 'mod_banners' OR `name` = 'mod_feed' OR `name` = 'mod_footer' OR `name` = 'mod_users_latest' OR @@ -40,9 +39,6 @@ DELETE FROM `#__extensions` WHERE `extension_id` = 800; ALTER TABLE `#__assets` ENGINE=InnoDB; ALTER TABLE `#__associations` ENGINE=InnoDB; -ALTER TABLE `#__banners` ENGINE=InnoDB; -ALTER TABLE `#__banner_clients` ENGINE=InnoDB; -ALTER TABLE `#__banner_tracks` ENGINE=InnoDB; ALTER TABLE `#__categories` ENGINE=InnoDB; ALTER TABLE `#__contact_details` ENGINE=InnoDB; ALTER TABLE `#__content` ENGINE=InnoDB; @@ -105,11 +101,6 @@ ALTER TABLE `#__newsfeeds` ADD COLUMN `hits` int(10) unsigned NOT NULL DEFAULT ' ALTER TABLE `#__newsfeeds` ADD COLUMN `images` text NOT NULL; ALTER TABLE `#__contact_details` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1'; ALTER TABLE `#__contact_details` ADD COLUMN `hits` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `#__banners` ADD COLUMN `created_by` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `#__banners` ADD COLUMN `created_by_alias` varchar(255) NOT NULL DEFAULT ''; -ALTER TABLE `#__banners` ADD COLUMN `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'; -ALTER TABLE `#__banners` ADD COLUMN `modified_by` int(10) unsigned NOT NULL DEFAULT '0'; -ALTER TABLE `#__banners` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1'; ALTER TABLE `#__categories` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1'; UPDATE `#__assets` SET name=REPLACE( name, 'com_user.notes.category','com_users.category' ); UPDATE `#__categories` SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category' ); diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index 895dbb806d..17ce774032 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -18,13 +18,6 @@ COM_ADMIN_FILE_UPLOADS="File Uploads" COM_ADMIN_GLOSSARY="Glossary" COM_ADMIN_GO="Go" COM_ADMIN_HELP="Joomla! Help" -COM_ADMIN_HELP_COMPONENTS_BANNERS_BANNERS="Banner Manager: Banners" -COM_ADMIN_HELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banner Manager: Banners - New/Edit" -COM_ADMIN_HELP_COMPONENTS_BANNERS_CATEGORIES="Banner Manager: Categories" -COM_ADMIN_HELP_COMPONENTS_BANNERS_CATEGORIES_EDIT="Banner Manager: Categories - New/Edit" -COM_ADMIN_HELP_COMPONENTS_BANNERS_CLIENTS="Banner Manager: Clients" -COM_ADMIN_HELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banner Manager: Clients - New/Edit" -COM_ADMIN_HELP_COMPONENTS_BANNERS_TRACKS="Banner Manager: Tracks" COM_ADMIN_HELP_COMPONENTS_CONTACTS_CONTACTS="Contact Manager: Contacts" COM_ADMIN_HELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contact Manager: Contacts - New/Edit" COM_ADMIN_HELP_COMPONENTS_CONTACT_CATEGORIES="Contact Manager: Categories" diff --git a/administrator/language/en-GB/en-GB.com_tags.sys.ini b/administrator/language/en-GB/en-GB.com_tags.sys.ini index 27af14b53a..901f5860e5 100644 --- a/administrator/language/en-GB/en-GB.com_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.com_tags.sys.ini @@ -6,9 +6,6 @@ COM_TAGS="Tags" COM_TAGS_CONTENT_TYPE_ARTICLE="Article" COM_TAGS_CONTENT_TYPE_ARTICLE_CATEGORY="Article Category" -COM_TAGS_CONTENT_TYPE_BANNER="Banner" -COM_TAGS_CONTENT_TYPE_BANNER_CLIENT="Banner Client" -COM_TAGS_CONTENT_TYPE_BANNERS_CATEGORY="Banner Category" COM_TAGS_CONTENT_TYPE_CONTACT="Contact" COM_TAGS_CONTENT_TYPE_CONTACT_CATEGORY="Contact Category" COM_TAGS_CONTENT_TYPE_NEWSFEED="Newsfeed" diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 60d9b3a7a7..c2b2cd2e59 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -566,14 +566,6 @@ JGRID_HEADING_ORDERING="Ordering" JGRID_HEADING_ORDERING_ASC="Ordering ascending" JGRID_HEADING_ORDERING_DESC="Ordering descending" -JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Components_Banners_Banners_Edit" -JHELP_COMPONENTS_BANNERS_BANNERS="Components_Banners_Banners" -JHELP_COMPONENTS_BANNERS_CATEGORIES="Components_Banners_Categories" -JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Components_Banners_Categories_Edit" -JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Components_Banners_Categories_Edit" -JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Components_Banners_Clients_Edit" -JHELP_COMPONENTS_BANNERS_CLIENTS="Components_Banners_Clients" -JHELP_COMPONENTS_BANNERS_TRACKS="Components_Banners_Tracks" JHELP_COMPONENTS_CACHE_MANAGER_SETTINGS="Components_Cache_Manager_Settings" JHELP_COMPONENTS_CHECK-IN_CONFIGURATION="Components_Check-in_Configuration" JHELP_COMPONENTS_COM_CACHE_OPTIONS="Components_Cache_Manager_Settings" @@ -668,7 +660,6 @@ JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Extensions_Module_Manager_A JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Extensions_Module_Manager_Articles_Category" JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Extensions_Module_Manager_Articles_Newsflash" JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Extensions_Module_Manager_Articles_Related" -JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Extensions_Module_Manager_Banners" JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Extensions_Module_Manager_Breadcrumbs" JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Extensions_Module_Manager_Custom_HTML" JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="Extensions_Module_Manager_Edit" diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 8be7e8b311..60fe634fba 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -97,98 +97,6 @@ CREATE TABLE IF NOT EXISTS `#__associations` ( -- -------------------------------------------------------- --- --- Table structure for table `#__banners` --- - -CREATE TABLE IF NOT EXISTS `#__banners` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `cid` int(11) NOT NULL DEFAULT 0, - `type` int(11) NOT NULL DEFAULT 0, - `name` varchar(255) NOT NULL DEFAULT '', - `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', - `imptotal` int(11) NOT NULL DEFAULT 0, - `impmade` int(11) NOT NULL DEFAULT 0, - `clicks` int(11) NOT NULL DEFAULT 0, - `clickurl` varchar(200) NOT NULL DEFAULT '', - `state` tinyint(3) NOT NULL DEFAULT 0, - `catid` int(10) unsigned NOT NULL DEFAULT 0, - `description` text NOT NULL, - `custombannercode` varchar(2048) NOT NULL, - `sticky` tinyint(1) unsigned NOT NULL DEFAULT 0, - `ordering` int(11) NOT NULL DEFAULT 0, - `metakey` text NOT NULL, - `params` text NOT NULL, - `own_prefix` tinyint(1) NOT NULL DEFAULT 0, - `metakey_prefix` varchar(255) NOT NULL DEFAULT '', - `purchase_type` tinyint(4) NOT NULL DEFAULT -1, - `track_clicks` tinyint(4) NOT NULL DEFAULT -1, - `track_impressions` tinyint(4) NOT NULL DEFAULT -1, - `checked_out` int(10) unsigned NOT NULL DEFAULT 0, - `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `reset` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `language` char(7) NOT NULL DEFAULT '', - `created_by` int(10) unsigned NOT NULL DEFAULT 0, - `created_by_alias` varchar(255) NOT NULL DEFAULT '', - `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `modified_by` int(10) unsigned NOT NULL DEFAULT 0, - `version` int(10) unsigned NOT NULL DEFAULT 1, - PRIMARY KEY (`id`), - KEY `idx_state` (`state`), - KEY `idx_own_prefix` (`own_prefix`), - KEY `idx_metakey_prefix` (`metakey_prefix`), - KEY `idx_banner_catid` (`catid`), - KEY `idx_language` (`language`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - --- --- Table structure for table `#__banner_clients` --- - -CREATE TABLE IF NOT EXISTS `#__banner_clients` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL DEFAULT '', - `contact` varchar(255) NOT NULL DEFAULT '', - `email` varchar(255) NOT NULL DEFAULT '', - `extrainfo` text NOT NULL, - `state` tinyint(3) NOT NULL DEFAULT 0, - `checked_out` int(10) unsigned NOT NULL DEFAULT 0, - `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `metakey` text NOT NULL, - `own_prefix` tinyint(4) NOT NULL DEFAULT 0, - `metakey_prefix` varchar(255) NOT NULL DEFAULT '', - `purchase_type` tinyint(4) NOT NULL DEFAULT -1, - `track_clicks` tinyint(4) NOT NULL DEFAULT -1, - `track_impressions` tinyint(4) NOT NULL DEFAULT -1, - PRIMARY KEY (`id`), - KEY `idx_own_prefix` (`own_prefix`), - KEY `idx_metakey_prefix` (`metakey_prefix`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - --- --- Table structure for table `#__banner_tracks` --- - -CREATE TABLE IF NOT EXISTS `#__banner_tracks` ( - `track_date` datetime NOT NULL, - `track_type` int(10) unsigned NOT NULL, - `banner_id` int(10) unsigned NOT NULL, - `count` int(10) unsigned NOT NULL DEFAULT 0, - PRIMARY KEY (`track_date`,`track_type`,`banner_id`), - KEY `idx_track_date` (`track_date`), - KEY `idx_track_type` (`track_type`), - KEY `idx_banner_id` (`banner_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - -- -- Table structure for table `#__categories` -- @@ -518,7 +426,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (201, 'mod_articles_latest', 'module', 'mod_articles_latest', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (202, 'mod_articles_popular', 'module', 'mod_articles_popular', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(203, 'mod_banners', 'module', 'mod_banners', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (204, 'mod_breadcrumbs', 'module', 'mod_breadcrumbs', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (205, 'mod_custom', 'module', 'mod_custom', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (206, 'mod_feed', 'module', 'mod_feed', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), diff --git a/installation/sql/mysql/sample_blog.sql b/installation/sql/mysql/sample_blog.sql index 9b880a31da..6d8e78f894 100644 --- a/installation/sql/mysql/sample_blog.sql +++ b/installation/sql/mysql/sample_blog.sql @@ -15,7 +15,6 @@ TRUNCATE `#__modules_menu`; INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 0, 93, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 9, 10, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 11, 12, 1, 'com_config', 'com_config', '{}'), @@ -39,7 +38,6 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` (24, 1, 67, 70, 1, 'com_users', 'com_users', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.own":{"6":1},"core.edit.state":[]}'), (26, 1, 77, 78, 1, 'com_wrapper', 'com_wrapper', '{}'), (27, 8, 18, 23, 2, 'com_content.category.2', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 56, 57, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (32, 24, 68, 69, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -61,7 +59,6 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`, `version`) VALUES (1, 0, 0, 0, 17, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 363, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), @@ -77,11 +74,6 @@ INSERT IGNORE INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext` INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 73, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 33, 38, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 34, 35, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 36, 37, 0, '*', 1), diff --git a/installation/sql/mysql/sample_learn.sql b/installation/sql/mysql/sample_learn.sql index a38f51bfa3..26c1c033c8 100644 --- a/installation/sql/mysql/sample_learn.sql +++ b/installation/sql/mysql/sample_learn.sql @@ -180,20 +180,9 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl (177, 1, 426, 427, 1, 'com_ajax', 'com_ajax', '{}'), (178, 1, 428, 429, 1, 'com_postinstall', 'com_postinstall', '{}'); -INSERT IGNORE INTO `#__banners` (`id`, `cid`, `type`, `name`, `alias`, `imptotal`, `impmade`, `clicks`, `clickurl`, `state`, `catid`, `description`, `custombannercode`, `sticky`, `ordering`, `metakey`, `params`, `own_prefix`, `metakey_prefix`, `purchase_type`, `track_clicks`, `track_impressions`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `reset`, `created`, `language`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `version`) VALUES -(2, 3, 0, 'Shop 1', 'shop-1', 0, 0, 0, 'http://shop.joomla.org/amazoncom-bookstores.html', 1, 15, 'Get books about Joomla! at the Joomla! Book Shop.', '', 0, 1, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Books"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1), -(3, 2, 0, 'Shop 2', 'shop-2', 0, 0, 0, 'http://shop.joomla.org', 1, 15, 'T Shirts, caps and more from the Joomla! Shop.', '', 0, 2, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Shop"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1), -(4, 1, 0, 'Support Joomla!', 'support-joomla', 0, 0, 0, 'http://contribute.joomla.org', 1, 15, 'Your contributions of time, talent and money make Joomla possible.', '', 0, 3, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":""}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1); - -INSERT IGNORE INTO `#__banner_clients` (`id`, `name`, `contact`, `email`, `extrainfo`, `state`, `checked_out`, `checked_out_time`, `metakey`, `own_prefix`, `metakey_prefix`, `purchase_type`, `track_clicks`, `track_impressions`) VALUES -(1, 'Joomla!', 'Administrator', 'email@email.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, -1, -1), -(2, 'Shop', 'Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0), -(3, 'Bookstore', 'Bookstore Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0); - INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`, `version`) VALUES (1, 0, 0, 0, 133, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (9, 34, 1, 129, 130, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(10, 35, 1, 127, 128, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (11, 36, 1, 123, 124, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (12, 37, 1, 59, 60, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (14, 39, 1, 9, 54, 1, 'sample-data-articles', 'com_content', 'Sample Data-Articles', 'sample-data-articles', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql index 3b96583046..4c535a7b41 100644 --- a/installation/sql/mysql/sample_testing.sql +++ b/installation/sql/mysql/sample_testing.sql @@ -179,20 +179,9 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` (179, 1, 435, 436, 1, '#__ucm_content.3', '#__ucm_content.3', '[]'), (180, 93, 146, 147, 7, 'com_content.article.72', 'Popular Tags', '{"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1}}'); -INSERT IGNORE INTO `#__banners` (`id`, `cid`, `type`, `name`, `alias`, `imptotal`, `impmade`, `clicks`, `clickurl`, `state`, `catid`, `description`, `custombannercode`, `sticky`, `ordering`, `metakey`, `params`, `own_prefix`, `metakey_prefix`, `purchase_type`, `track_clicks`, `track_impressions`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `reset`, `created`, `language`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `version`) VALUES -(2, 3, 0, 'Shop 1', 'shop-1', 0, 0, 0, 'http://shop.joomla.org/amazoncom-bookstores.html', 1, 15, 'Get books about Joomla! at the Joomla! Book Shop.', '', 0, 1, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Books"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1), -(3, 2, 0, 'Shop 2', 'shop-2', 0, 0, 0, 'http://shop.joomla.org', 1, 15, 'T Shirts, caps and more from the Joomla! Shop.', '', 0, 2, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Shop"}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1), -(4, 1, 0, 'Support Joomla!', 'support-joomla', 0, 0, 0, 'http://contribute.joomla.org', 1, 15, 'Your contributions of time, talent and money make Joomla possible.', '', 0, 3, '', '{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":""}', 0, '', -1, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', '2011-01-01 00:00:01', 'en-GB', 42, 'Joomla', '0000-00-00 00:00:00', 0, 1); - -INSERT IGNORE INTO `#__banner_clients` (`id`, `name`, `contact`, `email`, `extrainfo`, `state`, `checked_out`, `checked_out_time`, `metakey`, `own_prefix`, `metakey_prefix`, `purchase_type`, `track_clicks`, `track_impressions`) VALUES -(1, 'Joomla!', 'Administrator', 'email@email.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, -1, -1), -(2, 'Shop', 'Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0), -(3, 'Bookstore', 'Bookstore Example', 'example@example.com', '', 1, 0, '0000-00-00 00:00:00', '', 0, '', -1, 0, 0); - INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`, `version`) VALUES (1, 0, 0, 0, 135, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (9, 34, 1, 131, 132, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(10, 35, 1, 129, 130, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (11, 36, 1, 125, 126, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (12, 37, 1, 61, 62, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (14, 39, 1, 9, 56, 1, 'sample-data-articles', 'com_content', 'Sample Data-Articles', 'sample-data-articles', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 59fe7579cb..7be99d711e 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -48,8 +48,6 @@ en-GB.mod_articles_news.sys.ini en-GB.mod_articles_popular.ini en-GB.mod_articles_popular.sys.ini - en-GB.mod_banners.ini - en-GB.mod_banners.sys.ini en-GB.mod_breadcrumbs.ini en-GB.mod_breadcrumbs.sys.ini en-GB.mod_custom.ini From 00a42ef1b11ccf97a1ce1db851e420f5cf69e903 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Mon, 25 May 2015 17:50:00 +0200 Subject: [PATCH 3/3] #4 - Remove banner component tests and sample data --- .../templates/hathor/css/colour_blue.css | 18 -- .../templates/hathor/css/colour_brown.css | 18 -- .../hathor/css/colour_highcontrast.css | 42 --- .../templates/hathor/css/colour_standard.css | 18 -- .../templates/hathor/css/template.css | 12 - .../hathor/less/colour_baseline.less | 24 -- .../templates/hathor/less/template.less | 16 -- build/build.php | 1 - installation/sql/mysql/sample_brochure.sql | 8 - installation/sql/mysql/sample_data.sql | 7 - installation/sql/mysql/sample_learn.sql | 14 - installation/sql/mysql/sample_testing.sql | 14 - tests/system/resetdb.sql | 5 - tests/system/suite/acl/acl0001Test.php | 3 - .../control_panel/control_panel0002Test.php | 45 ---- .../suite/language/language0001Test.php | 197 -------------- .../Pages/Components/BannerEditPage.php | 92 ------- .../Pages/Components/BannerManagerPage.php | 164 ------------ .../webdriver/Pages/System/AdminPage.php | 4 - tests/unit/stubs/database/jos_assets.csv | 3 - tests/unit/stubs/database/jos_banners.csv | 4 - .../stubs/database/jos_banners_clients.csv | 4 - tests/unit/stubs/database/jos_categories.csv | 2 - tests/unit/stubs/database/jos_extensions.csv | 2 - .../unit/stubs/database/jos_finder_links.csv | 2 - tests/unit/stubs/database/jos_menu.csv | 5 - tests/unit/stubs/database/jos_modules.csv | 4 - tests/unit/stubs/database/jos_weblinks.csv | 10 - .../libraries/joomla/access/JAccessTest.php | 57 ----- .../language/data/language/en-GB/en-GB.xml | 2 - .../libraries/joomla/utilities/stubs/test.xml | 242 ------------------ 31 files changed, 1039 deletions(-) delete mode 100644 tests/system/webdriver/Pages/Components/BannerEditPage.php delete mode 100644 tests/system/webdriver/Pages/Components/BannerManagerPage.php delete mode 100644 tests/unit/stubs/database/jos_banners.csv delete mode 100644 tests/unit/stubs/database/jos_banners_clients.csv delete mode 100644 tests/unit/stubs/database/jos_weblinks.csv diff --git a/administrator/templates/hathor/css/colour_blue.css b/administrator/templates/hathor/css/colour_blue.css index 7ec8da2005..bfc79b3bb6 100644 --- a/administrator/templates/hathor/css/colour_blue.css +++ b/administrator/templates/hathor/css/colour_blue.css @@ -1222,24 +1222,6 @@ a img.calendar { .icon-48-generic { background-image: url(../images/header/icon-48-generic.png); } -.icon-48-banners { - background-image: url(../images/header/icon-48-banner.png); -} -.icon-48-banners-categories { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-edit { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-add { - background-image: url(../images/header/icon-48-category-add.png); -} -.icon-48-banners-clients { - background-image: url(../images/header/icon-48-banner-client.png); -} -.icon-48-banners-tracks { - background-image: url(../images/header/icon-48-banner-tracks.png); -} .icon-48-checkin { background-image: url(../images/header/icon-48-checkin.png); } diff --git a/administrator/templates/hathor/css/colour_brown.css b/administrator/templates/hathor/css/colour_brown.css index 0e7a84d5b3..6f44f5d042 100644 --- a/administrator/templates/hathor/css/colour_brown.css +++ b/administrator/templates/hathor/css/colour_brown.css @@ -1222,24 +1222,6 @@ a img.calendar { .icon-48-generic { background-image: url(../images/header/icon-48-generic.png); } -.icon-48-banners { - background-image: url(../images/header/icon-48-banner.png); -} -.icon-48-banners-categories { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-edit { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-add { - background-image: url(../images/header/icon-48-category-add.png); -} -.icon-48-banners-clients { - background-image: url(../images/header/icon-48-banner-client.png); -} -.icon-48-banners-tracks { - background-image: url(../images/header/icon-48-banner-tracks.png); -} .icon-48-checkin { background-image: url(../images/header/icon-48-checkin.png); } diff --git a/administrator/templates/hathor/css/colour_highcontrast.css b/administrator/templates/hathor/css/colour_highcontrast.css index ec388a1715..ae5f181a2c 100644 --- a/administrator/templates/hathor/css/colour_highcontrast.css +++ b/administrator/templates/hathor/css/colour_highcontrast.css @@ -848,23 +848,6 @@ a img.calendar { .icon-16-article { background-image: url(../images/menu/icon-16-article.png); } - -.icon-16-banners { - background-image: url(../images/menu/icon-16-banner.png); -} - -.icon-16-banners-clients { - background-image: url(../images/menu/icon-16-banner-client.png); -} - -.icon-16-banners-tracks { - background-image: url(../images/menu/icon-16-banner-tracks.png); -} - -.icon-16-banners-cat { - background-image: url(../images/menu/icon-16-banner-categories.png); -} - .icon-16-category { background-image: url(../images/menu/icon-16-category.png); } @@ -1307,31 +1290,6 @@ a img.calendar { .icon-48-generic { background-image: url(../images/header/icon-48-generic.png); } - -.icon-48-banners { - background-image: url(../images/header/icon-48-banner.png); -} - -.icon-48-banners-categories { - background-image: url(../images/header/icon-48-banner-categories.png); -} - -.icon-48-banners-category-edit { - background-image: url(../images/header/icon-48-banner-categories.png); -} - -.icon-48-banners-category-add { - background-image: url(../images/header/icon-48-category-add.png); -} - -.icon-48-banners-clients { - background-image: url(../images/header/icon-48-banner-client.png); -} - -.icon-48-banners-tracks { - background-image: url(../images/header/icon-48-banner-tracks.png); -} - .icon-48-checkin { background-image: url(../images/header/icon-48-checkin.png); } diff --git a/administrator/templates/hathor/css/colour_standard.css b/administrator/templates/hathor/css/colour_standard.css index fadcea9e02..adf0bc783d 100644 --- a/administrator/templates/hathor/css/colour_standard.css +++ b/administrator/templates/hathor/css/colour_standard.css @@ -1222,24 +1222,6 @@ a img.calendar { .icon-48-generic { background-image: url(../images/header/icon-48-generic.png); } -.icon-48-banners { - background-image: url(../images/header/icon-48-banner.png); -} -.icon-48-banners-categories { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-edit { - background-image: url(../images/header/icon-48-banner-categories.png); -} -.icon-48-banners-category-add { - background-image: url(../images/header/icon-48-category-add.png); -} -.icon-48-banners-clients { - background-image: url(../images/header/icon-48-banner-client.png); -} -.icon-48-banners-tracks { - background-image: url(../images/header/icon-48-banner-tracks.png); -} .icon-48-checkin { background-image: url(../images/header/icon-48-checkin.png); } diff --git a/administrator/templates/hathor/css/template.css b/administrator/templates/hathor/css/template.css index 1e7dc48602..e2e086e47f 100644 --- a/administrator/templates/hathor/css/template.css +++ b/administrator/templates/hathor/css/template.css @@ -2993,18 +2993,6 @@ ul.helpmenu li { .menu-article { background-image: url(../images/menu/icon-16-article.png); } -.menu-banners { - background-image: url(../images/menu/icon-16-banner.png); -} -.menu-banners-clients { - background-image: url(../images/menu/icon-16-banner-client.png); -} -.menu-banners-tracks { - background-image: url(../images/menu/icon-16-banner-tracks.png); -} -.menu-banners-cat { - background-image: url(../images/menu/icon-16-banner-categories.png); -} .menu-category { background-image: url(../images/menu/icon-16-category.png); } diff --git a/administrator/templates/hathor/less/colour_baseline.less b/administrator/templates/hathor/less/colour_baseline.less index 6b049267b0..5550391507 100644 --- a/administrator/templates/hathor/less/colour_baseline.less +++ b/administrator/templates/hathor/less/colour_baseline.less @@ -1009,30 +1009,6 @@ a img.calendar { background-image: url(../images/header/icon-48-generic.png); } -.icon-48-banners { - background-image: url(../images/header/icon-48-banner.png); -} - -.icon-48-banners-categories { - background-image: url(../images/header/icon-48-banner-categories.png); -} - -.icon-48-banners-category-edit { - background-image: url(../images/header/icon-48-banner-categories.png); -} - -.icon-48-banners-category-add { - background-image: url(../images/header/icon-48-category-add.png); -} - -.icon-48-banners-clients { - background-image: url(../images/header/icon-48-banner-client.png); -} - -.icon-48-banners-tracks { - background-image: url(../images/header/icon-48-banner-tracks.png); -} - .icon-48-checkin { background-image: url(../images/header/icon-48-checkin.png); } diff --git a/administrator/templates/hathor/less/template.less b/administrator/templates/hathor/less/template.less index ece762dd6d..de3ef0378e 100644 --- a/administrator/templates/hathor/less/template.less +++ b/administrator/templates/hathor/less/template.less @@ -2768,22 +2768,6 @@ ul.helpmenu li { background-image: url(../images/menu/icon-16-article.png); } -.menu-banners { - background-image: url(../images/menu/icon-16-banner.png); -} - -.menu-banners-clients { - background-image: url(../images/menu/icon-16-banner-client.png); -} - -.menu-banners-tracks { - background-image: url(../images/menu/icon-16-banner-tracks.png); -} - -.menu-banners-cat { - background-image: url(../images/menu/icon-16-banner-categories.png); -} - .menu-category { background-image: url(../images/menu/icon-16-category.png); } diff --git a/build/build.php b/build/build.php index e451b35bc3..358395c5b3 100644 --- a/build/build.php +++ b/build/build.php @@ -194,7 +194,6 @@ // Create full update file without installation folder or sample images. echo "Build full update package.\n"; system('rm -r installation'); -system('rm -r images/banners'); system('rm -r images/headers'); system('rm -r images/sampledata'); system('rm images/joomla_black.gif'); diff --git a/installation/sql/mysql/sample_brochure.sql b/installation/sql/mysql/sample_brochure.sql index 73c5cc25a2..78e2dcc42d 100644 --- a/installation/sql/mysql/sample_brochure.sql +++ b/installation/sql/mysql/sample_brochure.sql @@ -17,7 +17,6 @@ TRUNCATE `#__template_styles`; INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 0, 95, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 9, 10, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 11, 12, 1, 'com_config', 'com_config', '{}'), @@ -40,7 +39,6 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` (24, 1, 73, 76, 1, 'com_users', 'com_users', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":{"6":1}}'), (26, 1, 81, 82, 1, 'com_wrapper', 'com_wrapper', '{}'), (27, 8, 18, 23, 2, 'com_content.category.2', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 62, 63, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (32, 24, 74, 75, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -64,7 +62,6 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `extension`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`, `modified_user_id`, `modified_time`, `hits`, `language`, `version`) VALUES (1, 0, 0, 0, 15, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), @@ -80,11 +77,6 @@ INSERT IGNORE INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext` INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 65, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 19, 28, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 20, 21, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 22, 23, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 24, 25, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 26, 27, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 29, 34, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 30, 31, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 32, 33, 0, '*', 1), diff --git a/installation/sql/mysql/sample_data.sql b/installation/sql/mysql/sample_data.sql index d3ca933dda..db16225d53 100644 --- a/installation/sql/mysql/sample_data.sql +++ b/installation/sql/mysql/sample_data.sql @@ -15,7 +15,6 @@ TRUNCATE `#__modules_menu`; INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 0, 123, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 1, 2, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 3, 6, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 7, 8, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 9, 10, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 11, 12, 1, 'com_config', 'com_config', '{}'), @@ -38,7 +37,6 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` (24, 1, 99, 102, 1, 'com_users', 'com_users', '{"core.admin":{"7":1},"core.manage":[],"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (26, 1, 107, 108, 1, 'com_wrapper', 'com_wrapper', '{}'), (27, 8, 18, 21, 2, 'com_content.category.2', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), -(28, 3, 4, 5, 2, 'com_banners.category.3', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (29, 7, 14, 15, 2, 'com_contact.category.4', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (30, 19, 88, 89, 2, 'com_newsfeeds.category.5', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[],"core.edit.own":[]}'), (32, 24, 100, 101, 1, 'com_users.category.7', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -81,11 +79,6 @@ INSERT IGNORE INTO `#__contentitem_tag_map` (`type_alias`, `core_content_id`, `c INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 61, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 23, 28, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 24, 25, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 26, 27, 0, '*', 1), diff --git a/installation/sql/mysql/sample_learn.sql b/installation/sql/mysql/sample_learn.sql index 758f7fa15d..d3a1b8222f 100644 --- a/installation/sql/mysql/sample_learn.sql +++ b/installation/sql/mysql/sample_learn.sql @@ -21,7 +21,6 @@ TRUNCATE `#__viewlevels`; INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 1, 430, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":[],"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 12, 13, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 14, 15, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 16, 17, 1, 'com_config', 'com_config', '{}'), @@ -45,11 +44,9 @@ INSERT INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `titl 26, 1, 356, 357, 1, 'com_wrapper', 'com_wrapper', '{}'), (33, 1, 418, 419, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'), (34, 8, 105, 108, 2, 'com_content.category.9', 'Uncategorised', '{"core.create":{"10":0,"12":0},"core.delete":[],"core.edit":[],"core.edit.state":[]}'), -(35, 3, 7, 8, 2, 'com_banners.category.10', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (36, 7, 23, 24, 2, 'com_contact.category.11', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (37, 19, 321, 322, 2, 'com_newsfeeds.category.12', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (39, 8, 109, 296, 2, 'com_content.category.14', 'Sample Data-Articles', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), -(40, 3, 9, 10, 2, 'com_banners.category.15', 'Sample Data-Banners', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (41, 7, 25, 86, 2, 'com_contact.category.16', 'Sample Data-Contact', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (42, 19, 323, 324, 2, 'com_newsfeeds.category.17', 'Sample Data-Newsfeeds', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (44, 39, 110, 245, 3, 'com_content.category.19', 'Joomla!', '{"core.create":{"10":0,"12":0},"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -185,7 +182,6 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, (11, 36, 1, 123, 124, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (12, 37, 1, 59, 60, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (14, 39, 1, 9, 54, 1, 'sample-data-articles', 'com_content', 'Sample Data-Articles', 'sample-data-articles', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(15, 40, 1, 125, 126, 1, 'sample-data-banners', 'com_banners', 'Sample Data-Banners', 'sample-data-banners', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (16, 41, 1, 61, 122, 1, 'sample-data-contact', 'com_contact', 'Sample Data-Contact', 'sample-data-contact', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (17, 42, 1, 57, 58, 1, 'sample-data-newsfeeds', 'com_newsfeeds', 'Sample Data-Newsfeeds', 'sample-data-newsfeeds', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (19, 44, 14, 10, 37, 2, 'sample-data-articles/joomla', 'com_content', 'Joomla!', 'joomla', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 910, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), @@ -259,7 +255,6 @@ INSERT IGNORE INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext` (4, 92, 'Articles Category Module', 'articles-category-module', '

This module allows you to display the articles in a specific category. Help

\r\n
{loadmodule articles_category,Articles Category}
', '', 1, 64, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (5, 101, 'Authentication', 'authentication', '

The authentication plugins operate when users login to your site or administrator. The Joomla! authentication plugin is in operation by default but you can enable Gmail or LDAP or install a plugin for a different system. An example is included that may be used to create a new authentication plugin.

\r\n

Default on:

\r\n\r\n

Default off:

\r\n', '', 1, 25, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 3, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (6, 102, 'Australian Parks ', 'australian-parks', '

Welcome!

\r\n

This is a basic site about the beautiful and fascinating parks of Australia.

\r\n

On this site you can read all about my travels to different parks, see photos, and find links to park websites.

\r\n

This sample site is an example of using the core of Joomla! to create a basic website, whether a "brochure site," a personal blog, or as a way to present information on a topic you are interested in.

\r\n

Read more about the site in the About Parks module.

\r\n

 

', '', 1, 26, '2011-01-01 00:00:01', 123, 'Joomla', '2012-09-25 11:04:30', 123, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":null,"urlatext":"","targeta":"","urlb":null,"urlbtext":"","targetb":"","urlc":null,"urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","info_block_position":"0","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","urls_position":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 3, 1, '', '', 1, 14, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), -(7, 103, 'Banner Module', 'banner-module', '

The banner module is used to display the banners that are managed by the banners component in the site administrator. Help.

\r\n
{loadmodule banners,Banners}
', '', 1, 66, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_readmore":"","show_print_icon":"","show_email_icon":"","show_hits":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, '', '', 1, 0, '', 0, '*', ''), (8, 104, 'Beginners', 'beginners', '

If this is your first Joomla! site or your first web site, you have come to the right place. Joomla will help you get your website up and running quickly and easily.

\r\n

Start off using your site by logging in using the administrator account you created when you installed Joomla.

\r\n', '\r\n

Explore the articles and other resources right here on your site data to learn more about how Joomla works. (When you''re done reading, you can delete or archive all of this.) You will also probably want to visit the Beginners'' Areas of the Joomla documentation and support forums.

\r\n

You''ll also want to sign up for the Joomla Security Mailing list and the Announcements mailing list. For inspiration visit the Joomla! Site Showcase to see an amazing array of ways people use Joomla to tell their stories on the web.

\r\n

The basic Joomla installation will let you get a great site up and running, but when you are ready for more features the power of Joomla is in the creative ways that developers have extended it to do all kinds of things. Visit the Joomla! Extensions Directory to see thousands of extensions that can do almost anything you could want on a website. Can''t find what you need? You may want to find a Joomla professional in the Joomla! Resource Directory.

\r\n

Want to learn more? Consider attending a Joomla! Day or other event or joining a local Joomla! Users Group. Can''t find one near you? Start one yourself.

', 1, 19, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 4, '', '', 1, 1, '{"robots":"","author":"","rights":"","xreference":""}', 1, '*', ''), (9, 105, 'Contacts', 'contact', '

The contact component provides a way to provide contact forms and information for your site or to create a complex directory that can be used for many different purposes. Help

', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":""}', 1, 2, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (10, 106, 'Content', 'content', '

The content component (com_content) is what you use to write articles. It is extremely flexible and has the largest number of built in views. Articles can be created and edited from the front end, making content the easiest component to use to create your site content. Help

', '', 1, 21, '2011-01-01 00:00:01', 123, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":""}', 1, 1, '', '', 1, 2, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), @@ -329,11 +324,6 @@ INSERT IGNORE INTO `#__content_frontpage` (`content_id`, `ordering`) VALUES INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 281, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 13, 22, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 14, 15, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 16, 17, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 18, 19, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 20, 21, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 23, 28, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 24, 25, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 26, 27, 0, '*', 1), @@ -481,7 +471,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (15, 'Title', '', '', 1, 'title', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'), (16, 'Login Form', '', '', 7, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'), (17, 'Breadcrumbs', '', '', 1, 'position-2', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'), -(18, 'Book Store', '', '', 1, 'position-10', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (19, 'User Menu', '', '', 3, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"_menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'), (20, 'Top', '', '', 1, 'position-1', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"top","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":" nav-pills","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'), (22, 'Australian Parks ', '', '', 2, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"parks","active":"","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, 'en-GB'), @@ -507,7 +496,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (47, 'Latest Park Blogs', '', '', 6, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"catid":["27"],"count":"5","show_featured":"","ordering":"c_dsc","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, 'en-GB'), (48, 'Custom HTML', '', '

This is a custom html module. That means you can enter whatever content you want.

', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (52, 'Breadcrumbs', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'), -(56, 'Banners', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (57, 'Fruit Shop', '', '', 3, 'position-5', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'), (58, 'Special!', '', '

This week we have a special, half price on delicious oranges!

Only for our special customers!
Use the code: Joomla! when ordering

This module can only be seen by people in the customers group or higher.

', 1, 'position-12', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (61, 'Articles Categories', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'), @@ -518,8 +506,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (67, 'Extensions', '', '', 2, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_menu', 1, 1, '{"menutype":"aboutjoomla","startLevel":"1","endLevel":"6","showAllChildren":"0","tag_id":"","class_sfx":"-menu","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'), (68, 'About Parks', '', '

The Parks sample site is designed as a simple site that can be routinely updated from the front end of Joomla!.

\r\n

As a site, it is largely focused on a blog which can be updated using the front end article submission.

\r\n

New weblinks can also be added through the front end.

\r\n

A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.

', 2, 'position-2', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Protostar-well"}', 0, '*'), (69, 'Articles Category', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_category', 1, 1, '{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'), -(77, 'Shop', '', '', 1, 'position-11', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), -(78, 'Contribute', '', '', 1, 'position-9', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (79, 'Multilanguage status', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (84, 'Smart Search Module', '', '', 2, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","layout":"_:default","moduleclass_sfx":"","field_size":20,"alt_label":"","show_label":"0","label_pos":"top","show_button":"0","button_pos":"right","opensearch":"1","opensearch_title":""}', 0, '*'), (86, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql index 2705b310b4..3e2e172803 100644 --- a/installation/sql/mysql/sample_testing.sql +++ b/installation/sql/mysql/sample_testing.sql @@ -16,7 +16,6 @@ TRUNCATE `#__usergroups`; INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES (1, 0, 1, 437, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'), (2, 1, 2, 3, 1, 'com_admin', 'com_admin', '{}'), -(3, 1, 4, 11, 1, 'com_banners', 'com_banners', '{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (4, 1, 12, 13, 1, 'com_cache', 'com_cache', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (5, 1, 14, 15, 1, 'com_checkin', 'com_checkin', '{"core.admin":{"7":1},"core.manage":{"7":1}}'), (6, 1, 16, 17, 1, 'com_config', 'com_config', '{}'), @@ -40,11 +39,9 @@ INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name` (26, 1, 362, 363, 1, 'com_wrapper', 'com_wrapper', '{}'), (33, 1, 424, 425, 1, 'com_finder', 'com_finder', '{"core.admin":{"7":1},"core.manage":{"6":1}}'), (34, 8, 105, 108, 2, 'com_content.category.9', 'Uncategorised', '{"core.create":{"10":0,"12":0},"core.delete":[],"core.edit":[],"core.edit.state":[]}'), -(35, 3, 7, 8, 2, 'com_banners.category.10', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (36, 7, 23, 24, 2, 'com_contact.category.11', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (37, 19, 327, 328, 2, 'com_newsfeeds.category.12', 'Uncategorised', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (39, 8, 109, 302, 2, 'com_content.category.14', 'Sample Data-Articles', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), -(40, 3, 9, 10, 2, 'com_banners.category.15', 'Sample Data-Banners', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (41, 7, 25, 86, 2, 'com_contact.category.16', 'Sample Data-Contact', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (42, 19, 329, 330, 2, 'com_newsfeeds.category.17', 'Sample Data-Newsfeeds', '{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}'), (44, 39, 110, 251, 3, 'com_content.category.19', 'Joomla!', '{"core.create":{"10":0,"12":0},"core.delete":[],"core.edit":[],"core.edit.state":[]}'), @@ -184,7 +181,6 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, (11, 36, 1, 125, 126, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (12, 37, 1, 61, 62, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (14, 39, 1, 9, 56, 1, 'sample-data-articles', 'com_content', 'Sample Data-Articles', 'sample-data-articles', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), -(15, 40, 1, 127, 128, 1, 'sample-data-banners', 'com_banners', 'Sample Data-Banners', 'sample-data-banners', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (16, 41, 1, 63, 124, 1, 'sample-data-contact', 'com_contact', 'Sample Data-Contact', 'sample-data-contact', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (17, 42, 1, 59, 60, 1, 'sample-data-newsfeeds', 'com_newsfeeds', 'Sample Data-Newsfeeds', 'sample-data-newsfeeds', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), (19, 44, 14, 10, 39, 2, 'sample-data-articles/joomla', 'com_content', 'Joomla!', 'joomla', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1), @@ -259,7 +255,6 @@ INSERT IGNORE INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext` (4, 92, 'Articles Category Module', 'articles-category-module', '

This module allows you to display the articles in a specific category. Help

\r\n
{loadmodule articles_category,Articles Category}
', '', 1, 64, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","page_title":"","alternative_readmore":"","layout":""}', 1, 7, '', 'articles,content', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (5, 101, 'Authentication', 'authentication', '

The authentication plugins operate when users login to your site or administrator. The Joomla! authentication plugin is in operation by default but you can enable Gmail or LDAP or install a plugin for a different system. An example is included that may be used to create a new authentication plugin.

\r\n

Default on:

\r\n\r\n

Default off:

\r\n', '', 1, 25, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 3, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (6, 102, 'Australian Parks ', 'australian-parks', '

Cradle Park Banner

\r\n

Welcome!

\r\n

This is a basic site about the beautiful and fascinating parks of Australia.

\r\n

On this site you can read all about my travels to different parks, see photos, and find links to park websites.

\r\n

This sample site is an example of using the core of Joomla! to create a basic website, whether a "brochure site," a personal blog, or as a way to present information on a topic you are interested in.

\r\n

Read more about the site in the About Parks module.

\r\n

', '', 1, 26, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":""}', 1, 1, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), -(7, 103, 'Banner Module', 'banner-module', '

The banner module is used to display the banners that are managed by the banners component in the site administrator. Help.

\r\n
{loadmodule banners,Banners}
', '', 1, 66, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_readmore":"","show_print_icon":"","show_email_icon":"","show_hits":"","page_title":"","alternative_readmore":"","layout":""}', 1, 6, '', '', 1, 0, '', 0, '*', ''), (8, 104, 'Beginners', 'beginners', '

If this is your first Joomla! site or your first web site, you have come to the right place. Joomla will help you get your website up and running quickly and easily.

\r\n

Start off using your site by logging in using the administrator account you created when you installed Joomla.

\r\n', '\r\n

Explore the articles and other resources right here on your site data to learn more about how Joomla works. (When you''re done reading, you can delete or archive all of this.) You will also probably want to visit the Beginners'' Areas of the Joomla documentation and support forums.

\r\n

You''ll also want to sign up for the Joomla Security Mailing list and the Announcements mailing list. For inspiration visit the Joomla! Site Showcase to see an amazing array of ways people use Joomla to tell their stories on the web.

\r\n

The basic Joomla installation will let you get a great site up and running, but when you are ready for more features the power of Joomla is in the creative ways that developers have extended it to do all kinds of things. Visit the Joomla! Extensions Directory to see thousands of extensions that can do almost anything you could want on a website. Can''t find what you need? You may want to find a Joomla professional in the Joomla! Resource Directory.

\r\n

Want to learn more? Consider attending a Joomla! Day or other event or joining a local Joomla! Users Group. Can''t find one near you? Start one yourself.

', 1, 19, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 4, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 1, '*', ''), (9, 105, 'Contacts', 'contact', '

The contact component provides a way to provide contact forms and information for your site or to create a complex directory that can be used for many different purposes. Help

', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":""}', 1, 2, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), (10, 106, 'Content', 'content', '

The content component (com_content) is what you use to write articles. It is extremely flexible and has the largest number of built in views. Articles can be created and edited from the front end, making content the easiest component to use to create your site content. Help

', '', 1, 21, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":""}', 1, 1, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''), @@ -344,11 +339,6 @@ INSERT INTO `#__contentitem_tag_map` (`type_alias`, `core_content_id`, `content_ INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES (1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 275, 0, '*', 0), -(2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 5, 14, 0, '*', 1), -(3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 6, 7, 0, '*', 1), -(4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 8, 9, 0, '*', 1), -(5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-clients', 0, '', 10, 11, 0, '*', 1), -(6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 12, 13, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 15, 20, 0, '*', 1), (8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact', 0, '', 16, 17, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 18, 19, 0, '*', 1), @@ -498,7 +488,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (15, 'Title', '', '', 1, 'title', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'), (16, 'Login Form', '', '', 7, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"greeting":"1","name":"0"}', 0, '*'), (17, 'Breadcrumbs', '', '', 1, 'position-2', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'), -(18, 'Book Store', '', '', 1, 'position-10', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (19, 'User Menu', '', '', 3, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"_menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'), (20, 'Top', '', '', 1, 'position-1', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"top","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":" nav-pills","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'), (22, 'Australian Parks ', '', '', 2, 'position-5', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"parks","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, 'en-GB'), @@ -524,7 +513,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (47, 'Latest Park Blogs', '', '', 6, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_latest', 1, 1, '{"count":"5","ordering":"c_dsc","user_id":"0","show_front":"1","catid":"35","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, 'en-GB'), (48, 'Custom HTML', '', '

This is a custom html module. That means you can enter whatever content you want.

', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (52, 'Breadcrumbs', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'), -(56, 'Banners', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 1, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (57, 'Fruit Shop', '', '', 3, 'position-5', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}', 0, '*'), (58, 'Special!', '', '

This week we have a special, half price on delicious oranges!

Only for our special customers!
Use the code: Joomla! when ordering

This module can only be seen by people in the customers group or higher.

', 1, 'position-12', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 4, 1, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (61, 'Articles Categories', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_articles_categories', 1, 1, '{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}', 0, '*'), @@ -542,8 +530,6 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, ` (74, 'Bottom Middle Column (Atomic Template)', '', '
This is another nested column
\r\n

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.

', 1, 'atomic-bottommiddle', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (75, 'Sidebar (Atomic Template)', '', '

A Simple Sidebar

\r\n

Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.

\r\n

Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.

\r\n
Incremental leading
\r\n

Vestibulum ante ipsum primis in faucibus orci luctus vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus.

\r\n

Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras ornare mattis nunc. Mauris venenatis, pede sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue. sed aliquet vehicula, lectus tellus pulvinar neque, non cursus sem nisi vel augue.

', 1, 'atomic-sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}', 0, '*'), (76, 'Login (Atomic Template)', '', '', 2, 'atomic-sidebar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 0, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","name":"0","usesecure":"0","layout":"","moduleclass_sfx":"","cache":"0"}', 0, '*'), -(77, 'Shop', '', '', 1, 'position-11', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), -(78, 'Contribute', '', '', 1, 'position-9', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'), (79, 'Multilanguage status', '', '', 1, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 'mod_multilangstatus', 3, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), (84, 'Smart Search Module', '', '', 2, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_finder', 1, 1, '{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","layout":"_:default","moduleclass_sfx":"","field_size":20,"alt_label":"","show_label":"0","label_pos":"top","show_button":"0","button_pos":"right","opensearch":"1","opensearch_title":""}', 0, '*'), (86, 'Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'), diff --git a/tests/system/resetdb.sql b/tests/system/resetdb.sql index 6f77cab85e..9658583443 100644 --- a/tests/system/resetdb.sql +++ b/tests/system/resetdb.sql @@ -201,9 +201,6 @@ CREATE TABLE IF NOT EXISTS `jos_components` ( -- INSERT INTO `jos_components` (`id`, `name`, `link`, `menuid`, `parent`, `admin_menu_link`, `admin_menu_alt`, `option`, `ordering`, `admin_menu_img`, `iscore`, `params`, `enabled`) VALUES -(1, 'Banners', '', 0, 0, '', 'Banner Management', 'com_banners', 0, 'js/ThemeOffice/component.png', 0, 'track_impressions=0\ntrack_clicks=0\ntag_prefix=\n\n', 1), -(2, 'Banners', '', 0, 1, 'option=com_banners', 'Active Banners', 'com_banners', 1, 'js/ThemeOffice/edit.png', 0, '', 1), -(3, 'Clients', '', 0, 1, 'option=com_banners&c=client', 'Manage Clients', 'com_banners', 2, 'js/ThemeOffice/categories.png', 0, '', 1), (7, 'Contacts', 'option=com_contact', 0, 0, '', 'Edit contact details', 'com_contact', 0, 'js/ThemeOffice/component.png', 1, 'contact_icons=0\nicon_address=\nicon_email=\nicon_telephone=\nicon_fax=\nicon_misc=\nshow_headings=1\nshow_position=1\nshow_email=0\nshow_telephone=1\nshow_mobile=1\nshow_fax=1\nbannedEmail=\nbannedSubject=\nbannedText=\nsession=1\ncustomReply=0\n\n', 1), (8, 'Contacts', '', 0, 7, 'option=com_contact', 'Edit contact details', 'com_contact', 0, 'js/ThemeOffice/edit.png', 1, '', 1), (9, 'Categories', '', 0, 7, 'option=com_categories§ion=com_contact_details', 'Manage contact categories', '', 2, 'js/ThemeOffice/categories.png', 1, 'contact_icons=0\nicon_address=\nicon_email=\nicon_telephone=\nicon_fax=\nicon_misc=\nshow_headings=1\nshow_position=1\nshow_email=0\nshow_telephone=1\nshow_mobile=1\nshow_fax=1\nbannedEmail=\nbannedSubject=\nbannedText=\nsession=1\ncustomReply=0\n\n', 1), @@ -830,14 +827,12 @@ INSERT INTO `jos_modules` (`id`, `title`, `content`, `ordering`, `position`, `ch (27, 'Search', '', 1, 'user4', 0, '0000-00-00 00:00:00', 1, 'mod_search', 0, 0, 0, 'cache=1', 0, 0, ''), (28, 'Random Image', '', 9, 'right', 0, '0000-00-00 00:00:00', 1, 'mod_random_image', 0, 0, 1, '', 0, 0, ''), (29, 'Top Menu', '', 1, 'user3', 0, '0000-00-00 00:00:00', 1, 'mod_mainmenu', 0, 0, 0, 'cache=1\nmenutype=topmenu\nmenu_style=list_flat\nmenu_images=n\nmenu_images_align=left\nexpand_menu=n\nclass_sfx=-nav\nmoduleclass_sfx=\nindent_image1=0\nindent_image2=0\nindent_image3=0\nindent_image4=0\nindent_image5=0\nindent_image6=0', 1, 0, ''), -(30, 'Banners', '', 1, 'footer', 0, '0000-00-00 00:00:00', 1, 'mod_banners', 0, 0, 0, 'target=1\ncount=1\ncid=1\ncatid=33\ntag_search=0\nordering=random\nheader_text=\nfooter_text=\nmoduleclass_sfx=\ncache=1\ncache_time=15\n\n', 1, 0, ''), (31, 'Resources', '', 2, 'left', 0, '0000-00-00 00:00:00', 1, 'mod_mainmenu', 0, 0, 1, 'menutype=othermenu\nmenu_style=list\nstartLevel=0\nendLevel=0\nshowAllChildren=0\nwindow_open=\nshow_whitespace=0\ncache=1\ntag_id=\nclass_sfx=\nmoduleclass_sfx=_menu\nmaxdepth=10\nmenu_images=0\nmenu_images_align=0\nexpand_menu=0\nactivate_parent=0\nfull_active_id=0\nindent_image=0\nindent_image1=\nindent_image2=\nindent_image3=\nindent_image4=\nindent_image5=\nindent_image6=\nspacer=\nend_spacer=\n\n', 0, 0, ''), (32, 'Wrapper', '', 12, 'left', 0, '0000-00-00 00:00:00', 0, 'mod_wrapper', 0, 0, 1, '', 0, 0, ''), (33, 'Footer', '', 2, 'footer', 0, '0000-00-00 00:00:00', 1, 'mod_footer', 0, 0, 0, 'cache=1\n\n', 1, 0, ''), (34, 'Feed Display', '', 13, 'left', 0, '0000-00-00 00:00:00', 0, 'mod_feed', 0, 0, 1, '', 1, 0, ''), (35, 'Breadcrumbs', '', 1, 'breadcrumb', 0, '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 0, 0, 1, 'moduleclass_sfx=\ncache=0\nshowHome=1\nhomeText=Home\nshowComponent=1\nseparator=\n\n', 1, 0, ''), (36, 'Syndication', '', 3, 'syndicate', 0, '0000-00-00 00:00:00', 1, 'mod_syndicate', 0, 0, 0, '', 1, 0, ''), -(38, 'Advertisement', '', 3, 'right', 0, '0000-00-00 00:00:00', 1, 'mod_banners', 0, 0, 1, 'count=4\r\nrandomise=0\r\ncid=0\r\ncatid=14\r\nheader_text=Featured Links:\r\nfooter_text=Ads by Joomla!\r\nmoduleclass_sfx=_text\r\ncache=0\r\n\r\n', 0, 0, ''), (39, 'Example Pages', '', 5, 'left', 0, '0000-00-00 00:00:00', 1, 'mod_mainmenu', 0, 0, 1, 'cache=1\nclass_sfx=\nmoduleclass_sfx=_menu\nmenutype=ExamplePages\nmenu_style=list_flat\nstartLevel=0\nendLevel=0\nshowAllChildren=0\nfull_active_id=0\nmenu_images=0\nmenu_images_align=0\nexpand_menu=0\nactivate_parent=0\nindent_image=0\nindent_image1=\nindent_image2=\nindent_image3=\nindent_image4=\nindent_image5=\nindent_image6=\nspacer=\nend_spacer=\nwindow_open=\n\n', 0, 0, ''), (40, 'Key Concepts', '', 3, 'left', 0, '0000-00-00 00:00:00', 1, 'mod_mainmenu', 0, 0, 1, 'cache=1\nclass_sfx=\nmoduleclass_sfx=_menu\nmenutype=keyconcepts\nmenu_style=list\nstartLevel=0\nendLevel=0\nshowAllChildren=0\nfull_active_id=0\nmenu_images=0\nmenu_images_align=0\nexpand_menu=0\nactivate_parent=0\nindent_image=0\nindent_image1=\nindent_image2=\nindent_image3=\nindent_image4=\nindent_image5=\nindent_image6=\nspacer=\nend_spacer=\nwindow_open=\n\n', 0, 0, ''), (41, 'Welcome to Joomla!', '

Congratulations on choosing Joomla! as your content management system. To help you get started, check out these excellent resources for securing your server and pointers to documentation and other helpful resources.

Security

On the Internet, security is always a concern. For that reason, you are encouraged to subscribe to the Joomla! Security Announcements for the latest information on new Joomla! releases, emailed to you automatically.

If this is one of your first Web sites, security considerations may seem complicated and intimidating. There are three simple steps that go a long way towards securing a Web site: (1) regular backups; (2) prompt updates to the latest Joomla! release; and (3) a good Web host. There are many other important security considerations that you can learn about by reading the Joomla! Security Checklist.

If you believe your Web site was attacked, or you think you have discovered a security issue in Joomla!, please do not post it in the Joomla! forums. Publishing this information could put other Web sites at risk. Instead, report possible security vulnerabilities to the Joomla! Security Task Force.

Learning Joomla!

A good place to start learning Joomla! is the "Absolute Beginner''s Guide to Joomla!." There, you will find a Quick Start to Joomla! guide and video, amongst many other tutorials. The Joomla! Community Magazine also has articles for new learners and experienced users, alike. A great place to look for answers is the Frequently Asked Questions (FAQ). If you are stuck on a particular screen in the Administrator (which is where you are now), try clicking the Help toolbar button to get assistance specific to that page.

If you still have questions, please feel free to use the Joomla! Forums. The forums are an incredibly valuable resource for all levels of Joomla! users. Before you post a question, though, use the forum search (located at the top of each forum page) to see if the question has been asked and answered.

Getting Involved

If you want to help make Joomla! better, consider getting involved. There are many ways you can make a positive difference. Have fun using Joomla!.

', 0, 'cpanel', 0, '0000-00-00 00:00:00', 1, 'mod_custom', 0, 2, 1, 'moduleclass_sfx=\n\n', 1, 1, ''), diff --git a/tests/system/suite/acl/acl0001Test.php b/tests/system/suite/acl/acl0001Test.php index 4014b54f20..a2182de7bc 100644 --- a/tests/system/suite/acl/acl0001Test.php +++ b/tests/system/suite/acl/acl0001Test.php @@ -22,8 +22,6 @@ function testAclGroupCreation() $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-menus-menus']"), 'Menus should be visible'); - $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-banners']"), 'Banners should be visible'); - $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-contact']"), 'Contacts should be visible'); $this->assertTrue($this->isElementPresent("//ul[@id='menu-com-messages']"), 'Messaging should be visible'); @@ -74,7 +72,6 @@ function testAclGroupCreation() $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-users-users']"), 'Users menu should not be visible'); $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-users-groups']"), 'Groups should not be visible'); - $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-banners']"), 'Banners should not be visible'); $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-contact']"), 'Contacts should not be visible'); $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-messages']"), 'Messaging should not be visible'); $this->assertFalse($this->isElementPresent("//ul[@id='menu-com-newsfeeds']"), 'Newsfeeds should not be visible'); diff --git a/tests/system/suite/control_panel/control_panel0002Test.php b/tests/system/suite/control_panel/control_panel0002Test.php index fed096fb01..570ae559d1 100644 --- a/tests/system/suite/control_panel/control_panel0002Test.php +++ b/tests/system/suite/control_panel/control_panel0002Test.php @@ -187,51 +187,6 @@ function testMenuCheck() $this->jPrint ("Navigate to Control Panel.\n"); $this->gotoAdmin(); - $this->jPrint ("Navigate to Banner Manager.\n"); - $this->click("link=Banners"); - $this->waitForPageToLoad("30000"); - $this->assertTrue($this->isTextPresent("Banner Manager: Banners")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-new']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-edit']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-publish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-unpublish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-archive']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-trash']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-options']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-help']/button")); - $this->jPrint ("Navigate to Banner Clients.\n"); - $this->click("link=Clients"); - $this->waitForPageToLoad("30000"); - $this->assertTrue($this->isTextPresent("Banner Manager: Clients")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-new']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-edit']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-publish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-unpublish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-archive']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-trash']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-options']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-help']/button")); - - $this->jPrint ("Navigate to Banner Tracks.\n"); - $this->click("link=Tracks"); - $this->waitForPageToLoad("30000"); - $this->assertTrue($this->isTextPresent("Banner Manager: Tracks")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-options']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-COM_BANNERS_DELETE_MSG']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-help']/button")); - - $this->jPrint ("Navigate to Banner Categories.\n"); - $this->click("//a[contains(@href, 'option=com_categories&extension=com_banners')]"); - $this->waitForPageToLoad("30000"); - $this->assertTrue($this->isTextPresent("Category Manager: Banners")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-new']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-edit']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-publish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-unpublish']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-archive']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-trash']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-refresh']/button")); - $this->assertTrue($this->isElementPresent("//div[@id='toolbar-help']/button")); $this->jPrint ("Navigate to Contact Manager.\n"); $this->click("link=Contacts"); diff --git a/tests/system/suite/language/language0001Test.php b/tests/system/suite/language/language0001Test.php index 00fa90fb8e..58744f8a4f 100644 --- a/tests/system/suite/language/language0001Test.php +++ b/tests/system/suite/language/language0001Test.php @@ -347,203 +347,6 @@ function testCheckNotSelectedErrorMessages() { array_push($this->verificationErrors, $this->getTraceFiles($e)); } - - $this->click("//ul[@id='menu-com-banners']/li[1]/a"); - $screen='Banner Manager: Banners'; - $this->waitForPageToLoad("30000"); - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//div[@id='toolbar-publish']/button"); - $button='Publish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//div[@id='toolbar-unpublish']/button"); - $button='Unpublish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Archive')]"); - $button='Archive'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Check In')]"); - $button='Check In'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Trash')]"); - $button='Trash'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("//ul[@id='submenu']/li/a[contains(., 'Clients')]"); - $screen='Banner Manager: Clients'; - $this->waitForPageToLoad("30000"); - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Publish')]"); - $button='Publish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//div[@id='toolbar-unpublish']/button"); - $button='Unpublish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Archive')]"); - $button='Archive'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Check In')]"); - $button='Check In'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Trash')]"); - $button='Trash'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->click("//ul[@id='submenu']/li/a[contains(., 'Categories')]"); - $screen='Category Manager: Banners'; - $this->waitForPageToLoad("30000"); - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//div[@id='toolbar-publish']/button"); - $button='Publish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Unpublish')]"); - $button='Unpublish'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Archive')]"); - $button='Archive'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//div[@id='toolbar-checkin']/button"); - $button='Check in'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } - $this->filterView($filterOn); - $this->click("checkall-toggle"); - $this->click("//Button[contains(., 'Trash')]"); - $button='Trash'; - $this->jPrint ("Testing error message when clicking $button button with nothing selected at $screen screen.\n"); - try - { - $this->assertEquals("Please first make a selection from the list", $this->getAlert(), 'Should get alert message'); - } - catch (PHPUnit_Framework_AssertionFailedError $e) - { - array_push($this->verificationErrors, $this->getTraceFiles($e)); - } $this->click("//ul[@id='menu-com-contact']/li[1]/a"); $screen='Contact Manager: Contacts'; $this->waitForPageToLoad("30000"); diff --git a/tests/system/webdriver/Pages/Components/BannerEditPage.php b/tests/system/webdriver/Pages/Components/BannerEditPage.php deleted file mode 100644 index 06b0b96d91..0000000000 --- a/tests/system/webdriver/Pages/Components/BannerEditPage.php +++ /dev/null @@ -1,92 +0,0 @@ - 'Name', 'id' => 'jform_name', 'type' => 'input', 'tab' => 'header'), - array('label' => 'Alias', 'id' => 'jform_alias', 'type' => 'input', 'tab' => 'header'), - array('label' => 'Type', 'id' => 'jform_type', 'type' => 'select', 'tab' => 'details'), - array('label' => 'Image', 'id' => 'jform_params_imageurl', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Width', 'id' => 'jform_params_width', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Height', 'id' => 'jform_params_height', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Alternative Text', 'id' => 'jform_params_alt', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Click URL', 'id' => 'jform_clickurl', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Description', 'id' => 'jform_description', 'type' => 'textarea', 'tab' => 'details'), - array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'), - array('label' => 'Status', 'id' => 'jform_state', 'type' => 'select', 'tab' => 'details'), - array('label' => 'Sticky', 'id' => 'jform_sticky', 'type' => 'fieldset', 'tab' => 'details'), - array('label' => 'Language', 'id' => 'jform_language', 'type' => 'select', 'tab' => 'details'), - array('label' => 'Version Note', 'id' => 'jform_version_note', 'type' => 'input', 'tab' => 'details'), - array('label' => 'Max. Impressions', 'id' => 'jform_imptotal', 'type' => 'input', 'tab' => 'otherparams'), - array('label' => 'Total Impressions', 'id' => 'jform_impmade', 'type' => 'input', 'tab' => 'otherparams'), - array('label' => 'Total Clicks', 'id' => 'jform_clicks', 'type' => 'input', 'tab' => 'otherparams'), - array('label' => 'Client', 'id' => 'jform_cid', 'type' => 'select', 'tab' => 'otherparams'), - array('label' => 'Purchase Type', 'id' => 'jform_purchase_type', 'type' => 'select', 'tab' => 'otherparams'), - array('label' => 'Track Impressions', 'id' => 'jform_track_impressions', 'type' => 'select', 'tab' => 'otherparams'), - array('label' => 'Track Clicks', 'id' => 'jform_track_clicks', 'type' => 'select', 'tab' => 'otherparams'), - array('label' => 'Start Publishing', 'id' => 'jform_publish_up', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Finish Publishing', 'id' => 'jform_publish_down', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Created Date', 'id' => 'jform_created', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Created by', 'id' => 'jform_created_by', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Created by alias', 'id' => 'jform_created_by_alias', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Modified Date', 'id' => 'jform_modified', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Modified by', 'id' => 'jform_modified_by', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Revision', 'id' => 'jform_version', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'ID', 'id' => 'jform_id', 'type' => 'input', 'tab' => 'publishing'), - array('label' => 'Meta Keywords', 'id' => 'jform_metakey', 'type' => 'textarea', 'tab' => 'publishing'), - array('label' => 'Use Own Prefix', 'id' => 'jform_own_prefix', 'type' => 'fieldset', 'tab' => 'publishing'), - array('label' => 'Meta Keyword Prefix', 'id' => 'jform_metakey_prefix', 'type' => 'input', 'tab' => 'publishing'), - ); - -} - diff --git a/tests/system/webdriver/Pages/Components/BannerManagerPage.php b/tests/system/webdriver/Pages/Components/BannerManagerPage.php deleted file mode 100644 index 48bf937cae..0000000000 --- a/tests/system/webdriver/Pages/Components/BannerManagerPage.php +++ /dev/null @@ -1,164 +0,0 @@ - 'list_fullordering', - '20' => 'list_limit', - 'Select Status' => 'filter_state', - 'Select Client' => 'filter_client_id', - 'Select Category' => 'filter_category_id', - 'Select Language' => 'filter_language' - ); - - /** - * Array of toolbar id values for this page - * - * @var array - * @since 3.2 - */ - public $toolbar = array ( - 'New' => 'toolbar-new', - 'Edit' => 'toolbar-edit', - 'Publish' => 'toolbar-publish', - 'Unpublish' => 'toolbar-unpublish', - 'Archive' => 'toolbar-archive', - 'Check In' => 'toolbar-check-in', - 'Trash' => 'toolbar-trash', - 'Empty Trash' => 'toolbar-delete', - 'Batch' => 'toolbar-batch', - 'Options' => 'toolbar-options', - 'Help' => 'toolbar-help', - ); - - /** - * Add a new Banner item in the Banner Manager: Component screen. - * - * @param string $name Test Banner Name - * @param array $fields associative array of fields in the form label => value. - * - * @return BannerManagerPage - */ - public function addBanner($name='Test Banner', $fields = null) - { - $this->clickButton('toolbar-new'); - $bannerEditPage = $this->test->getPageObject('BannerEditPage'); - $bannerEditPage->setFieldValues(array('Name' => $name)); - if ($fields) - { - $bannerEditPage->setFieldValues($fields); - } - $bannerEditPage->clickButton('toolbar-save'); - $this->test->getPageObject('BannerManagerPage'); - } - - /** - * Edit a Banner item in the Banner Manager: Banner Items screen. - * - * @param string $name Banner Title field - * @param array $fields associative array of fields in the form label => value. - * - * @return void - */ - public function editBanner($name, $fields) - { - $this->clickItem($name); - $bannerEditPage = $this->test->getPageObject('BannerEditPage'); - $bannerEditPage->setFieldValues($fields); - $bannerEditPage->clickButton('toolbar-save'); - $this->test->getPageObject('BannerManagerPage'); - $this->searchFor(); - } - - /** - * Get state of a Banner item in the Banner Manager: Banner Items screen. - * - * @param string $name Banner Title field - * - * @return State of the Banner //Published or Unpublished - */ - public function getState($name) - { - $result = false; - $row = $this->getRowNumber($name); - $text = $this->driver->findElement(By::xPath("//tbody/tr[" . $row . "]/td[3]//a"))->getAttribute(@onclick); - if (strpos($text, 'banners.unpublish') > 0) - { - $result = 'published'; - } - if (strpos($text, 'banners.publish') > 0) - { - $result = 'unpublished'; - } - return $result; - } - - /** - * Change state of a Banner item in the Banner Manager: Banner Items screen. - * - * @param string $name Banner Title field - * @param string $state State of the Banner - * - * @return void - */ - public function changeBannerState($name, $state = 'published') - { - $this->searchFor($name); - $this->checkAll(); - if (strtolower($state) == 'published') - { - $this->clickButton('toolbar-publish'); - $this->driver->waitForElementUntilIsPresent(By::xPath($this->waitForXpath)); - } - elseif (strtolower($state) == 'unpublished') - { - $this->clickButton('toolbar-unpublish'); - $this->driver->waitForElementUntilIsPresent(By::xPath($this->waitForXpath)); - } - $this->searchFor(); - } -} diff --git a/tests/system/webdriver/Pages/System/AdminPage.php b/tests/system/webdriver/Pages/System/AdminPage.php index cc567b21e1..0a8b67989f 100644 --- a/tests/system/webdriver/Pages/System/AdminPage.php +++ b/tests/system/webdriver/Pages/System/AdminPage.php @@ -109,10 +109,6 @@ abstract class AdminPage 'Featured Articles' => 'administrator/index.php?option=com_content&view=featured', 'Media Manager' => 'administrator/index.php?option=com_media', 'Components' => 'administrator/index.php#', - 'Banners' => 'administrator/index.php?option=com_banners', - 'Banners Categories' => 'administrator/index.php?option=com_categories&extension=com_banners', - 'Banners Clients' => 'administrator/index.php?option=com_banners&view=clients', - 'Banners Tracks' => 'administrator/index.php?option=com_banners&view=tracks', 'Contacts' => 'administrator/index.php?option=com_contact', 'Contacts Categories' => 'administrator/index.php?option=com_categories&extension=com_contact', 'Joomla! Update' => 'administrator/index.php?option=com_joomlaupdate', diff --git a/tests/unit/stubs/database/jos_assets.csv b/tests/unit/stubs/database/jos_assets.csv index 1f3889a996..07a9f72ee3 100644 --- a/tests/unit/stubs/database/jos_assets.csv +++ b/tests/unit/stubs/database/jos_assets.csv @@ -1,7 +1,6 @@ 'id','parent_id','lft','rgt','level','name','title','rules' '1','0','1','424','0','root.1','Root Asset','{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":[],"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}' '2','1','2','3','1','com_admin','com_admin','{}' -'3','1','4','11','1','com_banners','com_banners','{"core.admin":{"7":1},"core.manage":{"6":1},"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '4','1','12','13','1','com_cache','com_cache','{"core.admin":{"7":1},"core.manage":{"7":1}}' '5','1','14','15','1','com_checkin','com_checkin','{"core.admin":{"7":1},"core.manage":{"7":1}}' '6','1','16','17','1','com_config','com_config','{}' @@ -26,12 +25,10 @@ '26','1','356','357','1','com_wrapper','com_wrapper','{}' '33','1','418','419','1','com_finder','com_finder','{"core.admin":{"7":1},"core.manage":{"6":1}}' '34','8','105','108','2','com_content.category.9','Uncategorised','{"core.create":{"10":0,"12":0},"core.delete":[],"core.edit":[],"core.edit.state":[]}' -'35','3','7','8','2','com_banners.category.10','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '36','7','23','24','2','com_contact.category.11','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '37','19','321','322','2','com_newsfeeds.category.12','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '38','25','345','346','2','com_weblinks.category.13','Uncategorised','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '39','8','109','296','2','com_content.category.14','Sample Data-Articles','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' -'40','3','9','10','2','com_banners.category.15','Sample Data-Banners','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '41','7','25','86','2','com_contact.category.16','Sample Data-Contact','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '42','19','323','324','2','com_newsfeeds.category.17','Sample Data-Newsfeeds','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' '43','25','347','354','2','com_weblinks.category.18','Sample Data-Weblinks','{"core.create":[],"core.delete":[],"core.edit":[],"core.edit.state":[]}' diff --git a/tests/unit/stubs/database/jos_banners.csv b/tests/unit/stubs/database/jos_banners.csv deleted file mode 100644 index f165479176..0000000000 --- a/tests/unit/stubs/database/jos_banners.csv +++ /dev/null @@ -1,4 +0,0 @@ -'id','cid','type','name','alias','imptotal','impmade','clicks','clickurl','state','catid','description','custombannercode','sticky','ordering','metakey','params','own_prefix','metakey_prefix','purchase_type','track_clicks','track_impressions','checked_out','checked_out_time','publish_up','publish_down','reset','created','language','created_by','created_by_alias','modified','modified_by','version' -'2','3','0','Shop 1','shop-1','0','0','0','http://shop.joomla.org/amazoncom-bookstores.html','1','15','Get books about Joomla! at the Joomla! Book Shop.',,'0','1',,'{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Books"}','0',,'-1','0','0','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','en-GB','42','Joomla','0000-00-00 00:00:00','0','1' -'3','2','0','Shop 2','shop-2','0','0','0','http://shop.joomla.org','1','15','T Shirts, caps and more from the Joomla! Shop.',,'0','2',,'{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":"Joomla! Shop"}','0',,'-1','0','0','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','en-GB','42','Joomla','0000-00-00 00:00:00','0','1' -'4','1','0','Support Joomla!','support-joomla','0','0','0','http://contribute.joomla.org','1','15','Your contributions of time, talent and money make Joomla possible.',,'0','3',,'{"imageurl":"images\\/banners\\/white.png","width":"","height":"","alt":""}','0',,'-1','0','0','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','en-GB','42','Joomla','0000-00-00 00:00:00','0','1' diff --git a/tests/unit/stubs/database/jos_banners_clients.csv b/tests/unit/stubs/database/jos_banners_clients.csv deleted file mode 100644 index 9fd0ac0082..0000000000 --- a/tests/unit/stubs/database/jos_banners_clients.csv +++ /dev/null @@ -1,4 +0,0 @@ -'id','name','contact','email','extrainfo','state','checked_out','checked_out_time','metakey','own_prefix','metakey_prefix','purchase_type','track_clicks','track_impressions' -'1','Joomla!','Administrator','email@email.com',,'1','0','0000-00-00 00:00:00',,'0',,'-1','-1','-1' -'2','Shop','Example','example@example.com',,'1','0','0000-00-00 00:00:00',,'0',,'-1','0','0' -'3','Bookstore','Bookstore Example','example@example.com',,'1','0','0000-00-00 00:00:00',,'0',,'-1','0','0' diff --git a/tests/unit/stubs/database/jos_categories.csv b/tests/unit/stubs/database/jos_categories.csv index 011ac43e61..d814ec80f2 100644 --- a/tests/unit/stubs/database/jos_categories.csv +++ b/tests/unit/stubs/database/jos_categories.csv @@ -1,12 +1,10 @@ 'id','asset_id','parent_id','lft','rgt','level','path','extension','title','alias','note','description','published','checked_out','checked_out_time','access','params','metadesc','metakey','metadata','created_user_id','created_time','modified_user_id','modified_time','hits','language','version' '1','0','0','0','133','0',,'system','ROOT','root',,,'1','0','0000-00-00 00:00:00','1','{}',,,,'100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '9','34','1','129','130','1','uncategorised','com_content','Uncategorised','uncategorised',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' -'10','35','1','127','128','1','uncategorised','com_banners','Uncategorised','uncategorised',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":"","foobar":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '11','36','1','123','124','1','uncategorised','com_contact','Uncategorised','uncategorised',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '12','37','1','59','60','1','uncategorised','com_newsfeeds','Uncategorised','uncategorised',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '13','38','1','55','56','1','uncategorised','com_weblinks','Uncategorised','uncategorised',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '14','39','1','9','54','1','sample-data-articles','com_content','Sample Data-Articles','sample-data-articles',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' -'15','40','1','125','126','1','sample-data-banners','com_banners','Sample Data-Banners','sample-data-banners',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":"","foobar":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '16','41','1','61','122','1','sample-data-contact','com_contact','Sample Data-Contact','sample-data-contact',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '17','42','1','57','58','1','sample-data-newsfeeds','com_newsfeeds','Sample Data-Newsfeeds','sample-data-newsfeeds',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' '18','43','1','1','8','1','sample-data-weblinks','com_weblinks','Sample Data-Weblinks','sample-data-weblinks',,,'1','0','0000-00-00 00:00:00','1','{"target":"","image":""}',,,'{"page_title":"","author":"","robots":""}','100','2011-01-01 00:00:01','0','0000-00-00 00:00:00','0','*','1' diff --git a/tests/unit/stubs/database/jos_extensions.csv b/tests/unit/stubs/database/jos_extensions.csv index d027775434..c8d4531a07 100644 --- a/tests/unit/stubs/database/jos_extensions.csv +++ b/tests/unit/stubs/database/jos_extensions.csv @@ -2,7 +2,6 @@ '1','com_mailto','component','com_mailto',,'0','1','1','1','{"name":"com_mailto","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_MAILTO_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '2','com_wrapper','component','com_wrapper',,'0','1','1','1','{"name":"com_wrapper","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_WRAPPER_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '3','com_admin','component','com_admin',,'1','1','1','1','{"name":"com_admin","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_ADMIN_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' -'4','com_banners','component','com_banners',,'1','1','1','0','{"name":"com_banners","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_BANNERS_XML_DESCRIPTION","group":""}','{"purchase_type":"3","track_impressions":"0","track_clicks":"0","metakey_prefix":""}',,,'0','0000-00-00 00:00:00','0','0' '5','com_cache','component','com_cache',,'1','1','1','1','{"name":"com_cache","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CACHE_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '6','com_categories','component','com_categories',,'1','1','1','1','{"name":"com_categories","type":"component","creationDate":"December 2007","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CATEGORIES_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '7','com_checkin','component','com_checkin',,'1','1','1','1','{"name":"com_checkin","type":"component","creationDate":"Unknown","author":"Joomla! Project","copyright":"(C) 2005 - 2008 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CHECKIN_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' @@ -33,7 +32,6 @@ '200','mod_articles_archive','module','mod_articles_archive',,'0','1','1','0','{"name":"mod_articles_archive","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters.\\n\\t\\tAll rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '201','mod_articles_latest','module','mod_articles_latest',,'0','1','1','0','{"name":"mod_articles_latest","type":"module","creationDate":"July 2004","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_LATEST_NEWS_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '202','mod_articles_popular','module','mod_articles_popular',,'0','1','1','0','{"name":"mod_articles_popular","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_POPULAR_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' -'203','mod_banners','module','mod_banners',,'0','1','1','0','{"name":"mod_banners","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_BANNERS_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '204','mod_breadcrumbs','module','mod_breadcrumbs',,'0','1','1','1','{"name":"mod_breadcrumbs","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_BREADCRUMBS_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '205','mod_custom','module','mod_custom',,'0','1','1','1','{"name":"mod_custom","type":"module","creationDate":"July 2004","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_CUSTOM_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' '206','mod_feed','module','mod_feed',,'0','1','1','0','{"name":"mod_feed","type":"module","creationDate":"July 2005","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_FEED_XML_DESCRIPTION","group":""}',,,,'0','0000-00-00 00:00:00','0','0' diff --git a/tests/unit/stubs/database/jos_finder_links.csv b/tests/unit/stubs/database/jos_finder_links.csv index 76d3c2d72b..2da3b34437 100644 --- a/tests/unit/stubs/database/jos_finder_links.csv +++ b/tests/unit/stubs/database/jos_finder_links.csv @@ -1,11 +1,9 @@ 'link_id','url','route','title','description','indexdate','md5sum','published','state','access','language','publish_start_date','publish_end_date','start_date','end_date','list_price','sale_price','type_id','object' '1','index.php?option=com_content&view=category&id=9','index.php?option=com_content&view=category&id=9&Itemid=435','Uncategorised',,'2013-06-02 17:41:05','12e2b6285b3ec32447ef98dee0e944f4','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:1:"9";s:5:"alias";s:13:"uncategorised";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_content";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:3:"129";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:15:"9:uncategorised";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:25:"index.php/9-uncategorised";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:47:"index.php?option=com_content&view=category&id=9";s:5:"route";s:58:"index.php?option=com_content&view=category&id=9&Itemid=435";s:5:"title";s:13:"Uncategorised";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' -'2','index.php?option=com_banners&view=category&id=10','index.php?option=com_content&view=category&id=10&Itemid=435','Uncategorised',,'2013-06-02 17:41:05','9fe5cb79a13f172105f2f16a97bb3728','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"10";s:5:"alias";s:13:"uncategorised";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_banners";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:3:"127";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:6:"target";s:0:"";s:5:"image";s:0:"";s:6:"foobar";s:0:"";}}s:4:"slug";s:16:"10:uncategorised";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:6:"?id=10";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:48:"index.php?option=com_banners&view=category&id=10";s:5:"route";s:59:"index.php?option=com_content&view=category&id=10&Itemid=435";s:5:"title";s:13:"Uncategorised";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '3','index.php?option=com_contact&view=category&id=11','index.php?option=com_contact&view=category&id=11&Itemid=435','Uncategorised',,'2013-06-02 17:41:05','3411df0afdfc74d216840801322bfaa4','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"11";s:5:"alias";s:13:"uncategorised";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_contact";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:3:"123";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:16:"11:uncategorised";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:64:"index.php/component/contact/category/11-uncategorised?Itemid=435";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:48:"index.php?option=com_contact&view=category&id=11";s:5:"route";s:59:"index.php?option=com_contact&view=category&id=11&Itemid=435";s:5:"title";s:13:"Uncategorised";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '4','index.php?option=com_newsfeeds&view=category&id=12','index.php?option=com_newsfeeds&view=category&id=12&Itemid=435','Uncategorised',,'2013-06-02 17:41:05','7805cbe168bca395dc6dca8247bf816c','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"12";s:5:"alias";s:13:"uncategorised";s:7:"summary";s:0:"";s:9:"extension";s:13:"com_newsfeeds";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:2:"59";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:16:"12:uncategorised";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:66:"index.php/component/newsfeeds/category/12-uncategorised?Itemid=435";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:50:"index.php?option=com_newsfeeds&view=category&id=12";s:5:"route";s:61:"index.php?option=com_newsfeeds&view=category&id=12&Itemid=435";s:5:"title";s:13:"Uncategorised";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '5','index.php?option=com_weblinks&view=category&id=13','index.php?option=com_weblinks&view=category&id=13&Itemid=435','Uncategorised',,'2013-06-02 17:41:05','0618bd3508f2859ad6b03d9ec0571704','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"13";s:5:"alias";s:13:"uncategorised";s:7:"summary";s:0:"";s:9:"extension";s:12:"com_weblinks";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:2:"55";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:16:"13:uncategorised";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:65:"index.php/component/weblinks/category/13-uncategorised?Itemid=435";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:49:"index.php?option=com_weblinks&view=category&id=13";s:5:"route";s:60:"index.php?option=com_weblinks&view=category&id=13&Itemid=435";s:5:"title";s:13:"Uncategorised";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '6','index.php?option=com_content&view=category&id=14','index.php?option=com_content&view=category&id=14&Itemid=435','Sample Data-Articles',,'2013-06-02 17:41:06','8d0228de7a7f65ccdc2c194d7eca4001','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"14";s:5:"alias";s:20:"sample-data-articles";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_content";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:1:"9";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:23:"14:sample-data-articles";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:33:"index.php/14-sample-data-articles";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:48:"index.php?option=com_content&view=category&id=14";s:5:"route";s:59:"index.php?option=com_content&view=category&id=14&Itemid=435";s:5:"title";s:20:"Sample Data-Articles";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' -'7','index.php?option=com_banners&view=category&id=15','index.php?option=com_content&view=category&id=15&Itemid=435','Sample Data-Banners',,'2013-06-02 17:41:06','2231ac0e3ba2fe29efb1e9061c069aed','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"15";s:5:"alias";s:19:"sample-data-banners";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_banners";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:3:"125";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:6:"target";s:0:"";s:5:"image";s:0:"";s:6:"foobar";s:0:"";}}s:4:"slug";s:22:"15:sample-data-banners";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:6:"?id=15";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:48:"index.php?option=com_banners&view=category&id=15";s:5:"route";s:59:"index.php?option=com_content&view=category&id=15&Itemid=435";s:5:"title";s:19:"Sample Data-Banners";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '8','index.php?option=com_contact&view=category&id=16','index.php?option=com_contact&view=category&id=16&Itemid=435','Sample Data-Contact',,'2013-06-02 17:41:06','769279bec4a677553d125b039f462bb7','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"16";s:5:"alias";s:19:"sample-data-contact";s:7:"summary";s:0:"";s:9:"extension";s:11:"com_contact";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:2:"61";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:22:"16:sample-data-contact";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:70:"index.php/component/contact/category/16-sample-data-contact?Itemid=435";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:48:"index.php?option=com_contact&view=category&id=16";s:5:"route";s:59:"index.php?option=com_contact&view=category&id=16&Itemid=435";s:5:"title";s:19:"Sample Data-Contact";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '9','index.php?option=com_newsfeeds&view=category&id=17','index.php?option=com_newsfeeds&view=category&id=17&Itemid=253','Sample Data-Newsfeeds',,'2013-06-02 17:41:06','8f415412e37ed3ea5d1f56b129e5c1cb','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"17";s:5:"alias";s:21:"sample-data-newsfeeds";s:7:"summary";s:0:"";s:9:"extension";s:13:"com_newsfeeds";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:2:"57";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:24:"17:sample-data-newsfeeds";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:118:"index.php/using-joomla/extensions/components/news-feeds-component/news-feed-category/category/17-sample-data-newsfeeds";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:50:"index.php?option=com_newsfeeds&view=category&id=17";s:5:"route";s:61:"index.php?option=com_newsfeeds&view=category&id=17&Itemid=253";s:5:"title";s:21:"Sample Data-Newsfeeds";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' '10','index.php?option=com_weblinks&view=category&id=18','index.php?option=com_weblinks&view=category&id=18&Itemid=435','Sample Data-Weblinks',,'2013-06-02 17:41:06','771fb21185cfe6764a3cbfc29c7db98b','1','1','1','en-GB','0000-00-00 00:00:00','0000-00-00 00:00:00','2011-01-01 00:00:01','0000-00-00 00:00:00','0','0','2','O:19:"FinderIndexerResult":19:{s:11:"�*�elements";a:19:{s:2:"id";s:2:"18";s:5:"alias";s:20:"sample-data-weblinks";s:7:"summary";s:0:"";s:9:"extension";s:12:"com_weblinks";s:10:"created_by";s:3:"100";s:8:"modified";s:19:"0000-00-00 00:00:00";s:11:"modified_by";s:1:"0";s:7:"metakey";s:0:"";s:8:"metadesc";s:0:"";s:8:"metadata";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":3:{s:10:"page_title";s:0:"";s:6:"author";s:0:"";s:6:"robots";s:0:"";}}s:3:"lft";s:1:"1";s:9:"parent_id";s:1:"1";s:5:"level";s:1:"1";s:6:"params";O:9:"JRegistry":1:{s:7:"�*�data";O:8:"stdClass":2:{s:6:"target";s:0:"";s:5:"image";s:0:"";}}s:4:"slug";s:23:"18:sample-data-weblinks";s:4:"mime";N;s:6:"layout";s:8:"category";s:10:"metaauthor";N;s:4:"path";s:72:"index.php/component/weblinks/category/18-sample-data-weblinks?Itemid=435";}s:15:"�*�instructions";a:5:{i:1;a:3:{i:0;s:5:"title";i:1;s:8:"subtitle";i:2;s:2:"id";}i:2;a:2:{i:0;s:7:"summary";i:1;s:4:"body";}i:3;a:8:{i:0;s:4:"meta";i:1;s:10:"list_price";i:2;s:10:"sale_price";i:3;s:4:"link";i:4;s:7:"metakey";i:5;s:8:"metadesc";i:6;s:10:"metaauthor";i:7;s:6:"author";}i:4;a:2:{i:0;s:4:"path";i:1;s:5:"alias";}i:5;a:1:{i:0;s:8:"comments";}}s:11:"�*�taxonomy";a:2:{s:4:"Type";a:1:{s:8:"Category";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:8:"Category";s:5:"state";i:1;s:6:"access";i:1;}}s:8:"Language";a:1:{s:5:"en-GB";O:7:"JObject":4:{s:10:"�*�_errors";a:0:{}s:5:"title";s:5:"en-GB";s:5:"state";i:1;s:6:"access";i:1;}}}s:3:"url";s:49:"index.php?option=com_weblinks&view=category&id=18";s:5:"route";s:60:"index.php?option=com_weblinks&view=category&id=18&Itemid=435";s:5:"title";s:20:"Sample Data-Weblinks";s:11:"description";s:0:"";s:9:"published";N;s:5:"state";i:1;s:6:"access";s:1:"1";s:8:"language";s:5:"en-GB";s:18:"publish_start_date";s:19:"0000-00-00 00:00:00";s:16:"publish_end_date";s:19:"0000-00-00 00:00:00";s:10:"start_date";s:19:"2011-01-01 00:00:01";s:8:"end_date";s:19:"0000-00-00 00:00:00";s:10:"list_price";N;s:10:"sale_price";N;s:7:"type_id";i:2;s:15:"defaultLanguage";s:5:"en-GB";}' diff --git a/tests/unit/stubs/database/jos_menu.csv b/tests/unit/stubs/database/jos_menu.csv index bfa4c6b492..6a734e5a2e 100644 --- a/tests/unit/stubs/database/jos_menu.csv +++ b/tests/unit/stubs/database/jos_menu.csv @@ -1,10 +1,5 @@ 'id','menutype','title','alias','note','path','link','type','published','parent_id','level','component_id','checked_out','checked_out_time','browserNav','access','img','template_style_id','params','lft','rgt','home','language','client_id' '1',,'Menu_Item_Root','root',,,,,'1','0','0','0','0','0000-00-00 00:00:00','0','0',,'0',,'0','279','0','*','0' -'2','menu','com_banners','Banners',,'Banners','index.php?option=com_banners','component','0','1','1','4','0','0000-00-00 00:00:00','0','0','class:banners','0',,'13','22','0','*','1' -'3','menu','com_banners','Banners',,'Banners/Banners','index.php?option=com_banners','component','0','2','2','4','0','0000-00-00 00:00:00','0','0','class:banners','0',,'14','15','0','*','1' -'4','menu','com_banners_categories','Categories',,'Banners/Categories','index.php?option=com_categories&extension=com_banners','component','0','2','2','6','0','0000-00-00 00:00:00','0','0','class:banners-cat','0',,'16','17','0','*','1' -'5','menu','com_banners_clients','Clients',,'Banners/Clients','index.php?option=com_banners&view=clients','component','0','2','2','4','0','0000-00-00 00:00:00','0','0','class:banners-clients','0',,'18','19','0','*','1' -'6','menu','com_banners_tracks','Tracks',,'Banners/Tracks','index.php?option=com_banners&view=tracks','component','0','2','2','4','0','0000-00-00 00:00:00','0','0','class:banners-tracks','0',,'20','21','0','*','1' '7','menu','com_contact','Contacts',,'Contacts','index.php?option=com_contact','component','0','1','1','8','0','0000-00-00 00:00:00','0','0','class:contact','0',,'23','28','0','*','1' '8','menu','com_contact','Contacts',,'Contacts/Contacts','index.php?option=com_contact','component','0','7','2','8','0','0000-00-00 00:00:00','0','0','class:contact','0',,'24','25','0','*','1' '9','menu','com_contact_categories','Categories',,'Contacts/Categories','index.php?option=com_categories&extension=com_contact','component','0','7','2','6','0','0000-00-00 00:00:00','0','0','class:contact-cat','0',,'26','27','0','*','1' diff --git a/tests/unit/stubs/database/jos_modules.csv b/tests/unit/stubs/database/jos_modules.csv index c01cc5742d..65c237040b 100644 --- a/tests/unit/stubs/database/jos_modules.csv +++ b/tests/unit/stubs/database/jos_modules.csv @@ -12,7 +12,6 @@ '15','Title',,,'1','title','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_title','3','1',,'1','*' '16','Login Form',,,'7','position-7','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_login','1','1','{"greeting":"1","name":"0"}','0','*' '17','Breadcrumbs',,,'1','position-2','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_breadcrumbs','1','1','{"moduleclass_sfx":"","showHome":"1","homeText":"Home","showComponent":"1","separator":"","cache":"1","cache_time":"900","cachemode":"itemid"}','0','*' -'18','Book Store',,,'1','position-10','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_banners','1','0','{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}','0','*' '19','User Menu',,,'3','position-7','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_menu','2','1','{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"_menu","cache":"1","cache_time":"900","cachemode":"itemid"}','0','*' '20','Top',,,'1','position-1','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_menu','1','1','{"menutype":"top","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":" nav-pills","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"1","header_tag":"h3","header_class":"","style":"0"}','0','*' '22','Australian Parks ',,,'2','position-7','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_menu','1','1','{"menutype":"parks","active":"","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"1","header_tag":"h3","header_class":"","style":"0"}','0','en-GB' @@ -39,7 +38,6 @@ '48','Custom HTML',,'

This is a custom html module. That means you can enter whatever content you want.

','1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_custom','1','1','{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}','0','*' '49','Weblinks',,,'1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_weblinks','1','1','{"catid":"32","count":"5","ordering":"title","direction":"asc","target":"3","description":"0","hits":"0","count_clicks":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}','0','*' '52','Breadcrumbs',,,'1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_breadcrumbs','1','1','{"showHere":"1","showHome":"1","homeText":"Home","showLast":"1","separator":"","layout":"_:default","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}','0','*' -'56','Banners',,,'1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_banners','1','1','{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"random","header_text":"","footer_text":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}','0','*' '57','Fruit Shop',,,'3','position-5','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_menu','1','1','{"menutype":"fruitshop","startLevel":"1","endLevel":"0","showAllChildren":"0","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":"","cache":"0","cache_time":"900","cachemode":"itemid"}','0','*' '58','Special!',,'

This week we have a special, half price on delicious oranges!

Only for our special customers!
Use the code: Joomla! when ordering

This module can only be seen by people in the customers group or higher.

','1','position-12','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_custom','4','1','{"prepare_content":"1","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static"}','0','*' '61','Articles Categories',,,'1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_articles_categories','1','1','{"parent":"29","show_description":"0","show_children":"0","count":"0","maxlevel":"0","layout":"_:default","item_heading":"4","moduleclass_sfx":"","owncache":"1","cache_time":"900"}','0','*' @@ -53,8 +51,6 @@

New weblinks can also be added through the front end.

A simple image gallery uses com_content with thumbnails displayed in a blog layout and full size images shown in article layout.

','2','position-2','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_custom','1','1','{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"1","header_tag":"h3","header_class":"","style":"Protostar-well"}','0','*' '69','Articles Category',,,'1',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_articles_category','1','1','{"mode":"normal","show_on_article_page":"1","show_front":"show","count":"0","category_filtering_type":"1","catid":["72"],"show_child_category_articles":"0","levels":"1","author_filtering_type":"1","created_by":[""],"author_alias_filtering_type":"1","created_by_alias":[""],"excluded_articles":"","date_filtering":"off","date_field":"a.created","start_date_range":"","end_date_range":"","relative_date":"30","article_ordering":"a.title","article_ordering_direction":"ASC","article_grouping":"none","article_grouping_direction":"ksort","month_year_format":"F Y","item_heading":"4","link_titles":"1","show_date":"0","show_date_field":"created","show_date_format":"Y-m-d H:i:s","show_category":"0","show_hits":"0","show_author":"0","show_introtext":"0","introtext_limit":"100","show_readmore":"0","show_readmore_title":"1","readmore_limit":"15","layout":"_:default","moduleclass_sfx":"","owncache":"1","cache_time":"900"}','0','*' -'77','Shop',,,'1','position-11','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_banners','1','0','{"target":"1","count":"1","cid":"2","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Shop!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}','0','*' -'78','Contribute',,,'1','position-9','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_banners','1','0','{"target":"1","count":"1","cid":"1","catid":["15"],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Contribute! ","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}','0','*' '79','Multilanguage status',,,'1','status','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','0','mod_multilangstatus','3','1','{"layout":"_:default","moduleclass_sfx":"","cache":"0"}','1','*' '84','Smart Search Module',,,'2',,'0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_finder','1','1','{"searchfilter":"","show_autosuggest":"1","show_advanced":"0","layout":"_:default","moduleclass_sfx":"","field_size":20,"alt_label":"","show_label":"0","label_pos":"top","show_button":"0","button_pos":"right","opensearch":"1","opensearch_title":""}','0','*' '86','Joomla Version',,,'1','footer','0','0000-00-00 00:00:00','0000-00-00 00:00:00','0000-00-00 00:00:00','1','mod_version','3','1','{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}','1','*' diff --git a/tests/unit/stubs/database/jos_weblinks.csv b/tests/unit/stubs/database/jos_weblinks.csv deleted file mode 100644 index c1542e646a..0000000000 --- a/tests/unit/stubs/database/jos_weblinks.csv +++ /dev/null @@ -1,10 +0,0 @@ -'id','catid','title','alias','url','description','hits','state','checked_out','checked_out_time','ordering','access','params','language','created','created_by','created_by_alias','modified','modified_by','metakey','metadesc','metadata','featured','xreference','publish_up','publish_down','version','images' -'1','32','Joomla!','joomla','http://www.joomla.org','

Home of Joomla!

','0','1','0','0000-00-00 00:00:00','1','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'2','33','php.net','php','http://www.php.net','

The language that Joomla! is developed in

','0','1','0','0000-00-00 00:00:00','1','1','{"target":"","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'3','33','MySQL','mysql','http://www.mysql.com','

The most commonly used database for Joomla!.

','0','1','0','0000-00-00 00:00:00','2','1','{"target":"","width":"","height":"","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'4','32','OpenSourceMatters','opensourcematters','http://www.opensourcematters.org','

Home of OSM

','0','1','0','0000-00-00 00:00:00','3','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'5','32','Joomla! - Forums','joomla-forums','http://forum.joomla.org','

Joomla! Forums

','0','1','0','0000-00-00 00:00:00','2','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'6','33','Ohloh Tracking of Joomla!','ohloh-tracking-of-joomla','http://www.ohloh.net/projects/20','

Objective reports from Ohloh about Joomla\'s development activity. Joomla! has some star developers with serious kudos.

','0','1','0','0000-00-00 00:00:00','3','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'7','31','Baw Baw National Park','baw-baw-national-park','http://www.parkweb.vic.gov.au/1park_display.cfm?park=44','

Park of the Austalian Alps National Parks system, Baw Baw features sub alpine vegetation, beautiful views, and opportunities for hiking, skiing and other outdoor activities.

','0','1','0','0000-00-00 00:00:00','1','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'8','31','Kakadu','kakadu','http://www.environment.gov.au/parks/kakadu/index.html','

Kakadu is known for both its cultural heritage and its natural features. It is one of a small number of places listed as World Heritage Places for both reasons. Extensive rock art is found there.

','0','1','0','0000-00-00 00:00:00','2','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'0000-00-00 00:00:00','0000-00-00 00:00:00','1', -'9','31','Pulu Keeling','pulu-keeling','http://www.environment.gov.au/parks/cocos/index.html','

Located on an atoll 2000 kilometers north of Perth, Pulu Keeling is Australia\'s smallest national park.

','0','1','0','0000-00-00 00:00:00','3','1','{"target":"0","count_clicks":""}','en-GB','2011-01-01 00:00:01','100','Joomla','0000-00-00 00:00:00','0',,,'{"robots":"","author":"","rights":""}','0',,'2010-07-10 23:44:03','0000-00-00 00:00:00','1', diff --git a/tests/unit/suites/libraries/joomla/access/JAccessTest.php b/tests/unit/suites/libraries/joomla/access/JAccessTest.php index 9cd81b3032..3e51586b8a 100644 --- a/tests/unit/suites/libraries/joomla/access/JAccessTest.php +++ b/tests/unit/suites/libraries/joomla/access/JAccessTest.php @@ -310,22 +310,6 @@ public function casesGetActionsFromData() { return array( array( - ' -
- - - - - - -
-
- - - - -
-', "/access/section[@name='component']/", array( (object) array('name' => "core.admin", 'title' => "JACTION_ADMIN", 'description' => "JACTION_ADMIN_COMPONENT_DESC"), @@ -336,30 +320,9 @@ public function casesGetActionsFromData() (object) array('name' => "core.edit.state", 'title' => "JACTION_EDITSTATE", 'description' => "JACTION_EDITSTATE_COMPONENT_DESC")), 'Unable to get actions from the component section.'), array( - ' -
- - - - - - -
-
- - - - -
-', "/access/section[@name='unexisting']/", array(), 'Unable to get actions from an unexiting section.'), - array( - ' -
- - - - - - -
-
- - - - -
-' - ); - $this->assertThat( JAccess::getActionsFromFile(JPATH_TESTS . '/tmp/access/access.xml'), $this->equalTo( diff --git a/tests/unit/suites/libraries/joomla/language/data/language/en-GB/en-GB.xml b/tests/unit/suites/libraries/joomla/language/data/language/en-GB/en-GB.xml index 01ca2f784f..03b99489cb 100644 --- a/tests/unit/suites/libraries/joomla/language/data/language/en-GB/en-GB.xml +++ b/tests/unit/suites/libraries/joomla/language/data/language/en-GB/en-GB.xml @@ -42,8 +42,6 @@ en-GB.mod_articles_news.sys.ini en-GB.mod_articles_popular.ini en-GB.mod_articles_popular.sys.ini - en-GB.mod_banners.ini - en-GB.mod_banners.sys.ini en-GB.mod_breadcrumbs.ini en-GB.mod_breadcrumbs.sys.ini en-GB.mod_custom.ini diff --git a/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml b/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml index d6549accdd..807d808d66 100644 --- a/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml +++ b/tests/unit/suites/libraries/joomla/utilities/stubs/test.xml @@ -29,16 +29,6 @@ com_admin {} - - 3 - 1 - 4 - 5 - 1 - com_banners - com_banners - {"core.admin":{"7":1},"core.manage":{"6":1},"core.create":{"4":0},"core.delete":{"4":0,"5":1},"core.edit":[],"core.edit.state":[]} - 4 1 @@ -260,57 +250,6 @@ {} - - id - name - contact - email - extrainfo - state - checked_out - checked_out_time - metakey - own_prefix - metakey_prefix - purchase_type - track_clicks - track_impressions -
- - track_date - track_type - banner_id - count -
- - id - cid - type - name - alias - imptotal - impmade - clicks - clickurl - state - catid - description - sticky - ordering - metakey - params - own_prefix - metakey_prefix - purchase_type - track_clicks - track_impressions - checked_out - checked_out_time - publish_up - publish_down - reset - created -
idasset_id @@ -549,25 +488,6 @@ 00 - - 4 - Banners - component - com_banners - - 1 - 1 - 1 - 0 - - {"purchase_type":"1","track_impressions":"0","track_clicks":"0","metakey_prefix":""} - - - 0 - 0000-00-00 00:00:00 - 0 - 0 - 5 Cache Manager @@ -1081,25 +1001,6 @@ 0 0 - - 32 - Banners - module - mod_banners - - 0 - 1 - 1 - 0 - - - - - 0 - 0000-00-00 00:00:00 - 0 - 0 - 33 Breadcrumbs @@ -2501,131 +2402,6 @@ 0 0 - - 2 - main - com_banners - Banners - Banners - index.php?option=com_banners - component - 0 - 1 - 1 - 4 - 0 - 0 - 0000-00-00 00:00:00 - 0 - 0 - class:banners - 0 - - 1 - 10 - 0 - 1 - - - 3 - main - com_banners - Banners - Banners/Banners - index.php?option=com_banners - component - 0 - 2 - 2 - 4 - 0 - 0 - 0000-00-00 00:00:00 - 0 - 0 - class:banners - 0 - - 2 - 3 - 0 - 1 - - - 4 - main - com_banners_clients - Clients - Banners/Clients - index.php?option=com_banners&view=clients - component - 0 - 2 - 2 - 4 - 0 - 0 - 0000-00-00 00:00:00 - 0 - 0 - class:banners-clients - 0 - - 4 - 5 - 0 - 1 - - - 5 - main - com_banners_tracks - Tracks - Banners/Tracks - index.php?option=com_banners&view=tracks - component - 0 - 2 - 2 - 4 - 0 - 0 - 0000-00-00 00:00:00 - 0 - 0 - class:banners-tracks - 0 - - 6 - 7 - 0 - 1 - - - 6 - main - com_banners_categories - Categories - Banners/Categories - index.php?option=com_categories&extension=com_banners - component - 0 - 2 - 2 - 6 - 0 - 0 - 0000-00-00 00:00:00 - 0 - 0 - class:banners-cat - 0 - - 8 - 9 - 0 - 1 - 7 main @@ -3326,24 +3102,6 @@ separator= 0 - - 19 - Banners - - 1 - bottom - 0 - 0000-00-00 00:00:00 - 0000-00-00 00:00:00 - 0000-00-00 00:00:00 - 0 - mod_banners - 1 - 1 - {"target":"1","count":"1","cid":"1","catid":"27","tag_search":"0","ordering":"0","header_text":"","footer_text":"","layout":"","moduleclass_sfx":"","cache":"1","cache_time":"0"} - 0 - -
moduleid