first import
This commit is contained in:
Bachir Soussi Chiadmi
@@ -0,0 +1,196 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Administrative page callbacks for the xmlsitemap_custom module.
|
||||
*/
|
||||
|
||||
function xmlsitemap_custom_list_links() {
|
||||
$header = array(
|
||||
'loc' => array('data' => t('Location'), 'field' => 'loc', 'sort' => 'asc'),
|
||||
'priority' => array('data' => t('Priority'), 'field' => 'priority'),
|
||||
'changefreq' => array('data' => t('Change frequency'), 'field' => 'changefreq'),
|
||||
'language' => array('data' => t('Language'), 'field' => 'language'),
|
||||
'operations' => array('data' => t('Operations')),
|
||||
);
|
||||
// Do not include the language column if locale is disabled.
|
||||
if (!module_exists('locale')) {
|
||||
unset($header['language']);
|
||||
}
|
||||
|
||||
$rows = array();
|
||||
$destination = drupal_get_destination();
|
||||
|
||||
$query = db_select('xmlsitemap');
|
||||
$query->fields('xmlsitemap');
|
||||
$query->condition('type', 'custom');
|
||||
$query->extend('PagerDefault')->limit(50);
|
||||
$query->extend('TableSort')->orderByHeader($header);
|
||||
$result = $query->execute();
|
||||
|
||||
foreach ($result as $link) {
|
||||
$row = array();
|
||||
$row['loc'] = l($link->loc, $link->loc);
|
||||
$row['priority'] = number_format($link->priority, 1);
|
||||
$row['changefreq'] = $link->changefreq ? drupal_ucfirst(xmlsitemap_get_changefreq($link->changefreq)) : t('None');
|
||||
if (isset($header['language'])) {
|
||||
$row['language'] = module_invoke('locale', 'language_name', $link->language);
|
||||
}
|
||||
$operations = array();
|
||||
$operations['edit'] = xmlsitemap_get_operation_link('admin/config/search/xmlsitemap/custom/edit/' . $link->id, array('title' => t('Edit'), 'modal' => TRUE));
|
||||
$operations['delete'] = xmlsitemap_get_operation_link('admin/config/search/xmlsitemap/custom/delete/' . $link->id, array('title' => t('Delete'), 'modal' => TRUE));
|
||||
$row['operations'] = array(
|
||||
'data' => array(
|
||||
'#theme' => 'links',
|
||||
'#links' => $operations,
|
||||
'#attributes' => array('class' => array('links', 'inline')),
|
||||
),
|
||||
);
|
||||
$rows[] = $row;
|
||||
}
|
||||
|
||||
// @todo Convert to tableselect
|
||||
$build['xmlsitemap_custom_table'] = array(
|
||||
'#theme' => 'table',
|
||||
'#header' => $header,
|
||||
'#rows' => $rows,
|
||||
'#empty' => t('No custom links available.') . ' ' . l(t('Add custom link'), 'admin/config/search/xmlsitemap/custom/add', array('query' => $destination)),
|
||||
);
|
||||
$build['xmlsitemap_custom_pager'] = array('#theme' => 'pager');
|
||||
return $build;
|
||||
}
|
||||
|
||||
function xmlsitemap_custom_edit_link_form($form, &$form_state, $link = array()) {
|
||||
module_load_include('inc', 'xmlsitemap', 'xmlsitemap.admin');
|
||||
_xmlsitemap_set_breadcrumb('admin/config/search/xmlsitemap/custom');
|
||||
|
||||
$link += array(
|
||||
'id' => db_query("SELECT MAX(id) FROM {xmlsitemap} WHERE type = 'custom'")->fetchField() + 1,
|
||||
'loc' => '',
|
||||
'priority' => XMLSITEMAP_PRIORITY_DEFAULT,
|
||||
'lastmod' => 0,
|
||||
'changefreq' => 0,
|
||||
'changecount' => 0,
|
||||
'language' => LANGUAGE_NONE,
|
||||
);
|
||||
|
||||
$form['type'] = array(
|
||||
'#type' => 'value',
|
||||
'#value' => 'custom',
|
||||
);
|
||||
$form['id'] = array(
|
||||
'#type' => 'value',
|
||||
'#value' => $link['id'],
|
||||
);
|
||||
$form['loc'] = array(
|
||||
'#type' => 'textfield',
|
||||
'#title' => t('Path to link'),
|
||||
'#field_prefix' => url('', array('absolute' => TRUE)),
|
||||
'#default_value' => $link['loc'] ? drupal_get_path_alias($link['loc'], $link['language']) : '',
|
||||
'#required' => TRUE,
|
||||
'#size' => 30,
|
||||
);
|
||||
$form['priority'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Priority'),
|
||||
'#options' => xmlsitemap_get_priority_options(),
|
||||
'#default_value' => number_format($link['priority'], 1),
|
||||
'#description' => t('The priority of this URL relative to other URLs on your site.'),
|
||||
);
|
||||
$form['changefreq'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Change frequency'),
|
||||
'#options' => array(0 => t('None')) + xmlsitemap_get_changefreq_options(),
|
||||
'#default_value' => $link['changefreq'],
|
||||
'#description' => t('How frequently the page is likely to change. This value provides general information to search engines and may not correlate exactly to how often they crawl the page.'),
|
||||
);
|
||||
$languages = module_exists('locale') ? locale_language_list() : array();
|
||||
$form['language'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Language'),
|
||||
'#default_value' => $link['language'],
|
||||
'#options' => array(LANGUAGE_NONE => t('Language neutral')) + $languages,
|
||||
'#access' => $languages,
|
||||
);
|
||||
|
||||
$form['actions'] = array(
|
||||
'#type' => 'actions'
|
||||
);
|
||||
$form['actions']['submit'] = array(
|
||||
'#type' => 'submit',
|
||||
'#value' => t('Save'),
|
||||
'#weight' => 5,
|
||||
);
|
||||
$form['actions']['cancel'] = array(
|
||||
'#markup' => l(t('Cancel'), 'admin/config/search/xmlsitemap/custom'),
|
||||
'#weight' => 10,
|
||||
);
|
||||
|
||||
return $form;
|
||||
}
|
||||
|
||||
function xmlsitemap_custom_edit_link_form_validate($form, &$form_state) {
|
||||
$link = &$form_state['values'];
|
||||
|
||||
// Make sure we trim and normalize the path first.
|
||||
$link['loc'] = trim($link['loc']);
|
||||
$link['loc'] = drupal_get_normal_path($link['loc'], $link['language']);
|
||||
|
||||
// Test anonymous user access to the custom link paths.
|
||||
xmlsitemap_switch_user(0);
|
||||
$menu_item = menu_get_item($link['loc']);
|
||||
xmlsitemap_restore_user();
|
||||
|
||||
// Since the menu item access results are cached, manually check the current path.
|
||||
if ($menu_item && strpos($link['loc'], 'admin/config/search/xmlsitemap/custom') === 0 && !user_access('administer xmlsitemap', drupal_anonymous_user())) {
|
||||
$menu_item['access'] = FALSE;
|
||||
}
|
||||
|
||||
if (db_query_range("SELECT 1 FROM {xmlsitemap} WHERE type <> 'custom' AND loc = :loc AND status = 1 AND access = 1 AND language IN (:languages)", 0, 1, array(':loc' => $link['loc'], ':languages' => array(LANGUAGE_NONE, $link['language'])))->fetchField()) {
|
||||
form_set_error('loc', t('There is already an existing link in the sitemap with the path %link.', array('%link' => $link['loc'])));
|
||||
}
|
||||
elseif (empty($menu_item['access']) && !is_readable('./' . $link['loc'])) {
|
||||
// @todo Harden this file exists check to make sure we can't link to files
|
||||
// like .htaccess.
|
||||
form_set_error('loc', t('The custom link %link is either invalid or it cannot be accessed by anonymous users.', array('%link' => $link['loc'])));
|
||||
}
|
||||
}
|
||||
|
||||
function xmlsitemap_custom_edit_link_form_submit($form, &$form_state) {
|
||||
$link = $form_state['values'];
|
||||
xmlsitemap_link_save($link);
|
||||
drupal_set_message(t('The custom link for %loc was saved.', array('%loc' => $link['loc'])));
|
||||
$form_state['redirect'] = 'admin/config/search/xmlsitemap/custom';
|
||||
}
|
||||
|
||||
function xmlsitemap_custom_delete_link_form($form, &$form_state, array $link) {
|
||||
// @todo Remove when http://drupal.org/node/576290 is fixed.
|
||||
_xmlsitemap_set_breadcrumb('admin/config/search/xmlsitemap/custom');
|
||||
|
||||
$form['#link'] = $link;
|
||||
$form['id'] = array(
|
||||
'#type' => 'value',
|
||||
'#value' => $link['id'],
|
||||
);
|
||||
$form['link'] = array(
|
||||
'#type' => 'value',
|
||||
'#value' => $link,
|
||||
);
|
||||
|
||||
return confirm_form(
|
||||
$form,
|
||||
t('Are you sure you want to delete the custom link for %loc?', array('%loc' => $link['loc'])),
|
||||
'admin/config/search/xmlsitemap/custom',
|
||||
t('This action cannot be undone.'),
|
||||
t('Delete'),
|
||||
t('Cancel')
|
||||
);
|
||||
}
|
||||
|
||||
function xmlsitemap_custom_delete_link_form_submit($form, &$form_state) {
|
||||
$link = $form_state['values']['link'];
|
||||
xmlsitemap_link_delete('custom', $link['id']);
|
||||
drupal_set_message(t('The custom link for %loc has been deleted.', array('%loc' => $link['loc'])));
|
||||
watchdog('xmlsitemap', 'The custom link for %loc has been deleted.', array('%loc' => $link['loc']), WATCHDOG_NOTICE);
|
||||
$form_state['redirect'] = 'admin/config/search/xmlsitemap/custom';
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
name = XML sitemap custom
|
||||
description = Adds user configurable links to the sitemap.
|
||||
package = XML sitemap
|
||||
core = 7.x
|
||||
dependencies[] = xmlsitemap
|
||||
files[] = xmlsitemap_custom.module
|
||||
files[] = xmlsitemap_custom.admin.inc
|
||||
files[] = xmlsitemap_custom.install
|
||||
files[] = xmlsitemap_custom.test
|
||||
configure = admin/config/search/xmlsitemap/custom
|
||||
|
||||
; Information added by drupal.org packaging script on 2012-12-08
|
||||
version = "7.x-2.0-rc2+0-dev"
|
||||
core = "7.x"
|
||||
project = "xmlsitemap"
|
||||
datestamp = "1354931808"
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Install and uninstall schema and functions for the xmlsitemap_custom module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_uninstall().
|
||||
*/
|
||||
function xmlsitemap_custom_uninstall() {
|
||||
drupal_load('module', 'xmlsitemap');
|
||||
xmlsitemap_link_delete_multiple(array('type' => 'custom'));
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Implements hook_menu().
|
||||
*/
|
||||
function xmlsitemap_custom_menu() {
|
||||
$items['admin/config/search/xmlsitemap/custom'] = array(
|
||||
'title' => 'Custom links',
|
||||
'page callback' => 'xmlsitemap_custom_list_links',
|
||||
'access arguments' => array('administer xmlsitemap'),
|
||||
'type' => MENU_LOCAL_TASK,
|
||||
'file' => 'xmlsitemap_custom.admin.inc',
|
||||
);
|
||||
$items['admin/config/search/xmlsitemap/custom/add'] = array(
|
||||
'title' => 'Add custom link',
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('xmlsitemap_custom_edit_link_form'),
|
||||
'access arguments' => array('administer xmlsitemap'),
|
||||
'type' => MENU_LOCAL_ACTION,
|
||||
'file' => 'xmlsitemap_custom.admin.inc',
|
||||
'modal' => TRUE,
|
||||
);
|
||||
$items['admin/config/search/xmlsitemap/custom/edit/%xmlsitemap_custom'] = array(
|
||||
'title' => 'Edit custom link',
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('xmlsitemap_custom_edit_link_form', 6),
|
||||
'access arguments' => array('administer xmlsitemap'),
|
||||
'file' => 'xmlsitemap_custom.admin.inc',
|
||||
'modal' => TRUE,
|
||||
);
|
||||
$items['admin/config/search/xmlsitemap/custom/delete/%xmlsitemap_custom'] = array(
|
||||
'title' => 'Delete custom link',
|
||||
'page callback' => 'drupal_get_form',
|
||||
'page arguments' => array('xmlsitemap_custom_delete_link_form', 6),
|
||||
'access arguments' => array('administer xmlsitemap'),
|
||||
'file' => 'xmlsitemap_custom.admin.inc',
|
||||
'modal' => TRUE,
|
||||
);
|
||||
return $items;
|
||||
}
|
||||
|
||||
/**
|
||||
* Menu load callback; load a custom sitemap link from the {xmlsitemap} table.
|
||||
*
|
||||
* @param $id
|
||||
* The sitemap link ID of the custom link to load.
|
||||
*
|
||||
* @see xmlsitemap_link_load()
|
||||
*/
|
||||
function xmlsitemap_custom_load($id) {
|
||||
return xmlsitemap_link_load('custom', $id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_xmlsitemap_link_info().
|
||||
*/
|
||||
function xmlsitemap_custom_xmlsitemap_link_info() {
|
||||
return array(
|
||||
'custom' => array(
|
||||
'label' => t('Custom links'),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Unit tests for the xmlsitemap_custom module.
|
||||
*/
|
||||
|
||||
class XMLSitemapCustomFunctionalTest extends XMLSitemapTestHelper {
|
||||
public static function getInfo() {
|
||||
return array(
|
||||
'name' => 'XML sitemap custom interface tests',
|
||||
'description' => 'Functional tests for the XML sitemap custom module.',
|
||||
'group' => 'XML sitemap',
|
||||
);
|
||||
}
|
||||
|
||||
function setUp($modules = array()) {
|
||||
$modules[] = 'xmlsitemap_custom';
|
||||
$modules[] = 'path';
|
||||
parent::setUp($modules);
|
||||
|
||||
$this->admin_user = $this->drupalCreateUser(array('access content', 'administer xmlsitemap'));
|
||||
$this->drupalLogin($this->admin_user);
|
||||
}
|
||||
|
||||
function testCustomLinks() {
|
||||
// Set a path alias for the node page.
|
||||
$alias = array('source' => 'system/files', 'alias' => 'public-files');
|
||||
path_save($alias);
|
||||
|
||||
$this->drupalGet('admin/config/search/xmlsitemap/custom');
|
||||
$this->clickLink(t('Add custom link'));
|
||||
|
||||
// Test an invalid path.
|
||||
$edit['loc'] = 'invalid-testing-path';
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
$this->assertText(t('The custom link @link is either invalid or it cannot be accessed by anonymous users.', array('@link' => $edit['loc'])));
|
||||
$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
|
||||
// Test a path not accessible to anonymous user.
|
||||
$edit['loc'] = 'admin/people/people';
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
$this->assertText(t('The custom link @link is either invalid or it cannot be accessed by anonymous users.', array('@link' => $edit['loc'])));
|
||||
$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
|
||||
// Test that the current page, which should not give a false positive for
|
||||
// $menu_item['access'] since the result has been cached already.
|
||||
$edit['loc'] = 'admin/config/search/xmlsitemap/custom/add';
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
$this->assertText(t('The custom link @link is either invalid or it cannot be accessed by anonymous users.', array('@link' => $edit['loc'])));
|
||||
$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
|
||||
// Add an aliased path with padded spaces.
|
||||
$edit['loc'] = ' public-files ';
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
$this->assertText('The custom link for system/files was saved');
|
||||
$links = xmlsitemap_link_load_multiple(array('type' => 'custom', 'loc' => 'system/files'));
|
||||
$this->assertEqual(count($links), 1, t('Custom link saved in the database.'));
|
||||
$link = reset($links);
|
||||
$this->assertSitemapLinkValues('custom', $link['id'], array('priority' => 0.5, 'changefreq' => 0, 'access' => 1, 'status' => 1));
|
||||
|
||||
$this->clickLink('Edit');
|
||||
$edit = array(
|
||||
'priority' => 0.1,
|
||||
'changefreq' => XMLSITEMAP_FREQUENCY_ALWAYS,
|
||||
);
|
||||
$this->drupalPost(NULL, $edit, t('Save'));
|
||||
$this->assertText('The custom link for system/files was saved');
|
||||
$this->assertSitemapLinkValues('custom', $link['id'], array('priority' => 0.1, 'changefreq' => XMLSITEMAP_FREQUENCY_ALWAYS, 'access' => 1, 'status' => 1));
|
||||
|
||||
$this->clickLink('Delete');
|
||||
$this->drupalPost(NULL, array(), t('Delete'));
|
||||
$this->assertText('The custom link for system/files has been deleted.');
|
||||
$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => 'system/files'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test adding files as custom links.
|
||||
*/
|
||||
function testCustomFileLinks() {
|
||||
// Test an invalid file.
|
||||
$edit['loc'] = $this->randomName();
|
||||
$this->drupalPost('admin/config/search/xmlsitemap/custom/add', $edit, t('Save'));
|
||||
$this->assertText(t('The custom link @link is either invalid or it cannot be accessed by anonymous users.', array('@link' => $edit['loc'])));
|
||||
$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
|
||||
// Test an unaccessible file .
|
||||
//$edit['loc'] = '.htaccess';
|
||||
//$this->drupalPost('admin/config/search/xmlsitemap/custom/add', $edit, t('Save'));
|
||||
//$this->assertText(t('The custom link @link is either invalid or it cannot be accessed by anonymous users.', array('@link' => $edit['loc'])));
|
||||
//$this->assertNoSitemapLink(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
|
||||
// Test a valid file.
|
||||
$edit['loc'] = 'misc/drupal.js';
|
||||
$this->drupalPost('admin/config/search/xmlsitemap/custom/add', $edit, t('Save'));
|
||||
$this->assertText('The custom link for ' . $edit['loc'] . ' was saved');
|
||||
$links = xmlsitemap_link_load_multiple(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
$this->assertEqual(count($links), 1, t('Custom link saved in the database.'));
|
||||
|
||||
// Test a valid folder.
|
||||
$edit['loc'] = 'misc';
|
||||
$this->drupalPost('admin/config/search/xmlsitemap/custom/add', $edit, t('Save'));
|
||||
$this->assertText('The custom link for ' . $edit['loc'] . ' was saved');
|
||||
$links = xmlsitemap_link_load_multiple(array('type' => 'custom', 'loc' => $edit['loc']));
|
||||
$this->assertEqual(count($links), 1, t('Custom link saved in the database.'));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user