=== modified file 'uc_store/countries/afghanistan_4_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/andorra_20_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/antigua_barbuda_28_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/argentina_32_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/aruba_533_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/australia_36_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/austria_40_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/belgium_56_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/bermuda_60_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/brazil_76_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/bulgaria_100_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/canada_124_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/chile_152_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/china_156_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/costa_rica_188_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/croatia_191_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/czech_203_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/denmark_208_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/dominican_republic_214_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/egypt_818_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/finland_246_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/france_250_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/germany_276_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/greece_300_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/greenland_304_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/hong_kong_344_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/hungary_348_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/india_356_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/indonesia_360_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/iran_364_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/ireland_372_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/israel_376_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/italy_380_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/japan_392_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/kazakhstan_398_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/korea_republic_of_410_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/latvia_428_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/lithuania_440_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/malaysia_458_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/mexico_484_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/mozambique_508_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/netherlands_528_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/new_zealand_554_3.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/norway_578_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/peru_604_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/philippines_608_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/poland_616_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/portugal_620_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/romania_642_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/russia_643_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/saint_lucia_662_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/singapore_702_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/slovak_703_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/south_africa_710_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/spain_724_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/sweden_752_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/switzerland_756_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/taiwan_158_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/thailand_764_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/turkey_792_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/ukraine_804_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/united_arab_emirates_784_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/united_kingdom_826_2.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/united_states_840_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/venezuela_862_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/vietnam_704_1.cif' (properties changed: -x to +x) === modified file 'uc_store/countries/zimbabwe_716_1.cif' (properties changed: -x to +x) === modified file 'uc_store/images/address_book.gif' (properties changed: -x to +x) === modified file 'uc_store/images/alert.gif' (properties changed: -x to +x) === modified file 'uc_store/images/copy.gif' (properties changed: -x to +x) === modified file 'uc_store/images/error.gif' (properties changed: -x to +x) === modified file 'uc_store/images/info.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_customers.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_customers_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_help.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_help_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_orders.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_orders_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_products.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_products_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_reports.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_reports_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_store_settings.gif' (properties changed: -x to +x) === modified file 'uc_store/images/menu_store_settings_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/order_delete.gif' (properties changed: -x to +x) === modified file 'uc_store/images/order_edit.gif' (properties changed: -x to +x) === modified file 'uc_store/images/order_view.gif' (properties changed: -x to +x) === modified file 'uc_store/images/print.gif' (properties changed: -x to +x) === modified file 'uc_store/images/store_monitor.gif' (properties changed: -x to +x) === modified file 'uc_store/images/store_monitor_small.gif' (properties changed: -x to +x) === modified file 'uc_store/images/throbber.gif' (properties changed: -x to +x) === modified file 'uc_store/includes/simplexml.php' (properties changed: -x to +x) === modified file 'uc_store/includes/summaries.inc' (properties changed: -x to +x) === modified file 'uc_store/includes/summaries.js' (properties changed: -x to +x) === modified file 'uc_store/includes/tapir.inc' (properties changed: -x to +x) --- uc_store/includes/tapir.inc 2009-02-03 14:32:57 +0000 +++ uc_store/includes/tapir.inc 2009-06-25 20:51:30 +0000 @@ -122,8 +122,9 @@ } // Merge the row data into a single row array along with the attributes. - $row = array_merge(array('data' => $row), (array)$data['#attributes']); - + if(isset($data['#attributes'])) { + $row = array_merge(array('data' => $row), (array)$data['#attributes']); + } // Add the current row to the table rows array. $rows[] = $row; } === modified file 'uc_store/includes/uc_price.inc' (properties changed: -x to +x) --- uc_store/includes/uc_price.inc 2009-05-08 19:14:30 +0000 +++ uc_store/includes/uc_price.inc 2009-06-25 20:30:18 +0000 @@ -240,7 +240,7 @@ $handlers['formatters'][] = $hook['format']['callback']; } - if (is_array($hook['options'])) { + if (isset($hook['options']) && is_array($hook['options'])) { $handlers['options'] += $hook['options']; } } @@ -273,7 +273,7 @@ */ function uc_store_price_handler_alter(&$price, &$context, &$options) { // If a class was specified in the price's context array... - if (is_array($context['class'])) { + if (isset($content['class']) && is_array($context['class'])) { // Look for a product price type in the class array and adjust the price // prefix accordingly. if (in_array('list', $context['class'])) { === modified file 'uc_store/translations/es.po' (properties changed: -x to +x) === modified file 'uc_store/translations/uc_store.pot' (properties changed: -x to +x) === modified file 'uc_store/uc_country_select.js' (properties changed: -x to +x) === modified file 'uc_store/uc_store.admin.inc' (properties changed: -x to +x) --- uc_store/uc_store.admin.inc 2009-05-15 14:05:26 +0000 +++ uc_store/uc_store.admin.inc 2009-06-29 17:25:31 +0000 @@ -8,7 +8,12 @@ */ function uc_store_admin() { + $output = ''; $tree = menu_navigation_links('navigation', 2); + $main_menu = ''; + $content = ''; + $icon = ''; + $rows = array(); if (($type = variable_get('uc_store_admin_page_display', 1)) == 4) { $main_menu = menu_get_item('admin/store'); @@ -21,7 +26,8 @@ } $results = module_invoke_all('store_status'); - + + $results = isset($results) ? $results : NULL; foreach ($results as $message) { switch ($message['status']) { case 'warning': @@ -53,7 +59,9 @@ * Display customer administration page. */ function uc_store_customers($message = NULL, $query = NULL, $count_query = NULL, $page_length = 25) { - if (!module_exists('uc_order')) { + $output = ''; + $rows = array(); + if (!module_exists('uc_order')) { return t('You must enable the order module to track customers.'); } @@ -65,6 +73,7 @@ ."o.order_status IN ". uc_order_status_list('general', TRUE); $count_query = ""; + switch ($GLOBALS['db_type']) { case 'mysql': case 'mysqli': @@ -269,7 +278,11 @@ } function uc_store_customer_search_form_submit($form, &$form_state) { - if (strlen(trim($form_state['values']['first_name'])) == 0) { + $first_name = ''; + $last_name = ''; + $email = ''; + + if (strlen(trim($form_state['values']['first_name'])) == 0) { $first_name = '0'; } else { @@ -323,6 +336,7 @@ * Display store help page. */ function uc_store_ubercart_help() { + $items = array(); $output = '

'. t('Use the following links to find documentation and support:') .'

'; $items[] = l(t("Ubercart User's Guide"), 'http://www.ubercart.org/docs/user'); @@ -353,13 +367,20 @@ function uc_country_import_form() { $result = db_query("SELECT * FROM {uc_countries} ORDER BY country_name ASC"); + $countries = array(); + $row = array(); + $rows = array(); + $options = array(); + $form = array(); + $header = array(); + while ($country = db_fetch_object($result)) { $countries[] = $country; } $files = _country_import_list(); $header = array(t('Country'), t('Code'), t('Version'), t('Operations')); - if (is_array($countries)) { + if (isset($countries) && is_array($countries)) { foreach ($countries as $country) { $row = array( $country->country_name, @@ -388,11 +409,11 @@ foreach ($files as $file) { $import_list[$file['file']] = $file['file']; } - if (is_array($import_list)) { + if (isset($import_list) && is_array($import_list)) { ksort($import_list); } - if (is_array($import_list)) { + if (isset($import_list) && is_array($import_list)) { $options = $import_list; } else { @@ -465,6 +486,9 @@ } function uc_country_formats_form() { + $form = array(); + $countries = array(); + $form['instructions'] = array( '#type' => 'fieldset', '#title' => t('Address variables instructions'), @@ -490,7 +514,7 @@ ); $form['instructions']['text'] = array( '#value' => '
'. t('The following variables should be used in configuring addresses for the countries you ship to:') .'

' - . theme('table', $header, $rows) .'

'. t('*Adding _if to any country variable will make it only display for addresses
whose country is different than the default store country.') .'

', + . theme('table', $header, $rows) .'

'. t('*Adding _if to any country variable will make it only display for addresses
whose country is different than the default store country.') .'', ); $result = db_query("SELECT * FROM {uc_countries} ORDER BY country_name ASC"); @@ -498,7 +522,7 @@ $countries[] = $country; } - if (is_array($countries)) { + if (isset_($countries) && is_array($countries)) { $form['countries'] = array( '#tree' => TRUE, ); @@ -559,6 +583,8 @@ // Displays the form for store settings. function uc_store_store_settings_form() { + $form = array(); + $form['uc_store_name'] = uc_textfield(t('Store name'), variable_get('uc_store_name', NULL), FALSE, NULL, 64); $form['uc_store_owner'] = uc_textfield(t('Store owner'), variable_get('uc_store_owner', NULL), FALSE, NULL, 64); @@ -616,6 +642,7 @@ } function uc_store_display_settings_form() { + $form = array(); $display_options = array( 1 => t('Dashboard with collapsed submenu links'), @@ -650,6 +677,7 @@ $options = array_merge(array(t('Randomly select a message from the list below.')), _store_footer_options()); + $user_footer = ''; // format the message nicely for the user switch (variable_get('uc_footer_message', 0)) { case 'none': @@ -677,6 +705,8 @@ } function uc_store_format_settings_form() { + $form = array(); + $form['currency'] = array( '#type' => 'fieldset', '#title' => t('Currency format'), @@ -815,6 +845,8 @@ } function uc_store_report_settings() { + $form = array(); + $form['uc_store_report'] = array( '#type' => 'checkbox', '#title' => t('Report version information to Ubercart.org as shown below.'), @@ -842,6 +874,8 @@ * Form to enter initials for an administrative user. */ function uc_store_initials() { + $form = array(); + $form['username'] = array( '#type' => 'textfield', '#title' => t('User name'), @@ -867,6 +901,7 @@ function uc_store_initials_submit($form, &$form_state) { $result = db_query("SELECT uid FROM {users} WHERE name = '%s'", $form_state['values']['username']); + $result = isset($result) ? $result : NULL; ///error eall check... should be done beter.. if ($user = db_fetch_object($result)) { if ($form_state['values']['initials'] == '') { variable_del('user_initials_'. $user->uid); @@ -885,8 +920,10 @@ * List of extensible TAPIr tables used by Ubercart. */ function uc_store_tables() { - $output = '

'. t('The following tables are used to display various parts of your store to your administrators and customers. Click on a table id to configure the display of that table.'); - $output .= '

'. tapir_table_list('admin/store/settings/tables') .'

'; + $output = '

'. t('The following tables are used to display various parts of'. + ' your store to your administrators and customers. Click on a table'. + ' id to configure the display of that table.') . + '

'. tapir_table_list('admin/store/settings/tables') .'

'; return $output; } @@ -896,7 +933,6 @@ ."order_status IN ". uc_order_status_list('general', TRUE) ." ORDER BY created DESC", 50, 0, NULL, $uid); - $header = array(t('View'), t('Order ID'), t('Date'), t('Billing name'), t('Shipping name'), t('Items'), t('Total')); @@ -1012,11 +1048,12 @@ // Form to completely remove a country. function uc_country_remove_form($form_state, $country_id) { + $form = array(); // Fetch the country name from the database. $country = db_result(db_query("SELECT country_name FROM {uc_countries} WHERE country_id = %d", $country_id)); // If orders exist for this country, show a warning message prior to removal. - if ($_POST['op'] != t('Remove') && module_exists('uc_order')) { + if (isset($_POST['op']) && $_POST['op'] != t('Remove') && module_exists('uc_order')) { $count = db_result(db_query("SELECT COUNT(order_id) FROM {uc_orders} WHERE delivery_country = %d OR billing_country = %d", $country_id, $country_id)); if ($count > 0) { drupal_set_message(t('Warning: @count orders were found with addresses in this country. Removing this country now will cause errors to show on those order pages. You might consider simply disabling this country instead.', array('@count' => $count)), 'error'); @@ -1094,6 +1131,8 @@ function uc_price_settings_form() { $options = array(); $form = array(); + $description = ''; + $options = array(); // Get all the handlers available. $handlers = _uc_price_get_handlers(array('rebuild_handlers' => TRUE, 'all_handlers' => TRUE)); @@ -1174,6 +1213,8 @@ */ function theme_uc_price_settings_form($form) { // Add the tabledrag to the alterer table. + $rows = array(); + drupal_add_tabledrag('uc-price-handler-table', 'order', 'sibling', 'uc-price-handler-table-weight'); $header = array(t('Price alterers'), t('Enabled'), t('Weight')); === modified file 'uc_store/uc_store.css' (properties changed: -x to +x) === modified file 'uc_store/uc_store.info' (properties changed: -x to +x) === modified file 'uc_store/uc_store.install' (properties changed: -x to +x) === modified file 'uc_store/uc_store.js' (properties changed: -x to +x) === modified file 'uc_store/uc_store.module' (properties changed: -x to +x) --- uc_store/uc_store.module 2009-06-19 14:58:16 +0000 +++ uc_store/uc_store.module 2009-06-29 18:09:26 +0000 @@ -65,6 +65,7 @@ */ function uc_store_menu() { $items = array(); + $items['admin/store'] = array( 'title' => 'Store administration', 'description' => 'Administer store settings, products, orders, and more.', @@ -373,7 +374,7 @@ * Implementation of hook_theme(). */ function uc_store_theme() { - return array( + $ret = array( 'uc_admin_dashboard' => array( 'arguments' => array('type' => NULL, 'menus' => NULL), ), @@ -399,6 +400,7 @@ 'arguments' => array('value' => 0, 'context' => array(), 'options' => array()), ), ); + return $ret; } /** @@ -406,6 +408,7 @@ */ function uc_store_token_values($type, $object = NULL) { global $base_url; + $values = array(); switch ($type) { case 'global': @@ -452,6 +455,8 @@ * Implementation of hook_token_list(). (token.module) */ function uc_store_token_list($type = 'all') { + $tokens = array(); + $tokens['global']['site-login'] = t('A link to the site login page.'); $tokens['global']['site-logo'] = t('The URL for the site logo.'); $tokens['global']['store-name'] = t('The Ubercart store name.'); @@ -498,6 +503,7 @@ if (variable_get('uc_footer_message', 0) === 'none') { return; } + $message = ''; // Figure out what page is being viewed. $path = drupal_get_normal_path($_GET['q']); @@ -567,13 +573,16 @@ // Theme a formatted price for display. function theme_uc_price($value, $context, $options) { + $output = ''; + // Fixup class names. - if (!is_array($context['class'])) { + if (!isset($context['class']) || !is_array($context['class'])) { $context['class'] = array(); } foreach ($context['class'] as $key => $class) { $context['class'][$key] = 'uc-price-'. $class; } + $context['class'][] = 'uc-price'; // Class the element. $output = ''; @@ -602,7 +611,7 @@ $output = ''; $panel = 0; - if (is_array($menus)) { + if (isset($menus) && is_array($menus)) { foreach ($menus as $menu) { $panel++; if ($panel % 4 == 0) { @@ -646,13 +655,14 @@ // Return the default store footer options. function _store_footer_options() { $url = array('!url' => 'http://www.ubercart.org/'); - return array( + $ret = array( 1 => t('Powered by Ubercart', $url), 2 => t('Drupal e-commerce provided by Ubercart.', $url), 3 => t('Supported by Ubercart, an open source e-commerce suite.', $url), 4 => t('Powered by Ubercart, the free shopping cart software.', $url), 'none' => t('(Do not display a message in the footer.)'), ); + return $ret; } // Wrap the footer in a div so it can be re-styled. @@ -661,6 +671,7 @@ } function uc_store_address_fields_form() { + $form = array(); $form['fields'] = array( '#tree' => TRUE, '#summary callback' => 'summarize_form', @@ -730,6 +741,7 @@ function theme_uc_store_address_fields_form($form) { $header = array(t('Enabled'), t('Field'), t('Title'), t('Required')); + $rows = array(); foreach (element_children($form['fields']) as $field) { $rows[] = array( @@ -748,6 +760,7 @@ function uc_store_address_fields_form_submit($form, &$form_state) { $fields = array(); $required = array(); + foreach ($form_state['values']['fields'] as $field => $data) { variable_set('uc_field_'. $field, $data['title']); if ($data['enabled'] == TRUE) { @@ -774,6 +787,8 @@ * A handler for Javascript helper functions... */ function uc_store_js_util($func) { + $output = ''; + switch ($func) { case 'currency_format': $context = array( @@ -867,6 +882,7 @@ * Format an amount for display with the store's currency settings. */ function uc_currency_format($value, $sign = TRUE, $thou = TRUE, $dec = NULL) { + $format = ''; if ($value === NULL) { return NULL; } @@ -944,6 +960,7 @@ */ function uc_length_format($value, $unit = NULL) { $vars = array('!value' => $value); + $format = ''; if (is_null($unit)) { $unit = variable_get('uc_length_unit', 'in'); @@ -1004,6 +1021,8 @@ * Format an address for display based on a country's address format. */ function uc_address_format($first_name, $last_name, $company, $street1, $street2, $city, $zone, $postal_code, $country) { + $address = ''; + $result = db_query("SELECT * FROM {uc_zones} WHERE zone_id = %d", $zone); if (!($zone_data = db_fetch_array($result))) { $zone_data = array('zone_code' => t('N/A'), 'zone_name' => t('Unknown')); @@ -1085,12 +1104,14 @@ * $fields array. */ function uc_get_country_data($match = array(), $sort = 'country_name') { + $where = ''; + $countries = array(); $valid_fields = array('country_id', 'country_name', 'country_iso_code_2', 'country_iso_code_3', 'version'); - if (!is_array($match)) { + if (isset($match) && !is_array($match)) { $match = array(); } - if (!in_array($sort, $valid_fields)) { + if (isset($match) && !in_array($sort, $valid_fields)) { $sort = 'country_name'; } @@ -1215,6 +1236,7 @@ * $display can be 'code' or 'name'. */ function uc_zone_select($title, $default = NULL, $description = NULL, $country_id = NULL, $display = 'name', $required = FALSE) { + $options = array(); if (empty($country_id)) { $country_id = uc_store_default_country(); } @@ -1259,6 +1281,8 @@ * $display can be 'name', 'code2' for the 2-digit code, or 'code3' for the 3-digit code. */ function uc_country_select($title, $default = NULL, $description = NULL, $display = 'name', $required = FALSE) { + $order_by = ''; + if ($display == 'code2') { $order_by = 'country_iso_code_2'; } @@ -1562,13 +1586,13 @@ * Theme a pane sorting form into a table! */ function theme_uc_pane_sort_table($form) { + $attributes = array(); $prefix = $form['#pane_prefix']; + $rows = array(); + if (isset($form['#table_attributes']) && is_array($form['#table_attributes'])) { $attributes = $form['#table_attributes']; } - else { - $attributes = array(); - } $header = array(t('Enabled'), t('Title'), t('List position')); === modified file 'uc_store/uc_store.test' (properties changed: -x to +x)