Changeset 282 for trunk/lib

Timestamp:

Oct 14, 2007 7:19:17 AM (17 years ago)

Author:

quinn

Message:

Added length arg to *Signature functions; added App::setQuery() method; FormValidator? msg rewording.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Email.inc.php (modified) (1 diff)
• FormValidator.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (3 diffs)

trunk/lib/App.inc.php

@@ -616 +616 @@
 
     /**
-     * Sets which query arguments will be carried persistently between requests.
+     * Forcefully set a query argument even if one currently exists in the reqeust.
+     * Values in the _carry_queries array will be copied to URLs (via $app->url()) and
+     * to hidden input values (via printHiddenSession()).
+     *
+     * @access  public
+     * @param   mixed   $query_key  The key (or keys, as an array) of the query argument to save.
+     * @param   mixed   $val        The new value of the argument key.
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   13 Oct 2007 11:34:51
+     */
+    function setQuery($query_key, $val)
+    {
+        if (!is_array($query_key)) {
+            $query_key = array($query_key);
+        }
+        foreach ($query_key as $k) {
+            // Set the value of the specified query argument into the _carry_queries array.
+            $this->_carry_queries[$k] = $val;
+        }
+    }
+
+    /**
+     * Specify which query arguments will be carried persistently between requests.
      * Values in the _carry_queries array will be copied to URLs (via $app->url()) and
      * to hidden input values (via printHiddenSession()).

trunk/lib/Email.inc.php

@@ -233 +233 @@
     {
         $app =& App::getInstance();
-    
+
         // Use arguments if provided.
         if (isset($to)) {

trunk/lib/FormValidator.inc.php

@@ -521 +521 @@
             return true;
         } else {
-            $this->addError($form_name, sprintf(_("<em>%s</em> is not a valid credit card number."), $cc_num));
+            $this->addError($form_name, sprintf(_("The credit card number you entered is not valid. Please check the number and try again."), $cc_num));
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -708 +708 @@
  * @param   string  $val    The string to sign.
  * @param   string  $salt   (Optional) A text key to use for computing the signature.
+ * @param   string  $length (Optional) The length of the added signature. Longer signatures are safer. Must match the length passed to verifySignature() for the signatures to match.
  * @return  string  The original value with a signature appended.
  */
-function addSignature($val, $salt=null)
+function addSignature($val, $salt=null, $length=18)
 {
     $app =& App::getInstance();
@@ -723 +724 @@
     }
 
-    return $val . '-' . mb_substr(md5($salt . md5($val . $salt)), 0, 18);
+    return $val . '-' . mb_substr(md5($salt . md5($val . $salt)), 0, $length);
 }
 
@@ -750 +751 @@
  * @return  bool    True if the signature matches the var.
  */
-function verifySignature($signed_val, $salt=null)
+function verifySignature($signed_val, $salt=null, $length=18)
 {
     // Strip the value from the signed value.
     $val = removeSignature($signed_val);
     // If the signed value matches the original signed value we consider the value safe.
-    if ($signed_val == addSignature($val, $salt)) {
+    if ($signed_val == addSignature($val, $salt, $length)) {
         // Signature verified.
         return true;