Skip to content
Snippets Groups Projects
Commit b3ea8d2b authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-153] Merging from testing into staging 

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@797 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 142b186f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sites/all/modules/unl/unl.module
+ 8
− 0
View file @ b3ea8d2b
......@@ -161,6 +161,14 @@ function unl_menu() {
'weight' => -8,
);
$items['admin/sites/unl/%/delete'] = array(
'title' => 'Delete site',
'page callback' => 'drupal_get_form',
'page arguments' => array('unl_site_delete_confirm', 3),
'access arguments' => array('unl site creation'),
'file' => 'unl_site_creation.php',
);
$items['admin/sites/unl/aliases'] = array(
'title' => 'Aliases',
'description' => 'Manage aliases of UNL Drupal sites.',
......
sites/all/modules/unl/unl_site_creation.php
+ 156
− 171
View file @ b3ea8d2b
<?php
require_once DRUPAL_ROOT . '/includes/install.core.inc';
function unl_sites_page() {
$page = array();
$page[] = drupal_get_form('unl_site_create');
......@@ -14,7 +11,6 @@ function unl_sites_page() {
return $page;
}
function unl_site_create($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
......@@ -86,9 +82,7 @@ function unl_site_create_submit($form, &$form_state) {
return;
}
function unl_site_list($form, &$form_state) {
$headers = array(
'site_path' => array(
'data' => 'Site Path',
......@@ -106,7 +100,7 @@ function unl_site_list($form, &$form_state) {
'data' => 'Link',
'field' => 's.uri',
),
'remove' => 'Remove (can not undo!)'
'operations' => t('Operations'),
);
$sites = db_select('unl_sites', 's')
......@@ -128,7 +122,6 @@ function unl_site_list($form, &$form_state) {
'#header' => $headers,
);
foreach ($sites as $site) {
unset($checkbox);
$form['root']['site_list']['rows'][$site->site_id] = array(
......@@ -140,35 +133,47 @@ function unl_site_list($form, &$form_state) {
'#title' => $site->uri,
'#href' => $site->uri,
),
'remove' => array(
'#type' => 'checkbox',
'#parents' => array('sites', $site->site_id, 'remove'),
'#default_value' => 0,
'operations' => array(
'#type' => 'link',
'#title' => t('delete'),
'#href' => 'admin/sites/unl/'.$site->site_id.'/delete',
),
);
}
$form['root']['submit'] = array(
'#type' => 'submit',
'#value' => 'Delete Selected Sites',
);
return $form;
}
function unl_site_list_submit($form, &$form_state) {
if (!isset($form_state['values']['sites'])) {
return;
}
/**
* Form to confirm UNL site delete operation.
*/
function unl_site_delete_confirm($form, &$form_state, $site_id) {
$form['site_id'] = array(
'#type' => 'value',
'#value' => $site_id,
);
$site_path = db_select('unl_sites', 's')
->fields('s', array('site_path'))
->condition('site_id', $site_id)
->execute()
->fetchCol();
foreach($form_state['values']['sites'] as $site_id => $site) {
if ($site['remove']) {
unl_site_remove($site_id);
return confirm_form($form, t('Are you sure you want to delete the site %site_path ?', array('%site_path' => $site_path[0])), 'admin/sites/unl', t('This action cannot be undone. DOUBLE CHECK WHICH CMS INSTANCE YOU ARE ON!'), t('Delete Site'));
}
/**
* Form submit handler for unl_site_delete_confirm().
*/
function unl_site_delete_confirm_submit($form, &$form_state) {
if (!isset($form_state['values']['site_id'])) {
return;
}
unl_site_remove($form_state['values']['site_id']);
drupal_set_message('The site has been scheduled for removal.');
$form_state['redirect'] = 'admin/sites/unl';
}
function unl_site_updates($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
......@@ -210,7 +215,6 @@ function unl_site_updates_step($site_uri, &$context) {
drupal_set_message('Messages from ' . $site_uri . ':<br />' . PHP_EOL . '<pre>' . shell_exec($command) . '</pre>', 'status');
}
function unl_site_email_settings($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
......@@ -245,7 +249,6 @@ function unl_site_email_settings_submit($form, &$form_state) {
variable_set('unl_site_created_alert_admins', $form_state['values']['unl_site_created_alert_admins']);
}
function unl_site_remove($site_id) {
$uri = db_select('unl_sites', 's')
->fields('s', array('uri'))
......@@ -285,7 +288,8 @@ function unl_site_remove($site_id) {
->fields(array('installed' => 3))
->condition('site_id', $site_id)
->execute();
drupal_set_message('The site has been scheduled for removal.');
return TRUE;
}
function _unl_get_sites_subdir($uri) {
......@@ -299,8 +303,6 @@ function _unl_get_sites_subdir($uri) {
return $sites_subdir;
}
function unl_aliases_page() {
$page = array();
$page[] = drupal_get_form('unl_site_alias_create');
......@@ -311,9 +313,7 @@ function unl_aliases_page() {
return $page;
}
function unl_site_alias_create($form, &$form_state) {
$sites = db_select('unl_sites', 's')
->fields('s', array('site_id', 'uri'))
->execute()
......@@ -365,9 +365,7 @@ function unl_site_alias_create_submit($form, &$form_state) {
))->execute();
}
function unl_site_alias_list($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'Existing Site Aliases',
......@@ -437,9 +435,7 @@ function unl_site_alias_list_submit($form, &$form_state) {
->execute();
}
function unl_page_alias_create($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'Create New Page Alias',
......@@ -476,9 +472,7 @@ function unl_page_alias_create_submit($form, &$form_state) {
))->execute();
}
function unl_page_alias_list($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'Existing Page Aliases',
......@@ -546,9 +540,7 @@ function unl_page_alias_list_submit($form, &$form_state) {
->execute();
}
function unl_wdn_registry($form, &$form_state) {
$form['root'] = array(
'#type' => 'fieldset',
'#title' => 'WDN Registry Database',
......@@ -625,7 +617,6 @@ function unl_wdn_registry_submit($form, &$form_state) {
variable_set('unl_frontier_password', $form_state['values']['frontier_password']);
}
function _unl_get_install_status_text($id) {
switch ($id) {
case 0:
......@@ -656,7 +647,6 @@ function _unl_get_install_status_text($id) {
return $installed;
}
function theme_unl_table($variables) {
$form = $variables['form'];
foreach (element_children($form['rows']) as $row_index) {
......@@ -667,8 +657,3 @@ function theme_unl_table($variables) {
return theme('table', $form);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment