Minor - format code.

main/admin/add_users_to_usergroup.php

@@ -157,6 +157,7 @@ if ($use_extra_fields) {
         $final_result = $extra_field_result[0];
     }
 }
+
 // Filters
 $filters = array(
     array('type' => 'text', 'name' => 'username', 'label' => get_lang('Username')),
@@ -175,7 +176,6 @@ foreach ($filters as $param) {
     $searchForm->addElement($param['type'], $param['name'], $param['label']);
 }
 $searchForm->addElement('button', 'submit', get_lang('Search'));
-//$searchForm->addElement('html', '</table>');
 
 $filterData = array();
 if ($searchForm->validate()) {

main/inc/lib/pear/HTML/QuickForm/Rule/Compare.php

@@ -1,29 +1,29 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
-/**
- * Rule to compare two form fields
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Compare.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules
- */
+/**
+ * Rule to compare two form fields
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_01.txt If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Alexey Borzov <avb@php.net>
+ * @copyright   2001-2009 The PHP Group
+ * @license     http://www.php.net/license/3_01.txt PHP License 3.01
+ * @version     CVS: $Id: Compare.php,v 1.7 2009/04/04 21:34:04 avb Exp $
+ * @link        http://pear.php.net/package/HTML_QuickForm
+ */
+
+/**
+ * Abstract base class for QuickForm validation rules
+ */
 require_once 'HTML/QuickForm/Rule.php';
 
 /**
@@ -32,11 +32,11 @@ require_once 'HTML/QuickForm/Rule.php';
  * The most common usage for this is to ensure that the password
  * confirmation field matches the password field
  *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.2
+ * @category    HTML
+ * @package     HTML_QuickForm
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 3.2.11
+ * @since       3.2
  */
 class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
 {
@@ -46,14 +46,14 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
     * @access private
     */
     var $_operators = array(
-        'eq'  => '===',
-        'neq' => '!==',
+        'eq'  => '===',
+        'neq' => '!==',
         'gt'  => '>',
         'gte' => '>=',
         'lt'  => '<',
-        'lte' => '<=',
-        '=='  => '===',
-        '!='  => '!=='
+        'lte' => '<=',
+        '=='  => '===',
+        '!='  => '!=='
     );
 
 
@@ -64,16 +64,16 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
     * @param  string     operator name
     * @return string     operator to use for validation
     */
-    function _findOperator($name)
-    {
+    function _findOperator($name) {
+        $name = trim($name);
         if (empty($name)) {
-            return '===';
+            return '===';
         } elseif (isset($this->_operators[$name])) {
             return $this->_operators[$name];
         } elseif (in_array($name, $this->_operators)) {
             return $name;
         } else {
-            return '===';
+            return '===';
         }
     }
 
@@ -81,10 +81,10 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
     function validate($values, $operator = null)
     {
         $operator = $this->_findOperator($operator);
-        if ('===' != $operator && '!==' != $operator) {
+        if ('===' != $operator && '!==' != $operator) {
             $compareFn = create_function('$a, $b', 'return floatval($a) ' . $operator . ' floatval($b);');
         } else {
-            $compareFn = create_function('$a, $b', 'return strval($a) ' . $operator . ' strval($b);');
+            $compareFn = create_function('$a, $b', 'return strval($a) ' . $operator . ' strval($b);');
         }
 
         return $compareFn($values[0], $values[1]);
@@ -94,10 +94,10 @@ class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
     function getValidationScript($operator = null)
     {
         $operator = $this->_findOperator($operator);
-        if ('===' != $operator && '!==' != $operator) {
+        if ('===' != $operator && '!==' != $operator) {
             $check = "!(Number({jsVar}[0]) {$operator} Number({jsVar}[1]))";
         } else {
-            $check = "!(String({jsVar}[0]) {$operator} String({jsVar}[1]))";
+            $check = "!(String({jsVar}[0]) {$operator} String({jsVar}[1]))";
         }
         return array('', "'' != {jsVar}[0] && {$check}");
     }