Changeset 336

Timestamp:

May 28, 2008 4:15:25 AM (16 years ago)

Author:

quinn

Message:

Minor bugfixes.

Location:

trunk

Files:

• bin/module_maker/skel/admin.php (modified) (9 diffs)
• lib/Cart.inc.php (modified) (1 diff)
• lib/TemplateGlue.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (2 diffs)

trunk/bin/module_maker/skel/admin.php

@@ -10 +10 @@
 
 $auth->requireLogin();
-// $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%);
 $app->sslOn();
 
@@ -71 +70 @@
 
 case 'add' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_ADD);
     // Initialize variables for the form template.
     $frm =& addRecordForm();
@@ -79 +77 @@
 
 case 'edit' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_EDIT);
     // Initialize variables for the form template.
     $frm =& editRecordForm(getFormData('%PRIMARY_KEY%'));
@@ -87 +84 @@
 
 case 'del' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_DELETE);
     deleteRecord(getFormData('%PRIMARY_KEY%'));%ADMIN_UPLOAD_DEL%
     if ($app->validBoomerangURL('%NAME_PLURAL%')) {
@@ -98 +94 @@
 
 case 'insert' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_ADD);
     if (getFormdata('cancel', false)) {
         if ($app->validBoomerangURL('%NAME_PLURAL%')) {
@@ -128 +123 @@
 
 case 'update' :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_EDIT);
     if (getFormdata('reset', false)) {
         $app->raiseMsg(_("Saved values have been reloaded."), MSG_NOTICE, __FILE__, __LINE__);
@@ -170 +164 @@
 
 case _("Save rank") :
-//     $auth->requireAccessClearance(ZONE_ADMIN_PROGRAMS_FUNC_REORDER);
     updateRank(getFormData('rank'));
     $app->dieURL($_SERVER['PHP_SELF']);
@@ -176 +169 @@
 
 default :
-//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_LIST, _("Permission to view %NAME_PLURAL% list denied."));
     $list =& getCachedList();
     $main_template = '%ADMIN_LIST_TEMPLATE%';
@@ -182 +174 @@
 }
 
-/******************************************************************************
- * TEMPLATE INITIALIZATION
- *****************************************************************************/
+/********************************************************************
+* OUTPUT
+********************************************************************/
 
 include 'header.ihtml';

trunk/lib/Cart.inc.php

@@ -233 +233 @@
         $sum = 0;
             foreach ($_SESSION['_cart'][$this->_ns]['items'] as $item_id => $specs) {
-                $sum += isset($specs[$key]) && is_numeric($specs[$key]) ? $specs[$key] : 0;
+                $sum += isset($specs[$key]) && is_numeric($specs[$key]) ? $specs[$key] * $specs['quantity'] : 0;
             }
             return $sum;

trunk/lib/TemplateGlue.inc.php

@@ -461 +461 @@
         foreach ($submit_buttons as $i => $b) {
             if (is_array($b)) {
-                ?><input type="submit" name="<?php echo oTxt($b['name']) ?>" value="<?php echo oTxt($b['value']); ?>" accesskey="<?php echo oTxt($b['accesskey']); ?>" /><?php
+                $defaults = array();
+                $defaults['type'] = isset($b['type']) ? $b['type'] : 'submit';
+                $defaults['id'] = isset($b['id']) ? $b['id'] : sprintf('sc-%s-button', $b['name']);
+                $b = array_merge($defaults, $b);
+                echo '<input';
+                foreach ($b as $key => $value) {
+                    printf(' %s="%s"', $key, oTxt($value));
+                }
+                echo ' />';
             } else {
                 // For backwards compatibility.

trunk/lib/Utilities.inc.php

@@ -43 +43 @@
  * Return dump as cleaned text. Useful for dumping data into emails.
  *
- * @param  mixed    $var        Variable to dump.
+ * @param  array    $var        Variable to dump.
  * @param  strong   $indent     A string to prepend indented lines (tab for example).
  * @return string Dump of var.
@@ -971 +971 @@
 function stripQuery($url)
 {
-    return preg_replace('![?#].*!', '', $url);
+    return preg_replace('/[?#].*$/', '', $url);
 }