' . t('No policies are currently defined. To add a new policy, click add policy.', array("%url" => url('admin/password_policy/add'))); + $output .= '
' . t('No policies are currently defined. To add a new policy, click add policy.', array("@url" => url('admin/settings/password_policy/add'))); } break; - case "admin/password_policy/add": - case "admin/password_policy/edit/" . arg(3) : + case "admin/settings/password_policy/add": + case "admin/settings/password_policy/edit/" . arg(3) : $output = '
';
if (arg(2) == 'add')
$output .= t("Give a name and descriptive comment to your new password policy. ");
@@ -58,52 +58,52 @@
$items = array();
$edit = user_access('administer password policies');
- $items[] = array('path' => 'admin/password_policy',
- 'title' => t('password policy'),
+ $items[] = array('path' => 'admin/settings/password_policy',
+ 'title' => t('Password Policy'),
'description' => t('Configures policies for user account passwords.'),
'callback' => 'password_policy_view',
'access' => $edit);
- $items[] = array('path' => 'admin/password_policy/add',
- 'title' => t('add policy'),
+ $items[] = array('path' => 'admin/settings/password_policy/add',
+ 'title' => t('Add Policy'),
'callback' => 'password_policy_form_policy',
'access' => $edit,
'type' => MENU_LOCAL_TASK);
- $arg3 = arg(3);
- if (!empty($arg3) && is_numeric($arg3)) {
- $items[] = array('path' => 'admin/password_policy/edit/'. arg(3),
+ $arg4 = arg(4);
+ if (!empty($arg4) && is_numeric($arg4)) {
+ $items[] = array('path' => 'admin/settings/password_policy/edit/'. arg(4),
'title' => t("Edit password policy"),
'callback' => 'password_policy_form_policy',
- 'callback arguments' => array('id' => arg(3)),
+ 'callback arguments' => array('id' => arg(4)),
'type' => MENU_CALLBACK,
'access' => $edit
);
- $items[] = array('path' => 'admin/password_policy/delete/'. arg(3),
+ $items[] = array('path' => 'admin/settings/password_policy/delete/'. arg(4),
'title' => t("Delete password policy"),
'callback' => 'password_policy_delete',
- 'callback arguments' => array('id' => arg(3)),
+ 'callback arguments' => array('id' => arg(4)),
'type' => MENU_CALLBACK,
'access' => $edit
);
}
// we display the name of the policy when viewing
- $arg2 = arg(2);
- if (!empty($arg2) && is_numeric($arg2)) {
- $policy = password_policy_load_policy_by_id($arg2);
+ $arg3 = arg(3);
+ if (!empty($arg3) && is_numeric($arg3)) {
+ $policy = password_policy_load_policy_by_id($arg3);
- $items[] = array('path' => 'admin/password_policy/'. $arg2,
+ $items[] = array('path' => 'admin/settings/password_policy/'. $arg3,
'title' => $policy->name,
'callback' => 'password_policy_view',
- 'callback arguments' => array('id' => $arg2),
+ 'callback arguments' => array('id' => $arg3),
'type' => MENU_CALLBACK,
'access' => $edit
);
}
- $items[] = array('path' => 'admin/password_policy/list',
+ $items[] = array('path' => 'admin/settings/password_policy/list',
'title' => t('list'),
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10);
@@ -118,8 +118,8 @@
* default view, the user can set a new default password policy or clear the default so
* that no policy is active and the default drupal password mechanism takes affect.
*/
-function password_policy_view_submit($form_id, $form_values) {
- $op = !empty($_POST['op']) ? $_POST['op'] : '';
+function password_policy_view_form_submit($form_id, $form_values) {
+ $op = !empty($form_values['op']) ? $form_values['op'] : '';
if ($op == t('Clear default')) {
_password_policy_clear_default();
drupal_set_message(t('No policy is active, all user passwords will be accepted (Drupal default).'));
@@ -156,9 +156,9 @@
if ($pid) {
$policy = password_policy_load_policy_by_id($pid);
if (!$policy) {
- drupal_goto("admin/password_policy");
+ drupal_goto("admin/settings/password_policy");
}
- $editURL = l(t('editing this policy'), 'admin/password_policy/edit/'. $pid);
+ $editURL = l(t('editing this policy'), 'admin/settings/password_policy/edit/'. $pid);
$constraints = $policy->constraints;
$desc = !$constraints ? t('This policy has no constraints set. You can add constraints by ') . $editURL . '.'
: t('This policy has the constraints listed below. You can change the constraints by ') . $editURL . '.' . $policy->getValidationErrorMessage();
@@ -169,30 +169,39 @@
// load the summary policies (id->name)
$summaries = _password_policy_load_policy_summaries();
-
+
if ($summaries) {
- foreach ($summaries as $summary) {
- $id = $summary['id'];
- $name = $summary['name'];
- $row = array();
- $options[$id] = '';
- if ($summary['enabled']) {
- $default_id = $id;
- }
- $form[$name]['id'] = array('#value' => $id);
- $form[$name]['view'] = array('#value' => l(t('view'), 'admin/password_policy/'. $id));
- $form[$name]['edit'] = array('#value' => l(t('edit'), 'admin/password_policy/edit/'. $id));
- $form[$name]['delete'] = array('#value' => l(t('delete'), 'admin/password_policy/delete/'. $id));
- }
- $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $default_id);
- $form['submit'] = array('#type' => 'submit', '#value' => t('Set default policy'));
- $form['clear'] = array('#type' => 'submit', '#value' => t('Clear default'));
- return drupal_get_form('password_policy_view', $form);
+ return drupal_get_form('password_policy_view_form', $summaries);
}
return "";
}
-
+function password_policy_view_form($summaries) {
+ $form = array();
+ //$summaries = _password_policy_load_policy_summaries();
+ if ($summaries) {
+ foreach ($summaries as $summary) {
+ $id = $summary['id'];
+ $name = $summary['name'];
+ $row = array();
+ $options[$id] = '';
+ if ($summary['enabled']) {
+ $default_id = $id;
+ }
+ $form[$name]['id'] = array('#value' => $id);
+ $form[$name]['view'] = array('#value' => l(t('view'), 'admin/settings/password_policy/'. $id));
+ $form[$name]['edit'] = array('#value' => l(t('edit'), 'admin/settings/password_policy/edit/'. $id));
+ $form[$name]['delete'] = array('#value' => l(t('delete'), 'admin/settings/password_policy/delete/'. $id));
+ //$options[$id] = $name;
+ //. l(t('view'), 'admin/password_policy/'. $id) . l(t('edit'), 'admin/password_policy/edit/'. $id) . l(t('delete'), 'admin/password_policy/delete/'. $id);
+ }
+ $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $default_id);
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Set default policy'));
+ $form['clear'] = array('#type' => 'submit', '#value' => t('Clear default'));
+
+ return $form;
+ }
+}
/**
* Custom theme for rendering a checkbox list of defined policies. With Drupal's form
@@ -200,22 +209,22 @@
* the default. This layout is based on a similar layout found in the "input formats"
* module.
*/
-function theme_password_policy_view($form) {
+function theme_password_policy_view_form($form) {
foreach ($form as $name => $element) {
if (!empty($element['edit']) && is_array($element['edit'])) {
$rows[] = array(
- form_render($form['default'][$element['id']['#value']]),
+ drupal_render($form['default'][$element['id']['#value']]),
check_plain($name),
- form_render($form[$name]['view']),
- form_render($form[$name]['edit']),
- form_render($form[$name]['delete'])
+ drupal_render($form[$name]['view']),
+ drupal_render($form[$name]['edit']),
+ drupal_render($form[$name]['delete'])
);
unset($form[$name]);
}
}
$header = array(t('Default'), t('Name'), array('data' => t('Operations'), 'colspan' => 3));
$output = theme('table', $header, $rows);
- $output .= form_render($form);
+ $output .= drupal_render($form);
return $output;
}
@@ -225,7 +234,7 @@
* in password_policy_delete_submit().
*/
function password_policy_delete() {
- $pid = arg(3);
+ $pid = arg(4);
if (!$pid) {
drupal_not_found();
}
@@ -233,31 +242,35 @@
$policy = password_policy_load_policy_by_id($pid);
if ($policy) {
- $form['pid'] = array('#type' => 'hidden', '#value' => $pid);
- $form['name'] = array('#type' => 'hidden', '#value' => $policy->name);
-
- $description = count($policy->constraints)
- ? t('This policy has the following constraints:') . '
' . $policy->getValidationErrorMessage()
- : t('There are no constraints specified for this policy.');
-
- return confirm_form(
- 'password_policy_delete',
- $form,
- t('Are you sure you want to delete the policy \'%name\'?', array('%name' => $policy->name)),
- 'admin/password_policy',
- $description,
- t('Delete'),
- t('Cancel'));
+ return drupal_get_form('password_policy_delete_confirm', $pid, $policy);
}
else {
drupal_not_found();
}
}
+function password_policy_delete_confirm($pid, $policy) {
+ $form = array();
+ $form['pid'] = array('#type' => 'hidden', '#value' => $pid);
+ $form['name'] = array('#type' => 'hidden', '#value' => $policy->name);
+
+ $description = count($policy->constraints)
+ ? t('This policy has the following constraints:') . '
' . $policy->getValidationErrorMessage()
+ : t('There are no constraints specified for this policy.');
+
+ return confirm_form(
+ $form,
+ t('Are you sure you want to delete the policy \'%name\'?', array('%name' => $policy->name)),
+ 'admin/settings/password_policy',
+ $description,
+ t('Delete')
+ );
+}
+
/**
* Submit hook for the delete policy operation.
*/
-function password_policy_delete_submit($form_id, $form_values) {
+function password_policy_delete_confirm_submit($form_id, $form_values) {
$pid = $form_values['pid'];
$policy = password_policy_load_policy_by_id($pid);
@@ -268,7 +281,7 @@
watchdog('password_policy', t('Policy \'%name\' was deleted.', array('%name' => $policy->name)), WATCHDOG_NOTICE);
}
- return 'admin/password_policy';
+ return 'admin/settings/password_policy';
}
/**
@@ -314,7 +327,13 @@
*/
function password_policy_form_policy($pid = NULL) {
- if ($pid) {
+ return drupal_get_form('password_policy_form_policy_form', $pid);
+}
+
+function password_policy_form_policy_form($pid) {
+ $form = array();
+
+ if ($pid) {
$policy = password_policy_load_policy_by_id($pid);
}
@@ -363,16 +382,15 @@
if ($policy) {
$form['pid'] = array('#type' => 'hidden', '#value' => $pid);
}
-
- return drupal_get_form('password_policy_form_policy', $form);
+
+ return $form;
}
/**
* Form submission hook for new or edited password policies.
*/
-function password_policy_form_policy_submit($form_id, $form_values) {
-
+function password_policy_form_policy_form_submit($form_id, $form_values) {
// create the policy
_password_policy_load_constraint_definitions();
@@ -400,14 +418,14 @@
if ($form_values['pid']) {
password_policy_update_policy($form_values['pid'], $policy);
drupal_set_message(t('Policy \'%name\' has been updated.', array('%name' => $policy->name)));
- watchdog('password_policy', t('Policy \'%name\' updated.', array('%name' => $policy->name)), WATCHDOG_NOTICE, l(t('view'), 'admin/password_policy/' . $form_values['pid']));
+ watchdog('password_policy', t('Policy \'%name\' updated.', array('%name' => $policy->name)), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/password_policy/' . $form_values['pid']));
}
else {
password_policy_save_policy($policy);
- watchdog('password_policy', t('New policy \'%name\' added.', array('%name' => $policy->name)), WATCHDOG_NOTICE, l(t('view'), 'admin/password_policy'));
+ watchdog('password_policy', t('New policy \'%name\' added.', array('%name' => $policy->name)), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/password_policy'));
}
- return "admin/password_policy";
+ return "admin/settings/password_policy";
}
/**
@@ -565,5 +583,3 @@
$tests = file_scan_directory($dir, '\.test$');
return array_keys($tests);
}
-
-?>