Changeset 316 for trunk/lib

Timestamp:

Mar 12, 2008 1:47:19 AM (16 years ago)

Author:

quinn

Message:

Minor improvements to module maker scripts. Minor AuthorizeNet? change.

Location:

trunk/lib

Files:

• AuthorizeNet.inc.php (modified) (5 diffs)
• Cache.inc.php (modified) (2 diffs)
• SortOrder.inc.php (modified) (2 diffs)

trunk/lib/AuthorizeNet.inc.php

@@ -42 +42 @@
 
     var $post_url = ''; // The URL to post data to.
-    var $md5_hash_value = ','; // A custom value for the response delimination character.
     var $_results = array();
     var $_params = array();
@@ -57 +56 @@
         'x_delim_char'      => ',',
         'x_encap_char'      => '',
+        'md5_hash_salt'    => '',
     );
 
@@ -111 +111 @@
     function AuthorizeNet($params = array())
     {
+        $app =& App::getInstance();
+
         if (!function_exists('curl_init')) {
             trigger_error('AuthorizeNet error: curl not installed.', E_USER_ERROR);
@@ -118 +120 @@
         $this->post_url = isset($params['post_url']) ? $params['post_url'] : 'https://secure.authorize.net/gateway/transact.dll';
 
-        // A custom value for the response delimination character.
-        $this->md5_hash_value = isset($params['md5_hash_value']) ? $params['md5_hash_value'] : '';
-
         // Set default parameters.
         $this->_params = $this->_default_params;
+        
+        $this->setParam(array('md5_hash_salt' => $app->getParam('signing_key')));
     }
 
@@ -239 +240 @@
         return (
             mb_strtolower($this->getResult('x_md5_hash')) == mb_strtolower(md5(
-                $this->md5_hash_value .
+                $this->getParam('md5_hash_salt') .
                 $this->getParam('x_login') .
                 $this->getResult('x_trans_id') .

trunk/lib/Cache.inc.php

@@ -133 +133 @@
 
         if (true !== $this->getParam('enabled')) {
-            $app->logMsg(sprintf('Cache not enabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cache disabled, not saving data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -182 +182 @@
 
         if (true !== $this->getParam('enabled')) {
-            $app->logMsg(sprintf('Cache not enabled, not getting data.', null), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cache disabled, not getting data.', null), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/SortOrder.inc.php

@@ -20 +20 @@
     var $sort_by;
     var $order;
-    var $asc_widget = '<img src="/admin/_widgets/sort_ascending.gif" alt="[ASC]" width="11" height="7" border="0" />';
-    var $desc_widget = '<img src="/admin/_widgets/sort_descending.gif" alt="[DESC]" width="11" height="7" border="0" />';
+    var $asc_widget;
+    var $desc_widget;
     var $default_sort;
     var $default_order;
@@ -35 +35 @@
     function SortOrder($default_sort = '', $default_order = '')
     {
+        $app =& App::getInstance();
+        
+        // Setup the HTML for printing ASC/DESC paths.
+        // This should be converted to CSS someday.
+        $images_path = $app->getParam('images_path') ? $app->getParam('images_path') : '/admin/_widgets';
+        $this->asc_widget = sprintf('<img src="%s/sort_ascending.gif" alt="%s" width="11" height="7" border="0" />', $images_path, _("Ascending"));
+        $this->desc_widget = sprintf('<img src="%s/sort_descending.gif" alt="%s" width="11" height="7" border="0" />', $images_path, _("Ascending"));
+        
+        // Setup prefs object.
         $this->prefs = new Prefs($_SERVER['PHP_SELF']);
         $this->prefs->setParam(array('persistent' => false));
 
+        // Setup defaults.
         $this->setDefault($default_sort, $default_order);
-
         $this->default_sort = $default_sort;
-        $this->default_order = $default_order;        
+        $this->default_order = $default_order;
     }