diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php index 5982f7bfc5c45..4b67589870e43 100644 --- a/administrator/components/com_contact/helpers/contact.php +++ b/administrator/components/com_contact/helpers/contact.php @@ -120,7 +120,7 @@ public static function validateSection($section, $item) $section = 'mail'; } - if (JFactory::getApplication()->isClient('site') && $section == 'category') + if (JFactory::getApplication()->isClient('site') && ($section == 'category' || $section == 'form')) { // The contact form needs to be the mail section $section = 'contact'; diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php index c6e1393768866..405047adc1fce 100644 --- a/administrator/components/com_contact/models/contact.php +++ b/administrator/components/com_contact/models/contact.php @@ -57,6 +57,14 @@ class ContactModelContact extends JModelAdmin 'user_id' => 'batchUser', ); + /** + * Name of the form + * + * @var string + * @since __DEPLOY_VERSION__ + */ + protected $formName = 'contact'; + /** * Batch change a linked user. * @@ -175,7 +183,7 @@ public function getForm($data = array(), $loadData = true) JForm::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_users/models/fields'); // Get the form. - $form = $this->loadForm('com_contact.contact', 'contact', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_contact.' . $this->formName, $this->formName, array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) { @@ -341,7 +349,7 @@ public function save($data) foreach ($links as $link) { - if ($data['params'][$link]) + if (!empty($data['params'][$link])) { $data['params'][$link] = JStringPunycode::urlToPunycode($data['params'][$link]); } diff --git a/administrator/language/en-GB/en-GB.com_contact.sys.ini b/administrator/language/en-GB/en-GB.com_contact.sys.ini index fa859f0244b21..d41ce9b13f52f 100644 --- a/administrator/language/en-GB/en-GB.com_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.com_contact.sys.ini @@ -21,6 +21,8 @@ COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category" COM_CONTACT_FEATURED_VIEW_DEFAULT_DESC="This view lists the featured contacts." COM_CONTACT_FEATURED_VIEW_DEFAULT_OPTION="Default" COM_CONTACT_FEATURED_VIEW_DEFAULT_TITLE="Featured Contacts" +COM_CONTACT_FORM_VIEW_DEFAULT_DESC="Create a new contact." +COM_CONTACT_FORM_VIEW_DEFAULT_TITLE="Create Contact" COM_CONTACT_CONTACTS="Contacts" COM_CONTACT_TAGS_CONTACT="Contact" COM_CONTACT_TAGS_CATEGORY="Contact Category" diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 94b803958a5a8..7037599ad6e5a 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -823,6 +823,7 @@ JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menus_Menu_Item_Article_Featured" JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menus_Menu_Item_Article_Single_Article" JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menus_Menu_Item_Contact_Categories" JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menus_Menu_Item_Contact_Category" +JHELP_MENUS_MENU_ITEM_CONTACT_CREATE="Menus_Menu_Item_Contact_Create" JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menus_Menu_Item_Contact_Featured" JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menus_Menu_Item_Contact_Single_Contact" JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menus_Menu_Item_Display_Site_Configuration" diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php index 82180e6233f0b..ca35aed7a0c7f 100644 --- a/components/com_contact/controllers/contact.php +++ b/components/com_contact/controllers/contact.php @@ -9,6 +9,10 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; +use Joomla\CMS\Uri\Uri; +use Joomla\Utilities\ArrayHelper; + /** * Controller for single contact view * @@ -16,6 +20,22 @@ */ class ContactControllerContact extends JControllerForm { + /** + * The URL view item variable. + * + * @var string + * @since __DEPLOY_VERSION__ + */ + protected $view_item = 'form'; + + /** + * The URL view list variable. + * + * @var string + * @since __DEPLOY_VERSION__ + */ + protected $view_list = 'categories'; + /** * Method to get a model object, loading it if required. * @@ -27,7 +47,7 @@ class ContactControllerContact extends JControllerForm * * @since 1.6.4 */ - public function getModel($name = '', $prefix = '', $config = array('ignore_request' => true)) + public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true)) { return parent::getModel($name, $prefix, array('ignore_request' => false)); } @@ -58,7 +78,7 @@ public function submit() $contact = $model->getItem($id); // Get item params, take menu parameters into account if necessary - $active = $app->getMenu()->getActive(); + $active = $app->getMenu()->getActive(); $stateParams = clone $model->getState()->get('params'); // If the current view is the active item and a contact view for this contact, then the menu item params take priority @@ -266,4 +286,143 @@ private function _sendEmail($data, $contact, $copy_email_activated) return $sent; } + + /** + * Method override to check if you can add a new record. + * + * @param array $data An array of input data. + * + * @return boolean + * + * @since __DEPLOY_VERSION__ + */ + protected function allowAdd($data = array()) + { + if ($categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('catid'), 'int')) + { + $user = Factory::getUser(); + + // If the category has been passed in the data or URL check it. + return $user->authorise('core.create', 'com_contact.category.' . $categoryId); + } + + // In the absence of better information, revert to the component permissions. + return parent::allowAdd(); + } + + /** + * 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; default is id. + * + * @return boolean + * + * @since __DEPLOY_VERSION__ + */ + protected function allowEdit($data = array(), $key = 'id') + { + $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + + if (!$recordId) + { + return false; + } + + // Need to do a lookup from the model. + $record = $this->getModel()->getItem($recordId); + $categoryId = (int) $record->catid; + + if ($categoryId) + { + $user = Factory::getUser(); + + // The category has been set. Check the category permissions. + if ($user->authorise('core.edit', $this->option . '.category.' . $categoryId)) + { + return true; + } + + // Fallback on edit.own. + if ($user->authorise('core.edit.own', $this->option . '.category.' . $categoryId)) + { + return ($record->created_by == $user->id); + } + + return false; + } + + // Since there is no asset tracking, revert to the component permissions. + return parent::allowEdit($data, $key); + } + + /** + * Gets the URL arguments to append to an item redirect. + * + * @param integer $recordId The primary key id for the item. + * @param string $urlVar The name of the URL variable for the id. + * + * @return string The arguments to append to the redirect URL. + * + * @since __DEPLOY_VERSION__ + */ + protected function getRedirectToItemAppend($recordId = 0, $urlVar = 'id') + { + // Need to override the parent method completely. + $tmpl = $this->input->get('tmpl'); + + $append = ''; + + // Setup redirect info. + if ($tmpl) + { + $append .= '&tmpl=' . $tmpl; + } + + $append .= '&layout=edit'; + + $append .= '&' . $urlVar . '=' . (int) $recordId; + + $itemId = $this->input->getInt('Itemid'); + $return = $this->getReturnPage(); + $catId = $this->input->getInt('catid'); + + if ($itemId) + { + $append .= '&Itemid=' . $itemId; + } + + if ($catId) + { + $append .= '&catid=' . $catId; + } + + if ($return) + { + $append .= '&return=' . base64_encode($return); + } + + return $append; + } + + /** + * Get the return URL. + * + * If a "return" variable has been passed in the request + * + * @return string The return URL. + * + * @since __DEPLOY_VERSION__ + */ + protected function getReturnPage() + { + $return = $this->input->get('return', null, 'base64'); + + if (empty($return) || !Uri::isInternal(base64_decode($return))) + { + return Uri::base(); + } + + return base64_decode($return); + } } diff --git a/components/com_contact/helpers/icon.php b/components/com_contact/helpers/icon.php new file mode 100644 index 0000000000000..cc6ff8f9a7fc5 --- /dev/null +++ b/components/com_contact/helpers/icon.php @@ -0,0 +1,150 @@ +id; + + $text = LayoutHelper::render('joomla.content.icons.create', array('params' => $params, 'legacy' => false)); + + // Add the button classes to the attribs array + if (isset($attribs['class'])) + { + $attribs['class'] .= ' btn btn-primary'; + } + else + { + $attribs['class'] = 'btn btn-primary'; + } + + $button = HTMLHelper::_('link', Route::_($url), $text, $attribs); + + $output = '' . $button . ''; + + return $output; + } + + /** + * Display an edit icon for the contact. + * + * This icon will not display in a popup window, nor if the contact is trashed. + * Edit access checks must be performed in the calling code. + * + * @param object $contact The contact information + * @param Registry $params The item parameters + * @param array $attribs Optional attributes for the link + * @param boolean $legacy True to use legacy images, false to use icomoon based graphic + * + * @return string The HTML for the contact edit icon. + * + * @since __DEPLOY_VERSION__ + */ + public static function edit($contact, $params, $attribs = array(), $legacy = false) + { + $user = Factory::getUser(); + $uri = Uri::getInstance(); + + // Ignore if in a popup window. + if ($params && $params->get('popup')) + { + return ''; + } + + // Ignore if the state is negative (trashed). + if ($contact->published < 0) + { + return ''; + } + + // Show checked_out icon if the contact is checked out by a different user + if (property_exists($contact, 'checked_out') + && property_exists($contact, 'checked_out_time') + && $contact->checked_out > 0 + && $contact->checked_out != $user->get('id')) + { + $checkoutUser = Factory::getUser($contact->checked_out); + $date = HTMLHelper::_('date', $contact->checked_out_time); + $tooltip = Text::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . Text::sprintf('COM_CONTACT_CHECKED_OUT_BY', $checkoutUser->name) + . '
' . $date; + + $text = LayoutHelper::render('joomla.content.icons.edit_lock', array('tooltip' => $tooltip, 'legacy' => $legacy)); + + $output = HTMLHelper::_('link', '#', $text, $attribs); + + return $output; + } + + $contactUrl = ContactHelperRoute::getContactRoute($contact->slug, $contact->catid, $contact->language); + $url = $contactUrl . '&task=contact.edit&id=' . $contact->id . '&return=' . base64_encode($uri); + + if ($contact->published == 0) + { + $overlib = Text::_('JUNPUBLISHED'); + } + else + { + $overlib = Text::_('JPUBLISHED'); + } + + $date = HTMLHelper::_('date', $contact->created); + $author = $contact->created_by_alias ?: Factory::getUser($contact->created_by)->name; + + $overlib .= '<br />'; + $overlib .= $date; + $overlib .= '<br />'; + $overlib .= Text::sprintf('COM_CONTACT_WRITTEN_BY', htmlspecialchars($author, ENT_COMPAT, 'UTF-8')); + + $icon = $contact->published ? 'edit' : 'eye-close'; + + if (strtotime($contact->publish_up) > strtotime(Factory::getDate()) + || ((strtotime($contact->publish_down) < strtotime(Factory::getDate())) && $contact->publish_down != Factory::getDbo()->getNullDate())) + { + $icon = 'eye-close'; + } + + $text = ''; + $text .= Text::_('JGLOBAL_EDIT'); + + $attribs['title'] = Text::_('COM_CONTACT_EDIT_CONTACT'); + $output = HTMLHelper::_('link', Route::_($url), $text, $attribs); + + return $output; + } +} diff --git a/components/com_contact/helpers/legacyrouter.php b/components/com_contact/helpers/legacyrouter.php index bef342523af08..1c1657e0a6cf4 100644 --- a/components/com_contact/helpers/legacyrouter.php +++ b/components/com_contact/helpers/legacyrouter.php @@ -73,7 +73,7 @@ public function build(&$query, &$segments) $mView = empty($menuItem->query['view']) ? null : $menuItem->query['view']; $mId = empty($menuItem->query['id']) ? null : $menuItem->query['id']; - if (isset($query['view'])) + if (isset($query['view']) && $query['view'] != 'form') { $view = $query['view']; diff --git a/components/com_contact/models/form.php b/components/com_contact/models/form.php new file mode 100644 index 0000000000000..3f9faa395bed8 --- /dev/null +++ b/components/com_contact/models/form.php @@ -0,0 +1,165 @@ +getState('contact.id'); + + // Get a row instance. + $table = $this->getTable(); + + // Attempt to load the row. + try + { + if (!$table->load($itemId)) + { + return false; + } + } + catch (Exception $e) + { + Factory::getApplication()->enqueueMessage($e->getMessage()); + + return false; + } + + $properties = $table->getProperties(); + $value = ArrayHelper::toObject($properties, 'JObject'); + + // Convert field to Registry. + $value->params = new Registry($value->params); + + // Convert the metadata field to an array. + $registry = new Registry($value->metadata); + $value->metadata = $registry->toArray(); + + if ($itemId) + { + $value->tags = new Joomla\CMS\Helper\TagsHelper; + $value->tags->getTagIds($value->id, 'com_contact.contact'); + $value->metadata['tags'] = $value->tags; + } + + return $value; + } + + /** + * Get the return URL. + * + * @return string The return URL. + * + * @since __DEPLOY_VERSION__ + */ + public function getReturnPage() + { + return base64_encode($this->getState('return_page')); + } + + /** + * Method to save the form data. + * + * @param array $data The form data. + * + * @return boolean True on success. + * + * @throws Exception + * @since __DEPLOY_VERSION__ + */ + public function save($data) + { + // Associations are not edited in frontend ATM so we have to inherit them + if (Associations::isEnabled() && !empty($data['id']) + && $associations = Associations::getAssociations('com_contact', '#__contact_details', 'com_contact.item', $data['id'])) + { + foreach ($associations as $tag => $associated) + { + $associations[$tag] = (int) $associated->id; + } + + $data['associations'] = $associations; + } + + return parent::save($data); + } + + /** + * Method to auto-populate the model state. + * + * Note. Calling getState in this method will result in recursion. + * + * @return void + * + * @throws Exception + * + * @since __DEPLOY_VERSION__ + */ + protected function populateState() + { + $app = Factory::getApplication(); + + // Load state from the request. + $pk = $app->input->getInt('id'); + $this->setState('contact.id', $pk); + + $this->setState('contact.catid', $app->input->getInt('catid')); + + $return = $app->input->get('return', null, 'base64'); + $this->setState('return_page', base64_decode($return)); + + // Load the parameters. + $params = $app->getParams(); + $this->setState('params', $params); + + $this->setState('layout', $app->input->getString('layout')); + } +} diff --git a/components/com_contact/models/forms/form.xml b/components/com_contact/models/forms/form.xml index 3bd4fdbec77e3..51b9efaa91094 100644 --- a/components/com_contact/models/forms/form.xml +++ b/components/com_contact/models/forms/form.xml @@ -1,772 +1,378 @@ -
- - - - - - - - - - - - - - - - - - - - + +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- + - - - -
- - - -
- - - - - - + + + + - + - - - - + + - - - +
- + - - - - - - - - - + + - + - - + + - diff --git a/components/com_contact/router.php b/components/com_contact/router.php index 7331bb6f6119f..5f125772da9bd 100644 --- a/components/com_contact/router.php +++ b/components/com_contact/router.php @@ -38,6 +38,9 @@ public function __construct($app = null, $menu = null) $contact->setKey('id')->setParent($category, 'catid'); $this->registerView($contact); $this->registerView(new JComponentRouterViewconfiguration('featured')); + $form = new JComponentRouterViewconfiguration('form'); + $form->setKey('id'); + $this->registerView($form); parent::__construct($app, $menu); @@ -131,6 +134,21 @@ public function getContactSegment($id, $query) return array((int) $id => $id); } + /** + * Method to get the segment(s) for a form + * + * @param string $id ID of the contact form to retrieve the segments for + * @param array $query The request that is built right now + * + * @return array|string The segments of this item + * + * @since __DEPLOY_VERSION__ + */ + public function getFormSegment($id, $query) + { + return $this->getContactSegment($id, $query); + } + /** * Method to get the id for a category * diff --git a/components/com_contact/views/category/tmpl/default.php b/components/com_contact/views/category/tmpl/default.php index 017e2cb7adfef..1e3f37a28d448 100644 --- a/components/com_contact/views/category/tmpl/default.php +++ b/components/com_contact/views/category/tmpl/default.php @@ -9,5 +9,9 @@ defined('_JEXEC') or die; +use Joomla\CMS\HTML\HTMLHelper; + +HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers'); + $this->subtemplatename = 'items'; echo JLayoutHelper::render('joomla.content.category_default', $this); diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php index fdfa671f702e9..9e61703d376c7 100644 --- a/components/com_contact/views/category/tmpl/default_items.php +++ b/components/com_contact/views/category/tmpl/default_items.php @@ -9,8 +9,13 @@ defined('_JEXEC') or die; -JHtml::_('behavior.core'); +use Joomla\CMS\Factory; +use Joomla\CMS\HTML\HTMLHelper; +JHtml::_('behavior.core'); +$canDo = ContactHelper::getActions('com_contact', 'category', $this->category->id); +$canEdit = $canDo->get('core.edit'); +$userId = Factory::getUser()->id; ?>
params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?> @@ -21,7 +26,7 @@ - + event->afterDisplayTitle; ?> event->beforeDisplayContent; ?> params->get('show_position_headings')) : ?> - con_position; ?>
+ con_position; ?>
params->get('show_email_headings')) : ?> - email_to; ?>
+ email_to; ?>
params->get('show_suburb_headings') && !empty($item->suburb)) : ?> @@ -106,21 +111,29 @@ class="inputbox"
params->get('show_telephone_headings') && !empty($item->telephone)) : ?> - telephone); ?>
+ telephone); ?>
params->get('show_mobile_headings') && !empty ($item->mobile)) : ?> - mobile); ?>
+ mobile); ?>
params->get('show_fax_headings') && !empty($item->fax)) : ?> - fax); ?>
+ fax); ?>
+ get('core.edit.own') && $item->created_by == $userId)) : ?> +
params); ?>
+ event->afterDisplayContent; ?> - + + + get('core.create')) : ?> + category, $this->category->params); ?> + + params->get('show_pagination', 2)) : ?>
- - + +
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php index 6aa627841ffe5..76f207e280f66 100644 --- a/components/com_contact/views/contact/tmpl/default.php +++ b/components/com_contact/views/contact/tmpl/default.php @@ -11,8 +11,12 @@ jimport('joomla.html.html.bootstrap'); +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers'); + $cparams = JComponentHelper::getParams('com_media'); $tparams = $this->item->params; +$canDo = JHelperContent::getActions('com_contact', 'category', $this->item->catid); +$canEdit = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == JFactory::getUser()->id); ?> @@ -34,6 +38,22 @@ + +
+
+ +
    +
  • item, $tparams); ?>
    • +
+
+
+ + get('show_contact_category'); ?> @@ -102,7 +122,7 @@ get('allow_vcard')) : ?> - + diff --git a/components/com_contact/views/form/tmpl/edit.php b/components/com_contact/views/form/tmpl/edit.php new file mode 100644 index 0000000000000..08601501349a5 --- /dev/null +++ b/components/com_contact/views/form/tmpl/edit.php @@ -0,0 +1,90 @@ + 0)); +HTMLHelper::_('formbehavior.chosen', 'select'); +$this->tab_name = 'com-contact-form'; +$this->ignore_fieldsets = array('details', 'item_associations'); + +JFactory::getDocument()->addScriptDeclaration(' + Joomla.submitbutton = function(task) + { + if (task == "contact.cancel" || document.formvalidator.isValid(document.getElementById("contact-form"))) + { + ' . $this->form->getField('misc')->save() . ' + Joomla.submitform(task, document.getElementById("contact-form")); + } + }; +'); +?> +
+ params->get('show_page_heading')) : ?> +
+

+ escape($this->params->get('page_heading')); ?> +

+
+ + +
+
+ tab_name, array('active' => 'details')); ?> + tab_name, 'details', empty($this->item->id) ? Text::_('COM_CONTACT_NEW_CONTACT') : Text::_('COM_CONTACT_EDIT_CONTACT')); ?> + form->renderField('name'); ?> + + item->id)) : ?> + form->renderField('alias'); ?> + + + form->renderFieldset('details'); ?> + + + tab_name, 'misc', Text::_('COM_CONTACT_FIELDSET_MISCELLANEOUS')); ?> + form->renderField('misc'); ?> + + + + + + + + +
+
+
+ +
+
+ +
+ params->get('save_history', 0) && $this->item->id) : ?> +
+ form->getInput('contenthistory'); ?> +
+ +
+
+
diff --git a/components/com_contact/views/form/tmpl/edit.xml b/components/com_contact/views/form/tmpl/edit.xml new file mode 100644 index 0000000000000..4c21a53902ac8 --- /dev/null +++ b/components/com_contact/views/form/tmpl/edit.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/components/com_contact/views/form/view.html.php b/components/com_contact/views/form/view.html.php new file mode 100644 index 0000000000000..269ff97073016 --- /dev/null +++ b/components/com_contact/views/form/view.html.php @@ -0,0 +1,194 @@ +state = $this->get('State'); + $this->item = $this->get('Item'); + $this->form = $this->get('Form'); + $this->return_page = $this->get('ReturnPage'); + + if (empty($this->item->id)) + { + $authorised = $user->authorise('core.create', 'com_contact') || count($user->getAuthorisedCategories('com_contact', 'core.create')); + } + else + { + // Since we don't track these assets at the item level, use the category id. + $canDo = ContactHelper::getActions('com_contact', 'category', $this->item->catid); + $authorised = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $user->id); + } + + if ($authorised !== true) + { + $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error'); + $app->setHeader('status', 403, true); + + return false; + } + + $this->item->tags = new Joomla\CMS\Helper\TagsHelper; + + if (!empty($this->item->id)) + { + $this->item->tags->getItemTags('com_contact.contact', $this->item->id); + } + + // Check for errors. + if (count($errors = $this->get('Errors'))) + { + $app->enqueueMessage(implode("\n", $errors), 'error'); + + return false; + } + + // Create a shortcut to the parameters. + $this->params = $this->state->params; + + // Escape strings for HTML output + $this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx')); + + // Override global params with contact specific params + $this->params->merge($this->item->params); + + // Propose current language as default when creating new contact + if (empty($this->item->id) && Multilanguage::isEnabled()) + { + $lang = Factory::getLanguage()->getTag(); + $this->form->setFieldAttribute('language', 'default', $lang); + } + + $this->_prepareDocument(); + + return parent::display($tpl); + } + + /** + * Prepares the document + * + * @return void + * + * @throws Exception + * + * @since __DEPLOY_VERSION__ + */ + protected function _prepareDocument() + { + $app = Factory::getApplication(); + $menus = $app->getMenu(); + $title = null; + + // Because the application sets a default page title, + // we need to get it from the menu item itself + $menu = $menus->getActive(); + + if ($menu) + { + $this->params->def('page_heading', $this->params->get('page_title', $menu->title)); + } + else + { + $this->params->def('page_heading', Text::_('COM_CONTACT_FORM_EDIT_CONTACT')); + } + + $title = $this->params->def('page_title', Text::_('COM_CONTACT_FORM_EDIT_CONTACT')); + + if ($app->get('sitename_pagetitles', 0) == 1) + { + $title = Text::sprintf('JPAGETITLE', $app->get('sitename'), $title); + } + elseif ($app->get('sitename_pagetitles', 0) == 2) + { + $title = Text::sprintf('JPAGETITLE', $title, $app->get('sitename')); + } + + $this->document->setTitle($title); + + $pathway = $app->getPathWay(); + $pathway->addItem($title, ''); + + if ($this->params->get('menu-meta_description')) + { + $this->document->setDescription($this->params->get('menu-meta_description')); + } + + if ($this->params->get('menu-meta_keywords')) + { + $this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords')); + } + + if ($this->params->get('robots')) + { + $this->document->setMetadata('robots', $this->params->get('robots')); + } + } +} diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini index 5a8d2b5c450dd..f9dd418acfc8e 100644 --- a/language/en-GB/en-GB.com_contact.ini +++ b/language/en-GB/en-GB.com_contact.ini @@ -19,8 +19,11 @@ COM_CONTACT_CONTACT_ENTER_VALID_EMAIL="Please enter a valid email address." COM_CONTACT_CONTACT_REQUIRED="* Required field" COM_CONTACT_CONTENT_TYPE_CONTACT="Contact" COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category" +COM_CONTACT_CREATE_CONTACT="Submit new contact" +COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact from this category has the same alias (remember it may be a trashed item)." COM_CONTACT_FILTER_LABEL="Filter Field" COM_CONTACT_FILTER_SEARCH_DESC="Contact Filter Search" +COM_CONTACT_CHECKED_OUT_BY="Checked out by %s" COM_CONTACT_CONTACT_MESSAGE_SUBJECT_DESC="Enter the subject of your message here." COM_CONTACT_CONTACT_MESSAGE_SUBJECT_LABEL="Subject" COM_CONTACT_CONTACT_SEND="Send Email" @@ -31,6 +34,7 @@ COM_CONTACT_COUNTRY="Country" COM_CONTACT_DEFAULT_PAGE_TITLE="Contacts" COM_CONTACT_DETAILS="Contact" COM_CONTACT_DOWNLOAD_INFORMATION_AS="Download information as:" +COM_CONTACT_EDIT_CONTACT="Edit Contact" COM_CONTACT_EMAIL_BANNEDTEXT="The %s of your email has banned text." COM_CONTACT_EMAIL_DESC="Email Address for contact." COM_CONTACT_EMAIL_FORM="Contact Form" @@ -40,6 +44,53 @@ COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via %s from:" COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found" COM_CONTACT_FAX="Fax" COM_CONTACT_FAX_NUMBER="Fax: %s" +COM_CONTACT_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the contact." +COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias" +COM_CONTACT_FIELD_FEATURED_DESC="If marked yes, will be displayed in featured view." +COM_CONTACT_FIELD_INFORMATION_ADDRESS_DESC="Contact's address." +COM_CONTACT_FIELD_INFORMATION_ADDRESS_LABEL="Address" +COM_CONTACT_FIELD_INFORMATION_COUNTRY_DESC="Contact's country." +COM_CONTACT_FIELD_INFORMATION_COUNTRY_LABEL="Country" +COM_CONTACT_FIELD_INFORMATION_EMAIL_DESC="Contact's email." +COM_CONTACT_FIELD_INFORMATION_FAX_DESC="Contact's fax." +COM_CONTACT_FIELD_INFORMATION_FAX_LABEL="Fax" +COM_CONTACT_FIELD_INFORMATION_MISC_DESC="Contact's miscellaneous information." +COM_CONTACT_FIELD_INFORMATION_MISC_LABEL="Miscellaneous Information" +COM_CONTACT_FIELD_INFORMATION_MOBILE_DESC="Contact's mobile phone." +COM_CONTACT_FIELD_INFORMATION_MOBILE_LABEL="Mobile" +COM_CONTACT_FIELD_INFORMATION_POSITION_DESC="Contact's position." +COM_CONTACT_FIELD_INFORMATION_POSITION_LABEL="Position" +COM_CONTACT_FIELD_INFORMATION_POSTCODE_DESC="Contact's Postal/ZIP code." +COM_CONTACT_FIELD_INFORMATION_POSTCODE_LABEL="Postal/ZIP Code" +COM_CONTACT_FIELD_INFORMATION_STATE_DESC="Contact's state or county." +COM_CONTACT_FIELD_INFORMATION_STATE_LABEL="State or County" +COM_CONTACT_FIELD_INFORMATION_SUBURB_DESC="Contact's city or suburb." +COM_CONTACT_FIELD_INFORMATION_SUBURB_LABEL="City or Suburb" +COM_CONTACT_FIELD_INFORMATION_TELEPHONE_DESC="Contact's telephone." +COM_CONTACT_FIELD_INFORMATION_TELEPHONE_LABEL="Telephone" +COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC="Contact's Website. IDN (International) Links are converted to punycode when they are saved." +COM_CONTACT_FIELD_INFORMATION_WEBPAGE_LABEL="Website" +COM_CONTACT_FIELD_LANGUAGE_DESC="Assign a language for this contact." +COM_CONTACT_FIELD_LINKED_USER_DESC="Linked Joomla User." +COM_CONTACT_FIELD_LINKED_USER_LABEL="Linked User" +COM_CONTACT_FIELD_NAME_DESC="Contact name." +COM_CONTACT_FIELD_NAME_LABEL="Name" +COM_CONTACT_FIELD_PARAMS_IMAGE_DESC="Select or upload the contact image." +COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL="Image" +COM_CONTACT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the contact." +COM_CONTACT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing" +COM_CONTACT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the contact." +COM_CONTACT_FIELD_PUBLISH_UP_LABEL="Start Publishing" +COM_CONTACT_FIELD_SORTNAME1_DESC="The part of the name to use as the first sort field." +COM_CONTACT_FIELD_SORTNAME1_LABEL="First Sort Field" +COM_CONTACT_FIELD_SORTNAME2_DESC="The part of the name to use as the second sort field." +COM_CONTACT_FIELD_SORTNAME2_LABEL="Second Sort Field" +COM_CONTACT_FIELD_SORTNAME3_DESC="The part of the name to use as the third sort field." +COM_CONTACT_FIELD_SORTNAME3_LABEL="Third Sort Field" +COM_CONTACT_FIELDSET_MISCELLANEOUS="Miscellaneous Information" +COM_CONTACT_FIELDSET_PUBLISHING="Publishing" +COM_CONTACT_FIELDSET_METADATA="Metadata" +COM_CONTACT_FORM_EDIT_CONTACT="Edit a contact" COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required." COM_CONTACT_FORM_NC="Please make sure the form is complete and valid." COM_CONTACT_IMAGE_DETAILS="Contact image" @@ -47,6 +98,7 @@ COM_CONTACT_LINKS="Links" COM_CONTACT_MAILENQUIRY="%s Enquiry" COM_CONTACT_MOBILE="Mobile" COM_CONTACT_MOBILE_NUMBER="Mobile: %s" +COM_CONTACT_NEW_CONTACT="New Contact" COM_CONTACT_NO_CONTACTS="There are no Contacts to display" COM_CONTACT_NOT_MORE_THAN_ONE_EMAIL_ADDRESS="You can't enter more than one email address." COM_CONTACT_NUM_ITEMS="Contact Count:" @@ -63,3 +115,4 @@ COM_CONTACT_TELEPHONE="Phone" COM_CONTACT_TELEPHONE_NUMBER="Phone: %s" COM_CONTACT_USER_FIELDS="Fields" COM_CONTACT_VCARD="vCard" +COM_CONTACT_WRITTEN_BY="Written by %s"