=== modified file 'uc_product/translations/es.po' (properties changed: -x to +x) === modified file 'uc_product/translations/uc_product.pot' (properties changed: -x to +x) === modified file 'uc_product/uc_product.admin.inc' (properties changed: -x to +x) --- uc_product/uc_product.admin.inc 2009-06-07 05:11:21 +0000 +++ uc_product/uc_product.admin.inc 2009-06-29 20:41:53 +0000 @@ -74,6 +74,8 @@ * @see uc_product_field_settings_form() */ function uc_product_settings_overview() { + $summaries = array(); + // Load the form summaries for pages beneath this path. $summaries = summarize_child_form_pages('admin/store/settings/products/edit'); @@ -239,8 +241,9 @@ } function _uc_product_fields_summarize($form, $options, $enabled, $weight) { + $items = array(); + $fields = array(); - $fields = array(); foreach ($options as $field => $label) { if ($enabled[$field]) { $fields[$field] = array('enabled' => $enabled[$field], @@ -271,6 +274,7 @@ */ function theme_uc_product_field_settings_form($form) { $header = array(t('Enable'), t('Product field'), t('List position')); + $output = ''; $rows = array(); foreach (element_children($form['fields']) as $field) { $row = array(); @@ -298,6 +302,7 @@ function uc_product_field_settings_form_submit($form, &$form_state) { $enabled = array(); $weight = array(); + foreach ($form_state['values']['fields'] as $id => $field) { $enabled[$id] = $field['enabled']; $weight[$id] = $field['weight']; @@ -315,6 +320,8 @@ */ function uc_product_feature_settings_form() { $titles = array(); + $form = array(); + $features = module_invoke_all('product_feature'); foreach ($features as $feature) { $titles[] = $feature['title']; @@ -346,25 +353,31 @@ } function _uc_product_features_summarize($form, $titles) { + $items = array(); + $items_children = array(); foreach ($titles as $title) { - $item[] = $title; + $items_children[] = $title; } $items[] = array( 'data' => t('The following features are enabled:'), - 'children' => $item, + 'children' => $items_children, ); return $items; } + + /** * Displays the product features tab on a product node edit form. */ function uc_product_features($node) { drupal_set_title(check_plain($node->title)); + $output = ''; + $rows = array(); if (arg(4)) { // First check to see if we're trying to remove a feature. @@ -461,6 +474,8 @@ * @see theme_uc_product_feature_add_form() */ function uc_product_feature_add_form() { + $form = array(); + foreach (module_invoke_all('product_feature') as $feature) { $options[$feature['id']] = $feature['title']; } @@ -520,6 +535,8 @@ * @see uc_product_class_form_submit() */ function uc_product_class_form($form_state, $class = NULL) { + $form = array(); + if (!is_null($class)) { $classname = $class->name; $classdesc = $class->description; === modified file 'uc_product/uc_product.css' (properties changed: -x to +x) === modified file 'uc_product/uc_product.info' (properties changed: -x to +x) === modified file 'uc_product/uc_product.install' (properties changed: -x to +x) === modified file 'uc_product/uc_product.module' (properties changed: -x to +x) --- uc_product/uc_product.module 2009-06-22 15:10:29 +0000 +++ uc_product/uc_product.module 2009-06-29 20:17:50 +0000 @@ -279,7 +279,7 @@ } function uc_product_theme() { - return array( + $ret = array( 'uc_product_form_prices' => array( 'arguments' => array('form' => NULL), ), @@ -319,6 +319,7 @@ 'file' => 'uc_product.admin.inc', ), ); + return $ret; } /** @@ -391,6 +392,7 @@ */ function uc_product_form(&$node) { $type = node_get_types('type', $node); + $form = array(); $location = array(); $location[] = menu_get_item('admin'); @@ -566,18 +568,20 @@ * @ingroup themeable */ function theme_uc_product_form_prices($form) { - return "
\n". drupal_render($form['list_price']) + $ret = "
\n". drupal_render($form['list_price']) .''. drupal_render($form['cost']) .''. drupal_render($form['sell_price']) ."
\n". drupal_render($form); + return $ret; } /** * @ingroup themeable */ function theme_uc_product_form_weight($form) { - return '
'. drupal_render($form['weight']) .'' + $ret = '
'. drupal_render($form['weight']) .'' . drupal_render($form['weight_units']) .'
'; + return $ret; } /** @@ -795,6 +799,7 @@ * Implementation of hook_form_alter(). */ function uc_product_form_alter(&$form, &$form_state, $form_id) { + $form = array(); if ($form_id == 'search_form' && arg(0) == 'admin' && arg(1) == 'store' && arg(2) == 'products' && user_access('use advanced search')) { // Keyword boxes: $form['advanced'] = array( @@ -875,6 +880,8 @@ function uc_product_form_node_type_form_alter(&$form, &$form_state) { $type = $form['#node_type']; + $form = array(); + $fields = ''; if (module_exists('content') && uc_product_is_product($type->type)) { $fields = content_types($type->type); @@ -1023,6 +1030,9 @@ * @see uc_product_image_defaults() */ function uc_product_store_status() { + $description = ''; + $status = ''; + if (!module_exists('imagefield') || !module_exists('imagecache')) { $status = 'warning'; $description = t('To automatically configure core image support, enable the Content, CCK Image field, and Imagecache modules.', array('!url' => url('admin/build/modules'))); @@ -1354,9 +1364,8 @@ * @ingroup themeable */ function theme_uc_product_body($body, $teaser = 0, $page = 0) { - $output = '
'; - $output .= $body; - $output .='
'; + $output = '
'. + $body.'
'; return $output; } /** @@ -1439,9 +1448,7 @@ */ function theme_uc_product_price($price, $context, $options = array()) { $output = '
'; - $output .= uc_price($price, $context, $options); - $output .= '
'; - + $output .= uc_price($price, $context, $options).''; return $output; } @@ -1551,6 +1558,7 @@ * TRUE or FALSE indicating whether or not a node type is a product node type. */ function uc_product_is_product($node) { + $form = array(); // Load the node object if we received an integer as an argument. if (is_int($node)) { $node = node_load($node); @@ -1586,6 +1594,7 @@ * TRUE or FALSE indicating whether or not the form is a product node form. */ function uc_product_is_product_form($form) { + $form['#id'] = isset($form['#id']) ? $form['#id'] : NULL; return $form['#id'] == 'node-form' && uc_product_is_product($form['#node']); } @@ -1612,7 +1621,6 @@ // And finally, we prepend 'Any' so it's the first option. return array(NULL => 'Any') + $models; } - /** * Get the cost of a product node. * @@ -1820,7 +1828,7 @@ else { drupal_set_message(t('The product feature has been updated.')); } - + $data['nid'] = isset($data['nid']) ? $data['nid'] : NULL; return 'node/'. $data['nid'] .'/edit/features'; } @@ -1970,8 +1978,9 @@ * Implementation of hook_views_api(). */ function uc_product_views_api() { - return array( + $ret= array( 'api' => '2.0', 'path' => drupal_get_path('module', 'uc_product') .'/views', ); + return $ret; } === modified file 'uc_product/uc_product.pages.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product.views.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product.views_default.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product_handler_field_addtocart.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product_handler_field_buyitnow.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product_handler_field_price.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product_handler_field_weight.inc' (properties changed: -x to +x) === modified file 'uc_product/views/uc_product_handler_filter_product.inc' (properties changed: -x to +x)