From 406b8446678028ecb54619e51ad0a47cc4521410 Mon Sep 17 00:00:00 2001 From: M Parker Date: Thu, 12 Mar 2015 19:25:26 -0400 Subject: [PATCH] s-152801-4 --- jreject.module | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/jreject.module b/jreject.module index 368e183..4c8f5af 100644 --- a/jreject.module +++ b/jreject.module @@ -9,6 +9,20 @@ */ /** + * Implements hook_permission(). + */ +function jreject_permission() { + $permissions = array(); + + $permissions['administer jreject'] = array( + 'title' => t('Administer jReject'), + 'description' => t("Enable jReject, change it's settings, and edit it's rejection messages."), + ); + + return $permissions; +} + +/** * Implements hook_init() */ function jreject_init() { @@ -69,7 +83,7 @@ function jreject_menu() { 'description' => 'Configure jReject integration', 'page callback' => 'drupal_get_form', 'page arguments' => array('jreject_configure_system'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer jreject'), 'file' => 'jreject.admin.inc', ); $items['admin/config/system/jreject/configure'] = array( @@ -82,7 +96,7 @@ function jreject_menu() { 'description' => 'Configure jReject Options', 'page callback' => 'drupal_get_form', 'page arguments' => array('jreject_configure_options'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer jreject'), 'file' => 'jreject.admin.inc', 'type' => MENU_LOCAL_TASK, 'weight' => -5, @@ -92,7 +106,7 @@ function jreject_menu() { 'description' => 'Configure jReject Browser Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('jreject_configure_browsers'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer jreject'), 'file' => 'jreject.admin.inc', 'type' => MENU_LOCAL_TASK, 'weight' => -4, @@ -102,7 +116,7 @@ function jreject_menu() { 'description' => 'Configure jReject Browser Alternatives', 'page callback' => 'drupal_get_form', 'page arguments' => array('jreject_configure_alternatives'), - 'access arguments' => array('administer users'), + 'access arguments' => array('administer jreject'), 'file' => 'jreject.admin.inc', 'type' => MENU_LOCAL_TASK, 'weight' => -3, @@ -119,7 +133,7 @@ function jreject_get_rejects() { foreach ($conf as $browser => $details) { foreach ($details as $version => $reject) { if ($reject) { - $out[] = $browser . $version . ": true"; + $out[] = check_plain($browser) . check_plain($version) . ": true"; } } } @@ -145,9 +159,9 @@ function jreject_get_options() { $value = $value ? "true" : "false"; //for javascript } else { - $value = is_numeric($value) ? $value : '"' . $value . '"'; + $value = is_numeric($value) ? floatval($value) : '"' . check_plain($value) . '"'; } - $out[] = $param . ": " . str_replace(array("\r\n", "\n", "\r"), "
", $value); + $out[] = check_plain($param) . ": " . str_replace(array("\r\n", "\n", "\r"), "
", $value); } return implode(", ", $out); } @@ -160,8 +174,8 @@ function jreject_get_browser_alternatives() { $out = array(); foreach ($conf as $browser => $enabled) { if ($enabled) { - $out[] = '"' . $browser . '"'; + $out[] = '"' . check_plain($browser) . '"'; } } return implode(", ", $out); -} \ No newline at end of file +} -- 2.3.2