r70 - trunk/direct.openmoko.com

roh at sita.openmoko.org roh at sita.openmoko.org
Wed Jul 4 16:49:03 CEST 2007


Author: roh
Date: 2007-07-04 16:48:57 +0200 (Wed, 04 Jul 2007)
New Revision: 70

Removed:
   trunk/direct.openmoko.com/Order_Info.php
   trunk/direct.openmoko.com/Order_Info_Process.php
   trunk/direct.openmoko.com/account.php
   trunk/direct.openmoko.com/account_edit.php
   trunk/direct.openmoko.com/account_history.php
   trunk/direct.openmoko.com/account_history_info.php
   trunk/direct.openmoko.com/account_newsletters.php
   trunk/direct.openmoko.com/account_notifications.php
   trunk/direct.openmoko.com/account_password.php
   trunk/direct.openmoko.com/add_checkout_success.php
   trunk/direct.openmoko.com/address_book.php
   trunk/direct.openmoko.com/address_book_process.php
   trunk/direct.openmoko.com/admin/
   trunk/direct.openmoko.com/advanced_search.php
   trunk/direct.openmoko.com/advanced_search_result.php
   trunk/direct.openmoko.com/affiliate_affiliate.php
   trunk/direct.openmoko.com/affiliate_banners.php
   trunk/direct.openmoko.com/affiliate_banners_banners.php
   trunk/direct.openmoko.com/affiliate_banners_build.php
   trunk/direct.openmoko.com/affiliate_banners_build_cat.php
   trunk/direct.openmoko.com/affiliate_banners_category.php
   trunk/direct.openmoko.com/affiliate_banners_product.php
   trunk/direct.openmoko.com/affiliate_banners_text.php
   trunk/direct.openmoko.com/affiliate_clicks.php
   trunk/direct.openmoko.com/affiliate_contact.php
   trunk/direct.openmoko.com/affiliate_details.php
   trunk/direct.openmoko.com/affiliate_details_ok.php
   trunk/direct.openmoko.com/affiliate_faq.php
   trunk/direct.openmoko.com/affiliate_help1.php
   trunk/direct.openmoko.com/affiliate_help10.php
   trunk/direct.openmoko.com/affiliate_help11.php
   trunk/direct.openmoko.com/affiliate_help12.php
   trunk/direct.openmoko.com/affiliate_help13.php
   trunk/direct.openmoko.com/affiliate_help14.php
   trunk/direct.openmoko.com/affiliate_help15.php
   trunk/direct.openmoko.com/affiliate_help16.php
   trunk/direct.openmoko.com/affiliate_help17.php
   trunk/direct.openmoko.com/affiliate_help18.php
   trunk/direct.openmoko.com/affiliate_help19.php
   trunk/direct.openmoko.com/affiliate_help2.php
   trunk/direct.openmoko.com/affiliate_help20.php
   trunk/direct.openmoko.com/affiliate_help21.php
   trunk/direct.openmoko.com/affiliate_help22.php
   trunk/direct.openmoko.com/affiliate_help3.php
   trunk/direct.openmoko.com/affiliate_help4.php
   trunk/direct.openmoko.com/affiliate_help5.php
   trunk/direct.openmoko.com/affiliate_help6.php
   trunk/direct.openmoko.com/affiliate_help7.php
   trunk/direct.openmoko.com/affiliate_help8.php
   trunk/direct.openmoko.com/affiliate_help9.php
   trunk/direct.openmoko.com/affiliate_info.php
   trunk/direct.openmoko.com/affiliate_logout.php
   trunk/direct.openmoko.com/affiliate_news.php
   trunk/direct.openmoko.com/affiliate_newsletter.php
   trunk/direct.openmoko.com/affiliate_password.php
   trunk/direct.openmoko.com/affiliate_password_forgotten.php
   trunk/direct.openmoko.com/affiliate_payment.php
   trunk/direct.openmoko.com/affiliate_reports.php
   trunk/direct.openmoko.com/affiliate_sales.php
   trunk/direct.openmoko.com/affiliate_show_banner.php
   trunk/direct.openmoko.com/affiliate_signup.php
   trunk/direct.openmoko.com/affiliate_signup_ok.php
   trunk/direct.openmoko.com/affiliate_summary.php
   trunk/direct.openmoko.com/affiliate_terms.php
   trunk/direct.openmoko.com/affiliate_terms_popup.php
   trunk/direct.openmoko.com/affiliate_validcats.php
   trunk/direct.openmoko.com/affiliate_validproducts.php
   trunk/direct.openmoko.com/all_prodcats.php
   trunk/direct.openmoko.com/all_prodmanf.php
   trunk/direct.openmoko.com/allprods.php
   trunk/direct.openmoko.com/article_info.php
   trunk/direct.openmoko.com/article_reviews.php
   trunk/direct.openmoko.com/article_reviews_info.php
   trunk/direct.openmoko.com/article_reviews_write.php
   trunk/direct.openmoko.com/article_search.php
   trunk/direct.openmoko.com/articles.php
   trunk/direct.openmoko.com/articles_new.php
   trunk/direct.openmoko.com/cache/
   trunk/direct.openmoko.com/calendar_content.php
   trunk/direct.openmoko.com/cert/
   trunk/direct.openmoko.com/check_lang.php
   trunk/direct.openmoko.com/checkout_confirmation.php
   trunk/direct.openmoko.com/checkout_payment.php
   trunk/direct.openmoko.com/checkout_payment_address.php
   trunk/direct.openmoko.com/checkout_paypalipn.php
   trunk/direct.openmoko.com/checkout_process.php
   trunk/direct.openmoko.com/checkout_shipping.php
   trunk/direct.openmoko.com/checkout_shipping_address.php
   trunk/direct.openmoko.com/checkout_success.php
   trunk/direct.openmoko.com/contact_us.php
   trunk/direct.openmoko.com/cookie_usage.php
   trunk/direct.openmoko.com/create_account.php
   trunk/direct.openmoko.com/create_account_success.php
   trunk/direct.openmoko.com/cvv.html
   trunk/direct.openmoko.com/debug/
   trunk/direct.openmoko.com/doc/
   trunk/direct.openmoko.com/down_for_maintenance.php
   trunk/direct.openmoko.com/download.php
   trunk/direct.openmoko.com/download/
   trunk/direct.openmoko.com/events_calendar.php
   trunk/direct.openmoko.com/ext/
   trunk/direct.openmoko.com/faq.php
   trunk/direct.openmoko.com/featured_products.php
   trunk/direct.openmoko.com/gv_faq.php
   trunk/direct.openmoko.com/gv_redeem.php
   trunk/direct.openmoko.com/gv_send.php
   trunk/direct.openmoko.com/iam.php
   trunk/direct.openmoko.com/images/
   trunk/direct.openmoko.com/includes/
   trunk/direct.openmoko.com/index.php
   trunk/direct.openmoko.com/info_shopping_cart.php
   trunk/direct.openmoko.com/information.php
   trunk/direct.openmoko.com/ipn.php
   trunk/direct.openmoko.com/links.php
   trunk/direct.openmoko.com/links_submit.php
   trunk/direct.openmoko.com/links_submit_success.php
   trunk/direct.openmoko.com/login.php
   trunk/direct.openmoko.com/logoff.php
   trunk/direct.openmoko.com/pages.php
   trunk/direct.openmoko.com/password_forgotten.php
   trunk/direct.openmoko.com/paypal_notify.php
   trunk/direct.openmoko.com/pear/
   trunk/direct.openmoko.com/popup_affiliate_help.php
   trunk/direct.openmoko.com/popup_coupon_help.php
   trunk/direct.openmoko.com/popup_cvs_help.php
   trunk/direct.openmoko.com/popup_image.php
   trunk/direct.openmoko.com/popup_links_help.php
   trunk/direct.openmoko.com/popup_paypal.php
   trunk/direct.openmoko.com/popup_search_help.php
   trunk/direct.openmoko.com/popup_wishlist_help.php
   trunk/direct.openmoko.com/print.css
   trunk/direct.openmoko.com/printorder.php
   trunk/direct.openmoko.com/product_info.php
   trunk/direct.openmoko.com/product_info_configureable.php
   trunk/direct.openmoko.com/product_reviews.php
   trunk/direct.openmoko.com/product_reviews_info.php
   trunk/direct.openmoko.com/product_reviews_write.php
   trunk/direct.openmoko.com/products_new.php
   trunk/direct.openmoko.com/pub/
   trunk/direct.openmoko.com/pw.php
   trunk/direct.openmoko.com/redirect.php
   trunk/direct.openmoko.com/reviews.php
   trunk/direct.openmoko.com/robots.txt
   trunk/direct.openmoko.com/rss.php
   trunk/direct.openmoko.com/shipping_estimator_popup.php
   trunk/direct.openmoko.com/shop_by_price.php
   trunk/direct.openmoko.com/shopping_cart.php
   trunk/direct.openmoko.com/specials.php
   trunk/direct.openmoko.com/ssl_check.php
   trunk/direct.openmoko.com/style.css
   trunk/direct.openmoko.com/tell_a_friend.php
   trunk/direct.openmoko.com/tell_a_friend_article.php
   trunk/direct.openmoko.com/temp/
   trunk/direct.openmoko.com/templates/
   trunk/direct.openmoko.com/tmp/
   trunk/direct.openmoko.com/upcoming_products.php
   trunk/direct.openmoko.com/validate_new.php
   trunk/direct.openmoko.com/vvc_display.php
   trunk/direct.openmoko.com/wishlist.php
   trunk/direct.openmoko.com/wishlist_email.php
   trunk/direct.openmoko.com/wishlist_help.php
   trunk/direct.openmoko.com/wpcallback.php
Log:
deleted php version


Deleted: trunk/direct.openmoko.com/Order_Info.php
===================================================================
--- trunk/direct.openmoko.com/Order_Info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/Order_Info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,20 +0,0 @@
-<?php
-/*
-  $Id: Order_Info.php,v 0.52 2002/09/21 hpdl Exp $
-        by Cheng
-        OSCommerce v2.2 CVS (09/17/02)
-   Modified versions of create_account.php and related
-  files.  Allowing 'purchase without account'.
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-  Copyright (c) 2002 osCommerce
-  Released under the GNU General Public License
-*/
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CREATE_ACCOUNT);
-  $breadcrumb->add(NAV_ORDER_INFO, tep_href_link('Order_Info.php', '', 'SSL'));
-$content = CONTENT_ORDER_INFO;
-$javascript = 'form_check.js.php';
-require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/Order_Info_Process.php
===================================================================
--- trunk/direct.openmoko.com/Order_Info_Process.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/Order_Info_Process.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,364 +0,0 @@
-<?php
-/*
-  $Id: Order_Info_Process.php,v 0.56 2003/03/08 hpdl Exp $
-  by Richy C.
-
-        OSCommerce v2.2MS1
-
-   Modified versions of create_account.php and related
-  files.  Allowing 'purchase without account'.
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CREATE_ACCOUNT);
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LOGIN);
-
-  if (!@$HTTP_POST_VARS['action']) {
-    tep_redirect(tep_href_link(FILENAME_ORDER_INFO, '', 'NONSSL'));
-  }
-
-  $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-  $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-  $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-  if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($HTTP_POST_VARS['dob']);
-  $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
-  $telephone = tep_db_prepare_input($HTTP_POST_VARS['telephone']);
-  $fax = tep_db_prepare_input($HTTP_POST_VARS['fax']);
-  $newsletter = tep_db_prepare_input($HTTP_POST_VARS['newsletter']);
-//  $password = tep_db_prepare_input($HTTP_POST_VARS['password']);
-        $password = tep_db_prepare_input('');
-  $confirmation = tep_db_prepare_input($HTTP_POST_VARS['confirmation']);
-  $street_address = tep_db_prepare_input($HTTP_POST_VARS['street_address']);
-  if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-  if (ACCOUNT_SUBURB == 'true') $suburb = tep_db_prepare_input($HTTP_POST_VARS['suburb']);
-  $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-  $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-  $zone_id = tep_db_prepare_input($HTTP_POST_VARS['zone_id']);
-  $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-  $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-
-  $error = false; // reset error flag
-
-  if (ACCOUNT_GENDER == 'true') {
-    if (($gender == 'm') || ($gender == 'f')) {
-      $entry_gender_error = false;
-    } else {
-      $error = true;
-      $entry_gender_error = true;
-    }
-  }
-
-  if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-    $error = true;
-    $entry_firstname_error = true;
-  } else {
-    $entry_firstname_error = false;
-  }
-
-  if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-    $error = true;
-    $entry_lastname_error = true;
-  } else {
-    $entry_lastname_error = false;
-  }
-
-  if (ACCOUNT_DOB == 'true') {
-    if (checkdate(substr(tep_date_raw($dob), 4, 2), substr(tep_date_raw($dob), 6, 2), substr(tep_date_raw($dob), 0, 4))) {
-      $entry_date_of_birth_error = false;
-    } else {
-      $error = true;
-      $entry_date_of_birth_error = true;
-    }
-  }
-
-  if (strlen($email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-    $error = true;
-    $entry_email_address_error = true;
-  } else {
-    $entry_email_address_error = false;
-  }
-
-  if (!tep_validate_email($email_address)) {
-    $error = true;
-    $entry_email_address_check_error = true;
-  } else {
-    $entry_email_address_check_error = false;
-  }
-
-  if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-    $error = true;
-    $entry_street_address_error = true;
-  } else {
-    $entry_street_address_error = false;
-  }
-
-  if (strlen($postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-    $error = true;
-    $entry_post_code_error = true;
-  } else {
-    $entry_post_code_error = false;
-  }
-
-  if (strlen($city) < ENTRY_CITY_MIN_LENGTH) {
-    $error = true;
-    $entry_city_error = true;
-  } else {
-    $entry_city_error = false;
-  }
-
-  if (!$country) {
-    $error = true;
-    $entry_country_error = true;
-  } else {
-    $entry_country_error = false;
-  }
-
-  if (ACCOUNT_STATE == 'true') {
-    if ($entry_country_error) {
-      $entry_state_error = true;
-    } else {
-      $zone_id = 0;
-      $entry_state_error = false;
-      $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($country) . "'");
-      $check_value = tep_db_fetch_array($check_query);
-      $entry_state_has_zones = ($check_value['total'] > 0);
-      if ($entry_state_has_zones) {
-        $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($country) . "' and zone_name = '" . tep_db_input($state) . "'");
-        if (tep_db_num_rows($zone_query) == 1) {
-          $zone_values = tep_db_fetch_array($zone_query);
-          $zone_id = $zone_values['zone_id'];
-        } else {
-          $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($country) . "' and zone_code = '" . tep_db_input($state) . "'");
-          if (tep_db_num_rows($zone_query) == 1) {
-            $zone_values = tep_db_fetch_array($zone_query);
-            $zone_id = $zone_values['zone_id'];
-          } else {
-            $error = true;
-            $entry_state_error = true;
-          }
-        }
-      } else {
-        if (!$state) {
-          $error = true;
-          $entry_state_error = true;
-        }
-      }
-    }
-  }
-
-  if (strlen($telephone) < ENTRY_TELEPHONE_MIN_LENGTH) {
-    $error = true;
-    $entry_telephone_error = true;
-  } else {
-    $entry_telephone_error = false;
-  }
-
-  $entry_password_error = false;
-  $entry_email_address_exists = false;
-
-  if ($error == true) {
-    $processed = true;
-
-    $breadcrumb->add(NAV_ORDER_INFO, tep_href_link(FILENAME_ORDER_INFO, '', 'NONSSL'));
-// DDB - 040622 - no need    $breadcrumb->add(NAVBAR_TITLE_2);
-
-$content = CONTENT_ORDER_INFO_PROCESS;
-require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-
-?>
-
-<?php
-  } else {
-
-    // PWA 0.70 : SELECT using new method of determining a customer has purchased without account:
-    $check_customer_query = tep_db_query("select customers_id, purchased_without_account,
-      customers_firstname, customers_password, customers_email_address,
-      customers_default_address_id from " . TABLE_CUSTOMERS . "
-      where upper(customers_email_address) = '" . tep_db_prepare_input(strtoupper($HTTP_POST_VARS['email_address'])) . "' and
-        upper(customers_firstname) = '" . tep_db_prepare_input(strtoupper($HTTP_POST_VARS['firstname'])) . "' and
-        upper(customers_lastname) = '" . tep_db_prepare_input(strtoupper($HTTP_POST_VARS['lastname'])) . "'");
-
-// if password is EMPTY (null) and e-mail address is same then we just load up their account information.
-// could be security flaw -- might want to setup password = somestring and have it recheck here (during the first initial
-// creation
-
-      $check_customer = tep_db_fetch_array($check_customer_query);
-
-      if (tep_db_num_rows($check_customer_query)) {
-
-        // PWA 0.70 added this for backwards compatibility with older versions of PWA
-        // that made a blank password, causing logins to fail:
-        if(!$check_customer['purchased_without_account']) {
-          list($md5hash, $salt) = explode(':',$check_customer['customers_password']);
-          if(md5($salt) == $md5hash) {
-            // password was blank; customer purchased without account using a previous version of PWA code
-            $check_customer['purchased_without_account'] = 1;
-          }
-        }
-
-        if ($check_customer['purchased_without_account'] != 1) {
-          tep_redirect(tep_href_link(FILENAME_LOGIN,
-            'login=fail&reason=' . urlencode(
-              str_replace('{EMAIL_ADDRESS}',$check_customer['customers_email_address'],PWA_FAIL_ACCOUNT_EXISTS)), 'SSL'));
-
-        } else {
-          $customer_id = $check_customer['customers_id'];
-          // now get latest address book entry:
-          $get_default_address = tep_db_query("select address_book_id, entry_country_id, entry_zone_id from " . TABLE_ADDRESS_BOOK . "
-                where customers_id = '" . (int)$customer_id . "' ORDER BY address_book_id DESC LIMIT 1");
-          $default_address = tep_db_fetch_array($get_default_address);
-          $customer_default_address_id = $default_address['address_book_id'];
-          $customer_first_name = $check_customer['customers_firstname'];
-          $customer_country_id = $default_address['entry_country_id'];
-          $customer_zone_id = $default_address['entry_zone_id'];
-          tep_session_register('customer_id');
-          tep_session_register('customer_default_address_id');
-          tep_session_register('customer_first_name');
-          tep_session_register('customer_country_id');
-          tep_session_register('customer_zone_id');
-          // PWA 0.71 update returning customer's address book:
-         $customer_update = array('customers_firstname' => $firstname,
-                             'customers_lastname' => $lastname,
-                             'customers_telephone' => $telephone,
-                             'customers_fax' => $fax);
-   if (ACCOUNT_GENDER == 'true') $customer_update['customers_gender'] = $gender;
-      tep_db_perform(TABLE_CUSTOMERS, $customer_update, 'update', "customers_id = '".$customer_id."'");
-
-   $address_book_update = array('customers_id' => $customer_id,
-         'entry_firstname' => $firstname,
-                 'entry_lastname' => $lastname,
-                 'entry_street_address' => $street_address,
-                 'entry_postcode' => $postcode,
-                 'entry_city' => $city,
-                 'entry_country_id' => $country);
-                   if (ACCOUNT_GENDER == 'true') $address_book_update['entry_gender'] = $gender;
-    if (ACCOUNT_COMPANY == 'true') $address_book_update['entry_company'] = $company;
-    if (ACCOUNT_SUBURB == 'true') $address_book_update['entry_suburb'] = $suburb;
-    if (ACCOUNT_STATE == 'true') {
-     if ($zone_id > 0) {
-      $address_book_update['entry_zone_id'] = $zone_id;
-      $address_book_update['entry_state'] = '';
-     } else {
-      $address_book_update['entry_zone_id'] = '0';
-      $address_book_update['entry_state'] = $state;
-     }
-    }
-         tep_db_perform(TABLE_ADDRESS_BOOK, $address_book_update, 'update', "address_book_id = '".$customer_default_address_id."'");
-   } // if-else $pass_ok
-
-          if ($HTTP_POST_VARS['setcookie'] == '1') {
-            setcookie('email_address', $HTTP_POST_VARS['email_address'], time()+2592000);
-            setcookie('password', $HTTP_POST_VARS['password'], time()+2592000);
-            setcookie('first_name', $customer_first_name, time()+2592000);
-          } elseif ( ($HTTP_COOKIE_VARS['email_address']) && ($HTTP_COOKIE_VARS['password']) ) {
-            setcookie('email_address', '');
-            setcookie('password', '');
-            setcookie('first_name', '');
-          } // if cookies
-
-          $date_now = date('Ymd');
-          tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_of_last_logon = now(),
-        customers_info_number_of_logons = customers_info_number_of_logons+1 where customers_info_id = '" . (int)$customer_id . "'");
-
-        } else {
-        // if customer_exist = NO
-
-    // PWA 0.70 : new way of determining a customer purchased without an account : just say so!
-    $sql_data_array = array('purchased_without_account' => 1,
-                            'customers_firstname' => $firstname,
-                            'customers_lastname' => $lastname,
-                            'customers_email_address' => $email_address,
-                            'customers_telephone' => $telephone,
-                            'customers_fax' => $fax,
-                            'customers_newsletter' => $newsletter,
-                            'customers_password' => tep_encrypt_password($password));
-//                            'customers_default_address_id' => 1);
-
-    if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
-    if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
-
-    tep_db_perform(TABLE_CUSTOMERS, $sql_data_array);
-
-    $customer_id = tep_db_insert_id();
-
-    $sql_data_array = array('customers_id' => $customer_id,
-                            'address_book_id' => (int)$address_id,
-                            'entry_firstname' => $firstname,
-                            'entry_lastname' => $lastname,
-                            'entry_street_address' => $street_address,
-                            'entry_postcode' => $postcode,
-                            'entry_city' => $city,
-                            'entry_country_id' => $country);
-
-    if (ACCOUNT_GENDER == 'true') $sql_data_array['entry_gender'] = $gender;
-    if (ACCOUNT_COMPANY == 'true') $sql_data_array['entry_company'] = $company;
-    if (ACCOUNT_SUBURB == 'true') $sql_data_array['entry_suburb'] = $suburb;
-    if (ACCOUNT_STATE == 'true') {
-      if ($zone_id > 0) {
-        $sql_data_array['entry_zone_id'] = $zone_id;
-        $sql_data_array['entry_state'] = '';
-      } else {
-        $sql_data_array['entry_zone_id'] = '0';
-        $sql_data_array['entry_state'] = $state;
-      }
-    }
-
-    tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array);
-
-      $address_id = tep_db_insert_id();
-
-      tep_db_query("update " . TABLE_CUSTOMERS . " set customers_default_address_id = '" . (int)$address_id . "' where customers_id = '" . (int)$customer_id . "'");
-
-      tep_db_query("insert into " . TABLE_CUSTOMERS_INFO . " (customers_info_id, customers_info_number_of_logons, customers_info_date_account_created) values ('" . (int)$customer_id . "', '0', now())");
-
-    $customer_first_name = $firstname;
-    $customer_default_address_id = $address_id;
-    $customer_country_id = $country;
-    $customer_zone_id = $zone_id;
-    tep_session_register('customer_id');
-    tep_session_register('customer_first_name');
-    tep_session_register('customer_default_address_id');
-    tep_session_register('customer_country_id');
-    tep_session_register('customer_zone_id');
-
-  } // ELSE CUSTOMER=NO
-
-// restore cart contents
-    $cart->restore_contents();
-
-    // build the message content
-// DDB - 040622 - no mail will be sent
-//    $name = $firstname . " " . $lastname;
-//
-//    if (ACCOUNT_GENDER == 'true') {
-//       if ($HTTP_POST_VARS['gender'] == 'm') {
-//         $email_text = EMAIL_GREET_MR;
-//       } else {
-//         $email_text = EMAIL_GREET_MS;
-//       }
-//    } else {
-//      $email_text = EMAIL_GREET_NONE;
-//    }
-//
-//    $email_text .= EMAIL_WELCOME . EMAIL_TEXT . EMAIL_CONTACT . EMAIL_WARNING;
-//    tep_mail($name, $email_address, EMAIL_SUBJECT, nl2br($email_text), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, '');
-
-//    tep_redirect(tep_href_link(FILENAME_CREATE_ACCOUNT_SUCCESS, '', 'SSL'));
-
-  tep_session_register('noaccount');
-
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account.php
===================================================================
--- trunk/direct.openmoko.com/account.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,42 +0,0 @@
-<?php
-/*
-  Id: account.php,v 1.1.1.1 2004/03/04 23:37:52 ccwjr Exp 
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Copyright &copy; 2003-2005 Chain Reaction Works, Inc.
-  
-  Last Modified by : $AUTHOR$
-  Latest Revision  : $REVISION$
-  Last Revision Date : $DATE$
-  License :  GNU General Public License 2.0
-  
-  http://creloaded.com
-  http://creforge.com
-  
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/account_edit.php
===================================================================
--- trunk/direct.openmoko.com/account_edit.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_edit.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,139 +0,0 @@
-<?php
-/*
-  $Id: account_edit.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Copyright &copy; 2003-2005 Chain Reaction Works, Inc.
-  
-  Last Modified by : $Author$
-  Latest Revision  : $Revision: 208 $
-  Last Revision Date : $Date$
-  License :  GNU General Public License 2.0
-  
-  http://creloaded.com
-  http://creforge.com
-  
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_EDIT);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-    $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-    $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-    if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($HTTP_POST_VARS['dob']);
-    $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
-    $telephone = tep_db_prepare_input($HTTP_POST_VARS['telephone']);
-    $fax = tep_db_prepare_input($HTTP_POST_VARS['fax']);
-
-    $error = false;
-
-    if (ACCOUNT_GENDER == 'true') {
-      if ( ($gender != 'm') && ($gender != 'f') ) {
-        $error = true;
-
-        $messageStack->add('account_edit', ENTRY_GENDER_ERROR);
-      }
-    }
-
-    if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_FIRST_NAME_ERROR);
-    }
-
-    if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_LAST_NAME_ERROR);
-    }
-
-    if (ACCOUNT_DOB == 'true') {
-      if (!checkdate(substr(tep_date_raw($dob), 4, 2), substr(tep_date_raw($dob), 6, 2), substr(tep_date_raw($dob), 0, 4))) {
-        $error = true;
-
-        $messageStack->add('account_edit', ENTRY_DATE_OF_BIRTH_ERROR);
-      }
-    }
-
-    if (strlen($email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_ERROR);
-    }
-
-    if (!tep_validate_email($email_address)) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
-    }
-
-    $check_email_query = tep_db_query("select count(*) as total from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "' and customers_id != '" . (int)$customer_id . "'");
-    $check_email = tep_db_fetch_array($check_email_query);
-    if ($check_email['total'] > 0) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_ERROR_EXISTS);
-    }
-
-    if (strlen($telephone) < ENTRY_TELEPHONE_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_edit', ENTRY_TELEPHONE_NUMBER_ERROR);
-    }
-
-    if ($error == false) {
-      $sql_data_array = array('customers_firstname' => $firstname,
-                              'customers_lastname' => $lastname,
-                              'customers_email_address' => $email_address,
-                              'customers_telephone' => $telephone,
-                              'customers_fax' => $fax);
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
-      if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
-
-      tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "'");
-
-      tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$customer_id . "'");
-
-      $sql_data_array = array('entry_firstname' => $firstname,
-                              'entry_lastname' => $lastname);
-
-      tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$customer_default_address_id . "'");
-
-// reset the session variables
-      $customer_first_name = $firstname;
-
-      $messageStack->add_session('account', SUCCESS_ACCOUNT_UPDATED, 'success');
-
-      tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-    }
-  }
-
-  $account_query = tep_db_query("select customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_telephone, customers_fax from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-  $account = tep_db_fetch_array($account_query);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT_EDIT;
-  $javascript = 'form_check.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account_history.php
===================================================================
--- trunk/direct.openmoko.com/account_history.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_history.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,41 +0,0 @@
-<?php
-/*
-  $Id: account_history.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Copyright &copy; 2003-2005 Chain Reaction Works, Inc.
-  
-  Last Modified by : $Author$
-  Latest Revision  : $Revision: 208 $
-  Last Revision Date : $Date$
-  License :  GNU General Public License 2.0
-  
-  http://creloaded.com
-  http://creforge.com
-  
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_HISTORY);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT_HISTORY;
-  $javascript = 'popup_window.js';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account_history_info.php
===================================================================
--- trunk/direct.openmoko.com/account_history_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_history_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,56 +0,0 @@
-<?php
-/*
-  $Id: account_history_info.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Copyright &copy; 2003-2005 Chain Reaction Works, Inc.
-  
-  Last Modified by : $Author$
-  Latest Revision  : $Revision: 208 $
-  Last Revision Date : $Date$
-  License :  GNU General Public License 2.0
-  
-  http://creloaded.com
-  http://creforge.com
-  
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  if (!isset($HTTP_GET_VARS['order_id']) || (isset($HTTP_GET_VARS['order_id']) && !is_numeric($HTTP_GET_VARS['order_id']))) {
-    tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
-  }
-  
-  $customer_info_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '". (int)$HTTP_GET_VARS['order_id'] . "'");
-  $customer_info = tep_db_fetch_array($customer_info_query);
-  if ($customer_info['customers_id'] != $customer_id) {
-    tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_HISTORY_INFO);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
-  $breadcrumb->add(sprintf(NAVBAR_TITLE_3, $HTTP_GET_VARS['order_id']), tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . (int)$HTTP_GET_VARS['order_id'], 'SSL'));
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order($HTTP_GET_VARS['order_id']);
-
-  $content = CONTENT_ACCOUNT_HISTORY_INFO;
-  //$javascript = 'popup_window.js';
- $javascript = 'popup_window_print.js';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account_newsletters.php
===================================================================
--- trunk/direct.openmoko.com/account_newsletters.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_newsletters.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,53 +0,0 @@
-<?php
-/*
-  $Id: account_newsletters.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_NEWSLETTERS);
-
-  $newsletter_query = tep_db_query("select customers_newsletter from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-  $newsletter = tep_db_fetch_array($newsletter_query);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    if (isset($HTTP_POST_VARS['newsletter_general']) && is_numeric($HTTP_POST_VARS['newsletter_general'])) {
-      $newsletter_general = tep_db_prepare_input($HTTP_POST_VARS['newsletter_general']);
-    } else {
-      $newsletter_general = '0';
-    }
-
-    if ($newsletter_general != $newsletter['customers_newsletter']) {
-      $newsletter_general = (($newsletter['customers_newsletter'] == '1') ? '0' : '1');
-
-      tep_db_query("update " . TABLE_CUSTOMERS . " set customers_newsletter = '" . (int)$newsletter_general . "' where customers_id = '" . (int)$customer_id . "'");
-    }
-
-    $messageStack->add_session('account', SUCCESS_NEWSLETTER_UPDATED, 'success');
-
-    tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT_NEWSLETTERS;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account_notifications.php
===================================================================
--- trunk/direct.openmoko.com/account_notifications.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_notifications.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,78 +0,0 @@
-<?php
-/*
-  $Id: account_notifications.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_NOTIFICATIONS);
-
-  $global_query = tep_db_query("select global_product_notifications from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . (int)$customer_id . "'");
-  $global = tep_db_fetch_array($global_query);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    if (isset($HTTP_POST_VARS['product_global']) && is_numeric($HTTP_POST_VARS['product_global'])) {
-      $product_global = tep_db_prepare_input($HTTP_POST_VARS['product_global']);
-    } else {
-      $product_global = '0';
-    }
-
-    (array)$products = $HTTP_POST_VARS['products'];
-
-    if ($product_global != $global['global_product_notifications']) {
-      $product_global = (($global['global_product_notifications'] == '1') ? '0' : '1');
-
-      tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set global_product_notifications = '" . (int)$product_global . "' where customers_info_id = '" . (int)$customer_id . "'");
-    } elseif (sizeof($products) > 0) {
-      $products_parsed = array();
-      for ($i=0, $n=sizeof($products); $i<$n; $i++) {
-        if (is_numeric($products[$i])) {
-          $products_parsed[] = $products[$i];
-        }
-      }
-
-      if (sizeof($products_parsed) > 0) {
-        $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
-        $check = tep_db_fetch_array($check_query);
-
-        if ($check['total'] > 0) {
-          tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
-        }
-      }
-    } else {
-      $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
-      $check = tep_db_fetch_array($check_query);
-
-      if ($check['total'] > 0) {
-        tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
-      }
-    }
-
-    $messageStack->add_session('account', SUCCESS_NOTIFICATIONS_UPDATED, 'success');
-
-    tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT_NOTIFICATIONS;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/account_password.php
===================================================================
--- trunk/direct.openmoko.com/account_password.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/account_password.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,73 +0,0 @@
-<?php
-/*
-  $Id: account_password.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_PASSWORD);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    $password_current = tep_db_prepare_input($HTTP_POST_VARS['password_current']);
-    $password_new = tep_db_prepare_input($HTTP_POST_VARS['password_new']);
-    $password_confirmation = tep_db_prepare_input($HTTP_POST_VARS['password_confirmation']);
-
-    $error = false;
-
-    if (strlen($password_current) < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_password', ENTRY_PASSWORD_CURRENT_ERROR);
-    } elseif (strlen($password_new) < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('account_password', ENTRY_PASSWORD_NEW_ERROR);
-    } elseif ($password_new != $password_confirmation) {
-      $error = true;
-
-      $messageStack->add('account_password', ENTRY_PASSWORD_NEW_ERROR_NOT_MATCHING);
-    }
-
-    if ($error == false) {
-      $check_customer_query = tep_db_query("select customers_password from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-      $check_customer = tep_db_fetch_array($check_customer_query);
-
-      if (tep_validate_password($password_current, $check_customer['customers_password'])) {
-        tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_encrypt_password($password_new) . "' where customers_id = '" . (int)$customer_id . "'");
-
-        tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$customer_id . "'");
-
-        $messageStack->add_session('account', SUCCESS_PASSWORD_UPDATED, 'success');
-
-        tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-      } else {
-        $error = true;
-
-        $messageStack->add('account_password', ERROR_CURRENT_PASSWORD_NOT_MATCHING);
-      }
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL'));
-
-  $content = CONTENT_ACCOUNT_PASSWORD;
-  $javascript = 'form_check.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/add_checkout_success.php
===================================================================
--- trunk/direct.openmoko.com/add_checkout_success.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/add_checkout_success.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,30 +0,0 @@
-<?php
-/*
-  $Id: add_checkout_success.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-//ICW ADDED FOR ORDER_TOTAL CREDIT SYSTEM - Start Addition
-  $gv_query=tep_db_query("select amount from " . TABLE_COUPON_GV_CUSTOMER . " where customer_id='".(int)$HTTP_GET_VARS['customer_id']."'");
-  if ($gv_result=tep_db_fetch_array($gv_query)) {
-    if ($gv_result['amount'] > 0) {
-?>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td align="center" class="main"><?php echo GV_HAS_VOUCHERA; echo tep_href_link(FILENAME_GV_SEND); echo GV_HAS_VOUCHERB; ?></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-<?php
-}}
-//ICW ADDED FOR ORDER_TOTAL CREDIT SYSTEM - End Addition
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/address_book.php
===================================================================
--- trunk/direct.openmoko.com/address_book.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/address_book.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,31 +0,0 @@
-<?php
-/*
-  $Id: address_book.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ADDRESS_BOOK);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-
-  $content = CONTENT_ADDRESS_BOOK;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/address_book_process.php
===================================================================
--- trunk/direct.openmoko.com/address_book_process.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/address_book_process.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,268 +0,0 @@
-<?php
-/*
-  $Id: address_book_process.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ADDRESS_BOOK_PROCESS);
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'deleteconfirm') && isset($HTTP_GET_VARS['delete']) && is_numeric($HTTP_GET_VARS['delete'])) {
-    tep_db_query("delete from " . TABLE_ADDRESS_BOOK . " where address_book_id = '" . (int)$HTTP_GET_VARS['delete'] . "' and customers_id = '" . (int)$customer_id . "'");
-
-    $messageStack->add_session('addressbook', SUCCESS_ADDRESS_BOOK_ENTRY_DELETED, 'success');
-
-    tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-  }
-
-// error checking when updating or adding an entry
-  $process = false;
-  if (isset($HTTP_POST_VARS['action']) && (($HTTP_POST_VARS['action'] == 'process') || ($HTTP_POST_VARS['action'] == 'update'))) {
-    $process = true;
-    $error = false;
-
-    if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-    if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-    $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-    $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-    $street_address = tep_db_prepare_input($HTTP_POST_VARS['street_address']);
-    if (ACCOUNT_SUBURB == 'true') $suburb = tep_db_prepare_input($HTTP_POST_VARS['suburb']);
-    $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-    $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-    $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-    if (ACCOUNT_STATE == 'true') {
-      if (isset($HTTP_POST_VARS['zone_id'])) {
-        $zone_id = tep_db_prepare_input($HTTP_POST_VARS['zone_id']);
-      } else {
-        $zone_id = false;
-      }
-      $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-    }
-
-    if (ACCOUNT_GENDER == 'true') {
-      if ( ($gender != 'm') && ($gender != 'f') ) {
-        $error = true;
-
-        $messageStack->add('addressbook', ENTRY_GENDER_ERROR);
-      }
-    }
-
-    if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_FIRST_NAME_ERROR);
-    }
-
-    if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_LAST_NAME_ERROR);
-    }
-
-    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_STREET_ADDRESS_ERROR);
-    }
-
-    if (strlen($postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_POST_CODE_ERROR);
-    }
-
-    if (strlen($city) < ENTRY_CITY_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_CITY_ERROR);
-    }
-
-    if (!is_numeric($country)) {
-      $error = true;
-
-      $messageStack->add('addressbook', ENTRY_COUNTRY_ERROR);
-    }
-
-    if (ACCOUNT_STATE == 'true') {
-      $zone_id = 0;
-      $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
-      $check = tep_db_fetch_array($check_query);
-      $entry_state_has_zones = ($check['total'] > 0);
-      if ($entry_state_has_zones == true) {
-//State abbreviation bug fix applied DMG 10/1/2004
-//Allows abbreviation of states and does not complain about capitalization
-$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' OR zone_code = '" . tep_db_input($state) . "')");
-        if (tep_db_num_rows($zone_query) == 1) {
-          $zone = tep_db_fetch_array($zone_query);
-          $zone_id = $zone['zone_id'];
-        } else {
-          $error = true;
-
-          $messageStack->add('addressbook', ENTRY_STATE_ERROR_SELECT);
-        }
-      } else {
-        if (strlen($state) < ENTRY_STATE_MIN_LENGTH) {
-          $error = true;
-
-          $messageStack->add('addressbook', ENTRY_STATE_ERROR);
-        }
-      }
-    }
-
-    if ($error == false) {
-      $sql_data_array = array('entry_firstname' => $firstname,
-                              'entry_lastname' => $lastname,
-                              'entry_street_address' => $street_address,
-                              'entry_postcode' => $postcode,
-                              'entry_city' => $city,
-                              'entry_country_id' => (int)$country);
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['entry_gender'] = $gender;
-      if (ACCOUNT_COMPANY == 'true') $sql_data_array['entry_company'] = $company;
-// Eversun mod for sppc and qty price breaks
-      if (ACCOUNT_COMPANY == 'true' && tep_not_null($company_tax_id)) {
-        $sql_data_array['entry_company_tax_id'] = tep_db_prepare_input($company_tax_id);
-      }
-// Eversun mod for sppc and qty price breaks
-      if (ACCOUNT_SUBURB == 'true') $sql_data_array['entry_suburb'] = $suburb;
-      if (ACCOUNT_STATE == 'true') {
-        if ($zone_id > 0) {
-          $sql_data_array['entry_zone_id'] = (int)$zone_id;
-          $sql_data_array['entry_state'] = '';
-        } else {
-          $sql_data_array['entry_zone_id'] = '0';
-          $sql_data_array['entry_state'] = $state;
-        }
-      }
-
-      if ($HTTP_POST_VARS['action'] == 'update') {
-        tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array, 'update', "address_book_id = '" . (int)$HTTP_GET_VARS['edit'] . "' and customers_id ='" . (int)$customer_id . "'");
-// Eversun mod for sppc and qty price breaks
-      if (ACCOUNT_COMPANY == 'true' && tep_not_null($company_tax_id)) {
-        $sql_data_array2['customers_group_ra'] = '1';
-      tep_db_perform(TABLE_CUSTOMERS, $sql_data_array2, 'update', "customers_id ='" . (int)$customer_id . "'");
-
-      // if you would *not* like to have an email when a tax id number has been entered in
-      // the appropriate field, comment out this section. The alert in admin is raised anyway
-
-      $alert_email_text = "Please note that " . $firstname . " " . $lastname . " of the company: " . $company . " has added a tax id number to his account information.";
-      tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, 'Tax id number added', $alert_email_text, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-      }
-//Eversun mod for sppc and qty price breaks
-
-// reregister session variables
-        if ( (isset($HTTP_POST_VARS['primary']) && ($HTTP_POST_VARS['primary'] == 'on')) || ($HTTP_GET_VARS['edit'] == $customer_default_address_id) ) {
-
-          $customer_first_name = $firstname;
-          $customer_country_id = $country_id;
-          $customer_zone_id = (($zone_id > 0) ? (int)$zone_id : '0');
-          $customer_default_address_id = (int)$HTTP_GET_VARS['edit'];
-
-          $sql_data_array = array('customers_firstname' => $firstname,
-                                  'customers_lastname' => $lastname,
-                                  'customers_default_address_id' => (int)$HTTP_GET_VARS['edit']);
-
-          if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
-
-          tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "'");
-        }
-      } else {
-        $sql_data_array['customers_id'] = (int)$customer_id;
-        tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array);
-
-        $new_address_book_id = tep_db_insert_id();
-
-// reregister session variables
-        if (isset($HTTP_POST_VARS['primary']) && ($HTTP_POST_VARS['primary'] == 'on')) {
-          $customer_first_name = $firstname;
-          $customer_country_id = $country_id;
-          $customer_zone_id = (($zone_id > 0) ? (int)$zone_id : '0');
-          if (isset($HTTP_POST_VARS['primary']) && ($HTTP_POST_VARS['primary'] == 'on')) $customer_default_address_id = $new_address_book_id;
-
-          $sql_data_array = array('customers_firstname' => $firstname,
-                                  'customers_lastname' => $lastname);
-
-          if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
-          if (isset($HTTP_POST_VARS['primary']) && ($HTTP_POST_VARS['primary'] == 'on')) $sql_data_array['customers_default_address_id'] = $new_address_book_id;
-
-          tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "'");
-        }
-      }
-
-      $messageStack->add_session('addressbook', SUCCESS_ADDRESS_BOOK_ENTRY_UPDATED, 'success');
-
-      tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-    }
-  }
-
-  if (isset($HTTP_GET_VARS['edit']) && is_numeric($HTTP_GET_VARS['edit'])) {
-    
-// Eversun mod for sppc and qty price breaks
-//  $entry_query = tep_db_query("select entry_gender, entry_company, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_zone_id, entry_country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$HTTP_GET_VARS['edit'] . "'");
-    $entry_query = tep_db_query("select entry_gender, entry_company, entry_company_tax_id, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_zone_id, entry_country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$HTTP_GET_VARS['edit'] . "'");
-// Eversun mod for sppc and qty price breaks
-    if (!tep_db_num_rows($entry_query)) {
-      $messageStack->add_session('addressbook', ERROR_NONEXISTING_ADDRESS_BOOK_ENTRY);
-
-      tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-    }
-
-    $entry = tep_db_fetch_array($entry_query);
-  } elseif (isset($HTTP_GET_VARS['delete']) && is_numeric($HTTP_GET_VARS['delete'])) {
-    if ($HTTP_GET_VARS['delete'] == $customer_default_address_id) {
-      $messageStack->add_session('addressbook', WARNING_PRIMARY_ADDRESS_DELETION, 'warning');
-
-      tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-    } else {
-      $check_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where address_book_id = '" . (int)$HTTP_GET_VARS['delete'] . "' and customers_id = '" . (int)$customer_id . "'");
-      $check = tep_db_fetch_array($check_query);
-
-      if ($check['total'] < 1) {
-        $messageStack->add_session('addressbook', ERROR_NONEXISTING_ADDRESS_BOOK_ENTRY);
-
-        tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-      }
-    }
-  } else {
-    $entry = array();
-  }
-
-  if (!isset($HTTP_GET_VARS['delete']) && !isset($HTTP_GET_VARS['edit'])) {
-    if (tep_count_customer_address_book_entries() >= MAX_ADDRESS_BOOK_ENTRIES) {
-      $messageStack->add_session('addressbook', ERROR_ADDRESS_BOOK_FULL);
-
-      tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-
-  if (isset($HTTP_GET_VARS['edit']) && is_numeric($HTTP_GET_VARS['edit'])) {
-    $breadcrumb->add(NAVBAR_TITLE_MODIFY_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $HTTP_GET_VARS['edit'], 'SSL'));
-  } elseif (isset($HTTP_GET_VARS['delete']) && is_numeric($HTTP_GET_VARS['delete'])) {
-    $breadcrumb->add(NAVBAR_TITLE_DELETE_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $HTTP_GET_VARS['delete'], 'SSL'));
-  } else {
-    $breadcrumb->add(NAVBAR_TITLE_ADD_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'));
-  }
-
-  $content = CONTENT_ADDRESS_BOOK_PROCESS;
-  $javascript = $content . '.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/advanced_search.php
===================================================================
--- trunk/direct.openmoko.com/advanced_search.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/advanced_search.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,25 +0,0 @@
-<?php
-/*
-  $Id: advanced_search.php,v 1.1.1.1 2004/03/04 23:37:53 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ADVANCED_SEARCH);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ADVANCED_SEARCH));
-
-  $content = CONTENT_ADVANCED_SEARCH;
-  $javascript = $content . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/advanced_search_result.php
===================================================================
--- trunk/direct.openmoko.com/advanced_search_result.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/advanced_search_result.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,153 +0,0 @@
-<?php
-/*
-  $Id: advanced_search_result.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Chain Reaction Works, Inc.
-  
-  Copyright &copy; 2005-2006
-  
-  Last Modified By : $Author$
-  Last Modified On : $Date$
-  Latest Revision : $Revision: 2633 $
-  
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ADVANCED_SEARCH);
-
-  $error = false;
-
-  if ( (isset($HTTP_GET_VARS['keywords']) && empty($HTTP_GET_VARS['keywords'])) &&
-       (isset($HTTP_GET_VARS['dfrom']) && (empty($HTTP_GET_VARS['dfrom']) || ($HTTP_GET_VARS['dfrom'] == DOB_FORMAT_STRING))) &&
-       (isset($HTTP_GET_VARS['dto']) && (empty($HTTP_GET_VARS['dto']) || ($HTTP_GET_VARS['dto'] == DOB_FORMAT_STRING))) &&
-       (isset($HTTP_GET_VARS['pfrom']) && !is_numeric($HTTP_GET_VARS['pfrom'])) &&
-       (isset($HTTP_GET_VARS['pto']) && !is_numeric($HTTP_GET_VARS['pto'])) ) {
-    $error = true;
-
-    $messageStack->add_session('search', ERROR_AT_LEAST_ONE_INPUT);
-  } else {
-    $dfrom = '';
-    $dto = '';
-    $pfrom = '';
-    $pto = '';
-    $keywords = '';
-
-    if (isset($HTTP_GET_VARS['dfrom'])) {
-      $dfrom = (($HTTP_GET_VARS['dfrom'] == DOB_FORMAT_STRING) ? '' : $HTTP_GET_VARS['dfrom']);
-    }
-
-    if (isset($HTTP_GET_VARS['dto'])) {
-      $dto = (($HTTP_GET_VARS['dto'] == DOB_FORMAT_STRING) ? '' : $HTTP_GET_VARS['dto']);
-    }
-
-    if (isset($HTTP_GET_VARS['pfrom'])) {
-      $pfrom = $HTTP_GET_VARS['pfrom'];
-    }
-
-    if (isset($HTTP_GET_VARS['pto'])) {
-      $pto = $HTTP_GET_VARS['pto'];
-    }
-    // VJ guest pricing begin
-    // ADDED for ViewPrice
-    if ((tep_not_null($pfrom) || tep_not_null($pto)) && (PRICES_LOGGED_IN == 'true') && (!tep_session_is_registered('customer_id'))){
-      $error = true;
-    //  $messageStack->add_session('search', 'You must be logged in to search for prices.');
-        $messageStack->add_session('search', VIEWPRICE_ERROR);
-    }
-    // END ViewPrice
-    // VJ guest pricing end
-
-    if (isset($HTTP_GET_VARS['keywords'])) {
-      $keywords = $HTTP_GET_VARS['keywords'];
-    }
-
-    $date_check_error = false;
-    if (tep_not_null($dfrom)) {
-      if (!tep_checkdate($dfrom, DOB_FORMAT_STRING, $dfrom_array)) {
-        $error = true;
-        $date_check_error = true;
-
-        $messageStack->add_session('search', ERROR_INVALID_FROM_DATE);
-      }
-    }
-
-    if (tep_not_null($dto)) {
-      if (!tep_checkdate($dto, DOB_FORMAT_STRING, $dto_array)) {
-        $error = true;
-        $date_check_error = true;
-
-        $messageStack->add_session('search', ERROR_INVALID_TO_DATE);
-      }
-    }
-
-    if (($date_check_error == false) && tep_not_null($dfrom) && tep_not_null($dto)) {
-      if (mktime(0, 0, 0, $dfrom_array[1], $dfrom_array[2], $dfrom_array[0]) > mktime(0, 0, 0, $dto_array[1], $dto_array[2], $dto_array[0])) {
-        $error = true;
-
-        $messageStack->add_session('search', ERROR_TO_DATE_LESS_THAN_FROM_DATE);
-      }
-    }
-
-    $price_check_error = false;
-    if (tep_not_null($pfrom)) {
-      if (!settype($pfrom, 'double')) {
-        $error = true;
-        $price_check_error = true;
-
-        $messageStack->add_session('search', ERROR_PRICE_FROM_MUST_BE_NUM);
-      }
-    }
-
-    if (tep_not_null($pto)) {
-      if (!settype($pto, 'double')) {
-        $error = true;
-        $price_check_error = true;
-
-        $messageStack->add_session('search', ERROR_PRICE_TO_MUST_BE_NUM);
-      }
-    }
-
-    if (($price_check_error == false) && is_float($pfrom) && is_float($pto)) {
-      if ($pfrom >= $pto) {
-        $error = true;
-
-        $messageStack->add_session('search', ERROR_PRICE_TO_LESS_THAN_PRICE_FROM);
-      }
-    }
-
-    if (tep_not_null($keywords)) {
-      if (!tep_parse_search_string($keywords, $search_keywords)) {
-        $error = true;
-
-        $messageStack->add_session('search', ERROR_INVALID_KEYWORDS);
-      }
-    }
-  }
-
-  if (empty($dfrom) && empty($dto) && empty($pfrom) && empty($pto) && empty($keywords)) {
-    $error = true;
-
-    $messageStack->add_session('search', ERROR_AT_LEAST_ONE_INPUT);
-  }
-
-  if ($error == true) {
-    tep_redirect(tep_href_link(FILENAME_ADVANCED_SEARCH, tep_get_all_get_params(), 'NONSSL', true, false));
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ADVANCED_SEARCH));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, tep_get_all_get_params(), 'NONSSL', true, false));
-
-  $content = CONTENT_ADVANCED_SEARCH_RESULT;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_affiliate.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_affiliate.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_affiliate.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_affiliate.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $affiliate_username = tep_db_prepare_input($HTTP_POST_VARS['affiliate_username']);
-    $affiliate_password = tep_db_prepare_input($HTTP_POST_VARS['affiliate_password']);
-
-// Check if username exists
-    $check_affiliate_query = tep_db_query("select affiliate_id, affiliate_firstname, affiliate_password, affiliate_email_address from " . TABLE_AFFILIATE . " where affiliate_email_address = '" . tep_db_input($affiliate_username) . "'");
-    if (!tep_db_num_rows($check_affiliate_query)) {
-      $HTTP_GET_VARS['login'] = 'fail';
-    } else {
-      $check_affiliate = tep_db_fetch_array($check_affiliate_query);
-// Check that password is good
-      if (!tep_validate_password($affiliate_password, $check_affiliate['affiliate_password'])) {
-        $HTTP_GET_VARS['login'] = 'fail';
-      } else {
-        $affiliate_id = $check_affiliate['affiliate_id'];
-        tep_session_register('affiliate_id');
-
-        $date_now = date('Ymd');
-
-        tep_db_query("update " . TABLE_AFFILIATE . " set affiliate_date_of_last_logon = now(), affiliate_number_of_logons = affiliate_number_of_logons + 1 where affiliate_id = '" . $affiliate_id . "'");
-
-        tep_redirect(tep_href_link(FILENAME_AFFILIATE_SUMMARY,'','SSL'));
-      }
-    }
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-
-
-  $content = CONTENT_AFFILIATE;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_banners.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,35 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banners.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_BANNERS));
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " order by affiliate_banners_title");
-
-  $content = CONTENT_AFFILIATE_BANNERS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_banners_banners.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_banners.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_banners.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,135 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banners_banners.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_BANNERS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_BANNERS_BANNERS));
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-    <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-  </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="0" cellspacing="0"><td>
-<?php
-  if (tep_db_num_rows($affiliate_banners_values)) {
-
-    while ($affiliate_banners = tep_db_fetch_array($affiliate_banners_values)) {
-      $prod_id = $affiliate_banners['affiliate_products_id'];
-      $ban_id = $affiliate_banners['affiliate_banners_id'];
-      switch (AFFILIATE_KIND_OF_BANNERS) {
-        case 1: // Link to Products
-          if ($prod_id < 1) {
-            $link = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_banners['affiliate_banners_title'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_banners['affiliate_banners_title'] . '"></a>';
-      }
-          break;
-        case 2: // Link to Products
-          if ($prod_id < 1) {
-            $link = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_banners['affiliate_banners_title'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_banners['affiliate_banners_title'] . '"></a>';
-      }
-          break;
-      }
-
-          if ($prod_id < 1) {
-?>
-      <tr>
-        <td><table width="95%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr>
-          <tr>
-            <td class="smallText" align="center"><br><?php echo $link; ?></td>
-          </tr>
-          <tr>
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td>
-          </tr>
-          <tr>
-            <td class="smallText" align="center">
-      <textarea cols="60" rows="4" class="boxText"><?php echo $link1; ?></textarea> 
-   </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-<?php }
-   }
-}
-?>
-          </table>
-   </td>
-      </tr>
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_banners_build.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_build.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_build.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,169 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banners_build.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_BUILD);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD));
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<script type="text/javascript"><!--
-function popupWindow(url) {
-  window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=600,height=300,screenX=150,screenY=150,top=150,left=150')
-}
-//--></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-     </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="95%" align="center" border="0" cellpadding="4" cellspacing="0"><td>
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER . ' ' . $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-          <tr>
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_INFO . tep_draw_form('individual_banner', tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD) ) . "\n" . tep_draw_input_field('individual_banner_id', '', 'size="5"') . "&nbsp;&nbsp;" . tep_image_submit('button_affiliate_build_a_link.gif', IMAGE_BUTTON_BUILD_A_LINK); ?></form></td>
-          </tr>
-     <tr>
-       <td class="smallText" align="center"><?php echo '<a href="javascript:popupWindow(\'' . tep_href_link(FILENAME_AFFILIATE_VALIDPRODUCTS) . '\')"><b>' . TEXT_AFFILIATE_VALIDPRODUCTS . '</b></a>'; ?>&nbsp;&nbsp;<?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_VIEW;?><br><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_HELP;?></td>
-     </tr>
-     <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-<?php
-  if (tep_not_null($HTTP_POST_VARS['individual_banner_id']) || tep_not_null($HTTP_GET_VARS['individual_banner_id'])) {
-
-    if (tep_not_null($HTTP_POST_VARS['individual_banner_id'])) $individual_banner_id = $HTTP_POST_VARS['individual_banner_id'];
-    if ($HTTP_GET_VARS['individual_banner_id']) $individual_banner_id = $HTTP_GET_VARS['individual_banner_id'];
-    $affiliate_pbanners_values = tep_db_query("select p.products_image, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$individual_banner_id . "' and pd.products_id = '" . (int)$individual_banner_id . "' and p.products_status = '1' and pd.language_id = '" . (int)$languages_id . "'");
-    if ($affiliate_pbanners = tep_db_fetch_array($affiliate_pbanners_values)) {
-      switch (AFFILIATE_KIND_OF_BANNERS) {
-        case 1:
-        $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_pbanners['products_image'] . '" border="0" alt="' . $affiliate_pbanners['products_name'] . '"></a>';
-        $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_pbanners['products_image'] . '" border="0" alt="' . $affiliate_pbanners['products_name'] . '"></a>';
-        $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank">' . $affiliate_pbanners['products_name'] . '</a>'; 
-      break; 
-      case 2: 
-   // Link to Products 
-        $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_pbanner_id=' . $individual_banner_id . '" border="0" alt="' . $affiliate_pbanners['products_name'] . '"></a>';
-        $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_pbanner_id=' . $individual_banner_id . '" border="0" alt="' . $affiliate_pbanners['products_name'] . '"></a>';
-        $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank">' . $affiliate_pbanners['products_name'] . '</a>'; 
-      break; 
-     } 
-} 
-?>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_pbanners['products_name']; ?></td>
-          </tr>
-          <tr>
-            <td class="smallText" align="center"><?php echo $link; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="4" class="boxText"><?php echo $link1; ?></textarea> 
-            </td> 
-          </tr> 
-          <tr> 
-            <td>&nbsp;<td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><b>Text Version:</b> <?php echo $link2; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="3" class="boxText"><?php echo $link2; ?></textarea> 
-            </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-<?php
-}
-?>
-   </td></tr>
-   </td>
-      </tr></table>
-   </td>
-      </tr> 
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_banners_build_cat.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_build_cat.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_build_cat.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,188 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banners_build.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_BUILD_CAT);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD_CAT));
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<?php
-// BOF: WebMakers.com Changed: Header Tag Controller v1.0
-if ( file_exists(DIR_WS_INCLUDES . 'header_tags.php') ) {
-    require(DIR_WS_INCLUDES . 'header_tags.php');
-  } else {
-    ?> 
-      <title><?php echo TITLE; ?></title>
-      <?php
-    }
-    if (DISPLAY_DHTML_MENU == 'CoolMenu') {
-        echo '<script type="text/javascript" SRC="includes/coolMenu.js"></SCRIPT>';
-      }
-      // EOF: WebMakers.com Changed: Header Tag Controller v1.0
-      ?>
-    
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<script type="text/javascript"><!--
-function popupWindow(url) {
-  window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=600,height=300,screenX=150,screenY=150,top=150,left=150')
-}
-//--></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<?php 
-if (DISPLAY_DHTML_MENU == 'CoolMenu') {
-    require(DIR_WS_INCLUDES . 'coolmenu.php'); 
-  }
-  ?>
-  <!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-     </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="95%" align="center" border="0" cellpadding="4" cellspacing="0"><td>
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER . ' ' . $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-          <tr>
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_INFO . tep_draw_form('individual_banner', tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD_CAT) ) . "\n" . tep_draw_input_field('individual_banner_id', '', 'size="5"') . "&nbsp;&nbsp;" . tep_image_submit('button_affiliate_build_a_link.gif', IMAGE_BUTTON_BUILD_A_LINK); ?></form></td>
-          </tr>
-     <tr>
-       <td class="smallText" align="center"><?php echo '<a href="javascript:popupWindow(\'' . tep_href_link(FILENAME_AFFILIATE_VALIDCATS) . '\')"><b>' . TEXT_AFFILIATE_VALIDPRODUCTS . '</b></a>'; ?>&nbsp;&nbsp;<?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_VIEW;?><br><?php echo TEXT_AFFILIATE_INDIVIDUAL_BANNER_HELP;?></td>
-     </tr>
-     <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-<?php
-  if (tep_not_null($HTTP_POST_VARS['individual_banner_id']) || tep_not_null($HTTP_GET_VARS['individual_banner_id'])) {
-
-    if (tep_not_null($HTTP_POST_VARS['individual_banner_id'])) $individual_banner_id = $HTTP_POST_VARS['individual_banner_id'];
-    if ($HTTP_GET_VARS['individual_banner_id']) $individual_banner_id = $HTTP_GET_VARS['individual_banner_id'];
-    $affiliate_pbanners_values = tep_db_query("select c.categories_image, cd.categories_name from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$individual_banner_id . "' and cd.categories_id = '" . (int)$individual_banner_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-    if ($affiliate_pbanners = tep_db_fetch_array($affiliate_pbanners_values)) {
-      switch (AFFILIATE_KIND_OF_BANNERS) {
-        case 1:
-        $link = '<a href="' . HTTPS_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_pbanners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_pbanners['categories_name'] . '"></a>';
-        $link1 = '<a href="' . HTTP_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_pbanners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_pbanners['categories_name'] . '"></a>';
-        $link2 = '<a href="' . HTTP_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank">' . $affiliate_pbanners['categories_name'] . '</a>'; 
-      break; 
-      case 2: 
-   // Link to Products 
-        $link = '<a href="' . HTTPS_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_pbanner_id=' . $individual_banner_id . '" border="0" alt="' . $affiliate_pbanners['categories_name'] . '"></a>';
-        $link1 = '<a href="' . HTTP_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_pbanner_id=' . $individual_banner_id . '" border="0" alt="' . $affiliate_pbanners['categories_name'] . '"></a>';
-        $link2 = '<a href="' . HTTP_SERVER . DIR_WS_HTTP_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&cPath=' . $individual_banner_id . '&affiliate_banner_id=1" target="_blank">' . $affiliate_pbanners['categories_name'] . '</a>'; 
-      break; 
-     } 
-} 
-?>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_pbanners['categories_name']; ?></td>
-          </tr>
-          <tr>
-            <td class="smallText" align="center"><?php echo $link; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="4" class="boxText"><?php echo $link1; ?></textarea> 
-            </td> 
-          </tr> 
-          <tr> 
-            <td><td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><b><!-- Text Version: --><?php echo TEXT_VERSION;?></b> <?php echo $link2; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="3" class="boxText"><?php echo $link2; ?></textarea> 
-            </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-<?php
-}
-?>
-   </td></tr>
-   </td>
-      </tr></table>
-   </td>
-      </tr> 
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_banners_category.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_category.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_category.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,174 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banner_category.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_CATEGORY);
-
-  $location = ' &raquo; <a href="' . tep_href_link(FILENAME_AFFILIATE_BANNERS_CATEGORY, '', 'NONSSL') . '" class="headerNavigation">' . NAVBAR_TITLE . '</a>';
-
-// $affiliate_values = tep_db_query("select * from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " where affiliate_category_id >'0' order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<?php
-// BOF: WebMakers.com Changed: Header Tag Controller v1.0
-if ( file_exists(DIR_WS_INCLUDES . 'header_tags.php') ) {
-    require(DIR_WS_INCLUDES . 'header_tags.php');
-  } else {
-    ?> 
-      <title><?php echo TITLE; ?></title>
-      <?php
-    }
-    if (DISPLAY_DHTML_MENU == 'CoolMenu') {
-        echo '<SCRIPT LANGUAGE="JavaScript1.2" SRC="includes/coolMenu.js"></SCRIPT>';
-      }
-      // EOF: WebMakers.com Changed: Header Tag Controller v1.0
-      ?>
-    
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<?php 
-if (DISPLAY_DHTML_MENU == 'CoolMenu') {
-    require(DIR_WS_INCLUDES . 'coolmenu.php'); 
-  }
-  ?>
-  <!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-    <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-  </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="0" cellspacing="0"><td>
-<?php
-  if (tep_db_num_rows($affiliate_banners_values)) {
-
-    while ($affiliate_banners = tep_db_fetch_array($affiliate_banners_values)) {
-      $affiliate_categories_query = tep_db_query("select categories_name from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . $affiliate_banners['affiliate_category_id'] . "' and language_id = '" . (int)$languages_id . "'");
-      $affiliate_categories = tep_db_fetch_array($affiliate_categories_query);
-      $prod_id = $affiliate_banners['affiliate_category_id'];
-      $ban_id = $affiliate_banners['affiliate_banners_id'];
-      switch (AFFILIATE_KIND_OF_BANNERS) {
-        case 1: // Link to Categories
-          if ($prod_id > 0) {
-            $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_categories['categories_name'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_categories['categories_name'] . '"></a>';
-            $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $affiliate_categories['categories_name'] . '</a>';
-      }
-          break;
-        case 2: // Link to Categories
-          if ($prod_id > 0) {
-            $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_categories['categories_name'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_categories['categories_name'] . '"></a>';
-            $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_CATEGORIES_INFO . '?ref=' . $affiliate_id . '&cPath=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $affiliate_categories['categories_name'] . '</a>';
-      }
-          break;
-      }
-
-          if ($prod_id > 0) {
-?>
-        <table width="95%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr>
-          <tr> 
-            <td class="smallText" align="center"><?php echo $link; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="4" class="boxText"><?php echo $link1; ?></textarea> 
-   </td> 
-          </tr> 
-          <tr> 
-            <td>&nbsp;<td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><b><?php echo TEXT_VERSION;?></b> <?php echo $link2; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="3" class="boxText"><?php echo $link2; ?></textarea> 
-   </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-
-<?php }
-}
-}
-?>
-          </table>
-   </td>
-      </tr>
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_banners_product.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_product.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_product.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,155 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banner_product.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_PRODUCT);
-
-  $location = ' &raquo; <a href="' . tep_href_link(FILENAME_AFFILIATE_BANNERS_PRODUCT, '', 'NONSSL') . '" class="headerNavigation">' . NAVBAR_TITLE . '</a>';
-
-// $affiliate_values = tep_db_query("select * from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " where affiliate_products_id >'0' order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-    <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-  </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="0" cellspacing="0"><td>
-<?php
-  if (tep_db_num_rows($affiliate_banners_values)) {
-
-    while ($affiliate_banners = tep_db_fetch_array($affiliate_banners_values)) {
-      $affiliate_products_query = tep_db_query("select products_name from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id = '" . $affiliate_banners['affiliate_products_id'] . "' and language_id = '" . (int)$languages_id . "'");
-      $affiliate_products = tep_db_fetch_array($affiliate_products_query);
-      $prod_id = $affiliate_banners['affiliate_products_id'];
-      $ban_id = $affiliate_banners['affiliate_banners_id'];
-      switch (AFFILIATE_KIND_OF_BANNERS) {
-        case 1: // Link to Products
-          if ($prod_id > 0) {
-            $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_products['products_name'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0" alt="' . $affiliate_products['products_name'] . '"></a>';
-            $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $affiliate_products['products_name'] . '</a>';
-      }
-          break;
-        case 2: // Link to Products
-          if ($prod_id > 0) {
-            $link = '<a href="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTPS_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_products['products_name'] . '"></a>';
-            $link1 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0" alt="' . $affiliate_products['products_name'] . '"></a>';
-            $link2 = '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $affiliate_products['products_name'] . '</a>';
-      }
-          break;
-      }
-
-          if ($prod_id > 0) {
-?>
-        <table width="95%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr>
-          <tr> 
-            <td class="smallText" align="center"><?php echo $link; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="4" class="boxText"><?php echo $link1; ?></textarea> 
-   </td> 
-          </tr> 
-          <tr> 
-            <td>&nbsp;<td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><b><?php echo TEXT_VERSION;?></b> <?php echo $link2; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="60" rows="3" class="boxText"><?php echo $link2; ?></textarea> 
-   </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-
-<?php }
-}
-}
-?>
-          </table>
-   </td>
-      </tr>
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_banners_text.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_banners_text.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_banners_text.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,148 +0,0 @@
-<?php
-/*
-  $Id: affiliate_banners_text.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_TEXT);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_BANNERS_TEXT));
-
-  $affiliate_banners_values = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS . " order by affiliate_banners_title");
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" height="28" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td width="100%"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_links.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-    <tr>
-            <td colspan=2 class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table>
-  </td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table width="100%" align="center" border="0" cellpadding="0" cellspacing="0"><td>
-<?php 
-if (tep_db_num_rows($affiliate_banners_values)) { 
-
-   while ($affiliate_banners = tep_db_fetch_array($affiliate_banners_values)) { 
-$prod_id=$affiliate_banners['affiliate_products_id']; 
-$prod_name=$affiliate_banners['affiliate_banners_title']; 
-$ban_id=$affiliate_banners['affiliate_banners_id']; 
-    switch (AFFILIATE_KIND_OF_BANNERS) { 
-     case 1: 
-   // Link to Products 
-   if ($prod_id>0) { 
-
-    $link= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0"></a>'; 
-    $link2= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $prod_name . '</a>'; 
-   } 
-   // generic_link 
-   else { 
-    $link= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . DIR_WS_IMAGES . $affiliate_banners['affiliate_banners_image'] . '" border="0"></a>'; 
-    $link2= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $prod_name . '</a>'; 
-             } 
-   break; 
-  case 2: 
-   // Link to Products 
-   if ($prod_id>0) { 
-
-    $link= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0"></a>'; 
-    $link2= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?ref=' . $affiliate_id . '&products_id=' . $prod_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $prod_name . '</a>'; 
-   } 
-   // generic_link 
-   else { 
-    $link= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank"><img src="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE_SHOW_BANNER . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" border="0"></a>'; 
-    $link2= '<a href="' . HTTP_SERVER . DIR_WS_CATALOG . FILENAME_DEFAULT . '?ref=' . $affiliate_id . '&affiliate_banner_id=' . $ban_id . '" target="_blank">' . $prod_name . '</a>'; 
-             } 
-   break;  
-     } 
-
-?>
-        <table width="95%" align="center" border="0" cellpadding="4" cellspacing="0" class="infoBoxContents">
-          <tr>
-            <td class="infoBoxHeading" align="center"><?php echo TEXT_AFFILIATE_NAME; ?>&nbsp;<?php echo $affiliate_banners['affiliate_banners_title']; ?></td>
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><b><?php echo TEXT_VERSION;?></b> <?php echo $link2; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"><?php echo TEXT_AFFILIATE_INFO; ?></td> 
-          </tr> 
-          <tr> 
-            <td class="smallText" align="center"> 
-             <textarea cols="50" rows="3" class="boxText"><?php echo $link2; ?></textarea> 
-   </td> 
-          </tr>
-          </table>
-<?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?>
-<?php
-   }
-}
-?>
-          </table>
-   </td>
-      </tr>
-     </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_clicks.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_clicks.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_clicks.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,56 +0,0 @@
-<?php
-/*
-  $Id: affiliate_clicks.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_CLICKS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_CLICKS, '', 'SSL'));
-/*
-  $affiliate_clickthroughs_raw = "
-  select a.*, pd.products_name from
-    " . TABLE_AFFILIATE_CLICKTHROUGHS . " a, 
-    " . TABLE_PRODUCTS . " p ,
-    " . TABLE_PRODUCTS_DESCRIPTION . " pd 
-    where a.affiliate_id = '" . $affiliate_id . "' and
-    a.affiliate_products_id = p.products_id and
-    p.products_id = pd.products_id and
-    pd.language_id = '" . $languages_id . "'
-    ORDER BY a.affiliate_clientdate desc
-    ";
-*/
-  $affiliate_clickthroughs_raw = "select ac.*, pd.products_name from
-" . TABLE_AFFILIATE_CLICKTHROUGHS . " ac left join 
-" . TABLE_PRODUCTS . " p on ac.affiliate_products_id = p.products_id left join
-" . TABLE_PRODUCTS_DESCRIPTION . " pd on pd.products_id = p.products_id and pd.language_id = '" . $languages_id . "'
-where
-ac.affiliate_id = '" .$affiliate_id . "'
-ORDER BY ac.affiliate_clientdate desc";
-
-  $affiliate_clickthroughs_split = new splitPageResults($affiliate_clickthroughs_raw, MAX_DISPLAY_SEARCH_RESULTS);
-
-  $content = CONTENT_AFFILIATE_CLICKS;
-  $javascript = CONTENT_AFFILIATE_SUMMARY . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_contact.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_contact.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_contact.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,47 +0,0 @@
-<?php
-/*
-  $Id: affiliate_contact.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_CONTACT);
-
-  $error = false;
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'send')) {
-    if (tep_validate_email(trim($HTTP_POST_VARS['email']))) {
-      tep_mail(STORE_OWNER, AFFILIATE_EMAIL_ADDRESS, EMAIL_SUBJECT, $HTTP_POST_VARS['enquiry'], $HTTP_POST_VARS['name'], $HTTP_POST_VARS['email']);
-      tep_redirect(tep_href_link(FILENAME_AFFILIATE_CONTACT, 'action=success'));
-    } else {
-      $error = true;
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_CONTACT));
-
-  $affiliate_values = tep_db_query("select * from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-  $affiliate = tep_db_fetch_array($affiliate_values);
-
-  $content = CONTENT_AFFILIATE_CONTACT;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/affiliate_details.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_details.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_details.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,283 +0,0 @@
-<?php
-/*
-  $Id: affiliate_details.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-  
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_DETAILS);
-
-  if (isset($HTTP_POST_VARS['action'])) {
-    $a_gender = tep_db_prepare_input($HTTP_POST_VARS['a_gender']);
-    $a_firstname = tep_db_prepare_input($HTTP_POST_VARS['a_firstname']);
-    $a_lastname = tep_db_prepare_input($HTTP_POST_VARS['a_lastname']);
-    $a_dob = tep_db_prepare_input($HTTP_POST_VARS['a_dob']);
-    $a_email_address = tep_db_prepare_input($HTTP_POST_VARS['a_email_address']);
-    $a_company = tep_db_prepare_input($HTTP_POST_VARS['a_company']);
-    $a_company_taxid = tep_db_prepare_input($HTTP_POST_VARS['a_company_taxid']);
-    $a_payment_check = tep_db_prepare_input($HTTP_POST_VARS['a_payment_check']);
-    $a_payment_paypal = tep_db_prepare_input($HTTP_POST_VARS['a_payment_paypal']);
-    $a_payment_bank_name = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_name']);
-    $a_payment_bank_branch_number = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_branch_number']);
-    $a_payment_bank_swift_code = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_swift_code']);
-    $a_payment_bank_account_name = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_account_name']);
-    $a_payment_bank_account_number = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_account_number']);
-    $a_street_address = tep_db_prepare_input($HTTP_POST_VARS['a_street_address']);
-    $a_suburb = tep_db_prepare_input($HTTP_POST_VARS['a_suburb']);
-    $a_postcode = tep_db_prepare_input($HTTP_POST_VARS['a_postcode']);
-    $a_city = tep_db_prepare_input($HTTP_POST_VARS['a_city']);
-    $a_country=tep_db_prepare_input($HTTP_POST_VARS['a_country']);
-    $a_zone_id = tep_db_prepare_input($HTTP_POST_VARS['a_zone_id']);
-    $a_state = tep_db_prepare_input($HTTP_POST_VARS['a_state']);
-    $a_telephone = tep_db_prepare_input($HTTP_POST_VARS['a_telephone']);
-    $a_fax = tep_db_prepare_input($HTTP_POST_VARS['a_fax']);
-    $a_homepage = tep_db_prepare_input($HTTP_POST_VARS['a_homepage']);
-    $a_password = tep_db_prepare_input($HTTP_POST_VARS['a_password']);
-
-    $error = false; // reset error flag
-
-    if (ACCOUNT_GENDER == 'true') {
-      if (($a_gender == 'm') || ($a_gender == 'f')) {
-        $entry_gender_error = false;
-      } else {
-        $error = true;
-        $entry_gender_error = true;
-      }
-    }
-
-    if (strlen($a_firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-      $error = true;
-      $entry_firstname_error = true;
-    } else {
-      $entry_firstname_error = false;
-    }
-
-    if (strlen($a_lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-      $error = true;
-      $entry_lastname_error = true;
-    } else {
-      $entry_lastname_error = false;
-    }
-
-    if (ACCOUNT_DOB == 'true') {
-      if (checkdate(substr(tep_date_raw($a_dob), 4, 2), substr(tep_date_raw($a_dob), 6, 2), substr(tep_date_raw($a_dob), 0, 4))) {
-        $entry_date_of_birth_error = false;
-      } else {
-        $error = true;
-        $entry_date_of_birth_error = true;
-      }
-    }
-  
-    if (strlen($a_email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-      $error = true;
-      $entry_email_address_error = true;
-    } else {
-      $entry_email_address_error = false;
-    }
-
-    if (!tep_validate_email($a_email_address)) {
-      $error = true;
-      $entry_email_address_check_error = true;
-    } else {
-      $entry_email_address_check_error = false;
-    }
-
-    if (strlen($a_street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-      $error = true;
-      $entry_street_address_error = true;
-    } else {
-      $entry_street_address_error = false;
-    }
-  
-    if (strlen($a_postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-      $error = true;
-      $entry_post_code_error = true;
-    } else {
-      $entry_post_code_error = false;
-    } 
-
-    if (strlen($a_city) < ENTRY_CITY_MIN_LENGTH) {
-      $error = true;
-      $entry_city_error = true;
-    } else {
-      $entry_city_error = false;
-    }
-
-    if (!$a_country) {
-      $error = true;
-      $entry_country_error = true;
-    } else {
-      $entry_country_error = false;
-    }
-
-    if (ACCOUNT_STATE == 'true') {
-      if ($entry_country_error) {
-        $entry_state_error = true;
-      } else {
-        $a_zone_id = 0;
-        $entry_state_error = false;
-        $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "'");
-        $check_value = tep_db_fetch_array($check_query);
-        $entry_state_has_zones = ($check_value['total'] > 0);
-        if ($entry_state_has_zones) {
-          $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "' and zone_name = '" . tep_db_input($a_state) . "'");
-          if (tep_db_num_rows($zone_query) == 1) {
-            $zone_values = tep_db_fetch_array($zone_query);
-            $a_zone_id = $zone_values['zone_id'];
-          } else {
-            $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "' and zone_code = '" . tep_db_input($a_state) . "'");
-            if (tep_db_num_rows($zone_query) == 1) {
-              $zone_values = tep_db_fetch_array($zone_query);
-              $a_zone_id = $zone_values['zone_id'];
-            } else {
-              $error = true;
-              $entry_state_error = true;
-            }
-          }
-        } else {
-          if (!$a_state) {
-            $error = true;
-            $entry_state_error = true;
-          }
-        }
-      }
-    }
-
-    if (strlen($a_telephone) < ENTRY_TELEPHONE_MIN_LENGTH) {
-      $error = true;
-      $entry_telephone_error = true;
-    } else {
-      $entry_telephone_error = false;
-    }
-
-    $passlen = strlen($a_password);
-    if ($passlen < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-      $entry_password_error = true;
-    } else {
-      $entry_password_error = false;
-    }
-
-    if ($a_password != $a_confirmation) {
-      $error = true;
-      $entry_password_error = true;
-    }
-
-    $check_email_query = tep_db_query("select count(*) as total from " . TABLE_AFFILIATE . " where affiliate_email_address = '" .  tep_db_input($a_email_address) . "' and affiliate_id != '" . tep_db_input($affiliate_id) . "'");
-    $check_email = tep_db_fetch_array($check_email_query);
-    if ($check_email['total'] > 0) {
-      $error = true;
-      $entry_email_address_exists = true;
-    } else {
-      $entry_email_address_exists = false;
-    }
-
-    // Check Suburb
-    $entry_suburb_error = false;
-
-    // Check Fax
-    $entry_fax_error = false;
-
-    if (!affiliate_check_url($a_homepage)) {
-      $error = true;
-      $entry_homepage_error = true;
-    } else {
-      $entry_homepage_error = false;
-    }
-
-    if (!$a_agb) {
-    $error=true;
-    $entry_agb_error=true;
-    }
-
-    // Check Company 
-    $entry_company_error = false;
-    $entry_company_taxid_error = false;
-
-    // Check Payment
-    $entry_payment_check_error = false;
-    $entry_payment_paypal_error = false;
-    $entry_payment_bank_name_error = false;
-    $entry_payment_bank_branch_number_error = false;
-    $entry_payment_bank_swift_code_error = false;
-    $entry_payment_bank_account_name_error = false;
-    $entry_payment_bank_account_number_error = false;
-
-    if (!$error) {
-
-      $sql_data_array = array('affiliate_firstname' => $a_firstname,
-                              'affiliate_lastname' => $a_lastname,
-                              'affiliate_email_address' => $a_email_address,
-                              'affiliate_payment_check' => $a_payment_check,
-                              'affiliate_payment_paypal' => $a_payment_paypal,
-                              'affiliate_payment_bank_name' => $a_payment_bank_name,
-                              'affiliate_payment_bank_branch_number' => $a_payment_bank_branch_number,
-                              'affiliate_payment_bank_swift_code' => $a_payment_bank_swift_code,
-                              'affiliate_payment_bank_account_name' => $a_payment_bank_account_name,
-                              'affiliate_payment_bank_account_number' => $a_payment_bank_account_number,
-                              'affiliate_street_address' => $a_street_address,
-                              'affiliate_postcode' => $a_postcode,
-                              'affiliate_city' => $a_city,
-                              'affiliate_country_id' => $a_country,
-                              'affiliate_telephone' => $a_telephone,
-                              'affiliate_fax' => $a_fax,
-                              'affiliate_homepage' => $a_homepage,
-                              'affiliate_password' => tep_encrypt_password($a_password),
-                              'affiliate_agb' => '1');
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['affiliate_gender'] = $a_gender;
-      if (ACCOUNT_DOB == 'true') $sql_data_array['affiliate_dob'] = tep_date_raw($a_dob);
-      if (ACCOUNT_COMPANY == 'true') {
-        $sql_data_array['affiliate_company'] = $a_company;
-        $sql_data_array['affiliate_company_taxid'] = $a_company_taxid;
-      }
-      if (ACCOUNT_SUBURB == 'true') $sql_data_array['affiliate_suburb'] = $a_suburb;
-      if (ACCOUNT_STATE == 'true') {
-        if ($a_zone_id > 0) {
-          $sql_data_array['affiliate_zone_id'] = $a_zone_id;
-          $sql_data_array['affiliate_state'] = '';
-        } else {
-          $sql_data_array['affiliate_zone_id'] = '0';
-          $sql_data_array['affiliate_state'] = $a_state;
-        }
-      }
-
-      $sql_data_array['affiliate_date_account_last_modified'] = 'now()';
-
-      tep_db_perform(TABLE_AFFILIATE, $sql_data_array, 'update', "affiliate_id = '" . tep_db_input($affiliate_id) . "'");
-
-      tep_redirect(tep_href_link(FILENAME_AFFILIATE_DETAILS_OK, '', 'SSL'));
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE_DETAILS, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_AFFILIATE_DETAILS, '', 'SSL'));
-
-
-  $affiliate_query = tep_db_query("select * from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-  $affiliate = tep_db_fetch_array($affiliate_query);
-
-
-  $content = CONTENT_AFFILIATE_DETAILS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/affiliate_details_ok.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_details_ok.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_details_ok.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,28 +0,0 @@
-<?php
-/*
-  $Id: affiliate_details_ok.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_DETAILS_OK);
-
- $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_DETAILS_OK));
-
- $content = CONTENT_AFFILIATE_SIGNUP_OK ;
-
-require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-?>

Deleted: trunk/direct.openmoko.com/affiliate_faq.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_faq.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_faq.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,35 +0,0 @@
-<?php
-
-/*
-
-  $Id: affiliate_faq.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-  OSC-Affiliate
-
-  Contribution based on:
-  osCommerce, Open Source E-Commerce Solutions
-
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-  Released under the GNU General Public License
-
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_FAQ);
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_FAQ));
-
-  $content = CONTENT_AFFILIATE_FAQ; 
-
-  $content_template = TEMPLATENAME_STATIC;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-
-?>

Deleted: trunk/direct.openmoko.com/affiliate_help1.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help1.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help1.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help1.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_IMPRESSIONS_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help10.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help10.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help10.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_CLICKS);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_CLICKTHROUGH_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_CLICKED_PRODUCT_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help11.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help11.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help11.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_CLICKS);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_CLICKTHROUGH_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_REFFERED_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help12.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help12.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help12.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_DATE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help13.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help13.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help13.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_SALE_VALUE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help14.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help14.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help14.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_COMMISSION_RATE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help15.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help15.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help15.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_COMMISSION_VALUE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help16.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help16.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help16.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_STATUS_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help17.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help17.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help17.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SUMMARY_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_CLICKTHROUGH_RATE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help18.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help18.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help18.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SUMMARY_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_PAY_PER_SALE_RATE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_help19.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help19.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help19.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_PAYMENT_ID
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_help2.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help2.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help2.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help2.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_VISITS_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help20.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help20.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help20.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_SALES_PAYMENT_DATE
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_help21.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help21.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help21.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_SALES_PAYMENT_Ammount
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_help22.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help22.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help22.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_SALES_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_PAYMENT_STATUS
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_help3.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help3.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help3.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help3.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_TRANSACTIONS_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help4.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help4.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help4.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help4.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_CONVERSION_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help5.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help5.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help5.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,58 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help5.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Chain Reaction Works, Inc. 
-  
-  $Author$
-  $Date$
-  $Revision: 1940 $ 
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_AMOUNT_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help6.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help6.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help6.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help6.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_AVERAGE_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help7.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help7.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help7.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help7.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_COMMISSION_RATE_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help8.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help8.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help8.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => HEADING_SUMMARY_HELP);
-
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_COMMISSION_HELP);
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_help9.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_help9.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_help9.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_help8.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_CLICKS);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => HEADING_CLICKTHROUGH_HELP
-                              );
-  new infoBoxHeading($info_box_contents, true, true);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_DATE_HELP
-                              );
-
-  new infoBox($info_box_contents);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_info.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,31 +0,0 @@
-<?php
-
-/*
-  $Id: affiliate_info.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-  OSC-Affiliate
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_INFO);
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_INFO));
-
-  $content = CONTENT_AFFILIATE_INFO; 
-
-  $content_template = TEMPLATENAME_STATIC;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-
-?>
-

Deleted: trunk/direct.openmoko.com/affiliate_logout.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_logout.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_logout.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,57 +0,0 @@
-<?php
-
-/*
-
-  $Id: affiliate_logout.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-
-
-  OSC-Affiliate
-
-
-
-  Contribution based on:
-
-
-
-  osCommerce, Open Source E-Commerce Solutions
-
-  http://www.oscommerce.com
-
-
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-
-
-  Released under the GNU General Public License
-
-*/
-
-
-
-
-
-  require('includes/application_top.php');
-
-
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_LOGOUT);
-
-
-
-  $breadcrumb->add(NAVBAR_TITLE);
-
-
-
-  $content = affiliate_logout; 
-
-
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-
-?>

Deleted: trunk/direct.openmoko.com/affiliate_news.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_news.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_news.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,96 +0,0 @@
-<?php
-/*
-  $Id: affiliate_news.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_NEWS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_NEWS));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_news.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
- <tr>
-   <td><br><?php include(DIR_WS_MODULES . FILENAME_AFFILIATE_NEWS); ?></td>
- </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-        </table></td>
-      </tr>
-    </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_newsletter.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_newsletter.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_newsletter.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,163 +0,0 @@
-<?php
-/*
-  $Id: affiliate_newsletter.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_NEWSLETTER);
-
-  $newsletter_query = tep_db_query("select affiliate_newsletter from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-  $newsletter = tep_db_fetch_array($newsletter_query);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    if (isset($HTTP_POST_VARS['newsletter_affiliate']) && is_numeric($HTTP_POST_VARS['newsletter_affiliate'])) {
-      $newsletter_affiliate = tep_db_prepare_input($HTTP_POST_VARS['newsletter_affiliate']);
-    } else {
-      $newsletter_affiliate = '0';
-    }
-
-    if ($newsletter_affiliate != $newsletter['affiliate_newsletter']) {
-      $newsletter_affiliate = (($newsletter['affiliate_newsletter'] == '1') ? '0' : '1');
-
-      tep_db_query("update " . TABLE_AFFILIATE . " set affiliate_newsletter = '" . (int)$newsletter_affiliate . "' where affiliate_id = '" . (int)$affiliate_id . "'");
-    }
-
-    $messageStack->add_session('account', SUCCESS_NEWSLETTER_UPDATED, 'success');
-
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE_SUMMARY, '', 'SSL'));
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE_SUMMARY, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_AFFILIATE_NEWSLETTER, '', 'SSL'));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<script type="text/javascript"><!--
-function rowOverEffect(object) {
-  if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
-  if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-
-function checkBox(object) {
-  document.account_newsletter.elements[object].checked = !document.account_newsletter.elements[object].checked;
-}
-//--></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_AFFILIATE_NEWSLETTER, '', 'SSL')) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_notifications.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td class="main"><b><?php echo MY_NEWSLETTERS_TITLE; ?></b></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-                <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-                  <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('newsletter_affiliate')">
-                    <td class="main"><?php echo tep_draw_checkbox_field('newsletter_affiliate', '1', (($newsletter['affiliate_newsletter'] == '1') ? true : false), 'onclick="checkBox(\'newsletter_affiliate\')"'); ?></td>
-                    <td class="main"><b><?php echo MY_NEWSLETTERS_AFFILIATE_NEWSLETTER; ?></b></td>
-                  </tr>
-                  <tr>
-                    <td class="main">&nbsp;</td>
-                    <td><table border="0" cellspacing="0" cellpadding="2">
-                      <tr>
-                        <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-                        <td class="main"><?php echo MY_NEWSLETTERS_AFFILIATE_NEWSLETTER_DESCRIPTION; ?></td>
-                        <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-                      </tr>
-                    </table></td>
-                  </tr>
-                </table></td>
-                <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-                <td><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_SUMMARY, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
-                <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
-                <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-      </tr>
-    </table></form></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_password.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_password.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_password.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,185 +0,0 @@
-<?php
-/*
-  $Id: affiliate_password.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_PASSWORD);
-
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    $password_current = tep_db_prepare_input($HTTP_POST_VARS['password_current']);
-    $password_new = tep_db_prepare_input($HTTP_POST_VARS['password_new']);
-    $password_confirmation = tep_db_prepare_input($HTTP_POST_VARS['password_confirmation']);
-
-    $error = false;
-
-    if (strlen($password_current) < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('a_password', ENTRY_PASSWORD_CURRENT_ERROR);
-    } elseif (strlen($password_new) < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('a_password', ENTRY_PASSWORD_NEW_ERROR);
-    } elseif ($password_new != $password_confirmation) {
-      $error = true;
-
-      $messageStack->add('a_password', ENTRY_PASSWORD_NEW_ERROR_NOT_MATCHING);
-    }
-
-    if ($error == false) {
-      $check_affiliate_query = tep_db_query("select affiliate_password from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-      $check_affiliate = tep_db_fetch_array($check_affiliate_query);
-
-      if (tep_validate_password($password_current, $check_affiliate['affiliate_password'])) {
-        tep_db_query("update " . TABLE_AFFILIATE . " set affiliate_password = '" . tep_encrypt_password($password_new) . "' where affiliate_id = '" . (int)$affiliate_id . "'");
-
-        $messageStack->add_session('account', SUCCESS_PASSWORD_UPDATED, 'success');
-
-        tep_redirect(tep_href_link(FILENAME_AFFILIATE_SUMMARY, '', 'SSL'));
-      } else {
-        $error = true;
-
-        $messageStack->add('a_password', ERROR_CURRENT_PASSWORD_NOT_MATCHING);
-      }
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_AFFILIATE_PASSWORD, '', 'SSL'));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<?php require('includes/form_check.js.php'); ?>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><?php echo tep_draw_form('a_password', tep_href_link(FILENAME_AFFILIATE_PASSWORD, '', 'SSL'), 'post', 'onSubmit="return check_form(a_password);"') . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-<?php
-  if ($messageStack->size('a_password') > 0) {
-?>
-      <tr>
-        <td><?php echo $messageStack->output('a_password'); ?></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-<?php
-  }
-?>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td class="main"><b><?php echo MY_PASSWORD_TITLE; ?></b></td>
-                <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
-              </tr>
-            </table></td>
-          </tr>
-          <tr>
-            <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-              <tr class="infoBoxContents">
-                <td><table border="0" cellspacing="2" cellpadding="2">
-                  <tr>
-                    <td class="main"><?php echo ENTRY_PASSWORD_CURRENT; ?></td>
-                    <td class="main"><?php echo tep_draw_password_field('password_current') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CURRENT_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CURRENT_TEXT . '</span>': ''); ?></td>
-                  </tr>
-                  <tr>
-                    <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-                  </tr>
-                  <tr>
-                    <td class="main"><?php echo ENTRY_PASSWORD_NEW; ?></td>
-                    <td class="main"><?php echo tep_draw_password_field('password_new') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_NEW_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_NEW_TEXT . '</span>': ''); ?></td>
-                  </tr>
-                  <tr>
-                    <td class="main"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></td>
-                    <td class="main"><?php echo tep_draw_password_field('password_confirmation') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?></td>
-                  </tr>
-                </table></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-                <td><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_SUMMARY, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
-                <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
-                <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-      </tr>
-    </table></form></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_password_forgotten.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_password_forgotten.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_password_forgotten.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,46 +0,0 @@
-<?php
-/*
-  $Id: affiliate_password_forgotten.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 -2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_PASSWORD_FORGOTTEN);
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $check_affiliate_query = tep_db_query("select affiliate_firstname, affiliate_lastname, affiliate_password, affiliate_id from " . TABLE_AFFILIATE . " where affiliate_email_address = '" . tep_db_prepare_input($HTTP_POST_VARS['email_address']) . "'");
-    if (tep_db_num_rows($check_affiliate_query)) {
-      $check_affiliate = tep_db_fetch_array($check_affiliate_query);
-      // Crypted password mods - create a new password, update the database and mail it to them
-      $newpass = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
-      $crypted_password = tep_encrypt_password($newpass);
-      tep_db_query("update " . TABLE_AFFILIATE . " set affiliate_password = '" . $crypted_password . "' where affiliate_id = '" . $check_affiliate['affiliate_id'] . "'");
-      
-      tep_mail($check_affiliate['affiliate_firstname'] . " " . $check_affiliate['affiliate_lastname'], $HTTP_POST_VARS['email_address'], EMAIL_PASSWORD_REMINDER_SUBJECT, nl2br(sprintf(EMAIL_PASSWORD_REMINDER_BODY, $newpass)), STORE_OWNER, AFFILIATE_EMAIL_ADDRESS);
-      tep_redirect(tep_href_link(FILENAME_AFFILIATE, 'info_message=' . urlencode(TEXT_PASSWORD_SENT), 'SSL', true, false));
-    } else {
-      tep_redirect(tep_href_link(FILENAME_AFFILIATE_PASSWORD_FORGOTTEN, 'email=nonexistent', 'SSL'));
-    }
-  } else {
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_AFFILIATE_PASSWORD_FORGOTTEN, '', 'SSL'));
-
-  $content = CONTENT_AFFILIATE_PASSWORD_FORGOTTEN;
-  $javascript = 'popup_window.js';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-}
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_payment.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_payment.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_payment.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,44 +0,0 @@
-<?php
-/*
-  $Id: affiliate_payment.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_PAYMENT);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_PAYMENT, '', 'SSL'));
-
-  $affiliate_payment_raw = "
-    select p.* , s.affiliate_payment_status_name 
-           from " . TABLE_AFFILIATE_PAYMENT . " p, " . TABLE_AFFILIATE_PAYMENT_STATUS . " s 
-           where p.affiliate_payment_status = s.affiliate_payment_status_id 
-           and s.affiliate_language_id = '" . $languages_id . "' 
-           and p.affiliate_id =  '" . $affiliate_id . "' 
-           order by p.affiliate_payment_id DESC
-           ";
-
-  $affiliate_payment_split = new splitPageResults($affiliate_payment_raw, MAX_DISPLAY_SEARCH_RESULTS);
-
-  $content = CONTENT_AFFILIATE_PAYMENT;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_reports.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_reports.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_reports.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,177 +0,0 @@
-<?php
-/*
-  $Id: shipping.php,v 2.00 2003/10/12
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_REPORTS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_REPORTS));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
-  <tr>
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
-    </table></td>
-<!-- body_text //-->
-    <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'affiliate_reports.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-
-      <tr>
-        <td colspan="4"><img src="images/pixel_trans.gif" border="0" alt="" width="100%" height="10"></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><b><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_CLICKS, '', 'SSL'). '">' . TEXT_AFFILIATE_CLICKS . '</a>';?></b></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td width="60"><img src="images/affiliate_clicks.gif" border="0" alt="" width="60" height="60"></td>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-                  <tr>
-                    <td class="main"><img src="images/arrow_green.gif" border="0" alt="" width="12" height="10">&nbsp;<?php echo TEXT_INFORMATION_CLICKS ;?></td>
-                    <td width="200" class="main" align="left"><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_CLICKS, '', 'SSL') . '">' . tep_image_button('button_affiliate_clickthroughs.gif', IMAGE_CLICKS) . '</a>';?></td>
-                  </tr>
-                  </table></td>
-               <td width="10" align="right"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-             </tr>
-           </table></td>
-         </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td colspan="4"><img src="images/pixel_trans.gif" border="0" alt="" width="100%" height="10"></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><b><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_SALES, '', 'SSL'). '">' . TEXT_AFFILIATE_SALES . '</a>';?></b></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td width="60"><img src="images/affiliate_sales.gif" border="0" alt="" width="60" height="60"></td>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-                  <tr>
-                    <td class="main"><img src="images/arrow_green.gif" border="0" alt="" width="12" height="10">&nbsp;<?php echo TEXT_INFORMATION_SALES ;?></td>
-                    <td width="200" class="main" align="left"><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_SALES, '', 'SSL') . '">' . tep_image_button('button_affiliate_sales.gif', IMAGE_SALES) . '</a>';?></td>
-                  </tr>
-                  </table></td>
-               <td width="10" align="right"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-             </tr>
-           </table></td>
-         </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td colspan="4"><img src="images/pixel_trans.gif" border="0" alt="" width="100%" height="10"></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><b><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_PAYMENT, '', 'SSL'). '">' . TEXT_AFFILIATE_PAYMENT . '</a>';?></b></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td colspan="4"><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
-          <tr class="infoBoxContents">
-            <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <tr>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td width="60"><img src="images/affiliate_payment.gif" border="0" alt="" width="60" height="60"></td>
-                <td width="10"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-                <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-                  <tr>
-                    <td class="main"><img src="images/arrow_green.gif" border="0" alt="" width="12" height="10">&nbsp;<?php echo TEXT_INFORMATION_PAYMENT ;?></td>
-                    <td width="200" class="main" align="left"><?php echo '<a href="' . tep_href_link(FILENAME_AFFILIATE_PAYMENT, '', 'SSL') . '">' . tep_image_button('button_affiliate_payment.gif', IMAGE_PAYMENT) . '</a>';?></td>
-                  </tr>
-                  </table></td>
-               <td width="10" align="right"><img src="images/pixel_trans.gif" border="0" alt="" width="10" height="1"></td>
-             </tr>
-           </table></td>
-         </tr>
-        </table></td>
-      </tr>
-
-    </table></td>
-<!-- body_text_eof //-->
-    <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- right_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
-<!-- right_navigation_eof //-->
-    </table></td>
-  </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_sales.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_sales.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_sales.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,50 +0,0 @@
-<?php
-
-/*
-  $Id: affiliate_sales.php,v 1.1.1.1 2004/03/04 23:37:54 ccwjr Exp $
-  OSC-Affiliate
-  Contribution based on:
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SALES);
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_SALES, '', 'SSL'));
-/*
-  $affiliate_sales_raw = "
-    select  a.*, o.orders_status as orders_status_id, os.orders_status_name as orders_status from " . TABLE_AFFILIATE_SALES . " a, 
-    " . TABLE_ORDERS . " o, 
-    " . TABLE_ORDERS_STATUS . " os
-    where a.affiliate_id = '" . $affiliate_id . "' and
-    o.orders_id = a.affiliate_orders_id and
-    os.orders_status_id and o.orders_status and
-    language_id = '" . $languages_id . "'
-    order by affiliate_date DESC
-    ";
-*/
-  $affiliate_sales_raw = "
-      select asale.*, os.orders_status_name as orders_status, o.orders_status as orders_status_id
-      from " . TABLE_AFFILIATE_SALES . " asale ,
-           " . TABLE_ORDERS . " o,
-           " . TABLE_ORDERS_STATUS . " os,
-           " . TABLE_AFFILIATE . " a
-      where asale.affiliate_id = '" . $affiliate_id . "'
-        and a.affiliate_id = '" . $affiliate_id . "'
-        and asale.affiliate_orders_id = o.orders_id
-        and os.orders_status_id = o.orders_status
-        and language_id = " . $languages_id . "
-      order by affiliate_date desc 
-      ";
-  $affiliate_sales_split = new splitPageResults($affiliate_sales_raw, MAX_DISPLAY_SEARCH_RESULTS);
-  $content = affiliate_sales; 
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-?>

Deleted: trunk/direct.openmoko.com/affiliate_show_banner.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_show_banner.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_show_banner.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,165 +0,0 @@
-<?php
-/*
-  $Id: affiliate_show_banner.php,v 1.1.1.1 2004/03/04 23:37:55 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-// CHECKIT
-// -> optimize code -> double parts
-
-// require of application_top not possible 
-// cause then whois online registers it also as visitor
-//
-
-  define('TABLE_AFFILIATE_BANNERS_HISTORY', 'affiliate_banners_history');
-  define('TABLE_AFFILIATE_BANNERS', 'affiliate_banners');
-  define('TABLE_PRODUCTS', 'products');
-
-// Set the local configuration parameters - mainly for developers
-  if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
-  require('includes/configure.php');
-  if (file_exists('includes/local/affiliate_configure.php')) include('includes/local/affiliate_configure.php');
-  require('includes/affiliate_configure.php');
-
-// include the database functions
-  require(DIR_WS_FUNCTIONS . 'database.php');
-// make a connection to the database... now
- // tep_db_connect() or die('Unable to connect to database server!');
-  tep_db_connect() or die(UNABLE_TO_CONNECT_TO_DATABASE_SERVER);
-
-  function affiliate_show_banner($pic) {
-//Read Pic and send it to browser
-    $fp = fopen($pic, "rb");
-    if (!$fp) exit();
-// Get Image type
-    $img_type = substr($pic, strrpos($pic, ".") + 1);
-// Get Imagename
-    $pos = strrpos($pic, "/");
-    if ($pos) {
-      $img_name = substr($pic, strrpos($pic, "/" ) + 1);
-    } else {
-      $img_name=$pic;
-    }
-    header ("Content-type: image/$img_type");
-    header ("Content-Disposition: inline; filename=$img_name");
-    fpassthru($fp);
-    // The file is closed when fpassthru() is done reading it (leaving handle useless).  
-    // fclose ($fp);
-    exit();
-  }
-
-  function affiliate_debug($banner,$sql) {
-?>
-   <!-- <table border=1 cellpadding=2 cellspacing=2>
-      <tr><td colspan=2>Check the pathes! (catalog/includes/configure.php)</td></tr>
-      <tr><td>absolute path to picture:</td><td><?php echo DIR_FS_DOCUMENT_ROOT . DIR_WS_CATALOG. DIR_WS_IMAGES . $banner; ?></td></tr>
-      <tr><td>build with:</td><td>DIR_FS_DOCUMENT_ROOT . DIR_WS_CATALOG . DIR_WS_IMAGES . $banner</td></tr>
-      <tr><td>DIR_FS_DOCUMENT_ROOT</td><td><?php echo DIR_FS_DOCUMENT_ROOT; ?></td></tr>
-      <tr><td>DIR_WS_CATALOG</td><td><?php echo DIR_WS_CATALOG ; ?></td></tr>
-      <tr><td>DIR_WS_IMAGES</td><td><?php echo DIR_WS_IMAGES; ?></td></tr>
-      <tr><td>$banner</td><td><?php echo $banner; ?></td></tr>
-      <tr><td>SQL-Query used:</td><td><?php echo $sql; ?></td></tr>
-      <tr><th>Try to find error:</td><td>&nbsp;</th></tr>
-      <tr><td>SQL-Query:</td><td><?php if ($banner) echo "Got Result"; else echo "No result"; ?></td></tr>
-      <tr><td>Locating Pic</td><td> -->
-
-    <table border=1 cellpadding=2 cellspacing=2>
-      <tr><td colspan=2><?php echo AFFILIATE_SHOW_BANNER_CHECK_PATHES;?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_ABSOLUTE_PATH;?></td><td><?php echo DIR_FS_DOCUMENT_ROOT . DIR_WS_CATALOG. DIR_WS_IMAGES . $banner; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_BUILD_WITH_1;?></td><td><?php echo AFFILIATE_SHOW_BANNER_BUILD_WITH_2;?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_DIR_FS_DOCUMENT_ROOT;?></td><td><?php echo DIR_FS_DOCUMENT_ROOT; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_DIR_WS_CATALOG;?></td><td><?php echo DIR_WS_CATALOG ; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_DIR_WS_IMAGES;?></td><td><?php echo DIR_WS_IMAGES; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_BANNER;?></td><td><?php echo $banner; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_SQL_QUERY_USED;?></td><td><?php echo $sql; ?></td></tr>
-      <tr><th><?php echo AFFILIATE_SHOW_BANNER_TRY_TO_FIND_ERROR;?></td><td>&nbsp;</th></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_SQL_QUERY;?></td><td><?php if ($banner) echo "Got Result"; else echo "No result"; ?></td></tr>
-      <tr><td><?php echo AFFILIATE_SHOW_BANNER_LOCATING_PIC;?></td><td>
-<?php 
-    $pic = DIR_FS_CATALOG . DIR_WS_IMAGES . $banner;
-    echo $pic . "<br>";
-    if (!is_file($pic)) {
-      echo "failed<br>";
-    } else {
-      echo "success<br>";
-    }
-?>
-      </td></tr>
-    </table>
-<?php
-    exit();
-  }
-
-// Register needed Post / Get Variables
-  if ($HTTP_GET_VARS['ref']) $affiliate_id=$HTTP_GET_VARS['ref'];
-  if ($HTTP_POST_VARS['ref']) $affiliate_id=$HTTP_POST_VARS['ref'];
-
-  if ($HTTP_GET_VARS['affiliate_banner_id']) $banner_id = $HTTP_GET_VARS['affiliate_banner_id'];
-  if ($HTTP_POST_VARS['affiliate_banner_id']) $banner_id = $HTTP_POST_VARS['affiliate_banner_id'];
-  if ($HTTP_GET_VARS['affiliate_pbanner_id']) $prod_banner_id = $HTTP_GET_VARS['affiliate_pbanner_id'];
-  if ($HTTP_POST_VARS['affiliate_pbanner_id']) $prod_banner_id = $HTTP_POST_VARS['affiliate_pbanner_id'];
-
-  $banner = '';
-  $products_id = '';
-
-  if ($banner_id) {
-    $sql = "select affiliate_banners_image, affiliate_products_id from " . TABLE_AFFILIATE_BANNERS . " where affiliate_banners_id = '" . (int)$banner_id  . "' and affiliate_status = 1";
-    $banner_values = tep_db_query($sql);
-    if ($banner_array = tep_db_fetch_array($banner_values)) {
-      $banner = $banner_array['affiliate_banners_image'];
-      $products_id = $banner_array['affiliate_products_id']; 
-    }
-  }
-
-  if ($prod_banner_id) {
-    $banner_id = 1; // Banner ID for these Banners is one
-    $sql = "select products_image from " . TABLE_PRODUCTS . " where products_id = '" . (int)$prod_banner_id  . "' and products_status = 1";
-    $banner_values = tep_db_query($sql);
-    if ($banner_array = tep_db_fetch_array($banner_values)) {
-      $banner = $banner_array['products_image'];
-      $products_id = (int)$prod_banner_id;
-    }
-  }
-
-// DebugModus
-  if (AFFILIATE_SHOW_BANNERS_DEBUG == 'true') affiliate_debug($banner,$sql);
-
-  if ($banner) {
-    $pic = DIR_FS_CATALOG . DIR_WS_IMAGES . $banner;
-
-    // Show Banner only if it exists:
-    if (is_file($pic)) {
-      $today = date('Y-m-d');
-    // Update stats:
-      if ($affiliate_id) {
-        $banner_stats_query = tep_db_query("select * from " . TABLE_AFFILIATE_BANNERS_HISTORY . " where affiliate_banners_id = '" . (int)$banner_id  . "' and affiliate_banners_products_id = '" . $products_id ."' and affiliate_banners_affiliate_id = '" . (int)$affiliate_id. "' and affiliate_banners_history_date = '" . $today . "'");
-    // Banner has been shown today 
-        if ($banner_stats_array = tep_db_fetch_array($banner_stats_query)) {
-          tep_db_query("update " . TABLE_AFFILIATE_BANNERS_HISTORY . " set affiliate_banners_shown = affiliate_banners_shown + 1 where affiliate_banners_id = '" . (int)$banner_id  . "' and affiliate_banners_affiliate_id = '" . (int)$affiliate_id. "' and affiliate_banners_products_id = '" . $products_id ."' and affiliate_banners_history_date = '" . $today . "'");
-        } else { // First view of Banner today
-          tep_db_query("insert into " . TABLE_AFFILIATE_BANNERS_HISTORY . " (affiliate_banners_id, affiliate_banners_products_id, affiliate_banners_affiliate_id, affiliate_banners_shown, affiliate_banners_history_date) VALUES ('" . (int)$banner_id  . "', '" .  $products_id ."', '" . (int)$affiliate_id. "', '1', '" . $today . "')");
-        }
-      }
-    // Show Banner
-      affiliate_show_banner($pic);
-    }
-  }
-
-// Show default Banner if none is found
-  if (is_file(AFFILIATE_SHOW_BANNERS_DEFAULT_PIC)) {
-    affiliate_show_banner(AFFILIATE_SHOW_BANNERS_DEFAULT_PIC);
-  } else {
-    echo "<br>"; // Output something to prevent endless loading
-  }
-  exit();
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_signup.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_signup.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_signup.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,291 +0,0 @@
-<?php
-/*
-  $Id: affiliate_signup.php,v 1.1.1.1 2004/03/04 23:37:55 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SIGNUP);
-
-  if (isset($HTTP_POST_VARS['action'])) {
-    $a_gender = tep_db_prepare_input($HTTP_POST_VARS['a_gender']);
-    $a_firstname = tep_db_prepare_input($HTTP_POST_VARS['a_firstname']);
-    $a_lastname = tep_db_prepare_input($HTTP_POST_VARS['a_lastname']);
-    $a_dob = tep_db_prepare_input($HTTP_POST_VARS['a_dob']);
-    $a_email_address = tep_db_prepare_input($HTTP_POST_VARS['a_email_address']);
-    $a_company = tep_db_prepare_input($HTTP_POST_VARS['a_company']);
-    $a_company_taxid = tep_db_prepare_input($HTTP_POST_VARS['a_company_taxid']);
-    $a_payment_check = tep_db_prepare_input($HTTP_POST_VARS['a_payment_check']);
-    $a_payment_paypal = tep_db_prepare_input($HTTP_POST_VARS['a_payment_paypal']);
-    $a_payment_bank_name = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_name']);
-    $a_payment_bank_branch_number = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_branch_number']);
-    $a_payment_bank_swift_code = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_swift_code']);
-    $a_payment_bank_account_name = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_account_name']);
-    $a_payment_bank_account_number = tep_db_prepare_input($HTTP_POST_VARS['a_payment_bank_account_number']);
-    $a_street_address = tep_db_prepare_input($HTTP_POST_VARS['a_street_address']);
-    $a_suburb = tep_db_prepare_input($HTTP_POST_VARS['a_suburb']);
-    $a_postcode = tep_db_prepare_input($HTTP_POST_VARS['a_postcode']);
-    $a_city = tep_db_prepare_input($HTTP_POST_VARS['a_city']);
-    $a_country=tep_db_prepare_input($HTTP_POST_VARS['a_country']);
-    $a_zone_id = tep_db_prepare_input($HTTP_POST_VARS['a_zone_id']);
-    $a_state = tep_db_prepare_input($HTTP_POST_VARS['a_state']);
-    $a_telephone = tep_db_prepare_input($HTTP_POST_VARS['a_telephone']);
-    $a_fax = tep_db_prepare_input($HTTP_POST_VARS['a_fax']);
-    $a_homepage = tep_db_prepare_input($HTTP_POST_VARS['a_homepage']);
-    $a_password = tep_db_prepare_input($HTTP_POST_VARS['a_password']);
-
-    $error = false; // reset error flag
-
-    if (ACCOUNT_GENDER == 'true') {
-      if (($a_gender == 'm') || ($a_gender == 'f')) {
-        $entry_gender_error = false;
-      } else {
-        $error = true;
-        $entry_gender_error = true;
-      }
-    }
-
-    if (strlen($a_firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-      $error = true;
-      $entry_firstname_error = true;
-    } else {
-      $entry_firstname_error = false;
-    }
-
-    if (strlen($a_lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-      $error = true;
-      $entry_lastname_error = true;
-    } else {
-      $entry_lastname_error = false;
-    }
-
-    if (ACCOUNT_DOB == 'true') {
-      if (checkdate(substr(tep_date_raw($a_dob), 4, 2), substr(tep_date_raw($a_dob), 6, 2), substr(tep_date_raw($a_dob), 0, 4))) {
-        $entry_date_of_birth_error = false;
-      } else {
-        $error = true;
-        $entry_date_of_birth_error = true;
-      }
-    }
-  
-    if (strlen($a_email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-      $error = true;
-      $entry_email_address_error = true;
-    } else {
-      $entry_email_address_error = false;
-    }
-
-    if (!tep_validate_email($a_email_address)) {
-      $error = true;
-      $entry_email_address_check_error = true;
-    } else {
-      $entry_email_address_check_error = false;
-    }
-
-    if (strlen($a_street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-      $error = true;
-      $entry_street_address_error = true;
-    } else {
-      $entry_street_address_error = false;
-    }
-  
-    if (strlen($a_postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-      $error = true;
-      $entry_post_code_error = true;
-    } else {
-      $entry_post_code_error = false;
-    } 
-
-    if (strlen($a_city) < ENTRY_CITY_MIN_LENGTH) {
-      $error = true;
-      $entry_city_error = true;
-    } else {
-      $entry_city_error = false;
-    }
-
-    if (!$a_country) {
-      $error = true;
-      $entry_country_error = true;
-    } else {
-      $entry_country_error = false;
-    }
-
-    if (ACCOUNT_STATE == 'true') {
-      if ($entry_country_error) {
-        $entry_state_error = true;
-      } else {
-        $a_zone_id = 0;
-        $entry_state_error = false;
-        $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "'");
-        $check_value = tep_db_fetch_array($check_query);
-        $entry_state_has_zones = ($check_value['total'] > 0);
-        if ($entry_state_has_zones) {
-          $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "' and zone_name = '" . tep_db_input($a_state) . "'");
-          if (tep_db_num_rows($zone_query) == 1) {
-            $zone_values = tep_db_fetch_array($zone_query);
-            $a_zone_id = $zone_values['zone_id'];
-          } else {
-            $zone_query = tep_db_query("select zone_id from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input($a_country) . "' and zone_code = '" . tep_db_input($a_state) . "'");
-            if (tep_db_num_rows($zone_query) == 1) {
-              $zone_values = tep_db_fetch_array($zone_query);
-              $a_zone_id = $zone_values['zone_id'];
-            } else {
-              $error = true;
-              $entry_state_error = true;
-            }
-          }
-        } else {
-          if (!$a_state) {
-            $error = true;
-            $entry_state_error = true;
-          }
-        }
-      }
-    }
-
-    if (strlen($a_telephone) < ENTRY_TELEPHONE_MIN_LENGTH) {
-      $error = true;
-      $entry_telephone_error = true;
-    } else {
-      $entry_telephone_error = false;
-    }
-
-    $passlen = strlen($a_password);
-    if ($passlen < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-      $entry_password_error = true;
-    } else {
-      $entry_password_error = false;
-    }
-
-    if ($a_password != $a_confirmation) {
-      $error = true;
-      $entry_password_error = true;
-    }
-
-    $check_email = tep_db_query("select affiliate_email_address from " . TABLE_AFFILIATE . " where affiliate_email_address = '" . tep_db_input($a_email_address) . "'");
-    if (tep_db_num_rows($check_email)) {
-      $error = true;
-      $entry_email_address_exists = true;
-    } else {
-      $entry_email_address_exists = false;
-    }
-
-    // Check Suburb
-    $entry_suburb_error = false;
-
-    // Check Fax
-    $entry_fax_error = false;
-
-    if (!affiliate_check_url($a_homepage)) {
-      $error = true;
-      $entry_homepage_error = true;
-    } else {
-      $entry_homepage_error = false;
-    }
-
-    if (!$a_agb) {
-    $error=true;
-    $entry_agb_error=true;
-    }
-
-    // Check Company 
-    $entry_company_error = false;
-    $entry_company_taxid_error = false;
-
-    // Check Newsletter 
-    $entry_newsletter_error = false;
-    // Check Payment
-    $entry_payment_check_error = false;
-    $entry_payment_paypal_error = false;
-    $entry_payment_bank_name_error = false;
-    $entry_payment_bank_branch_number_error = false;
-    $entry_payment_bank_swift_code_error = false;
-    $entry_payment_bank_account_name_error = false;
-    $entry_payment_bank_account_number_error = false;
-
-    if (!$error) {
-
-      $sql_data_array = array('affiliate_firstname' => $a_firstname,
-                              'affiliate_lastname' => $a_lastname,
-                              'affiliate_email_address' => $a_email_address,
-                              'affiliate_payment_check' => $a_payment_check,
-                              'affiliate_payment_paypal' => $a_payment_paypal,
-                              'affiliate_payment_bank_name' => $a_payment_bank_name,
-                              'affiliate_payment_bank_branch_number' => $a_payment_bank_branch_number,
-                              'affiliate_payment_bank_swift_code' => $a_payment_bank_swift_code,
-                              'affiliate_payment_bank_account_name' => $a_payment_bank_account_name,
-                              'affiliate_payment_bank_account_number' => $a_payment_bank_account_number,
-                              'affiliate_street_address' => $a_street_address,
-                              'affiliate_postcode' => $a_postcode,
-                              'affiliate_city' => $a_city,
-                              'affiliate_country_id' => $a_country,
-                              'affiliate_telephone' => $a_telephone,
-                              'affiliate_fax' => $a_fax,
-                              'affiliate_homepage' => $a_homepage,
-                              'affiliate_password' => tep_encrypt_password($a_password),
-                              'affiliate_agb' => '1',
-                              'affiliate_newsletter' => $a_newsletter);
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['affiliate_gender'] = $a_gender;
-      if (ACCOUNT_DOB == 'true') $sql_data_array['affiliate_dob'] = tep_date_raw($a_dob);
-      if (ACCOUNT_COMPANY == 'true') {
-        $sql_data_array['affiliate_company'] = $a_company;
-        $sql_data_array['affiliate_company_taxid'] = $a_company_taxid;
-      }
-      if (ACCOUNT_SUBURB == 'true') $sql_data_array['affiliate_suburb'] = $a_suburb;
-      if (ACCOUNT_STATE == 'true') {
-        if ($a_zone_id > 0) {
-          $sql_data_array['affiliate_zone_id'] = $a_zone_id;
-          $sql_data_array['affiliate_state'] = '';
-        } else {
-          $sql_data_array['affiliate_zone_id'] = '0';
-          $sql_data_array['affiliate_state'] = $a_state;
-        }
-      }
-
-      $sql_data_array['affiliate_date_account_created'] = 'now()';
-
-      $affiliate_id = affiliate_insert ($sql_data_array, $HTTP_SESSION_VARS['affiliate_ref'] );
-
-      // build the message content
-    $name = $a_firstname . ' ' . $a_lastname;    
-    $email_text = sprintf(MAIL_GREET_NONE, $a_firstname);
-          $email_text .= MAIL_AFFILIATE_HEADER;
-    $email_text .= sprintf(MAIL_AFFILIATE_ID, $affiliate_id);
-    $email_text .= sprintf(MAIL_AFFILIATE_USERNAME, $a_email_address);
-    $email_text .= sprintf(MAIL_AFFILIATE_PASSWORD, $a_password);
-    $email_text .= sprintf(MAIL_AFFILIATE_LINK, HTTP_SERVER . DIR_WS_CATALOG . FILENAME_AFFILIATE) . "\n\n";
-    $email_text .= MAIL_AFFILIATE_FOOTER;
-
-      tep_mail($name, $a_email_address, MAIL_AFFILIATE_SUBJECT, $email_text, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-    
-      tep_session_register('affiliate_id');
-      $affiliate_email = $a_email_address;
-      $affiliate_name = $a_firstname . ' ' . $a_lastname;
-      tep_session_register('affiliate_email');
-      tep_session_register('affiliate_name');
-      tep_redirect(tep_href_link(FILENAME_AFFILIATE_SIGNUP_OK, '', 'SSL'));
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_SIGNUP, '', 'SSL'));
-
-
-  $content = CONTENT_AFFILIATE_SIGNUP;
-  require('includes/form_check.js.php');
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/affiliate_signup_ok.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_signup_ok.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_signup_ok.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,29 +0,0 @@
-<?php
-
-/*
-  $Id: affiliate_signup_ok.php,v 1.1 2004/03/05 01:57:13 ccwjr Exp $
-  OSC-Affiliate
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SIGNUP_OK);
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_SIGNUP_OK));
-
-  $content = CONTENT_AFFILIATE_SIGNUP_OK;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>
-

Deleted: trunk/direct.openmoko.com/affiliate_summary.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_summary.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_summary.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,77 +0,0 @@
-<?php
-/*
-  $Id: affiliate_summary.php,v 1.1.1.1 2004/03/04 23:37:55 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('affiliate_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_AFFILIATE, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_SUMMARY);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_SUMMARY));
-
-  $affiliate_banner_history_raw = "select sum(affiliate_banners_shown) as count from " . TABLE_AFFILIATE_BANNERS_HISTORY .  " where affiliate_banners_affiliate_id  = '" . (int)$affiliate_id . "'";
-  $affiliate_banner_history_query=tep_db_query($affiliate_banner_history_raw);
-  $affiliate_banner_history = tep_db_fetch_array($affiliate_banner_history_query);
-  $affiliate_impressions = $affiliate_banner_history['count'];
-  if ($affiliate_impressions == 0) $affiliate_impressions="n/a"; 
-
-  $affiliate_clickthroughs_raw = "select count(*) as count from " . TABLE_AFFILIATE_CLICKTHROUGHS . " where affiliate_id = '" . (int)$affiliate_id . "'";
-  $affiliate_clickthroughs_query = tep_db_query($affiliate_clickthroughs_raw);
-  $affiliate_clickthroughs = tep_db_fetch_array($affiliate_clickthroughs_query);
-  $affiliate_clickthroughs =$affiliate_clickthroughs['count'];
-
-  $affiliate_sales_raw = "select count(*) as count, sum(a.affiliate_value) as total, sum(a.affiliate_payment) as payment from
-      " . TABLE_AFFILIATE_SALES . " a, 
-      " . TABLE_ORDERS . " o
-      where a.affiliate_id = '" . (int)$affiliate_id . "' and 
-      o.orders_id = a.affiliate_orders_id and
-      o.orders_status >= '" . AFFILIATE_PAYMENT_ORDER_MIN_STATUS . "' 
-      ";
-  $affiliate_sales_query = tep_db_query($affiliate_sales_raw);
-  $affiliate_sales = tep_db_fetch_array($affiliate_sales_query);
-
-  $affiliate_transactions=$affiliate_sales['count'];
-  if ($affiliate_clickthroughs > 0) {
-  $affiliate_conversions = tep_round(($affiliate_transactions / $affiliate_clickthroughs)*100, 2) . "%";
-  } else {
-    $affiliate_conversions = "n/a";
-  }
-  $affiliate_amount = $affiliate_sales['total'];
-  if ($affiliate_transactions>0) {
-  $affiliate_average = tep_round($affiliate_amount / $affiliate_transactions, 2);
-  } else {
-  $affiliate_average = "n/a";
-  }
-  $affiliate_commission = $affiliate_sales['payment'];
-
-  $affiliate_values = tep_db_query("select * from " . TABLE_AFFILIATE . " where affiliate_id = '" . (int)$affiliate_id . "'");
-  $affiliate = tep_db_fetch_array($affiliate_values);
-  $affiliate_percent = 0;
-  $affiliate_percent = $affiliate['affiliate_commission_percent'];
-  if ($affiliate_percent < AFFILIATE_PERCENT) $affiliate_percent = AFFILIATE_PERCENT;
-
-
-  $content = CONTENT_AFFILIATE_SUMMARY;
-  $javascript = $content . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/affiliate_terms.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_terms.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_terms.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,54 +0,0 @@
-<?php
-
-/*
-
-  $Id: affiliate_terms.php,v 1.1.1.1 2004/03/04 23:37:55 ccwjr Exp $
-
-
-
-  OSC-Affiliate
-
-
-
-  Contribution based on:
-
-
-
-  osCommerce, Open Source E-Commerce Solutions
-
-  http://www.oscommerce.com
-
-
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-
-
-  Released under the GNU General Public License
-
-*/
-
-  require('includes/application_top.php');
-
-
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_TERMS);
-
-
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_AFFILIATE_TERMS));
-
-
-
-  $content = CONTENT_AFFILIATE_TERMS; 
-
-
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-
-?>
-

Deleted: trunk/direct.openmoko.com/affiliate_terms_popup.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_terms_popup.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_terms_popup.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: affiliate_terms_popup.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_TERMS);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo HEADING_AFFILIATE_PROGRAM_TITLE; ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_specials.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr>
-            <td class="main"><?php echo TEXT_INFORMATION; ?></td>
-          </tr>
-        </table></td>
-      </tr>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/affiliate_validcats.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_validcats.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_validcats.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,63 +0,0 @@
-<?php
-/*
-  $Id: affiliate_validcats.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_BUILD_CAT);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<?php
-// BOF: WebMakers.com Changed: Header Tag Controller v1.0
-if ( file_exists(DIR_WS_INCLUDES . 'header_tags.php') ) {
-    require(DIR_WS_INCLUDES . 'header_tags.php');
-  } else {
-    ?> 
-      <title><?php echo TITLE; ?></title>
-      <?php
-    }
-    ?>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<head>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
- 
-  <table width="580" class="infoBoxContents">
-<tr>
-<td colspan="2" class="infoBoxHeading" align="center"><?php echo TEXT_VALID_CATEGORIES_LIST; ?></td>
-</tr>
-<?php 
-    echo "<tr><td><b>". TEXT_VALID_CATEGORIES_ID . "</b></td><td><b>" . TEXT_VALID_CATEGORIES_NAME . "</b></td></tr><tr>";
-    $result = mysql_query("SELECT * FROM categories, categories_description WHERE categories.categories_id = categories_description.categories_id and categories_description.language_id = '" . $languages_id . "' ORDER BY categories_description.categories_name");
-    if ($row = mysql_fetch_array($result)) {
-        do {
-            echo "<td class='infoBoxContents'>&nbsp".$row["categories_id"]."</td>\n";
-            echo "<td class='infoBoxContents'>".$row["categories_name"]."</td>\n";
-            echo "</tr>\n";
-        }
-        while($row = mysql_fetch_array($result));
-    }
-    echo "</table>\n";
-?>
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?>&nbsp;&nbsp;&nbsp;</p>
-<br>
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/affiliate_validproducts.php
===================================================================
--- trunk/direct.openmoko.com/affiliate_validproducts.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/affiliate_validproducts.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,53 +0,0 @@
-<?php
-/*
-  $Id: affiliate_validproducts.php,v 2.00 2003/10/12
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_AFFILIATE_BANNERS_BUILD);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_AFFILIATE_BANNERS_BUILD));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<head>
-<body>
-<table width="580" class="infoBoxContents">
-<tr>
-<td colspan="2" class="infoBoxHeading" align="center"><?php echo TEXT_VALID_PRODUCTS_LIST; ?></td>
-</tr>
-<?php 
-    echo "<tr><td><b>". TEXT_VALID_PRODUCTS_ID . "</b></td><td><b>" . TEXT_VALID_PRODUCTS_NAME . "</b></td></tr><tr>";
-    $result = mysql_query("SELECT * FROM products, products_description WHERE products.products_id = products_description.products_id and products_description.language_id = '" . $languages_id . "' ORDER BY products_description.products_name");
-    if ($row = mysql_fetch_array($result)) {
-        do {
-            echo "<td class='infoBoxContents'> ".$row["products_id"]."</td>\n";
-            echo "<td class='infoBoxContents'>".$row["products_name"]."</td>\n";
-            echo "</tr>\n";
-        }
-        while($row = mysql_fetch_array($result));
-    }
-    echo "</table>\n";
-?>
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?>&nbsp;&nbsp;&nbsp;</p>
-<br>
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/all_prodcats.php
===================================================================
--- trunk/direct.openmoko.com/all_prodcats.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/all_prodcats.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,26 +0,0 @@
-<?php
-/*
-  $Id: all_prodcats.php,v 3.0 2004/02/21 by Ingo (info at gamephisto.de)
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2004 osCommerce
-
-  Released under the GNU General Public License
-
-  modified by schizobinky 05/23/2004
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ALL_PRODCATS);
-
-  $breadcrumb->add(HEADING_TITLE, tep_href_link(FILENAME_ALL_PRODCATS, '', 'NONSSL'));
-
-  $content = CONTENT_ALL_PRODCATS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/all_prodmanf.php
===================================================================
--- trunk/direct.openmoko.com/all_prodmanf.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/all_prodmanf.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,26 +0,0 @@
-<?php
-/*
-  $Id: all_prodmanf.php,v 3.0 2004/02/21 by Ingo (info at gamephisto.de)
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2004 osCommerce
-
-  Released under the GNU General Public License
-
-  modified by schizobinky 05/23/2004
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ALL_PRODMANF);
-
-  $breadcrumb->add(HEADING_TITLE, tep_href_link(FILENAME_ALL_PRODMANF, '', 'NONSSL'));
-
-  $content = CONTENT_ALL_PRODMANF;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/allprods.php
===================================================================
--- trunk/direct.openmoko.com/allprods.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/allprods.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,27 +0,0 @@
-<?php
-/*
-  $Id: all_prods.php,v 3.0 2004/02/21 by Ingo (info at gamephisto.de)
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-  Copyright (c) 2002 HMCservices
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  include(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ALLPRODS);
-
-// Set number of columns in listing
-define ('NR_COLUMNS', 1);
-//
-  $breadcrumb->add(HEADING_TITLE, tep_href_link(FILENAME_ALLPRODS, '', 'NONSSL'));
-
-  $content = CONTENT_ALL_PRODS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/article_info.php
===================================================================
--- trunk/direct.openmoko.com/article_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/article_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,25 +0,0 @@
-<?php
-/*
-  $Id: article_info.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLE_INFO);
-
-  $article_check_query = tep_db_query("select count(*) as total from " . TABLE_ARTICLES . " a, " . TABLE_ARTICLES_DESCRIPTION . " ad where a.articles_status = '1' and a.articles_id = '" . (int)$HTTP_GET_VARS['articles_id'] . "' and ad.articles_id = a.articles_id and ad.language_id = '" . (int)$languages_id . "'");
-  $article_check = tep_db_fetch_array($article_check_query);
-
-  $content = CONTENT_ARTICLE_INFO;
- 
-  $javascript = $content . '.js';
-  
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);  
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/article_reviews.php
===================================================================
--- trunk/direct.openmoko.com/article_reviews.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/article_reviews.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,31 +0,0 @@
-<?php
-/*
-  $Id: article_reviews.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $article_info_query = tep_db_query("select a.articles_id, ad.articles_name from " . TABLE_ARTICLES . " a, " . TABLE_ARTICLES_DESCRIPTION . " ad where a.articles_id = '" . (int)$HTTP_GET_VARS['articles_id'] . "' and a.articles_status = '1' and a.articles_id = ad.articles_id and ad.language_id = '" . (int)$languages_id . "'");
-  if (!tep_db_num_rows($article_info_query)) {
-    tep_redirect(tep_href_link(FILENAME_REVIEWS));
-  } else {
-    $article_info = tep_db_fetch_array($article_info_query);
-  }
-
-  $articles_name = $article_info['articles_name'];
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLE_REVIEWS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params()));
-
-  $content = CONTENT_ARTICLE_REVIEWS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);  
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/article_reviews_info.php
===================================================================
--- trunk/direct.openmoko.com/article_reviews_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/article_reviews_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,40 +0,0 @@
-<?php
-/*
-  $Id: article_reviews_info.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (isset($HTTP_GET_VARS['reviews_id']) && tep_not_null($HTTP_GET_VARS['reviews_id']) && isset($HTTP_GET_VARS['articles_id']) && tep_not_null($HTTP_GET_VARS['articles_id'])) {
-    $review_check_query = tep_db_query("select count(*) as total from " . TABLE_ARTICLE_REVIEWS . " r, " . TABLE_ARTICLE_REVIEWS_DESCRIPTION . " rd where r.reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "' and r.articles_id = '" . (int)$HTTP_GET_VARS['articles_id'] . "' and r.reviews_id = rd.reviews_id and rd.languages_id = '" . (int)$languages_id . "'");
-    $review_check = tep_db_fetch_array($review_check_query);
-
-    if ($review_check['total'] < 1) {
-      tep_redirect(tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params(array('reviews_id'))));
-    }
-  } else {
-    tep_redirect(tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params(array('reviews_id'))));
-  }
-
-  tep_db_query("update " . TABLE_ARTICLE_REVIEWS . " set reviews_read = reviews_read+1 where reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "'");
-
-  $review_query = tep_db_query("select rd.reviews_text, r.reviews_rating, r.reviews_id, r.customers_name, r.date_added, r.reviews_read, a.articles_id, ad.articles_name from " . TABLE_ARTICLE_REVIEWS . " r, " . TABLE_ARTICLE_REVIEWS_DESCRIPTION . " rd, " . TABLE_ARTICLES . " a, " . TABLE_ARTICLES_DESCRIPTION . " ad where r.reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "' and r.reviews_id = rd.reviews_id and rd.languages_id = '" . (int)$languages_id . "' and r.articles_id = a.articles_id and a.articles_status = '1' and a.articles_id = ad.articles_id and ad.language_id = '". (int)$languages_id . "'");
-  $review = tep_db_fetch_array($review_query);
-
-  $articles_name = $review['articles_name'];
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLE_REVIEWS_INFO);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params()));
-
-   $content = CONTENT_ARTICLE_REVIEWS_INFO;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);  
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

Deleted: trunk/direct.openmoko.com/article_reviews_write.php
===================================================================
--- trunk/direct.openmoko.com/article_reviews_write.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/article_reviews_write.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,67 +0,0 @@
-<?php
-/*
-  $Id: article_reviews_write.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  $article_info_query = tep_db_query("select a.articles_id, ad.articles_name from " . TABLE_ARTICLES . " a, " . TABLE_ARTICLES_DESCRIPTION . " ad where a.articles_id = '" . (int)$HTTP_GET_VARS['articles_id'] . "' and a.articles_status = '1' and a.articles_id = ad.articles_id and ad.language_id = '" . (int)$languages_id . "'");
-  if (!tep_db_num_rows($article_info_query)) {
-    tep_redirect(tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params(array('action'))));
-  } else {
-    $article_info = tep_db_fetch_array($article_info_query);
-  }
-
-  $customer_query = tep_db_query("select customers_firstname, customers_lastname from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-  $customer = tep_db_fetch_array($customer_query);
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $rating = tep_db_prepare_input($HTTP_POST_VARS['article_rating']);
-    $review = tep_db_prepare_input($HTTP_POST_VARS['article_review']);
-
-    $error = false;
-    if (strlen($review) < REVIEW_TEXT_MIN_LENGTH) {
-      $error = true;
-      $messageStack->add('article_review', JS_REVIEW_TEXT);
-    }
-
-    if (($rating < 1) || ($rating > 5)) {
-      $error = true;
-      $messageStack->add('article_review', JS_REVIEW_RATING);
-    }
-
-    if ($error == false) {
-      tep_db_query("insert into " . TABLE_ARTICLE_REVIEWS . " (articles_id, customers_id, customers_name, reviews_rating, date_added) values ('" . (int)$HTTP_GET_VARS['articles_id'] . "', '" . (int)$customer_id . "', '" . tep_db_input($customer['customers_firstname']) . ' ' . tep_db_input($customer['customers_lastname']) . "', '" . tep_db_input($rating) . "', now())");
-      $insert_id = tep_db_insert_id();
-
-      tep_db_query("insert into " . TABLE_ARTICLE_REVIEWS_DESCRIPTION . " (reviews_id, languages_id, reviews_text) values ('" . (int)$insert_id . "', '" . (int)$languages_id . "', '" . tep_db_input($review) . "')");
-
-      tep_redirect(tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params(array('action'))));
-    }
-  }
-
-  $articles_name = $article_info['articles_name'];
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLE_REVIEWS_WRITE);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ARTICLE_REVIEWS, tep_get_all_get_params()));
-  
- $content = CONTENT_ARTICLE_REVIEWS_WRITE;
-    
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-  
-  ?>

Deleted: trunk/direct.openmoko.com/article_search.php
===================================================================
--- trunk/direct.openmoko.com/article_search.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/article_search.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,30 +0,0 @@
-<?php
-/*
-  $Id: article_search.php
-  by AlDaffodil:  aldaffodil at hotmail.com
-  Allows you to search articles using article_manager v 1.0
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLE_SEARCH);
-
-  $akeywords = '';
-
-    if (isset($HTTP_GET_VARS['akeywords'])) {
-      $akeywords = $HTTP_GET_VARS['akeywords'];
-    }
-  
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ADVANCED_SEARCH));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, tep_get_all_get_params(), 'NONSSL', true, false));
-  $content = CONTENT_ARTICLE_SEARCH;
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);  
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/articles.php
===================================================================
--- trunk/direct.openmoko.com/articles.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/articles.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,45 +0,0 @@
-<?php
-/*
-  $Id: articles.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// the following tPath references come from application_top.php
-  $topic_depth = 'top';
-
-  if (isset($tPath) && tep_not_null($tPath)) {
-    $topics_articles_query = tep_db_query("select count(*) as total from " . TABLE_ARTICLES_TO_TOPICS . " where topics_id = '" . (int)$current_topic_id . "'");
-    $topics_articles = tep_db_fetch_array($topics_articles_query);
-    if ($topics_articles['total'] > 0) {
-      $topic_depth = 'articles'; // display articles
-    } else {
-      $topic_parent_query = tep_db_query("select count(*) as total from " . TABLE_TOPICS . " where parent_id = '" . (int)$current_topic_id . "'");
-      $topic_parent = tep_db_fetch_array($topic_parent_query);
-      if ($topic_parent['total'] > 0) {
-        $topic_depth = 'nested'; // navigate through the topics
-      } else {
-        $topic_depth = 'articles'; // topic has no articles, but display the 'no articles' message
-      }
-    }
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLES);
-
-  if ($topic_depth == 'top' && !(isset($HTTP_GET_VARS['authors_id'])) ) {
-    $breadcrumb->add(NAVBAR_TITLE_DEFAULT, tep_href_link(FILENAME_ARTICLES));
-  }
-
-  $content = CONTENT_ARTICLES;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); 
- ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/articles_new.php
===================================================================
--- trunk/direct.openmoko.com/articles_new.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/articles_new.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,22 +0,0 @@
-<?php
-/*
-  $Id: articles_new.php, v1.0 2003/12/04 12:00:00 ra Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ARTICLES_NEW);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ARTICLES_NEW));
-
-  $content = CONTENT_ARTICLES_NEW;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);  
-  
-  require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/calendar_content.php
===================================================================
--- trunk/direct.openmoko.com/calendar_content.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/calendar_content.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,133 +0,0 @@
-<?php
-/*
-  $Id: events_calendar v1.00 2003/03/08 18:09:16 ip chilipepper.it Exp $
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-  Copyright (c) 2003 osCommerce
-  Released under the GNU General Public License
-*/
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_EVENTS_CALENDAR);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE ?></title>
-<!-- events_calendar //-->
-<link rel="stylesheet" type="text/css" href="<?php echo DIR_WS_TEMPLATES . TEMPLATE_NAME . '/stylesheet.css'?>">
-<style type="text/css">
-<!--
-.button {border: 1px outset; margin: 0px; color: #000000; width: 20px; height: 20px;
-}
--->
-</style>
-<script type="text/javascript">
-function jump(view, url){
-if (document.all||document.getElementById){
-    month= document.calendar._month.options[document.calendar._month.selectedIndex].value;
-    year=  document.calendar._year.options[document.calendar._year.selectedIndex].value;
-    return url +'?_month='+ month +'&amp;_year='+ year +'&amp;year_view='+ view;
- }
-}
-</SCRIPT>
-</head>
-<body>
-<?php
-// Construct a calendar to show the current month
-$cal = new Calendar;
-$cal->setStartDay(FIRST_DAY_OF_WEEK);
-$this_month = date('m');
-$this_year = date('Y');
-
-if ($HTTP_GET_VARS['_month']) {
-$month = $_month;
-$year = $_year;
-$a = $cal->adjustDate($month, $year);
-$month_ = $a[0];
-$year_= $a[1];
-}else{
-$year = date('Y');
-$month = date('m');
-$month_= $month;
-$year_= $year;
-}
-echo '<form method="get" name="calendar" action="events_calendar.php">';
-echo '<table bgcolor="#EDECE9" width="100%"  align="center" border="0" cellspacing="0" cellpadding="0" style="cursor: default">';
-echo '<tr><td align="center" valign="top">' . $cal->getMonthView($month,$year) . '</td></tr>';
-//echo '<tr>';
-?>
-
-  <tr>
-     <td style="line-height: 2px;">&nbsp;
-     </td>
-  </tr>
-  <tr>
-    <td align="center" valign="top" nowrap>
-<?php
-$monthShort = explode("," ,MONTHS_SHORT_ARRAY);
-echo '<select name="_month" class="select">';
-$month = date('m');
-while (list($key, $value) = each($monthShort)){
-if ($HTTP_GET_VARS['_month']){
-    if($key+1 == $_month){
-        $key=$key+1;
-        echo '<option value="'. $key .'" selected>'. $value .'</option>' . "\n";
-    }else{
-        $key=$key+1;
-    echo '<option value="'. $key .'">'. $value .'</option>' . "\n";
-    }
-}else{
-    if($key+1 == $month){
-        $key=$key+1;
-        echo '<option value="'. $key .'" selected>'. $value .'</option>' . "\n";
-    }else{
-        $key=$key+1;
-    echo '<option value="'. $key .'">'. $value .'</option>' . "\n";
-    }
-  }
-}
-echo '</select>';
-echo '<select name="_year" class="select">';
-$year = date('Y');
-$years = NUMBER_OF_YEARS;
-for ($y=0; $y < $years; $y++){
-$_y = $year+$y;
-if ($HTTP_GET_VARS['_month']){
-    if($_y == $_year){
-    echo '<option value="'. $_y .'" selected>'. $_y .'</option>' . "\n";
-    }else{
-    echo '<option value="'. $_y .'">'. $_y .'</option>' . "\n";
-    }
-}else{
-    if($_y == $year){
-    echo '<option value="'. $_y .'" selected>'. $_y .'</option>' . "\n";
-    }else{
-    echo '<option value="'. $_y .'">'. $_y .'</option>' . "\n";
-    }
-  }
-}
-?>
-</select>
-
-
-<input type="button" class="button" title="<?php echo BOX_GO_BUTTON_TITLE; ?>" value="<?php echo BOX_GO_BUTTON; ?>"  onclick="top.window.location=jump(0,'<?php echo  FILENAME_EVENTS_CALENDAR ; ?>')">
-<?php
-if (($month != $this_month) || ($month_ != $this_month)){
-?>
-<br>
-<input type="button" class="button" title="<?php echo BOX_TODAY_BUTTON_TITLE; ?>" value="<?php echo BOX_TODAY_BUTTON; ?>" onclick=top.calendar.location="<?php echo  FILENAME_EVENTS_CALENDAR_CONTENT ; ?>?_month=<?php echo $this_month .'&amp;_year='. $this_year ?>">
-<?php
-}
-?>
-
-<input type="button" class="button" title="<?php echo BOX_YEAR_VIEW_BUTTON_TITLE; ?>" value="<?php echo BOX_YEAR_VIEW_BUTTON; ?>" onclick="top.window.location=jump(1,'<?php echo  FILENAME_EVENTS_CALENDAR ; ?>')">
-     </td>
-    </tr>
-   
-</table>
- </form>
-</body>
-</html>
-
-<!-- events_calendar //-->

Deleted: trunk/direct.openmoko.com/check_lang.php
===================================================================
--- trunk/direct.openmoko.com/check_lang.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/check_lang.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,550 +0,0 @@
-<?php
-// W Godefroy
-//  OSCommerce language integrity verification
-//
-// For latest info check:
-// http://buzzy.belgoline.com/hacks/fldr_checklang
-//
-// Copyright (C) 2005 W Godefroy
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-
-define("ERROR_CANNOT_OPEN_LANGUAGE_DIR","FATAL ERROR: Cannot open language dir: ");
-define("CHECK_LANG_FILENAME","Filename");
-define("CHECK_LANG_MISSING_IN","Missing in");
-define("CHECK_LANG_NONE_FOUND","None found");
-define("CHECK_LANG_FOUND_IN","Found in");
-define("CHECK_LANG_DEFINITION_NAME","Definition name");
-define("CHECK_LANG_EQUAL_TO","Equal to");
-define("CHECK_LANG_REFERENCES","References");
-define("CHECK_LANG_ALL_EQUAL","All equal");
-define("CHECK_LANG_WHERE_USED","Where Used");
-define("CHECK_LANG_FOUND_FOR","Found for");
-define("CHECK_LANG_MISSING_FOR","Missing for");
-define("CHECK_LANG_ALL_BUT","All but");
-define("CHECK_LANG_FILE_NAME","File Name");
-define("CHECK_LANG_SELECT_OPTION","Select option");
-define("CHECK_LANG_TO_CHECK_FILE_CONSISTENCY","To check file consistency");
-define("CHECK_LANG_CLICK_HERE","Click Here");
-define("CHECK_LANG_TO_CHECK_DEFINITION_CONSISTENCY","To check definition consistency");
-define("CHECK_LANG_TO_CHECK_EQUAL_DEFINITIONS","To check equal definitions");
-define("CHECK_LANG_HOME","Home");
-define("CHECK_LANG_BACK","Back");
-define("CHECK_LANG_W_GODEFROY","W Godefroy");
-define("CHECK_LANG_EXECUTION_TIME","Execution Time: ");
-define("CHECK_LANG_TITLE","Check Language Integrity");
-define("CHECK_LANG_LIST_OF_FILES_USING","List of files using");
-define("CHECK_LANG_LIST_OF_FILES_PRESENT_FOR_ONE_LANGUAGE","List of files that are present for one language-definition but missing for other(s)");
-define("CHECK_LANG_LIST_OF_PHRASE_PRESENT_FOR_ONE_LANGUAGE","List of phrase definitions that are present for one language-file but missing for other(s)");
-define("CHECK_LANG_LIST_OF_PHRASE_DEFINITIONS_EQUAL","List of phrase definitions that are equal");
-
-
-
-
-//require('includes/application_top.php');
-define('DIR_WS_INCLUDES', "includes/");
-
-$timeparts = explode(' ',microtime());
-$starttime = $timeparts[1].substr($timeparts[0],1);
-
-function tep_show_array_table(&$myarray, $title, $lev=0) 
-{
-    if($lev) 
-  echo "<table >";
-    else
-  echo "<table border=1 >";
-
-    echo "\n<tr><th colspan=2>$title</th></tr>";
-    foreach($myarray as $key => $values) {
-  echo "<tr><td> $key </td>\n  <td>";
-  if(is_array($values)) {
-      tep_show_array_table($values, $key, $lev + 1);
-  } else {
-      echo "$values";
-  }
-  echo "</td></tr>\n";
-    }
-    echo "</table>";
-}
-
-function tep_show_env() 
-{
-    
-    global $HTTP_SERVER_VARS, $HTTP_ENV_VARS, $HTTP_COOKIE_VARS, $HTTP_GET_VARS;
-    global $HTTP_POST_VARS, $HTTP_SESSION_VARS;
-
-    tep_show_array_table($HTTP_SERVER_VARS, "HTTP_SERVER_VARS");
-    echo"<br>";
-    
-    tep_show_array_table($HTTP_ENV_VARS, "HTTP_ENV_VARS");
-    echo"<br>";
-
-    tep_show_array_table($HTTP_COOKIE_VARS, "HTTP_COOCKIE_VARS");
-    echo"<br>";
-
-    tep_show_array_table($HTTP_GET_VARS, "HTTP_GET_VARS");
-    echo"<br>";
-
-    tep_show_array_table($HTTP_POST_VARS, "HTTP_POST_VARS");
-    echo"<br>";
-
-    tep_show_array_table($HTTP_SESSION_VARS, "HTTP_SESSION_VARS");
-    echo"<br>";
-}
-  
-
-function tep_scan_lang_dirs(&$lar, $lang_dir) {
-    if(is_dir($lang_dir)) {
-  if ($dh = opendir($lang_dir)) {
-      while (false !== ($file = readdir($dh))) {
-    $fpath = $lang_dir . $file;
-      
-    if(is_file($fpath)) {
-        if($lang_name = tep_is_lang_file($fpath)) {
-      $lar[$lang_name]["__filename__"] = $fpath;
-        }
-    }
-      }
-  closedir($dh);
-  }
-    } else {
-  //die("FATAL ERROR: Cannot open language dir: $lang_dir");
-  die(ERROR_CANNOT_OPEN_LANGUAGE_DIR. $lang_dir);
-    }
-}
-
-function tep_is_lang_file($file_name) 
-{
-    $match_pattern = '/(\w+)\.php$/';
-
-    if(preg_match($match_pattern,$file_name,$matches)) {
-  return $matches[1];
-    } else {
-  return 0;
-    }    
-}
-
-function tep_read_files_in_dir($dir_name) 
-{
-    $result = array();
-
-
-    $dirlist = array($dir_name);
-    
-    while($dirlist) {
-  $currdir = array_pop($dirlist);
-  
-  if($dh = opendir($currdir)) {
-      
-      while(false !== ($dire = readdir($dh))) {
-    $fpath = $currdir . '/' . $dire;
-    
-    if(is_file($fpath)) {
-        $result[] = $fpath;
-    } elseif(is_dir($fpath) && $dire != ".." && $dire != "." && $dire != "CVS") {
-        $dirlist[] = $fpath;
-    }
-      }
-      
-      
-  }
-    }
-    
-    return $result;
-}
-
-
-function tep_read_lang_files(&$lar) 
-{
-    foreach ($lar as $key => $value) {
-  //read lang directory
-  $landir = dirname($value["__filename__"]) . "/$key";
-
-  $lar[$key] += tep_read_files_in_dir($landir);
-    }
-}
-
-
-function tep_neuter_lang($lname, $str) 
-{
-    if(preg_match("/(.+)\/$lname(.+)/",$str,$matches)) {
-  return $matches[2];
-    } else {
-  return basename($str);
-    }
-}
-
-
-function tep_create_lang_neutral(&$lar) 
-{
-    $neutral_file_list = array();
-    foreach($lar as $lang => $flist) 
-  foreach($flist as $fname) {
-      $neutral_file = tep_neuter_lang($lang, $fname);
-      if(!(array_search($neutral_file, $neutral_file_list) !== false))
-    $neutral_file_list[] = $neutral_file;
-  }
-
-    return $neutral_file_list;
-}
-
-
-function tep_new_show_missing_files(&$lar) 
-{
-    $lang_list = array_keys($lar);
-
-    $neutral_file_list = tep_create_lang_neutral($lar);
-
-    echo "<table border=1>";
-    //echo "<tr><th>Filename</th><th>Missing in</th></tr>\n";
-    echo "<tr><th>".CHECK_LANG_FILENAME."</th><th>".CHECK_LANG_MISSING_IN."</th></tr>\n";
-    $found_errors = 0;
-    foreach($neutral_file_list as $file_name) {
-  $total = 0;
-  $missing = 0;
-  foreach($lang_list as $lang) {
-      $lang_file = DIR_WS_INCLUDES . "languages/$lang" . $file_name;
-
-      $total++;
-      if(!is_file($lang_file)) {
-    $missing++;
-    $missing_lang .= " [$lang]";
-      } else
-    $lang_found = $lang;
-  }
-
-  if($missing_lang) {
-      $found_errors = 1;
-      
-      $gen_file = "languages/<i>[LANG_NAME]</i>" . $file_name;
-      echo "<tr><td>$gen_file</td><td>";
-
-      if($missing >= $total - 1) 
-    echo "<i>All but $lang_found</i>";
-      else
-    echo $missing_lang;
-
-      echo "</td></tr>\n";
-  }
-    }
-    if(!$found_errors) 
-  //echo "<tr><td colspan=2><i>None found</i></td></tr>\n";
-  echo "<tr><td colspan=2><i>".CHECK_LANG_NONE_FOUND."</i></td></tr>\n";
-    
-    echo "</table>";
-}
-
-function tep_read_lang_words($lang, $file_base) {
-    $file_name = DIR_WS_INCLUDES . "languages/$lang" . $file_base;
-
-    $result = array();
-    
-    if(is_file($file_name)) {
-  $handle = fopen($file_name, "r");
-  while(!feof($handle)) {
-      $fline = fgets($handle);
-      if(preg_match("/define\s*\(\s*(\'|\")(\w+)(\'|\")\s*,\s*(.+)\s*\)\s*;/",$fline,$matches)) {
-    $result[$matches[2]] = $matches[4];
-      }
-  }
-    }
-
-    return $result;
-}
-
-// this function is equal to tep_new_show_missing_def but a few subtile
-// differences which would make a single function for both just unreadable
-function tep_new_show_equal_def(&$lar) 
-{
-    global $my_url;
-
-    $file_defs_checked = array();
-
-    $lang_list = array_keys($lar);
-
-    $neutral_file_list = tep_create_lang_neutral($lar);
-
-    echo "<table border=1>";
-    //echo "<tr><th>Found in</th><th>Definition name</th><th>Equal to</th><th>References</th></tr>\n";
-    echo "<tr><th>".CHECK_LANG_FOUND_IN."</th><th>".CHECK_LANG_DEFINITION_NAME."</th><th>".CHECK_LANG_EQUAL_TO."</th><th>".CHECK_LANG_REFERENCES."</th></tr>\n";
-    foreach($neutral_file_list as $neuter_file) {
-  $first_missing_in_file = 1;
-
-  //create word-definition array
-  $war = array();
-  foreach($lang_list as $lang) 
-      $war[$lang] = tep_read_lang_words($lang, $neuter_file);
-  
-  $def_lang_checked = array();
-  foreach($war as $lang => $lang_def) {
-      foreach($lang_def as $def_name => $def_val) {
-    $total = 0;
-    $matches = 0;
-    $lang_equal = "";
-
-    //keep list of verified ($def_name,$lang)'s to avoid dupes
-    $def_lang = "$def_name $lang";
-    if(!(array_search($def_lang, $def_lang_checked) !== false)) {
-        $def_lang_checked[] = $def_lang;
-
-        foreach($lang_list as $lang_comp) 
-      if($lang_comp != $lang) {
-          $total++;
-
-          if($war[$lang][$def_name] == $war[$lang_comp][$def_name]) {
-        $matches++;
-        $lang_equal .= " [$lang_comp]";
-
-        //add to the list to avoid dupes
-        $def_lang = "$def_name $lang_comp";
-        $def_lang_checked[] = $def_lang;
-          }
-      }
-
-        if($matches) {
-      if($first_missing_in_file) {
-          $first_missing_in_file = 0;
-          echo "<tr><th colspan=3>includes/<i>[LANG_NAME]</i>$neuter_file</th><td></td></tr>\n";
-      }
-
-      echo "<tr><td>$lang</td><td>$def_name</td><td>";
-      if($matches == $total) 
-          echo "<i>".CHECK_LANG_ALL_EQUAL."</i>";
-      else
-          echo $lang_equal;
-
-      //echo "</td><td><a href='$my_url?find_def=$def_name&file_name=$neuter_file'>Where Used</a></td></tr>\n";   
-      echo "</td><td><a href='$my_url?find_def=$def_name&file_name=$neuter_file'>".CHECK_LANG_WHERE_USED."</a></td></tr>\n";   
-        }
-    }
-      }
-  }
-    }
-    echo "</table>";
-}
-
-function tep_new_show_missing_def(&$lar) 
-{
-    global $my_url;
-
-    $file_defs_checked = array();
-
-    $lang_list = array_keys($lar);
-
-    $neutral_file_list = tep_create_lang_neutral($lar);
-
-    //itterate all files to find missing files
-    echo "<table border=1>";
-  //  echo "<tr><th>Found for</th><th>Definition name</th><th>Missing for</th><th>References</th></tr>\n";
-    echo "<tr><th>".CHECK_LANG_FOUND_FOR."</th><th>".CHECK_LANG_DEFINITION_NAME."</th><th>".CHECK_LANG_MISSING_FOR."</th><th>".CHECK_LANG_REFERENCES."</th></tr>\n";
-
-    foreach ($neutral_file_list as $neuter_file) {
-  $first_missing_in_file = 1;
-  
-  //create word-definition array
-  $war = array();
-  foreach($lang_list as $lang) 
-      $war[$lang] = tep_read_lang_words($lang, $neuter_file);
-
-  //check definitions are present for all files
-  $defs_checked = array();
-  foreach($war as $lang => $lang_def) {
-      foreach($lang_def as $def_name => $def_val) {
-    $total = 0;
-    $missing = 0;
-    $lang_missing = "";
-
-    //keep list of verified $def_name's to avoid dupes
-    if(!(array_search($def_name, $defs_checked) !== false)) {
-        $defs_checked[] = $def_name;
-
-        foreach($lang_list as $lang_comp) 
-      if($lang_comp != $lang) {
-          $total++;
-
-//          echo "<br>search $def_name ($lang_comp) in";
-//          print_r($war[$lang_comp]);
-          
-          if(!isset($war[$lang_comp][$def_name])) {
-        $missing++;
-        $lang_missing .= " [$lang_comp]";
-          }
-      }
-
-        if($missing) {
-      if($first_missing_in_file) {
-          $first_missing_in_file = 0;
-          echo "<tr><th colspan=3>includes/<i>[LANG_NAME]</i>$neuter_file</th><td></td></tr>\n";          
-      }
-
-      echo "<tr><td>$lang</td><td>$def_name</td><td>";
-
-      if($missing == $total) 
-          //echo "<i>All but $lang</i>";
-          echo "<i>".CHECK_LANG_ALL_BUT." $lang</i>";
-      else
-          echo $lang_missing;
-
-
-      //echo "</td><td><a href='$my_url?find_def=$def_name&file_name=$neuter_file'>Where Used</a></td></tr>\n";
-      
-      echo "</td><td><a href='$my_url?find_def=$def_name&file_name=$neuter_file'>".CHECK_LANG_WHERE_USED."</a></td></tr>\n";   
-        }
-    }
-      }
-  }
-    }
-    echo "</table>";
-}
-
-function tep_file_contains($def_name, $file_name) 
-{    
-    $contents = file_get_contents($file_name);
-
-    if(strstr($contents, $def_name))
-  return 1;
-    else
-  return 0;
-}    
-    
-function tep_find_occurences($def_name, $dir, $bstr = "") 
-{
-    global $my_url;
-
-    $file_list = tep_read_files_in_dir($dir);
-
-    $none_found = 1;
-    $line_buf = "";
-    //echo "<table>\n<tr><th>File Name</th></tr>\n";
-    echo "<table>\n<tr><th>".CHECK_LANG_FILE_NAME."</th></tr>\n";
-    foreach($file_list as $file) {
-  if(!strstr($file,"/languages/") &&
-     is_file($file) &&
-     tep_file_contains($def_name, $file)) {
-      $none_found = 0;
-      
-      if(strstr($file, $bstr)) 
-    echo "<tr><td><b>$file</b></td></tr>\n";
-      else
-    $line_buf .= "<tr><td>$file</td></tr>\n";
-  }
-    }
-    
-    
-    if($none_found) 
-  //echo "<tr><td cospan=2 align=center><i>None Found</i></td></tr>\n";
-  echo "<tr><td cospan=2 align=center><i>".CHECK_LANG_NONE_FOUND."</i></td></tr>\n";
-    elseif($line_buf)
-  echo $line_buf;
-  
-    echo "</table><br>";
-}
-
-function tep_show_main_menu($my_url) 
-{
- /*   echo "<table>
-<tr><th colspan=2>Select option</th></tr>
-<tr><td>To check file consistency</td>      <td><a href='$my_url?check_file=1'>Click Here</a></td></tr>
-<tr><td>To check definition consistency</td><td><a href='$my_url?check_def=1'>Click Here</a></td></tr>
-<tr><td>To check equal definitions</td>     <td><a href='$my_url?check_eq=1'>Click Here</a></td></tr>
-</table>";
-*/
-
-echo "<table><tr><th colspan=2>".CHECK_LANG_SELECT_OPTION."</th></tr><tr><td>".CHECK_LANG_TO_CHECK_FILE_CONSISTENCY."</td><td><a href='$my_url?check_file=1'>".CHECK_LANG_CLICK_HERE."</a></td></tr><tr><td>".CHECK_LANG_TO_CHECK_DEFINITION_CONSISTENCY."</td><td><a href='$my_url?check_def=1'>".CHECK_LANG_CLICK_HERE."</a></td></tr><tr><td>".CHECK_LANG_TO_CHECK_EQUAL_DEFINITIONS."</td><td><a href='$my_url?check_eq=1'>".CHECK_LANG_CLICK_HERE."</a></td></tr></table>";
-
-}
-
-function tep_show_footer($my_url, $my_ref, $starttime) {
-    
-   // echo "\n\n<br><a href='$my_url'>Home</a> - <a href='$my_ref'>Back</a>";
-    echo "\n\n<br><a href='$my_url'>".CHECK_LANG_HOME."</a> - <a href='$my_ref'>".CHECK_LANG_BACK."</a>";
-    
-    $timeparts = explode(' ',microtime());
-    $endtime = $timeparts[1].substr($timeparts[0],1);
-    echo "<br><h6> ".CHECK_LANG_W_GODEFROY." - check_lang.php\n";
-    echo " - ".CHECK_LANG_EXECUTION_TIME." " . bcsub($endtime,$starttime,6);
-    echo " s </h6>";
-}
-
-
-//////////////////////////// PROGRAM START \\\\\\\\\\\\\\\\\\\\\\\\\ 
-
-/*echo "<html>
-<head>
-<title>Check Language Integrity</title>
-</head>
-<body>\n";*/
-echo "<html>
-<head>
-<title>".CHECK_LANG_TITLE."</title>
-</head>
-<body>\n";
-
-//tep_show_env();
-
-$lang_dir = DIR_WS_INCLUDES . 'languages/';
-$my_url = $HTTP_SERVER_VARS["PHP_SELF"];
-$my_file = $HTTP_SERVER_VARS["PATH_TRANSLATED"];
-$my_ref = $HTTP_SERVER_VARS["HTTP_REFERER"];
-
-if(isset($HTTP_GET_VARS["find_def"])) {
-    echo "<h3>".CHECK_LANG_LIST_OF_FILES_USING." " . $HTTP_GET_VARS["find_def"] . "</h3><br>\n";
-    
-    tep_find_occurences($HTTP_GET_VARS["find_def"],
-      dirname($my_file),
-      $HTTP_GET_VARS["file_name"]);
-
-} elseif(isset($HTTP_GET_VARS["check_file"])) {
-    $lar = array();
-
-   // echo "<h3>List of files that are present for one language-definition but missing for other(s)</h3><br>\n";
-
-    echo "<h3>".CHECK_LANG_LIST_OF_FILES_PRESENT_FOR_ONE_LANGUAGE."</h3><br>\n";
-
-    tep_scan_lang_dirs($lar, $lang_dir);
-    
-    tep_read_lang_files($lar);
-    
-//    tep_show_missing_files($lar);
-    tep_new_show_missing_files($lar);
-
-} elseif(isset($HTTP_GET_VARS["check_def"])) {
-    //echo "<h3>List of phrase definitions that are present for one language-file but missing for other(s)</h3><br>\n";
-    echo "<h3>".CHECK_LANG_LIST_OF_PHRASE_PRESENT_FOR_ONE_LANGUAGE."</h3><br>\n";
-
-    tep_scan_lang_dirs($lar, $lang_dir);
-    tep_read_lang_files($lar);    
-    //tep_show_missing_equal_def($lar);
-    tep_new_show_missing_def($lar);
-
-} elseif(isset($HTTP_GET_VARS["check_eq"])) {
-    //echo "<h3>List of phrase definitions that are equal</h3><br>\n";
-    echo "<h3>".CHECK_LANG_LIST_OF_PHRASE_DEFINITIONS_EQUAL."</h3><br>\n";
-    tep_scan_lang_dirs($lar, $lang_dir);
-    tep_read_lang_files($lar);
-    //tep_show_missing_equal_def($lar, 1);
-    tep_new_show_equal_def($lar);
-    
-}  else {
-    tep_show_main_menu($my_url);
-}
-
-
-tep_show_footer($my_url, $my_ref, $starttime);
-
-echo "</body></html>\n";
-
-?>

Deleted: trunk/direct.openmoko.com/checkout_confirmation.php
===================================================================
--- trunk/direct.openmoko.com/checkout_confirmation.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_confirmation.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,120 +0,0 @@
-<?php
-/*
-  $Id: checkout_confirmation.php,v 1.2 2004/03/05 00:36:41 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot(array('mode' => 'SSL', 'page' => FILENAME_CHECKOUT_PAYMENT));
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// if there is nothing in the customers cart, redirect them to the shopping cart page
-  if ($cart->count_contents() < 1) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-
-// avoid hack attempts during the checkout procedure by checking the internal cartID
-  if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
-    if ($cart->cartID != $cartID) {
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-    }
-  }
-
-// if no shipping method has been selected, redirect the customer to the shipping method selection page
-  if (!tep_session_is_registered('shipping')) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  }
-
-  if (!tep_session_is_registered('payment')) tep_session_register('payment');
-  if (isset($HTTP_POST_VARS['payment'])) $payment = $HTTP_POST_VARS['payment'];
-
-  if (!tep_session_is_registered('comments')) tep_session_register('comments');
-  if (tep_not_null($HTTP_POST_VARS['comments'])) {
-    $comments = tep_db_prepare_input($HTTP_POST_VARS['comments']);
-  }
-
-// load the selected payment module
-  require(DIR_WS_CLASSES . 'payment.php');
-  if ($credit_covers) $payment=''; //ICW added for CREDIT CLASS
-  $payment_modules = new payment($payment);
-  $payment_modules->update_status();
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-
-  // Stock Check
-  $any_out_of_stock = false;
-  if (STOCK_CHECK == 'true') {
-    for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
-      if (tep_check_stock($order->products[$i]['id'], $order->products[$i]['qty'])) {
-        $any_out_of_stock = true;
-      }
-    }
-    // Out of Stock
-    if ( (STOCK_ALLOW_CHECKOUT != 'true') && ($any_out_of_stock == true) ) {
-      tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-    }
-  }
-
-// Ok, the various checks have been applied.  Now if this is thesecond time thru
-// we want to proceed.  The checks are to be applied before the confirmation screen is presented
-// and once again after the confirm button is clicked to reduce possible errors in the order.
-  if ( isset($HTTP_POST_VARS['action']) && $HTTP_POST_VARS['action'] == 'proceed' ) {
-    if (isset($$payment->form_action_url)) {
-      tep_redirect($$payment->form_action_url);
-    } else {
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL'));
-    }
-  }  
-
-  
-//ICW ADDED FOR CREDIT CLASS SYSTEM
-  require(DIR_WS_CLASSES . 'order_total.php');
-//ICW ADDED FOR CREDIT CLASS SYSTEM
-  $order_total_modules = new order_total;
-//ICW ADDED FOR CREDIT CLASS SYSTEM
-  $order_total_modules->collect_posts();
-//ICW ADDED FOR CREDIT CLASS SYSTEM
-  $order_total_modules->pre_confirmation_check();
-
-// ICW CREDIT CLASS Amended Line
-//  if ( ( is_array($payment_modules->modules) && (sizeof($payment_modules->modules) > 1) && !is_object($$payment) ) || (is_object($$payment) && ($$payment->enabled == false)) ) {
-  if ( (is_array($payment_modules->modules)) && (sizeof($payment_modules->modules) > 1) && (!is_object($$payment)) && (!$credit_covers) ) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode(ERROR_NO_PAYMENT_MODULE_SELECTED), 'SSL'));
-  }
-
-  if (is_array($payment_modules->modules)) {
-    $payment_modules->pre_confirmation_check();
-  }
-
-// load the selected shipping module
-  require(DIR_WS_CLASSES . 'shipping.php');
-  $shipping_modules = new shipping($shipping);
-//ICW Credit class amendment Lines below repositioned
-//  require(DIR_WS_CLASSES . 'order_total.php');
-//  $order_total_modules = new order_total;
-
-  
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_CONFIRMATION);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2);
-
-  $content = CONTENT_CHECKOUT_CONFIRMATION;
-  
-  if (ACCOUNT_CONDITIONS_REQUIRED == 'true') $javascript = 'checkout_confirmation.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_payment.php
===================================================================
--- trunk/direct.openmoko.com/checkout_payment.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_payment.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,106 +0,0 @@
-<?php
-/*
-  $Id: checkout_payment.php,v 1.1.1.3 2004/03/04 23:37:55 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-
-  Updated for: Authorize.net Consolidated v1.7 - CRE loaded6 v4 edition
-  Date: April 10, 2004
-  Added: Rewrote checkout_payment.php for CRE loaded6 v4
-  Author: Austin Renfroe (Austin519)
-  Email: Austin519 at aol.com
-*/
-
-  require('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// if there is nothing in the customers cart, redirect them to the shopping cart page
-  if ($cart->count_contents() < 1) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-
-// if no shipping method has been selected, redirect the customer to the shipping method selection page
-  if (!tep_session_is_registered('shipping')) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  }
-
-// avoid hack attempts during the checkout procedure by checking the internal cartID
-  if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
-    if ($cart->cartID != $cartID) {
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-    }
-  }
-
-// if we have been here before and are coming back get rid of the credit covers variable
-  if(tep_session_is_registered('credit_covers')) tep_session_unregister('credit_covers');  //ICW ADDED FOR CREDIT CLASS SYSTEM
-
-// Stock Check
-  if ( (STOCK_CHECK == 'true') && (STOCK_ALLOW_CHECKOUT != 'true') ) {
-    $products = $cart->get_products();
-    for ($i=0, $n=sizeof($products); $i<$n; $i++) {
-      if (tep_check_stock($products[$i]['id'], $products[$i]['quantity'])) {
-        tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-        break;
-      }
-    }
-  }
-
-// if no billing destination address was selected, use the customers own address as default
-  if (!tep_session_is_registered('billto')) {
-    tep_session_register('billto');
-    $billto = $customer_default_address_id;
-  } else {
-// verify the selected billing address
-    $check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$billto . "'");
-    $check_address = tep_db_fetch_array($check_address_query);
-
-    if ($check_address['total'] != '1') {
-      $billto = $customer_default_address_id;
-      if (tep_session_is_registered('payment')) tep_session_unregister('payment');
-    }
-  }
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-  require(DIR_WS_CLASSES . 'order_total.php');//ICW ADDED FOR CREDIT CLASS SYSTEM
-  $order_total_modules = new order_total;//ICW ADDED FOR CREDIT CLASS SYSTEM
-  $order_total_modules->clear_posts(); // ADDED FOR CREDIT CLASS SYSTEM by Rigadin in v5.13
-
-  if (!tep_session_is_registered('comments')) tep_session_register('comments');
-
-  $total_weight = $cart->show_weight();
-  $total_count = $cart->count_contents();
-  $total_count = $cart->count_contents_virtual(); //ICW ADDED FOR CREDIT CLASS SYSTEM
-
-// load all enabled payment modules
-  require(DIR_WS_CLASSES . 'payment.php');
-  $payment_modules = new payment;
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_PAYMENT);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-
-  $content = CONTENT_CHECKOUT_PAYMENT;
-  $javascript = $content . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
-<script type="text/javascript"><!--
-function CVVPopUpWindow(url) {
-  window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,copyhistory=no,width=600,height=233,screenX=150,screenY=150,top=150,left=150')
-}
-//--></script>

Deleted: trunk/direct.openmoko.com/checkout_payment_address.php
===================================================================
--- trunk/direct.openmoko.com/checkout_payment_address.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_payment_address.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,205 +0,0 @@
-<?php
-/*
-  $Id: checkout_payment_address.php,v 1.1.1.1 2004/03/04 23:37:56 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// if there is nothing in the customers cart, redirect them to the shopping cart page
-  if ($cart->count_contents() < 1) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_PAYMENT_ADDRESS);
-
-  $error = false;
-  $process = false;
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'submit')) {
-// process a new billing address
-    if (tep_not_null($HTTP_POST_VARS['firstname']) && tep_not_null($HTTP_POST_VARS['lastname']) && tep_not_null($HTTP_POST_VARS['street_address'])) {
-      $process = true;
-
-      if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-      if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-      $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-      $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-      $street_address = tep_db_prepare_input($HTTP_POST_VARS['street_address']);
-      if (ACCOUNT_SUBURB == 'true') $suburb = tep_db_prepare_input($HTTP_POST_VARS['suburb']);
-      $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-      $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-      $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-      if (ACCOUNT_STATE == 'true') {
-        if (isset($HTTP_POST_VARS['zone_id'])) {
-          $zone_id = tep_db_prepare_input($HTTP_POST_VARS['zone_id']);
-        } else {
-          $zone_id = false;
-        }
-        $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-      }
-
-      if (ACCOUNT_GENDER == 'true') {
-        if ( ($gender != 'm') && ($gender != 'f') ) {
-          $error = true;
-
-          $messageStack->add('checkout_address', ENTRY_GENDER_ERROR);
-        }
-      }
-
-      if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_FIRST_NAME_ERROR);
-      }
-
-      if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_LAST_NAME_ERROR);
-      }
-
-      if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_STREET_ADDRESS_ERROR);
-      }
-
-      if (strlen($postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_POST_CODE_ERROR);
-      }
-
-      if (strlen($city) < ENTRY_CITY_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_CITY_ERROR);
-      }
-
-      if (ACCOUNT_STATE == 'true') {
-        $zone_id = 0;
-        $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
-        $check = tep_db_fetch_array($check_query);
-        $entry_state_has_zones = ($check['total'] > 0);
-        if ($entry_state_has_zones == true) {
-//State abbreviation bug fix applied. 10/1/2004
-//Now accepts abbreviation - no complaints about capitalization
-$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' OR zone_code = '" . tep_db_input($state) . "')");
-          if (tep_db_num_rows($zone_query) == 1) {
-            $zone = tep_db_fetch_array($zone_query);
-            $zone_id = $zone['zone_id'];
-          } else {
-            $error = true;
-
-            $messageStack->add('checkout_address', ENTRY_STATE_ERROR_SELECT);
-          }
-        } else {
-          if (strlen($state) < ENTRY_STATE_MIN_LENGTH) {
-            $error = true;
-
-            $messageStack->add('checkout_address', ENTRY_STATE_ERROR);
-          }
-        }
-      }
-
-      if ( (is_numeric($country) == false) || ($country < 1) ) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_COUNTRY_ERROR);
-      }
-
-      if ($error == false) {
-        $sql_data_array = array('customers_id' => $customer_id,
-                                'entry_firstname' => $firstname,
-                                'entry_lastname' => $lastname,
-                                'entry_street_address' => $street_address,
-                                'entry_postcode' => $postcode,
-                                'entry_city' => $city,
-                                'entry_country_id' => $country);
-
-        if (ACCOUNT_GENDER == 'true') $sql_data_array['entry_gender'] = $gender;
-        if (ACCOUNT_COMPANY == 'true') $sql_data_array['entry_company'] = $company;
-        if (ACCOUNT_SUBURB == 'true') $sql_data_array['entry_suburb'] = $suburb;
-        if (ACCOUNT_STATE == 'true') {
-          if ($zone_id > 0) {
-            $sql_data_array['entry_zone_id'] = $zone_id;
-            $sql_data_array['entry_state'] = '';
-          } else {
-            $sql_data_array['entry_zone_id'] = '0';
-            $sql_data_array['entry_state'] = $state;
-          }
-        }
-
-        if (!tep_session_is_registered('billto')) tep_session_register('billto');
-
-        tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array);
-
-        $billto = tep_db_insert_id();
-
-        if (tep_session_is_registered('payment')) tep_session_unregister('payment');
-
-        tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-      }
-// process the selected billing destination
-    } elseif (isset($HTTP_POST_VARS['address'])) {
-      $reset_payment = false;
-      if (tep_session_is_registered('billto')) {
-        if ($billto != $HTTP_POST_VARS['address']) {
-          if (tep_session_is_registered('payment')) {
-            $reset_payment = true;
-          }
-        }
-      } else {
-        tep_session_register('billto');
-      }
-
-      $billto = $HTTP_POST_VARS['address'];
-
-      $check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$billto . "'");
-      $check_address = tep_db_fetch_array($check_address_query);
-
-      if ($check_address['total'] == '1') {
-        if ($reset_payment == true) tep_session_unregister('payment');
-        tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-      } else {
-        tep_session_unregister('billto');
-      }
-// no addresses to select from - customer decided to keep the current assigned address
-    } else {
-      if (!tep_session_is_registered('billto')) tep_session_register('billto');
-      $billto = $customer_default_address_id;
-
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-    }
-  }
-
-// if no billing destination address was selected, use their own address as default
-  if (!tep_session_is_registered('billto')) {
-    $billto = $customer_default_address_id;
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_CHECKOUT_PAYMENT_ADDRESS, '', 'SSL'));
-
-  $addresses_count = tep_count_customer_address_book_entries();
-
-  $content = CONTENT_CHECKOUT_PAYMENT_ADDRESS;
-  $javascript = $content . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_paypalipn.php
===================================================================
--- trunk/direct.openmoko.com/checkout_paypalipn.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_paypalipn.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,262 +0,0 @@
-<?php
-/*
-  $Id: checkout_paypalipn.php,v 1.1.1.1 2004/03/04 23:37:56 ccwjr Exp $
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Paypal IPN v0.981 for Milestone 2
-  Copyright (c) 2003 Pablo Pasqualino
-  pablo_osc at osmosisdc.com
-  http://www.osmosisdc.com
-
-  Released under the GNU General Public License
-*/
-
-  include('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot(array('mode' => 'SSL', 'page' => FILENAME_CHECKOUT_PAYMENT));
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  if (!tep_session_is_registered('sendto')) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-  if ( (tep_not_null(MODULE_PAYMENT_INSTALLED)) && (!tep_session_is_registered('payment')) ) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-// avoid hack attempts during the checkout procedure by checking the internal cartID
-  if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
-    if ($cart->cartID != $cartID) {
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-    }
-  }
-
-  include(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_PROCESS);
-
-// load selected payment module
-  require(DIR_WS_CLASSES . 'payment.php');
-  if ($credit_covers) $payment=''; //ICW added for CREDIT CLASS
-  $payment_modules = new payment($payment);
-
-// load the selected shipping module
-  require(DIR_WS_CLASSES . 'shipping.php');
-  $shipping_modules = new shipping($shipping);
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-  
-// load the before_process function from the payment modules
-  $payment_modules->before_process();
-
-  require(DIR_WS_CLASSES . 'order_total.php');
-  $order_total_modules = new order_total;
-
-  $order_totals = $order_total_modules->process();
-
-// BOF: WebMakers.com Added: Downloads Controller
-  $sql_data_array = array('customers_id' => (int)$customer_id,
-                          'customers_name' => $order->customer['firstname'] . ' ' . $order->customer['lastname'],
-                          'customers_company' => $order->customer['company'],
-                          'customers_street_address' => $order->customer['street_address'],
-                          'customers_suburb' => $order->customer['suburb'],
-                          'customers_city' => $order->customer['city'],
-                          'customers_postcode' => $order->customer['postcode'], 
-                          'customers_state' => $order->customer['state'], 
-                          'customers_country' => $order->customer['country']['title'], 
-                          'customers_telephone' => $order->customer['telephone'], 
-                          'customers_email_address' => $order->customer['email_address'],
-                          'customers_address_format_id' => $order->customer['format_id'], 
-                          'delivery_name' => $order->delivery['firstname'] . ' ' . $order->delivery['lastname'], 
-                          'delivery_company' => $order->delivery['company'],
-                          'delivery_street_address' => $order->delivery['street_address'], 
-                          'delivery_suburb' => $order->delivery['suburb'], 
-                          'delivery_city' => $order->delivery['city'], 
-                          'delivery_postcode' => $order->delivery['postcode'], 
-                          'delivery_state' => $order->delivery['state'], 
-                          'delivery_country' => $order->delivery['country']['title'], 
-                          'delivery_address_format_id' => $order->delivery['format_id'], 
-                          'billing_name' => $order->billing['firstname'] . ' ' . $order->billing['lastname'], 
-                          'billing_company' => $order->billing['company'],
-                          'billing_street_address' => $order->billing['street_address'], 
-                          'billing_suburb' => $order->billing['suburb'], 
-                          'billing_city' => $order->billing['city'], 
-                          'billing_postcode' => $order->billing['postcode'], 
-                          'billing_state' => $order->billing['state'], 
-                          'billing_country' => $order->billing['country']['title'], 
-                          'billing_address_format_id' => $order->billing['format_id'], 
-                          'payment_method' => $order->info['payment_method'],
-// BOF: Lango Added for print order mod 
-                          'payment_info' => $GLOBALS['payment_info'],
-// EOF: Lango Added for print order mod 
-                          'cc_type' => $order->info['cc_type'], 
-                          'cc_owner' => $order->info['cc_owner'], 
-                          'cc_number' => $order->info['cc_number'], 
-                          'cc_expires' => $order->info['cc_expires'], 
-                          'date_purchased' => 'now()', 
-                          'last_modified' => 'now()', 
-                          'orders_status' => 99999, 
-                          'currency' => $order->info['currency'], 
-                          'currency_value' => $order->info['currency_value']);
-// EOF: WebMakers.com Added: Downloads Controller
-  tep_db_perform(TABLE_ORDERS, $sql_data_array);
-  $insert_id = tep_db_insert_id();
-  for ($i=0, $n=sizeof($order_totals); $i<$n; $i++) {
-    $sql_data_array = array('orders_id' => $insert_id,
-                            'title' => $order_totals[$i]['title'],
-                            'text' => $order_totals[$i]['text'],
-                            'value' => $order_totals[$i]['value'], 
-                            'class' => $order_totals[$i]['code'], 
-                            'sort_order' => $order_totals[$i]['sort_order']);
-    tep_db_perform(TABLE_ORDERS_TOTAL, $sql_data_array);
-  }
-
-  $customer_notification = (SEND_EMAILS == 'true') ? '1' : '0';
-  $sql_data_array = array('orders_id' => $insert_id, 
-                          'orders_status_id' => '99999', 
-                          'date_added' => 'now()', 
-                          'customer_notified' => $customer_notification,
-                          'comments' => $order->info['comments']);
-  tep_db_perform(TABLE_ORDERS_STATUS_HISTORY, $sql_data_array);
-
-  for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
-// Stock Update - Joao Correia
-    if (STOCK_LIMITED == 'true' && MODULE_PAYMENT_PAYPALIPN_UPDATE_STOCK_BEFORE_PAYMENT=='True') {
-      $downloadable_product = false;
-      if (DOWNLOAD_ENABLED == 'true') {
-        // see if this product actually has a downloadable file in the attributes
-        $download_check_query_raw = "SELECT products_quantity, pad.products_attributes_filename
-                            FROM " . TABLE_PRODUCTS . " p, 
-                            " . TABLE_PRODUCTS_ATTRIBUTES . " pa,
-                            " . TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD . " pad
-                             WHERE p.products_id = '" . tep_get_prid($order->products[$i]['id']) . "'
-                             and p.products_id=pa.products_id
-                             and pad.products_attributes_id=pa.products_attributes_id ";
-                             
-        $download_check_query = tep_db_query($download_check_query_raw);
-        if (tep_db_num_rows($download_check_query) > 0) {
-          $downloadable_product = true;
-        }
-      }  // end of downloadable product check
-      if ( !$downloadable_product ) {
-        $stock_query = tep_db_query("select products_quantity from " . TABLE_PRODUCTS . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        $stock_values = tep_db_fetch_array($stock_query);
-        $stock_left = $stock_values['products_quantity'] - $order->products[$i]['qty'];
-        tep_db_query("update " . TABLE_PRODUCTS . " set products_quantity = '" . $stock_left . "' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        if ( ($stock_left < 1) && (STOCK_ALLOW_CHECKOUT == 'false') ) {
-          tep_db_query("update " . TABLE_PRODUCTS . " set products_status = '0' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        }
-      }
-    }
-
-// Update products_ordered (for bestsellers list) 
-    tep_db_query("update " . TABLE_PRODUCTS . " set products_ordered = products_ordered + " . sprintf('%d', $order->products[$i]['qty']) . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-
-    $sql_data_array = array('orders_id' => $insert_id, 
-                            'products_id' => tep_get_prid($order->products[$i]['id']), 
-                            'products_model' => $order->products[$i]['model'], 
-                            'products_name' => $order->products[$i]['name'], 
-                            'products_price' => $order->products[$i]['price'], 
-                            'final_price' => $order->products[$i]['final_price'], 
-                            'products_tax' => $order->products[$i]['tax'], 
-                            'products_quantity' => $order->products[$i]['qty']);
-    tep_db_perform(TABLE_ORDERS_PRODUCTS, $sql_data_array);
-    $order_products_id = tep_db_insert_id();
-    $order_total_modules->update_credit_account($i);//ICW ADDED FOR CREDIT CLASS SYSTEM
-//------insert customer choosen option to order--------
-    $attributes_exist = '0';
-    $products_ordered_attributes = '';
-    if (isset($order->products[$i]['attributes'])) {
-      $attributes_exist = '1';
-      for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
-        if (DOWNLOAD_ENABLED == 'true') {
-          $attributes_query = "select popt.products_options_name, poval.products_options_values_name, pa.options_values_price, pa.price_prefix, pad.products_attributes_maxdays, pad.products_attributes_maxcount , pad.products_attributes_filename 
-                               from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_OPTIONS_VALUES . " poval, " . TABLE_PRODUCTS_ATTRIBUTES . " pa 
-                               left join " . TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD . " pad
-                                on pa.products_attributes_id=pad.products_attributes_id
-                               where pa.products_id = '" . $order->products[$i]['id'] . "' 
-                                and pa.options_id = '" . $order->products[$i]['attributes'][$j]['option_id'] . "' 
-                                and pa.options_id = popt.products_options_id 
-                                and pa.options_values_id = '" . $order->products[$i]['attributes'][$j]['value_id'] . "' 
-                                and pa.options_values_id = poval.products_options_values_id 
-                                and poptt.language_id = '" . (int)$languages_id . "' 
-                                and poval.language_id = '" . (int)$languages_id . "'";
-          $attributes = tep_db_query($attributes_query);
-        } else {
-          $attributes = tep_db_query("select poptt.products_options_name, poval.products_options_values_name, pa.options_values_price, pa.price_prefix from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_OPTIONS_TEXT . " poptt,  " . TABLE_PRODUCTS_OPTIONS_VALUES . " poval, " . TABLE_PRODUCTS_ATTRIBUTES . " pa where pa.products_id = '" . $order->products[$i]['id'] . "' and pa.options_id = '" . $order->products[$i]['attributes'][$j]['option_id'] . "' and pa.options_id = popt.products_options_id and poptt.products_options_text_id = popt.products_options_id and pa.options_values_id = '" . $order->products[$i]['attributes'][$j]['value_id'] . "' and pa.options_values_id = poval.products_options_values_id and poptt.language_id = '" . (int)$languages_id . "' and poval.language_id = '" . (int)$languages_id . "'");
-        }
-        $attributes_values = tep_db_fetch_array($attributes);
-
-        $sql_data_array = array('orders_id' => $insert_id, 
-                                'orders_products_id' => $order_products_id, 
-                                'products_options' => $attributes_values['products_options_name'],
-                                'products_options_values' => $attributes_values['products_options_values_name'], 
-                                'options_values_price' => $attributes_values['options_values_price'], 
-                                'price_prefix' => $attributes_values['price_prefix']);
-        tep_db_perform(TABLE_ORDERS_PRODUCTS_ATTRIBUTES, $sql_data_array);
-  
-        if ((DOWNLOAD_ENABLED == 'true') && isset($attributes_values['products_attributes_filename']) && tep_not_null($attributes_values['products_attributes_filename'])) {
-          $sql_data_array = array('orders_id' => $insert_id, 
-                                  'orders_products_id' => $order_products_id, 
-                                  'orders_products_filename' => $attributes_values['products_attributes_filename'], 
-                                  'download_maxdays' => $attributes_values['products_attributes_maxdays'], 
-                                  'download_count' => $attributes_values['products_attributes_maxcount']);
-          tep_db_perform(TABLE_ORDERS_PRODUCTS_DOWNLOAD, $sql_data_array);
-        }
-        $products_ordered_attributes .= "\n\t" . $attributes_values['products_options_name'] . ' ' . $attributes_values['products_options_values_name'];
-      }
-    }
-//------insert customer choosen option eof ----
-    $total_weight += ($order->products[$i]['qty'] * $order->products[$i]['weight']);
-    $total_tax += tep_calculate_tax($total_products_price, $products_tax) * $order->products[$i]['qty'];
-    $total_cost += $total_products_price;
-
-    $products_ordered .= $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name'] . ' (' . $order->products[$i]['model'] . ') = ' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . $products_ordered_attributes . "\n";
-  }
-  $order_total_modules->apply_credit();//ICW ADDED FOR CREDIT CLASS SYSTEM
-
- // Include OSC-AFFILIATE  DMG  
-  require(DIR_WS_INCLUDES . 'affiliate_checkout_process.php');
-
-
-// load the after_process function from the payment modules
-  $payment_modules->after_process();
-
-// unregister session variables used during checkout
-  tep_session_unregister('sendto');
-  tep_session_unregister('billto');
-  tep_session_unregister('shipping');
-  tep_session_unregister('payment');
-  tep_session_unregister('comments');
-
-  if (ereg($order->info['currency'],MODULE_PAYMENT_PAYPALIPN_ALLOWED_CURRENCIES)) {
-    $paypal_ipn_currency = $order->info['currency'];
-  } else {
-    $paypal_ipn_currency = MODULE_PAYMENT_PAYPALIPN_DEFAULT_CURRENCY;
-  };
-
-  $paypal_ipn_order_amount = $order->info['total'];
-
-  if (MODULE_PAYMENT_PAYPALIPN_ADD_SHIPPING_TO_AMOUNT=='True') {
-    $paypal_ipn_shipping_amount = 0.00;
-  } else {
-    $paypal_ipn_order_amount -= $order->info['shipping_cost'];
-    $paypal_ipn_shipping_amount = number_format($order->info['shipping_cost'] * $currencies->get_value($paypal_ipn_currency), 2);
-  };
-
-  if (MODULE_PAYMENT_PAYPALIPN_ADD_TAX_TO_AMOUNT=='True') {
-    $paypal_ipn_tax_amount = 0.00;
-  } else {
-    $paypal_ipn_order_amount -= $order->info['tax'];
-    $paypal_ipn_tax_amount = number_format($order->info['tax'] * $currencies->get_value($paypal_ipn_currency), 2);
-  };
-
-  $paypal_ipn_order_amount = number_format($paypal_ipn_order_amount * $currencies->get_value($paypal_ipn_currency), 2);
-
-  tep_redirect("https://www.paypal.com/cgi-bin/webscr?cmd=_ext-enter&redirect_cmd=_xclick&business=".MODULE_PAYMENT_PAYPALIPN_ID."&item_name=".urlencode(STORE_NAME)."&item_number=".$insert_id."&currency_code=".$paypal_ipn_currency."&amount=".$paypal_ipn_order_amount."&shipping=".$paypal_ipn_shipping_amount."&tax=".$paypal_ipn_tax_amount."&first_name=".urlencode($order->customer['firstname'])."&last_name=".urlencode($order->customer['lastname'])."&address1=".urlencode($order->customer['street_address'])."&city=".urlencode($order->customer['city'])."&state=".urlencode($order->customer['state'])."&zip=".urlencode($order->customer['postcode'])."&email=".$order->customer['email_address']."&bn=oscommerce-osmosis-0.981&return=".tep_href_link(FILENAME_CHECKOUT_SUCCESS, '', 'SSL')."&cancel_return=".tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL')."&notify_url=".MODULE_PAYMENT_PAYPALIPN_NOTIFY_URL);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_process.php
===================================================================
--- trunk/direct.openmoko.com/checkout_process.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_process.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,377 +0,0 @@
-<?php
-/*
-  $Id: checkout_process.php,v 1.1.1.2 2004/03/04 23:37:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  include('includes/application_top.php');
-
-  $ip = $HTTP_SERVER_VARS["REMOTE_ADDR"];
-  $client = gethostbyaddr($HTTP_SERVER_VARS["REMOTE_ADDR"]);
-  $str = preg_split("/\./", $client);
-  $i = count($str);
-  $x = $i - 1;
-  $n = $i - 2;
-  $isp = $str[$n] . "." . $str[$x];
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot(array('mode' => 'SSL', 'page' => FILENAME_CHECKOUT_PAYMENT));
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  if (!tep_session_is_registered('sendto')) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-  if ( (tep_not_null(MODULE_PAYMENT_INSTALLED)) && (!tep_session_is_registered('payment')) ) {
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
- }
-
-// avoid hack attempts during the checkout procedure by checking the internal cartID
-  if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
-    if ($cart->cartID != $cartID) {
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-    }
-  }
-
-  include(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_PROCESS);
-
-// load selected payment module
-  require(DIR_WS_CLASSES . 'payment.php');
-  if ($credit_covers) $payment=''; //ICW added for CREDIT CLASS
-  $payment_modules = new payment($payment);
-
-// load the selected shipping module
-  require(DIR_WS_CLASSES . 'shipping.php');
-  $shipping_modules = new shipping($shipping);
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-
-if(!class_exists('order_total')) {
- include(DIR_WS_CLASSES . 'order_total.php');
- $order_total_modules = new order_total;
-}
-
-  $order_totals = $order_total_modules->process();
-
-
-
-// load the before_process function from the payment modules.  
-// Authorize.net/QuickCommerce/PlugnPlay processing - this called moved to a later point
-// This is maintained for compatiblity with all other modules
-// update for incorrect logic - start - 06/09/06 - datazen
-/* old code commented out
- if (!MODULE_PAYMENT_AUTHORIZENET_STATUS)
-   {
-    $payment_modules->before_process();
-    }
-*/
- if( ((MODULE_PAYMENT_AUTHORIZENET_STATUS == 'True') && ($payment == 'authorizenet') ) || 
-    ((MODULE_PAYMENT_QUICKCOMMERCE_STATUS =='True') && ($payment == 'quickcommerce') ) || 
-    ((MODULE_PAYMENT_PLUGNPAY_STATUS =='True')  && ($payment == 'plugnpay')) ){
-    //don't load before process
-  } elseif((MODULE_PAYMENT_PAYPAL_STATUS == 'True') && ($payment == 'paypal')) {
-    $payment_modules->before_process();
-    include(DIR_WS_MODULES . 'payment/paypal/catalog/checkout_process.inc.php');
-  } else {
-    $payment_modules->before_process();
-  }
-// update for incorrect logic - end
-  
-  if ( (PAYMENT_CC_CRYPT == 'True' ) && !empty($order->info['cc_number']) ){
-   $cc_number1 = cc_encrypt($order->info['cc_number']);
-   $cc_expires1 = cc_encrypt($order->info['cc_expires']);
-  }else{
-   $cc_number1 =$order->info['cc_number'];
-   $cc_expires1 =$order->info['cc_expires'];
-  }
-  
-  
-// BOF: WebMakers.com Added: Downloads Controller
-  $sql_data_array = array('customers_id' => $customer_id,
-                          'customers_name' => $order->customer['firstname'] . ' ' . $order->customer['lastname'],
-                          'customers_company' => $order->customer['company'],
-                          'customers_street_address' => $order->customer['street_address'],
-                          'customers_suburb' => $order->customer['suburb'],
-                          'customers_city' => $order->customer['city'],
-                          'customers_postcode' => $order->customer['postcode'],
-                          'customers_state' => $order->customer['state'],
-                          'customers_country' => $order->customer['country']['title'],
-                          'customers_telephone' => $order->customer['telephone'],
-                          'customers_email_address' => $order->customer['email_address'],
-                          'customers_address_format_id' => $order->customer['format_id'],
-                          'delivery_name' => $order->delivery['firstname'] . ' ' . $order->delivery['lastname'],
-                          'delivery_company' => $order->delivery['company'],
-                          'delivery_street_address' => $order->delivery['street_address'],
-                          'delivery_suburb' => $order->delivery['suburb'],
-                          'delivery_city' => $order->delivery['city'],
-                          'delivery_postcode' => $order->delivery['postcode'],
-                          'delivery_state' => $order->delivery['state'],
-                          'delivery_country' => $order->delivery['country']['title'],
-                          'delivery_address_format_id' => $order->delivery['format_id'],
-                          'billing_name' => $order->billing['firstname'] . ' ' . $order->billing['lastname'],
-                          'billing_company' => $order->billing['company'],
-                          'billing_street_address' => $order->billing['street_address'],
-                          'billing_suburb' => $order->billing['suburb'],
-                          'billing_city' => $order->billing['city'],
-                          'billing_postcode' => $order->billing['postcode'],
-                          'billing_state' => $order->billing['state'],
-                          'billing_country' => $order->billing['country']['title'],
-                          'billing_address_format_id' => $order->billing['format_id'],
-                          'payment_method' => $order->info['payment_method'],
-                          'payment_info' => $GLOBALS['payment_info'],
-                          'cc_type' => $order->info['cc_type'],
-                          'cc_owner' => $order->info['cc_owner'],
-                          'cc_number' => $cc_number1,
-                          'cc_ccv' => '',
-                          'cc_start' => $order->info['cc_start'],
-                          'cc_issue' => $order->info['cc_issue'],
-                          'cc_expires' => $cc_expires1,
-                          'date_purchased' => 'now()',
-                          'last_modified' => 'now()',
-                          'orders_status' => $order->info['order_status'],
-                          'currency' => $order->info['currency'],
-                          'currency_value' => $order->info['currency_value'],
-                          'ipaddy' => $ip,
-        'ipisp' => $isp);
-              
-// EOF: WebMakers.com Added: Downloads Controller
-  tep_db_perform(TABLE_ORDERS, $sql_data_array);
-  $insert_id = tep_db_insert_id();
-
-// Make sure the /catalog/includes/class/order.php is included
-// and $order object is created before this!!!
-// load the before_process function from the payment modules
-
-//************
-  if(defined(MODULE_PAYMENT_AUTHORIZENET_STATUS) && MODULE_PAYMENT_AUTHORIZENET_STATUS) {
-    include(DIR_WS_MODULES . 'authorizenet_direct.php');
-    $payment_modules->before_process();
-  }
-//************************************************************
-
- //quickcommerce
- if(defined(MODULE_PAYMENT_QUICKCOMMERCE_STATUS) && MODULE_PAYMENT_QUICKCOMMERCE_STATUS) {
-    include(DIR_WS_MODULES . 'quickcommerce_direct.php');
-    $payment_modules->before_process();
-  }
-//***********************************
-  if(defined(MODULE_PAYMENT_PLUGNPAY_STATUS) && MODULE_PAYMENT_PLUGNPAY_STATUS) {
-    include(DIR_WS_MODULES . 'plugnpay_api.php');
-    $payment_modules->before_process();
-  }
-
-
-
-//insert order total
-
-  for ($i=0, $n=sizeof($order_totals); $i<$n; $i++) {
-    $sql_data_array = array('orders_id' => $insert_id,
-                            'title' => $order_totals[$i]['title'],
-                            'text' => $order_totals[$i]['text'],
-                            'value' => $order_totals[$i]['value'],
-                            'class' => $order_totals[$i]['code'],
-                            'sort_order' => $order_totals[$i]['sort_order']);
-    tep_db_perform(TABLE_ORDERS_TOTAL, $sql_data_array);
-  }
-
-  $customer_notification = (SEND_EMAILS == 'true') ? '1' : '0';
-  $sql_data_array = array('orders_id' => $insert_id,
-                          'orders_status_id' => $order->info['order_status'],
-                          'date_added' => 'now()',
-                          'customer_notified' => $customer_notification,
-                          'comments' => $order->info['comments']);
-  tep_db_perform(TABLE_ORDERS_STATUS_HISTORY, $sql_data_array);
-
-// initialized for the email confirmation
-  $products_ordered = '';
-  $subtotal = 0;
-  $total_tax = 0;
-
-  for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
-// Stock Update - Joao Correia
-    if (STOCK_LIMITED == 'true') {
-      $downloadable_product = false;
-      if (DOWNLOAD_ENABLED == 'true') {
-        // see if this product actually has a downloadable file in the attributes
-        $download_check_query_raw = "SELECT products_quantity, pad.products_attributes_filename
-                            FROM " . TABLE_PRODUCTS . " p, 
-                            " . TABLE_PRODUCTS_ATTRIBUTES . " pa,
-                            " . TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD . " pad
-                             WHERE p.products_id = '" . tep_get_prid($order->products[$i]['id']) . "'
-                             and p.products_id=pa.products_id
-                             and pad.products_attributes_id=pa.products_attributes_id ";
-                             
-        $download_check_query = tep_db_query($download_check_query_raw);
-        if (tep_db_num_rows($download_check_query) > 0) {
-          $downloadable_product = true;
-        }
-      }  // end of downloadable product check
-      if ( !$downloadable_product ) {
-        $stock_query = tep_db_query("select products_quantity from " . TABLE_PRODUCTS . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        $stock_values = tep_db_fetch_array($stock_query);
-        $stock_left = $stock_values['products_quantity'] - $order->products[$i]['qty'];
-        tep_db_query("update " . TABLE_PRODUCTS . " set products_quantity = '" . $stock_left . "' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        if ( ($stock_left < 1) && (STOCK_ALLOW_CHECKOUT == 'false') ) {
-          tep_db_query("update " . TABLE_PRODUCTS . " set products_status = '0' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        }
-      }
-    }
-
-// Update products_ordered (for bestsellers list)
-    tep_db_query("update " . TABLE_PRODUCTS . " set products_ordered = products_ordered + " . sprintf('%d', $order->products[$i]['qty']) . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-
-    $sql_data_array = array('orders_id' => $insert_id,
-                            'products_id' => tep_get_prid($order->products[$i]['id']),
-                            'products_model' => $order->products[$i]['model'],
-                            'products_name' => $order->products[$i]['name'],
-                            'products_price' => $order->products[$i]['price'],
-                            'final_price' => $order->products[$i]['final_price'],
-                            'products_tax' => $order->products[$i]['tax'],
-                            'products_quantity' => $order->products[$i]['qty']);
-    tep_db_perform(TABLE_ORDERS_PRODUCTS, $sql_data_array);
-    $order_products_id = tep_db_insert_id();
-    $order_total_modules->update_credit_account($i);//ICW ADDED FOR CREDIT CLASS SYSTEM
-
-//------insert customer choosen option to order--------
-    $products_ordered_attributes = '';
-    if (isset($order->products[$i]['attributes'])) {
-      for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
-        
-        $sql_data_array = array('orders_id' => $insert_id,
-                                'orders_products_id' => $order_products_id,
-                                'products_options' => $order->products[$i]['attributes'][$j]['option'],
-                                'products_options_values' => $order->products[$i]['attributes'][$j]['value'],
-                                'options_values_price' => $order->products[$i]['attributes'][$j]['price'],
-                                'price_prefix' => $order->products[$i]['attributes'][$j]['prefix'],
-                                'products_options_id' => $order->products[$i]['attributes'][$j]['option_id'],
-                                'products_options_values_id' => $order->products[$i]['attributes'][$j]['value_id']);
-        tep_db_perform(TABLE_ORDERS_PRODUCTS_ATTRIBUTES, $sql_data_array);
-        
-        if (DOWNLOAD_ENABLED == 'true') {
-          $attributes_query = "select pad.products_attributes_maxdays, pad.products_attributes_maxcount , pad.products_attributes_filename
-                           from " . TABLE_PRODUCTS_ATTRIBUTES . " pa,
-                                " . TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD . " pad
-                              where pa.products_id = '" . $order->products[$i]['id'] . "'
-                                and pa.options_id = '" . $order->products[$i]['attributes'][$j]['option_id'] . "'
-                                and pa.options_values_id = '" . $order->products[$i]['attributes'][$j]['value_id'] . "'
-                                and pa.products_attributes_id = pad.products_attributes_id";
-          $attributes = tep_db_query($attributes_query);
-          
-          $attributes_values = tep_db_fetch_array($attributes);
-        
-          if ( isset($attributes_values['products_attributes_filename']) && tep_not_null($attributes_values['products_attributes_filename']) ) {
-            $sql_data_array = array('orders_id' => $insert_id,
-                                    'orders_products_id' => $order_products_id,
-                                    'orders_products_filename' => $attributes_values['products_attributes_filename'],
-                                    'download_maxdays' => $attributes_values['products_attributes_maxdays'],
-                                    'download_count' => $attributes_values['products_attributes_maxcount']);
-            tep_db_perform(TABLE_ORDERS_PRODUCTS_DOWNLOAD, $sql_data_array);
-          }
-        }
-        $products_ordered_attributes .= "\n\t" . $order->products[$i]['attributes'][$j]['option'] . ' ' . $order->products[$i]['attributes'][$j]['value'] . ' ' . $order->products[$i]['attributes'][$j]['prefix'] . ' ' . $currencies->display_price($order->products[$i]['attributes'][$j]['price'], tep_get_tax_rate($products[$i]['tax_class_id']), 1);
-      }
-    }
-//------insert customer choosen option eof ----
-    $total_weight += ($order->products[$i]['qty'] * $order->products[$i]['weight']);
-    $total_tax += tep_calculate_tax($total_products_price, $products_tax) * $order->products[$i]['qty'];
-    $total_cost += $total_products_price;
-
-    $products_ordered .= $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name'] . ' (' . $order->products[$i]['model'] . ') = ' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . $products_ordered_attributes . "\n";
-  }
-$order_total_modules->apply_credit();//ICW ADDED FOR CREDIT CLASS SYSTEM
-// lets start with the email confirmation
-
-  // Include OSC-AFFILIATE
-  require(DIR_WS_INCLUDES . 'affiliate_checkout_process.php');
-
-  if (!tep_session_is_registered('noaccount'))
-{
-$email_order = STORE_NAME . "\n" .
-EMAIL_SEPARATOR . "\n" .
-EMAIL_TEXT_ORDER_NUMBER . ' ' . $insert_id . "\n" .
-EMAIL_TEXT_INVOICE_URL . ' ' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $insert_id, 'SSL', false) . "\n" .
-EMAIL_TEXT_DATE_ORDERED . ' ' . strftime(DATE_FORMAT_LONG) . "\n\n";
-}else{
-$email_order = STORE_NAME . "\n" .
-EMAIL_SEPARATOR . "\n" .
-EMAIL_TEXT_ORDER_NUMBER . ' ' . $insert_id . "\n" .
-EMAIL_TEXT_DATE_ORDERED . ' ' . strftime(DATE_FORMAT_LONG) . "\n\n";
-}
-
-// EOF: daithik change for PWA
-
-  if ($order->info['comments']) {
-    $email_order .= tep_db_output($order->info['comments']) . "\n\n";
-  }
-  $email_order .= EMAIL_TEXT_PRODUCTS . "\n" .
-                  EMAIL_SEPARATOR . "\n" .
-                  $products_ordered .
-                  EMAIL_SEPARATOR . "\n";
-
-  for ($i=0, $n=sizeof($order_totals); $i<$n; $i++) {
-    $email_order .= strip_tags($order_totals[$i]['title']) . ' ' . strip_tags($order_totals[$i]['text']) . "\n";
-  }
-
-  if ($order->content_type != 'virtual') {
-    $email_order .= "\n" . EMAIL_TEXT_DELIVERY_ADDRESS . "\n" .
-                    EMAIL_SEPARATOR . "\n" .
-                    tep_address_label($customer_id, $sendto, 0, '', "\n") . "\n";
-  }
-
-  $email_order .= "\n" . EMAIL_TEXT_BILLING_ADDRESS . "\n" .
-                  EMAIL_SEPARATOR . "\n" .
-                  tep_address_label($customer_id, $billto, 0, '', "\n") . "\n\n";
-  if (is_object($$payment)) {
-    $email_order .= EMAIL_TEXT_PAYMENT_METHOD . "\n" .
-                    EMAIL_SEPARATOR . "\n";
-    $payment_class = $$payment;
-    $email_order .= $payment_class->title . "\n\n";
-    if ($payment_class->email_footer) {
-      $email_order .= $payment_class->email_footer . "\n\n";
-    }
-  }
-  
-  tep_mail($order->customer['firstname'] . ' ' . $order->customer['lastname'], $order->customer['email_address'], EMAIL_TEXT_SUBJECT, $email_order, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-
-// send emails to other people
-  if (SEND_EXTRA_ORDER_EMAILS_TO != '') {
-    tep_mail('', SEND_EXTRA_ORDER_EMAILS_TO, EMAIL_TEXT_SUBJECT, $email_order, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-  }
-
-// load the after_process function from the payment modules
-  $payment_modules->after_process();
-  
-// AFSv1.0 - record the customers order and ip address info for fraud screening process
-
-$ip = $REMOTE_ADDR;
-$proxy = $HTTP_X_FORWARDED_FOR;
-if($proxy != ''){ $ip = $proxy; }
-$sql_data_array = array( 'order_id' => $insert_id,
-'ip_address' => $ip);
-
-tep_db_perform('algozone_fraud_queries', $sql_data_array);
-
-// End AFSv1.0
-  $cart->reset(true);
-
-// unregister session variables used during checkout
-  tep_session_unregister('sendto');
-  tep_session_unregister('billto');
-  tep_session_unregister('shipping');
-  tep_session_unregister('payment');
-  tep_session_unregister('comments');
-  if(tep_session_is_registered('credit_covers')) tep_session_unregister('credit_covers');
-  $order_total_modules->clear_posts();//ICW ADDED FOR CREDIT CLASS SYSTEM
-// BOF: Lango added for print order mod
-  tep_redirect(tep_href_link(FILENAME_CHECKOUT_SUCCESS, 'order_id='. $insert_id, 'SSL'));
-// EOF: Lango added for print order mod
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_shipping.php
===================================================================
--- trunk/direct.openmoko.com/checkout_shipping.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_shipping.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,178 +0,0 @@
-<?php
-/*
-  $Id: checkout_shipping.php,v 1.1.1.1 2004/03/04 23:37:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  Shoppe Enhancement Controller - Copyright (c) 2003 WebMakers.com
-  Linda McGrath - osCommerce at WebMakers.com
-*/
-
-  require('includes/application_top.php');
-  require('includes/classes/http_client.php');
-
-// BOF: WebMakers.com Added: Downloads Controller - Free Shipping
-// Reset $shipping if free shipping is on and weight is not 0
-if (tep_get_configuration_key_value('MODULE_SHIPPING_FREESHIPPER_STATUS') and $cart->show_weight()!=0) {
-  tep_session_unregister('shipping');
-}
-// EOF: WebMakers.com Added: Downloads Controller - Free Shipping
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// if there is nothing in the customers cart, redirect them to the shopping cart page
-  if ($cart->count_contents() < 1) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-// BOF: WebMakers.com Added: Attributes Sorter and Copier and Quantity Controller
-// Validate Cart for checkout
-  $valid_to_checkout= true;
-  $cart->get_products(true);
-  if (!$valid_to_checkout) {
-    //$messageStack->add_session('header', 'Please update your order ...', 'error');
-    $messageStack->add_session('header', ERROR_VALID_TO_CHECKOUT, 'error');
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-// EOF: WebMakers.com Added: Attributes Sorter and Copier and Quantity Controller
-
-// if no shipping destination address was selected, use the customers own address as default
-  if (!tep_session_is_registered('sendto')) {
-    tep_session_register('sendto');
-    $sendto = $customer_default_address_id;
-  } else {
-// verify the selected shipping address
-    $check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$sendto . "'");
-    $check_address = tep_db_fetch_array($check_address_query);
-
-    if ($check_address['total'] != '1') {
-      $sendto = $customer_default_address_id;
-      if (tep_session_is_registered('shipping')) tep_session_unregister('shipping');
-    }
-  }
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-
-// register a random ID in the session to check throughout the checkout procedure
-// against alterations in the shopping cart contents
-  if (!tep_session_is_registered('cartID')) tep_session_register('cartID');
-  $cartID = $cart->cartID;
-
-// if the order contains only virtual products, forward the customer to the billing page as
-// a shipping address is not needed
-// ICW CREDIT CLASS GV AMENDE LINE BELOW
-//  if ($order->content_type == 'virtual') {
-  if (($order->content_type == 'virtual') || ($order->content_type == 'virtual_weight') ) {
-    if (!tep_session_is_registered('shipping')) tep_session_register('shipping');
-    $shipping = false;
-    $sendto = false;
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-  $total_weight = $cart->show_weight();
-  $total_count = $cart->count_contents();
-
-// load all enabled shipping modules
-  require(DIR_WS_CLASSES . 'shipping.php');
-  $shipping_modules = new shipping;
-
-  if ( defined('MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING') && (MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING == 'true') ) {
-    $pass = false;
-
-    switch (MODULE_ORDER_TOTAL_SHIPPING_DESTINATION) {
-      case 'national':
-        if ($order->delivery['country_id'] == STORE_COUNTRY) {
-          $pass = true;
-        }
-        break;
-      case 'international':
-        if ($order->delivery['country_id'] != STORE_COUNTRY) {
-          $pass = true;
-        }
-        break;
-      case 'both':
-        $pass = true;
-        break;
-    }
-
-    $free_shipping = false;
-    if ( ($pass == true) && ($order->info['total'] >= MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER) ) {
-      $free_shipping = true;
-
-      include(DIR_WS_LANGUAGES . $language . '/modules/order_total/ot_shipping.php');
-    }
-  } else {
-    $free_shipping = false;
-  }
-
-// process the selected shipping method
-  if ( isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process') ) {
-    if (!tep_session_is_registered('comments')) tep_session_register('comments');
-    if (tep_not_null($HTTP_POST_VARS['comments'])) {
-      $comments = tep_db_prepare_input($HTTP_POST_VARS['comments']);
-    }
-
-    if (!tep_session_is_registered('shipping')) tep_session_register('shipping');
-
-    if ( (tep_count_shipping_modules() > 0) || ($free_shipping == true) ) {
-      if ( (isset($HTTP_POST_VARS['shipping'])) && (strpos($HTTP_POST_VARS['shipping'], '_')) ) {
-        $shipping = $HTTP_POST_VARS['shipping'];
-
-        list($module, $method) = explode('_', $shipping);
-        if ( is_object($$module) || ($shipping == 'free_free') ) {
-          if ($shipping == 'free_free') {
-            $quote[0]['methods'][0]['title'] = FREE_SHIPPING_TITLE;
-            $quote[0]['methods'][0]['cost'] = '0';
-          } else {
-            $quote = $shipping_modules->quote($method, $module);
-          }
-          if (isset($quote['error'])) {
-            tep_session_unregister('shipping');
-          } else {
-            if ( (isset($quote[0]['methods'][0]['title'])) && (isset($quote[0]['methods'][0]['cost'])) ) {
-              $shipping = array('id' => $shipping,
-                                'title' => (($free_shipping == true) ?  $quote[0]['methods'][0]['title'] : $quote[0]['module'] . ' (' . $quote[0]['methods'][0]['title'] . ')'),
-                                'cost' => $quote[0]['methods'][0]['cost']);
-
-              tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-            }
-          }
-        } else {
-          tep_session_unregister('shipping');
-        }
-      }
-    } else {
-      $shipping = false;
-                
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-    }    
-  }
-
-// get all available shipping quotes
-  $quotes = $shipping_modules->quote();
-
-// if no shipping method has been selected, automatically select the cheapest method.
-// if the modules status was changed when none were available, to save on implementing
-// a javascript force-selection method, also automatically select the cheapest shipping
-// method if more than one module is now enabled
-  if ( !tep_session_is_registered('shipping') || ( tep_session_is_registered('shipping') && ($shipping == false) && (tep_count_shipping_modules() > 1) ) ) $shipping = $shipping_modules->cheapest();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_SHIPPING);
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-
-  $content = CONTENT_CHECKOUT_SHIPPING;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_shipping_address.php
===================================================================
--- trunk/direct.openmoko.com/checkout_shipping_address.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_shipping_address.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,217 +0,0 @@
-<?php
-/*
-  $Id: checkout_shipping_address.php,v 1.1.1.1 2004/03/04 23:37:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-// if there is nothing in the customers cart, redirect them to the shopping cart page
-  if ($cart->count_contents() < 1) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-
-  // needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_SHIPPING_ADDRESS);
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order;
-
-// if the order contains only virtual products, forward the customer to the billing page as
-// a shipping address is not needed
-  if ($order->content_type == 'virtual') {
-    if (!tep_session_is_registered('shipping')) tep_session_register('shipping');
-    $shipping = false;
-    if (!tep_session_is_registered('sendto')) tep_session_register('sendto');
-    $sendto = false;
-    tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
-  }
-
-  $error = false;
-  $process = false;
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'submit')) {
-// process a new shipping address
-    if (tep_not_null($HTTP_POST_VARS['firstname']) && tep_not_null($HTTP_POST_VARS['lastname']) && tep_not_null($HTTP_POST_VARS['street_address'])) {
-      $process = true;
-
-      if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-      if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-      $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-      $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-      $street_address = tep_db_prepare_input($HTTP_POST_VARS['street_address']);
-      if (ACCOUNT_SUBURB == 'true') $suburb = tep_db_prepare_input($HTTP_POST_VARS['suburb']);
-      $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-      $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-      $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-      if (ACCOUNT_STATE == 'true') {
-        if (isset($HTTP_POST_VARS['zone_id'])) {
-          $zone_id = tep_db_prepare_input($HTTP_POST_VARS['zone_id']);
-        } else {
-          $zone_id = false;
-        }
-        $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-      }
-
-      if (ACCOUNT_GENDER == 'true') {
-        if ( ($gender != 'm') && ($gender != 'f') ) {
-          $error = true;
-
-          $messageStack->add('checkout_address', ENTRY_GENDER_ERROR);
-        }
-      }
-
-      if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_FIRST_NAME_ERROR);
-      }
-
-      if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_LAST_NAME_ERROR);
-      }
-
-      if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_STREET_ADDRESS_ERROR);
-      }
-
-      if (strlen($postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_POST_CODE_ERROR);
-      }
-
-      if (strlen($city) < ENTRY_CITY_MIN_LENGTH) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_CITY_ERROR);
-      }
-
-      if (ACCOUNT_STATE == 'true') {
-        $zone_id = 0;
-        $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
-        $check = tep_db_fetch_array($check_query);
-        $entry_state_has_zones = ($check['total'] > 0);
-        if ($entry_state_has_zones == true) {
-//state abbreviation bug fix applied 10/1/2004 DMG
-//now accepts abbreviations - no complaint re capitilization
-$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' OR zone_code = '" . tep_db_input($state) . "')");
-          if (tep_db_num_rows($zone_query) == 1) {
-            $zone = tep_db_fetch_array($zone_query);
-            $zone_id = $zone['zone_id'];
-          } else {
-            $error = true;
-
-            $messageStack->add('checkout_address', ENTRY_STATE_ERROR_SELECT);
-          }
-        } else {
-          if (strlen($state) < ENTRY_STATE_MIN_LENGTH) {
-            $error = true;
-
-            $messageStack->add('checkout_address', ENTRY_STATE_ERROR);
-          }
-        }
-      }
-
-      if ( (is_numeric($country) == false) || ($country < 1) ) {
-        $error = true;
-
-        $messageStack->add('checkout_address', ENTRY_COUNTRY_ERROR);
-      }
-
-      if ($error == false) {
-        $sql_data_array = array('customers_id' => $customer_id,
-                                'entry_firstname' => $firstname,
-                                'entry_lastname' => $lastname,
-                                'entry_street_address' => $street_address,
-                                'entry_postcode' => $postcode,
-                                'entry_city' => $city,
-                                'entry_country_id' => $country);
-
-        if (ACCOUNT_GENDER == 'true') $sql_data_array['entry_gender'] = $gender;
-        if (ACCOUNT_COMPANY == 'true') $sql_data_array['entry_company'] = $company;
-        if (ACCOUNT_SUBURB == 'true') $sql_data_array['entry_suburb'] = $suburb;
-        if (ACCOUNT_STATE == 'true') {
-          if ($zone_id > 0) {
-            $sql_data_array['entry_zone_id'] = $zone_id;
-            $sql_data_array['entry_state'] = '';
-          } else {
-            $sql_data_array['entry_zone_id'] = '0';
-            $sql_data_array['entry_state'] = $state;
-          }
-        }
-
-        if (!tep_session_is_registered('sendto')) tep_session_register('sendto');
-
-        tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array);
-
-        $sendto = tep_db_insert_id();
-
-        if (tep_session_is_registered('shipping')) tep_session_unregister('shipping');
-
-        tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-      }
-// process the selected shipping destination
-    } elseif (isset($HTTP_POST_VARS['address'])) {
-      $reset_shipping = false;
-      if (tep_session_is_registered('sendto')) {
-        if ($sendto != $HTTP_POST_VARS['address']) {
-          if (tep_session_is_registered('shipping')) {
-            $reset_shipping = true;
-          }
-        }
-      } else {
-        tep_session_register('sendto');
-      }
-
-      $sendto = $HTTP_POST_VARS['address'];
-
-      $check_address_query = tep_db_query("select count(*) as total from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$sendto . "'");
-      $check_address = tep_db_fetch_array($check_address_query);
-
-      if ($check_address['total'] == '1') {
-        if ($reset_shipping == true) tep_session_unregister('shipping');
-        tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-      } else {
-        tep_session_unregister('sendto');
-      }
-    } else {
-      if (!tep_session_is_registered('sendto')) tep_session_register('sendto');
-      $sendto = $customer_default_address_id;
-
-      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-    }
-  }
-
-// if no shipping destination address was selected, use their own address as default
-  if (!tep_session_is_registered('sendto')) {
-    $sendto = $customer_default_address_id;
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_CHECKOUT_SHIPPING_ADDRESS, '', 'SSL'));
-
-  $addresses_count = tep_count_customer_address_book_entries();
-
-  $content = CONTENT_CHECKOUT_SHIPPING_ADDRESS;
-  $javascript = $content . '.js.php';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/checkout_success.php
===================================================================
--- trunk/direct.openmoko.com/checkout_success.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/checkout_success.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,76 +0,0 @@
-<?php
-/*
-  $Id: checkout_success.php,v 1.3 2004/09/25 14:36 DMG Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  // begin PayPal_Shopping_Cart_IPN 2.8 (DMG)
-  require(DIR_WS_MODULES . 'payment/paypal/classes/paypal_order.class.php');
-  // end PayPal_Shopping_Cart_IPN
-  // if the customer is not logged on, redirect them to the shopping cart page
-  if (!tep_session_is_registered('customer_id')) {
-    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'update')) {
-    $notify_string = 'action=notify&';
-    $notify = $HTTP_POST_VARS['notify'];
-    if (!is_array($notify)) $notify = array($notify);
-    for ($i=0, $n=sizeof($notify); $i<$n; $i++) {
-      $notify_string .= 'notify[]=' . $notify[$i] . '&';
-    }
-    if (strlen($notify_string) > 0) $notify_string = substr($notify_string, 0, -1);
-    // BOF: daithik change for PWA//  DMG Merge w. Paypal IPN 2.8
-    if (tep_session_is_registered('noaccount')) {
-      tep_session_destroy();
-      tep_redirect(tep_href_link(FILENAME_DEFAULT, '$notify_string', 'NONSSL'));
-    }else{
-      tep_redirect(tep_href_link(FILENAME_DEFAULT, $notify_string));
-    }
-  } else if ((isset($HTTP_GET_VARS['action']) && $HTTP_GET_VARS['action'] == 'success')) {
-    //begin PayPal_Shopping_Cart_IPN
-    paypal_order::reset_checkout_cart_session();
-  }
-  //end PayPal_Shopping_Cart_IPN
-  // EOF: daithik change for PWA
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_SUCCESS);
-
-  $breadcrumb->add(NAVBAR_TITLE_1);
-  $breadcrumb->add(NAVBAR_TITLE_2);
-
-
-  // BOF: daithik change for PWA
-  if (tep_session_is_registered('noaccount')) {
-    $order_update = array('purchased_without_account' => '1');
-    tep_db_perform(TABLE_ORDERS, $order_update, 'update', "orders_id = '".$orders['orders_id']."'");
-    //  tep_db_query("insert into " . TABLE_ORDERS . " (purchased_without_account) values ('1') where orders_id = '" . (int)$orders['orders_id'] . "'");
-    tep_db_query("delete from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . tep_db_input($customer_id) . "'");
-    tep_db_query("delete from " . TABLE_CUSTOMERS . " where customers_id = '" . tep_db_input($customer_id) . "'");
-    tep_db_query("delete from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . tep_db_input($customer_id) . "'");
-    tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . tep_db_input($customer_id) . "'");
-    tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . tep_db_input($customer_id) . "'");
-    tep_db_query("delete from " . TABLE_WHOS_ONLINE . " where customer_id = '" . tep_db_input($customer_id) . "'");
-    if (!tep_session_is_registered('noaccount')){ 
-      tep_session_destroy();
-    }
-  }
-  // EOF: daithik change for PWA
-
-  // load all enabled checkout success modules
-  require(DIR_WS_CLASSES . 'checkout_success.php');
-  $checkout_success_modules = new checkout_success;
-
-  $content = CONTENT_CHECKOUT_SUCCESS;
-  $javascript = 'popup_window_print.js';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/contact_us.php
===================================================================
--- trunk/direct.openmoko.com/contact_us.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/contact_us.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,109 +0,0 @@
-<?php
-/*
-  $Id: contact_us.php,v 1.1.1.1 2004/03/04 23:37:58 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-Email security fix added 
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CONTACT_US);
-
-  $vccCheckOk="True";
-  //VISUAL VERIFY CODE start
-    $code_query = tep_db_query("select code from visual_verify_code where oscsid = '" . tep_session_id() . "'");
-    $code_array = tep_db_fetch_array($code_query);
-    $code = $code_array['code'];
-
-    tep_db_query("DELETE FROM " . TABLE_VISUAL_VERIFY_CODE . " WHERE oscsid='" . tep_session_id() . "'"); //remove the visual verify code associated with this session to clean database and ensure new results
-
-    $user_entered_code = $HTTP_POST_VARS['visual_verify_code'];
-    if (!(strcasecmp($user_entered_code, $code) == 0)) {    //make the check case insensitive
-        $error = true;
-        
-    if(($HTTP_GET_VARS['action'] == 'send'))
-    {
-      $messageStack->add('contact', VISUAL_VERIFY_CODE_ENTRY_ERROR);
-    }
-    
-    $vccCheckOk="False";    
-    }
-//VISUAL VERIFY CODE stop
-
-  $error = false;
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'send') && $vccCheckOk=='True') {
-    $name = tep_db_prepare_input($HTTP_POST_VARS['name']);
-    $email_address = tep_db_prepare_input($HTTP_POST_VARS['email']);
-    $enquiry = tep_db_prepare_input($HTTP_POST_VARS['enquiry']);
-
-    // VJ enhancement begin
-    $telephone = tep_db_prepare_input($HTTP_POST_VARS['telephone']);
-    $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-    $street = tep_db_prepare_input($HTTP_POST_VARS['street']);
-    $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-    $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-    $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-    $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-
-    $topic = tep_db_prepare_input($HTTP_POST_VARS['topic']);
-    $subject = tep_db_prepare_input($HTTP_POST_VARS['subject']);
-
-    $urgent = (tep_db_prepare_input($HTTP_POST_VARS['urgent']) == 'on') ? '1' : '0';
-    $self = (tep_db_prepare_input($HTTP_POST_VARS['self']) == 'on') ? '1' : '0';
-
-    $urgent_string = '';
-    if ($urgent == '1') {
-      $urgent_string = '(' . TEXT_SUBJECT_URGENT . ')';
-    }
-
-    $subject_string = TEXT_SUBJECT_PREFIX . ' ' . $subject . $urgent_string;
-    $message_string = $topic . ": " . $subject . "\n\n" . 
-      $enquiry . "\n\n" . 
-      ENTRY_COMPANY . ' ' . $company . "\n" . 
-      ENTRY_NAME . ' ' . $name . "\n" . 
-      ENTRY_EMAIL . ' ' . $email_address . "\n" . 
-      ENTRY_STREET_ADDRESS . ' ' . $street . "\n" . 
-      ENTRY_CITY . ' ' . $city . "\n" . 
-      ENTRY_STATE . ' ' . $state . "\n" . 
-      ENTRY_POST_CODE . ' ' . $postcode . "\n" . 
-      ENTRY_COUNTRY . ' ' . tep_get_country_name($country) . "\n" . 
-      ENTRY_TELEPHONE_NUMBER . ' ' . $telephone . "\n";
-
-    $ipaddress = $HTTP_SERVER_VARS["REMOTE_ADDR"];
-    $message_string .= "\n\n" . 'IP: ' . $ipaddress . "\n";
-    // VJ enhancement end
-
-    if (tep_validate_email($email_address)) {
-      // VJ enhancement begin
-      tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, $subject_string, $message_string, $name, $email_address); 
-
-      // email a copy to sender, if opted
-    if ($self == '1') {
-        tep_mail($name, $email_address, $subject_string, $message_string, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS); 
-      }
-      // VJ enhancement end
-
-      tep_redirect(tep_href_link(FILENAME_CONTACT_US, 'action=success', 'SSL'));
-    } 
-  else
-  {
-      $error = true;
-      $messageStack->add('contact', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
-      $enquiry = "";
-      $name = "";
-      $email = "";      
-    }
- } 
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_CONTACT_US, '', 'SSL'));
-
-  $content = CONTENT_CONTACT_US;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/cookie_usage.php
===================================================================
--- trunk/direct.openmoko.com/cookie_usage.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/cookie_usage.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,24 +0,0 @@
-<?php
-/*
-  $Id: cookie_usage.php,v 1.1.1.1 2004/03/04 23:37:58 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_COOKIE_USAGE);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_COOKIE_USAGE));
-
-  $content = CONTENT_COOKIE_USAGE;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/create_account.php
===================================================================
--- trunk/direct.openmoko.com/create_account.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/create_account.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,376 +0,0 @@
-<?php
-/*
-  $Id: create_account.php,v 1.4 2004/09/25 15:09:15 DMG Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Chain Reaction Works, Inc.
-  
-  Copyright &copy; 2003-2005
-  
-  Last Modified By : $Author$
-  Last Modified On : $Date$
-  Latest Revision :  $Revision: 3444 $
-  
-*/
-
-  require('includes/application_top.php');
-
-  // needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CREATE_ACCOUNT);
-
-  $process = false;  // used by the state routine
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    $process = true;
-
-    if (ACCOUNT_GENDER == 'true') {
-      if (isset($HTTP_POST_VARS['gender'])) {
-        $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
-      } else {
-        $gender = false;
-      }
-    }
-    $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
-    $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
-    if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($HTTP_POST_VARS['dob']);
-    $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
-    if (ACCOUNT_COMPANY == 'true') $company = tep_db_prepare_input($HTTP_POST_VARS['company']);
-    $street_address = tep_db_prepare_input($HTTP_POST_VARS['street_address']);
-    if (ACCOUNT_SUBURB == 'true') $suburb = tep_db_prepare_input($HTTP_POST_VARS['suburb']);
-    $postcode = tep_db_prepare_input($HTTP_POST_VARS['postcode']);
-    $city = tep_db_prepare_input($HTTP_POST_VARS['city']);
-    if (ACCOUNT_STATE == 'true') {
-      $state = tep_db_prepare_input($HTTP_POST_VARS['state']);
-      if (isset($HTTP_POST_VARS['zone_id'])) {
-        $zone_id = tep_db_prepare_input($HTTP_POST_VARS['zone_id']);
-      } else {
-        $zone_id = false;
-      }
-    }
-    $country = tep_db_prepare_input($HTTP_POST_VARS['country']);
-    $telephone = tep_db_prepare_input($HTTP_POST_VARS['telephone']);
-    $fax = tep_db_prepare_input($HTTP_POST_VARS['fax']);
-    if (isset($HTTP_POST_VARS['newsletter'])) {
-      $newsletter = tep_db_prepare_input($HTTP_POST_VARS['newsletter']);
-    } else {
-      $newsletter = false;
-    }
-    $password = tep_db_prepare_input($HTTP_POST_VARS['password']);
-    $confirmation = tep_db_prepare_input($HTTP_POST_VARS['confirmation']);
-
-    $error = false;
-
-    if (ACCOUNT_GENDER == 'true') {
-      if ( ($gender != 'm') && ($gender != 'f') ) {
-        $error = true;
-
-        $messageStack->add('create_account', ENTRY_GENDER_ERROR);
-      }
-    }
-
-    if (strlen($firstname) < ENTRY_FIRST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_FIRST_NAME_ERROR);
-    }
-
-    if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_LAST_NAME_ERROR);
-    }
-
-    if (ACCOUNT_DOB == 'true') {
-      if (checkdate(substr(tep_date_raw($dob), 4, 2), substr(tep_date_raw($dob), 6, 2), substr(tep_date_raw($dob), 0, 4)) == false) {
-        $error = true;
-
-        $messageStack->add('create_account', ENTRY_DATE_OF_BIRTH_ERROR);
-      }
-    }
-
-    if (strlen($email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_EMAIL_ADDRESS_ERROR);
-    } elseif (tep_validate_email($email_address) == false) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
-    } else {
-      $check_email_query = tep_db_query("select count(*) as total from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
-      $check_email = tep_db_fetch_array($check_email_query);
-      // BOF: daithik - PWA
-      //      if ($check_email['total'] > 0) {
-      //        $error = true;
-      //        $messageStack->add('create_account', ENTRY_EMAIL_ADDRESS_ERROR_EXISTS);
-      //      }
-      if ($check_email['total'] > 0) {  //PWA delete account
-        $get_customer_info = tep_db_query("select customers_id, customers_email_address, purchased_without_account from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
-        $customer_info = tep_db_fetch_array($get_customer_info);
-        $customer_id = $customer_info['customers_id'];
-        $customer_email_address = $customer_info['customers_email_address'];
-        $customer_pwa = $customer_info['purchased_without_account'];
-        if ($customer_pwa !='1') {
-          $error = true;
-
-          $messageStack->add('create_account', ENTRY_EMAIL_ADDRESS_ERROR_EXISTS);
-        } else {
-          tep_db_query("delete from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . $customer_id . "'");
-          tep_db_query("delete from " . TABLE_CUSTOMERS . " where customers_id = '" . $customer_id . "'");
-          tep_db_query("delete from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . $customer_id . "'");
-          tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . $customer_id . "'");
-          tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . $customer_id . "'");
-          tep_db_query("delete from " . TABLE_WHOS_ONLINE . " where customer_id = '" . $customer_id . "'");
-        }
-      }
-      // EOF: daithik - PWA
-    }
-
-    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_STREET_ADDRESS_ERROR);
-    }
-
-    if (strlen($postcode) < ENTRY_POSTCODE_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_POST_CODE_ERROR);
-    }
-
-    if (strlen($city) < ENTRY_CITY_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_CITY_ERROR);
-    }
-
-    if (is_numeric($country) == false) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_COUNTRY_ERROR);
-    }
-
-    if (ACCOUNT_STATE == 'true') {
-      $zone_id = 0;
-      $check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
-      $check = tep_db_fetch_array($check_query);
-      $entry_state_has_zones = ($check['total'] > 0);
-      // State selection bug fix applied 10/1/2004 DMG
-      if ($entry_state_has_zones == true) {
-        $zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' OR zone_code = '" . tep_db_input($state) . "')");
-        if (tep_db_num_rows($zone_query) == 1) {
-          $zone = tep_db_fetch_array($zone_query);
-          $zone_id = $zone['zone_id'];
-        } else {
-          $error = true;
-
-          $messageStack->add('create_account', ENTRY_STATE_ERROR_SELECT);
-        }
-      } else {
-        if (strlen($state) < ENTRY_STATE_MIN_LENGTH) {
-          $error = true;
-
-          $messageStack->add('create_account', ENTRY_STATE_ERROR);
-        }
-      }
-    }
-
-    if (strlen($telephone) < ENTRY_TELEPHONE_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_TELEPHONE_NUMBER_ERROR);
-    }
-
-
-    if (strlen($password) < ENTRY_PASSWORD_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_PASSWORD_ERROR);
-    } elseif ($password != $confirmation) {
-      $error = true;
-
-      $messageStack->add('create_account', ENTRY_PASSWORD_ERROR_NOT_MATCHING);
-    }
-
-  
-    //VISUAL VERIFY CODE start
-    $code_query = tep_db_query("select code from " . TABLE_VISUAL_VERIFY_CODE . "  where oscsid = '" . tep_session_id() . "'");
-    $code_array = tep_db_fetch_array($code_query);
-    $code = $code_array['code'];
-
-    tep_db_query("DELETE FROM " . TABLE_VISUAL_VERIFY_CODE . " WHERE oscsid='" . tep_session_id() . "'"); //remove the visual verify code associated with this session to clean database and ensure new results
-
-    $user_entered_code = $HTTP_POST_VARS['visual_verify_code'];
-    if (!(strcasecmp($user_entered_code, $code) == 0)) {    //make the check case insensitive
-      $error = true;
-      $messageStack->add('create_account', VISUAL_VERIFY_CODE_ENTRY_ERROR);
-    }
-    //VISUAL VERIFY CODE stop
-
-
-    if ($error == false) {
-      $sql_data_array = array('customers_firstname' => $firstname,
-                              'customers_lastname' => $lastname,
-                              'customers_email_address' => $email_address,
-                              'customers_telephone' => $telephone,
-                              'customers_fax' => $fax,
-                              'customers_newsletter' => $newsletter,
-                              'customers_password' => tep_encrypt_password($password));
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
-      if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
-
-      tep_db_perform(TABLE_CUSTOMERS, $sql_data_array);
-
-      $customer_id = tep_db_insert_id();
-
-      $sql_data_array = array('customers_id' => $customer_id,
-                              'entry_firstname' => $firstname,
-                              'entry_lastname' => $lastname,
-                              'entry_street_address' => $street_address,
-                              'entry_postcode' => $postcode,
-                              'entry_city' => $city,
-                              'entry_country_id' => $country);
-
-      if (ACCOUNT_GENDER == 'true') $sql_data_array['entry_gender'] = $gender;
-      if (ACCOUNT_COMPANY == 'true') $sql_data_array['entry_company'] = $company;
-      if (ACCOUNT_SUBURB == 'true') $sql_data_array['entry_suburb'] = $suburb;
-      if (ACCOUNT_STATE == 'true') {
-        if ($zone_id > 0) {
-          $sql_data_array['entry_zone_id'] = $zone_id;
-          $sql_data_array['entry_state'] = '';
-        } else {
-          $sql_data_array['entry_zone_id'] = '0';
-          $sql_data_array['entry_state'] = $state;
-        }
-      }
-
-      tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array);
-
-      $address_id = tep_db_insert_id();
-
-      tep_db_query("update " . TABLE_CUSTOMERS . " set customers_default_address_id = '" . (int)$address_id . "' where customers_id = '" . (int)$customer_id . "'");
-
-      tep_db_query("insert into " . TABLE_CUSTOMERS_INFO . " (customers_info_id, customers_info_number_of_logons, customers_info_date_account_created) values ('" . (int)$customer_id . "', '0', now())");
-
-      if (SESSION_RECREATE == 'True') {
-        tep_session_recreate();
-      }
-
-      // If we are not doing the email confirmation, then log the customer in
-      if ( ACCOUNT_EMAIL_CONFIRMATION != 'true' ) {
-        $customer_first_name = $firstname;
-        $customer_default_address_id = $address_id;
-        $customer_country_id = $country;
-        $customer_zone_id = $zone_id;
-        tep_session_register('customer_id');
-        tep_session_register('customer_first_name');
-        tep_session_register('customer_default_address_id');
-        tep_session_register('customer_country_id');
-        tep_session_register('customer_zone_id');
-        // restore cart contents
-        $cart->restore_contents();
-
-      } else {  // we need to build the data to do the verification
-        $pw="ABCDEFGHJKMNOPQRSTUVWXYZabcdefghjkmnopqrstuvwxyz0123456789";
-        srand((double)microtime()*1000000);
-        for ($i=1;$i<=5;$i++){ 
-          $Pass .= $pw{rand(0,strlen($pw)-1)};
-        }
-        $pw1="ABCDEFGHJKMNOPQRSTUVWXYZabcdefghjkmnopqrstuvwxyz0123456789";
-        srand((double)microtime()*1000000);
-        for ($i=1;$i<=5;$i++){ 
-          $Pass_neu .= $pw1{rand(0,strlen($pw1)-1)};
-        }
-        tep_db_query('update customers set customers_validation_code = "' . $Pass . $Pass_neu . '" where customers_id = "' . $customer_id . '"');
-      }
-
-      $name = $firstname . ' ' . $lastname;
-
-      if (ACCOUNT_GENDER == 'true') {
-         if ($gender == 'm') {
-           $email_text = sprintf(EMAIL_GREET_MR, $lastname);
-         } else {
-           $email_text = sprintf(EMAIL_GREET_MS, $lastname);
-         }
-      } else {
-        $email_text = sprintf(EMAIL_GREET_NONE, $firstname);
-      }
-
-      $email_text .= EMAIL_WELCOME . EMAIL_TEXT . EMAIL_CONTACT . EMAIL_WARNING . "\n" . "\n";
-      if ( ACCOUNT_EMAIL_CONFIRMATION == 'true' ) {
-        $email_text .=  "\n" . MAIL_VALIDATION . "\n" . '<a href="' . tep_href_link('pw.php', 'action=reg&pass=' . $Pass . $Pass_neu . '&verifyid=' . $customer_id, 'SSL', false) . '">' . VALIDATE_YOUR_MAILADRESS . '</a>' . "\n" . "\n" . '(' . SECOND_LINK . ' ' . tep_href_link('pw.php', 'action=reg&pass=' . $Pass . $Pass_neu . '&verifyid=' . $customer_id, 'SSL', false) . ' )' . "\n" . "\n". OR_VALIDATION_CODE . $Pass . $Pass_neu . "\n" . "\n";          
-      }
-
-// ICW - CREDIT CLASS CODE BLOCK ADDED  ******************************************************* BEGIN
-  if (NEW_SIGNUP_GIFT_VOUCHER_AMOUNT > 0) {
-    $coupon_code = create_coupon_code();
-    $insert_query = tep_db_query("insert into " . TABLE_COUPONS . " (coupon_code, coupon_type, coupon_amount, date_created) values ('" . $coupon_code . "', 'G', '" . NEW_SIGNUP_GIFT_VOUCHER_AMOUNT . "', now())");
-    $insert_id = tep_db_insert_id($insert_query);
-    $insert_query = tep_db_query("insert into " . TABLE_COUPON_EMAIL_TRACK . " (coupon_id, customer_id_sent, sent_firstname, emailed_to, date_sent) values ('" . $insert_id ."', '0', 'Admin', '" . $email_address . "', now() )");
-
-    $email_text .= sprintf(EMAIL_GV_INCENTIVE_HEADER, $currencies->format(NEW_SIGNUP_GIFT_VOUCHER_AMOUNT)) . "\n\n" .
-                   sprintf(EMAIL_GV_REDEEM, $coupon_code) . "\n\n" .
-                   EMAIL_GV_LINK . tep_href_link(FILENAME_GV_REDEEM, 'gv_no=' . $coupon_code,'NONSSL', false) .
-                   "\n\n";
-  }
-  if (NEW_SIGNUP_DISCOUNT_COUPON != '') {
-    $coupon_code = NEW_SIGNUP_DISCOUNT_COUPON;
-    $coupon_query = tep_db_query("select * from " . TABLE_COUPONS . " where coupon_code = '" . $coupon_code . "'");
-    $coupon = tep_db_fetch_array($coupon_query);
-    $coupon_id = $coupon['coupon_id'];
-    $coupon_desc_query = tep_db_query("select * from " . TABLE_COUPONS_DESCRIPTION . " where coupon_id = '" . $coupon_id . "' and language_id = '" . (int)$languages_id . "'");
-    $coupon_desc = tep_db_fetch_array($coupon_desc_query);
-    $insert_query = tep_db_query("insert into " . TABLE_COUPON_EMAIL_TRACK . " (coupon_id, customer_id_sent, sent_firstname, emailed_to, date_sent) values ('" . $coupon_id ."', '0', 'Admin', '" . $email_address . "', now() )");
-    $email_text .= EMAIL_COUPON_INCENTIVE_HEADER .  "\n" .
-                   sprintf("%s", $coupon_desc['coupon_description']) ."\n\n" .
-                   sprintf(EMAIL_COUPON_REDEEM, $coupon['coupon_code']) . "\n\n" .
-                   "\n\n";
-
-
-
-  }
-//    $email_text .= EMAIL_TEXT . EMAIL_CONTACT . EMAIL_WARNING;
-// ICW - CREDIT CLASS CODE BLOCK ADDED  ******************************************************* END
-      tep_mail($name, $email_address, EMAIL_SUBJECT, $email_text, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-
-      // VJ member approval begin
-      // admin email notification 
-//      $admin_email_text .= ADMIN_EMAIL_WELCOME . ADMIN_EMAIL_TEXT . EMAIL_WARNING;
-// remove hard coded admin notification for now.      
-//      tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, EMAIL_SUBJECT, $admin_email_text, $name, $email_address, '');
-      // VJ member approval end
-
-      tep_redirect(tep_href_link(FILENAME_CREATE_ACCOUNT_SUCCESS, '', 'SSL'));
-    }
-  } else {
-    // check to see if someone is already logged in
-    if ( tep_session_is_registered('customer_id') ) {
-      // force a log off
-      tep_session_unregister('customer_id');
-      tep_session_unregister('customer_default_address_id');
-      tep_session_unregister('customer_first_name');
-      tep_session_unregister('customer_country_id');
-      tep_session_unregister('customer_zone_id');
-      tep_session_unregister('comments');
-      //ICW - logout -> unregister GIFT VOUCHER sessions - Thanks Fredrik
-      tep_session_unregister('gv_id');
-      tep_session_unregister('cc_id');
-      //ICW - logout -> unregister GIFT VOUCHER sessions  - Thanks Fredrik
-      $cart->reset();
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL'));
-
-  $content = CONTENT_CREATE_ACCOUNT;
-  $javascript = 'form_check.js.php';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/create_account_success.php
===================================================================
--- trunk/direct.openmoko.com/create_account_success.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/create_account_success.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,32 +0,0 @@
-<?php
-/*
-  $Id: create_account_success.php,v 1.1.1.1 2004/03/04 23:37:58 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CREATE_ACCOUNT_SUCCESS);
-
-  $breadcrumb->add(NAVBAR_TITLE_1);
-  $breadcrumb->add(NAVBAR_TITLE_2);
-  
-  if (sizeof($navigation->snapshot) > 0) {
-    $origin_href = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array(tep_session_name())), $navigation->snapshot['mode']);
-    $navigation->clear_snapshot();
-  } else {
-    $origin_href = tep_href_link(FILENAME_DEFAULT);
-  }
-
-  $content = CONTENT_CREATE_ACCOUNT_SUCCESS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/cvv.html
===================================================================
--- trunk/direct.openmoko.com/cvv.html	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/cvv.html	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,13 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>CVV Number Examples</title>
-</head>
-<body>
-<table border="0" cellpadding="0" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="569" id="AutoNumber1" height="223">
-  <tr>
-    <td><img border="0" src="images/cvv.jpg" width="569" height="223"></td>
-  </tr>
-</table>
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/down_for_maintenance.php
===================================================================
--- trunk/direct.openmoko.com/down_for_maintenance.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/down_for_maintenance.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,31 +0,0 @@
-<?php
-/*
-  Created by: Linda McGrath osCOMMERCE at WebMakers.com
-  
-  Update by: fram 05-05-2003
-  Updated by: Donald Harriman - 08-08-2003 - MS2
-
-  down_for_maintenance.php v1.1
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . DOWN_FOR_MAINTENANCE_FILENAME);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(DOWN_FOR_MAINTENANCE_FILENAME));
-
-
-  $content = CONTENT_DOWN_FOR_MAINTAINANCE;
-
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/download.php
===================================================================
--- trunk/direct.openmoko.com/download.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/download.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,99 +0,0 @@
-<?php
-/*
-  $Id: download.php,v 1.1.1.1 2004/03/04 23:37:58 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  include('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) die;
-
-// Check download.php was called with proper GET parameters
-  if ((isset($HTTP_GET_VARS['order']) && !is_numeric($HTTP_GET_VARS['order'])) || (isset($HTTP_GET_VARS['id']) && !is_numeric($HTTP_GET_VARS['id'])) ) {
-    die;
-  }
-  
-// Check that order_id, customer_id and filename match
-  $downloads_query = tep_db_query("select date_format(o.date_purchased, '%Y-%m-%d') as date_purchased_day, opd.download_maxdays, opd.download_count, opd.download_maxdays, opd.orders_products_filename from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS_PRODUCTS_DOWNLOAD . " opd where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = '" . (int)$HTTP_GET_VARS['order'] . "' and o.orders_id = op.orders_id and op.orders_products_id = opd.orders_products_id and opd.orders_products_download_id = '" . (int)$HTTP_GET_VARS['id'] . "' and opd.orders_products_filename != ''");
-  if (!tep_db_num_rows($downloads_query)) die;
-  $downloads = tep_db_fetch_array($downloads_query);
-// MySQL 3.22 does not have INTERVAL
-  list($dt_year, $dt_month, $dt_day) = explode('-', $downloads['date_purchased_day']);
-  $download_timestamp = mktime(23, 59, 59, $dt_month, $dt_day + $downloads['download_maxdays'], $dt_year);
-
-// Die if time expired (maxdays = 0 means no time limit)
-  if (($downloads['download_maxdays'] != 0) && ($download_timestamp <= time())) die;
-// Die if remaining count is <=0
-  if ($downloads['download_count'] <= 0) die;
-// Die if file is not there
-  if (!file_exists(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'])) die;
-  
-// Now decrement counter
-  tep_db_query("update " . TABLE_ORDERS_PRODUCTS_DOWNLOAD . " set download_count = download_count-1 where orders_products_download_id = '" . (int)$HTTP_GET_VARS['id'] . "'");
-
-// Returns a random name, 16 to 20 characters long
-// There are more than 10^28 combinations
-// The directory is "hidden", i.e. starts with '.'
-function tep_random_name()
-{
-  $letters = 'abcdefghijklmnopqrstuvwxyz';
-  $dirname = '.';
-  $length = floor(tep_rand(16,20));
-  for ($i = 1; $i <= $length; $i++) {
-   $q = floor(tep_rand(1,26));
-   $dirname .= $letters[$q];
-  }
-  return $dirname;
-}
-
-// Unlinks all subdirectories and files in $dir
-// Works only on one subdir level, will not recurse
-function tep_unlink_temp_dir($dir)
-{
-  $h1 = opendir($dir);
-  while ($subdir = readdir($h1)) {
-// Ignore non directories
-    if (!is_dir($dir . $subdir)) continue;
-// Ignore . and .. and CVS
-    if ($subdir == '.' || $subdir == '..' || $subdir == 'CVS') continue;
-// Loop and unlink files in subdirectory
-    $h2 = opendir($dir . $subdir);
-    while ($file = readdir($h2)) {
-      if ($file == '.' || $file == '..') continue;
-      @unlink($dir . $subdir . '/' . $file);
-    }
-    closedir($h2); 
-    @rmdir($dir . $subdir);
-  }
-  closedir($h1);
-}
-
-
-// Now send the file with header() magic
-  header("Expires: Mon, 26 Nov 1962 00:00:00 GMT");
-  header("Last-Modified: " . gmdate("D,d M Y H:i:s") . " GMT");
-  header("Cache-Control: no-cache, must-revalidate");
-  header("Pragma: no-cache");
-  header("Content-Type: Application/octet-stream");
-  header("Content-disposition: attachment; filename=" . $downloads['orders_products_filename']);
-
-  if (DOWNLOAD_BY_REDIRECT == 'true') {
-// This will work only on Unix/Linux hosts
-    tep_unlink_temp_dir(DIR_FS_DOWNLOAD_PUBLIC);
-    $tempdir = tep_random_name();
-    umask(0000);
-    mkdir(DIR_FS_DOWNLOAD_PUBLIC . $tempdir, 0777);
-    symlink(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'], DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']);
-    tep_redirect(DIR_WS_DOWNLOAD_PUBLIC . $tempdir . '/' . $downloads['orders_products_filename']);
-  } else {
-// This will work on all systems, but will need considerable resources
-// We could also loop with fread($fp, 4096) to save memory
-    readfile(DIR_FS_DOWNLOAD . $downloads['orders_products_filename']);
-  }
-?>

Deleted: trunk/direct.openmoko.com/events_calendar.php
===================================================================
--- trunk/direct.openmoko.com/events_calendar.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/events_calendar.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,45 +0,0 @@
-<?php
-/*
-  $Id: events_calendar v2.00 2003/06/16 18:09:20 ip chilipepper.it Exp $
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-  Copyright (c) 2003 osCommerce
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_EVENTS_CALENDAR);
-  
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_EVENTS_CALENDAR, '', 'NONSSL'));
-  $i =1;
-  $cal = new Calendar;
-  $cal->setStartDay(FIRST_DAY_OF_WEEK);
-  $this_month = date('m');
-  $this_year = date('Y');
-
-  if ($HTTP_GET_VARS['_month']) {
-  $month = $_month;
-  $year = $_year;
-  $a = $cal->adjustDate($month, $year);
-  $month_ = $a[0];
-  $year_= $a[1];
-  }else{
-  $year = date('Y');
-  $month = date('m');
-  $yeventear_= $year;
-  $month_= $month;
-  }
-  
-  if($HTTP_GET_VARS['_day']){
-  $ev_query = tep_db_query("select event_id from ". TABLE_EVENTS_CALENDAR ." where DAYOFMONTH(start_date)= '". $_day ."' and MONTH(start_date) = '". $_month ."' and YEAR(start_date) = '". $_year ."' AND language_id = '". (int)$languages_id ."'");
-   if (tep_db_num_rows($ev_query) < 2){
-    $ev = tep_db_fetch_array($ev_query);
-    $single_event = true;
-    $select_event = $ev['event_id'];
-    }
-  }
-  
-  $content = CONTENT_EVENTS_CALENDAR;
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/faq.php
===================================================================
--- trunk/direct.openmoko.com/faq.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/faq.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,44 +0,0 @@
-<?php
-/*
-  $Id: faq.php,v 1.2 2004/03/12 19:28:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-require('includes/application_top.php');
-
-$cID = 0;
-$display_mode = '';
-
-if (isset($HTTP_GET_VARS['cID']) && tep_not_null($HTTP_GET_VARS['cID'])) {
-  $cID = (int)$HTTP_GET_VARS['cID'];
-  $display_mode = 'faq';
-}
-
-require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_FAQ);
-
-// faq breadcrumb
-$faq_categories_query = tep_db_query("select icd.categories_name from " . TABLE_FAQ_CATEGORIES_DESCRIPTION . " icd, " . TABLE_FAQ_CATEGORIES . " ic where ic.categories_id = icd.categories_id and icd.categories_id = '" . (int)$cID . "' and icd.language_id = '" . (int)$languages_id . "' and ic.categories_status = '1'");
-$faq_categories_value = tep_db_fetch_array($faq_categories_query);
-
-if ($display_mode == 'faq') {
-  $breadcrumb->add(NAVBAR_TITLE, FILENAME_FAQ);
-
-  if (tep_not_null($faq_categories_value['categories_name'])) {
-    $breadcrumb->add($faq_categories_value['categories_name'], FILENAME_FAQ . '?cID=' . $cID);
-  }
-} else {
-  $breadcrumb->add(NAVBAR_TITLE, FILENAME_FAQ);
-}
-
-$content = CONTENT_FAQ;
-
-require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/featured_products.php
===================================================================
--- trunk/direct.openmoko.com/featured_products.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/featured_products.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,143 +0,0 @@
-<?php
-/*
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-
-  Released under the GNU General Public License
-
-this file gets all the reaw data needed by product_listing and product_listing_column to build
-the display
-  
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_FEATURED_PRODUCTS);
-    // Eversun mod for sppc and qty price breaks
-       if(!tep_session_is_registered('sppc_customer_group_id')) {
-         $customer_group_id = 'G';
-         } else {
-          $customer_group_id = $sppc_customer_group_id;
-       }
-
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-
-       // find out if sorting by price has been requested
-       if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-        $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-        if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-          $status_need_to_get_prices = true;
-          }
-       }
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-
-        $select_column_list = '';
-    
-    $listing_sql .= ' order by ';    
-        for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-          switch ($column_list[$i]) {
-            case 'PRODUCT_LIST_MODEL':
-              $select_column_list .= 'p.products_model, ';
-              break;
-            case 'PRODUCT_LIST_NAME':
-              $select_column_list .= 'pd.products_name, ';
-              break;
-            case 'PRODUCT_LIST_MANUFACTURER':
-              $select_column_list .= 'm.manufacturers_name, ';
-              break;
-            case 'PRODUCT_LIST_QUANTITY':
-              $select_column_list .= 'p.products_quantity, ';
-              break;
-            case 'PRODUCT_LIST_IMAGE':
-              $select_column_list .= 'p.products_image, ';
-              break;
-            case 'PRODUCT_LIST_WEIGHT':
-              $select_column_list .= 'p.products_weight, ';
-              break;
-             }
-    }
-   
-    // We show them all
-   // either retail or no need to get correct special prices
-          $listing_sql = "select distinct " . $select_column_list . "  
-                          p.products_id,
-                          p.products_price as final_price,
-                          p.products_tax_class_id,
-                          p.products_image 
-                        from (" . TABLE_PRODUCTS . " p 
-                        left join " . TABLE_SPECIALS . " s using(products_id)),
-                        " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                        " . TABLE_FEATURED . " f
-                        where 
-                         p.products_status = '1'
-                         and f.status ='1'
-                         and p.products_id = f.products_id
-                         and pd.products_id = p.products_id
-                         and pd.language_id = '" . (int)$languages_id . "'"; 
-                          
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-   //   $sort = ;
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-   }
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_FEATURED_PRODUCTS, '', 'NONSSL'));
-
-  $content = CONTENT_FEATURED_PRODUCTS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/gv_faq.php
===================================================================
--- trunk/direct.openmoko.com/gv_faq.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/gv_faq.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,29 +0,0 @@
-<?php
-/*
-  $Id: gv_faq.php,v 1.1.1.1 2004/03/04 23:37:59 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Gift Voucher System v1.0
-  Copyright (c) 2001, 2002 Ian C Wilson
-  http://www.phesis.org
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_GV_FAQ);
-
-  $breadcrumb->add(NAVBAR_TITLE); 
-
-  $content = CONTENT_GV_FAQ;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/gv_redeem.php
===================================================================
--- trunk/direct.openmoko.com/gv_redeem.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/gv_redeem.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,204 +0,0 @@
-<?php
-/*
-  $Id: gv_redeem.php,v 1.1.1.1 2004/03/04 23:37:59 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Gift Voucher System v1.0
-  Copyright (c) 2001, 2002 Ian C Wilson
-  http://www.phesis.org
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// if the customer is not logged on, redirect them to the login page
-if (!tep_session_is_registered('customer_id')) {
-$navigation->set_snapshot();
-tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-}
-// check for a voucher number in the url
-  if (isset($HTTP_GET_VARS['gv_no'])) {
-    $error = true;
- $voucher_number=tep_db_prepare_input($HTTP_GET_VARS['gv_no']);
-    $gv_query = tep_db_query("select c.coupon_id, c.coupon_amount from " . TABLE_COUPONS . " c, " . TABLE_COUPON_EMAIL_TRACK . " et where coupon_code = '" . addslashes($voucher_number) . "' and c.coupon_id = et.coupon_id");
-    if (tep_db_num_rows($gv_query) >0) {
-      $coupon = tep_db_fetch_array($gv_query);
-      $redeem_query = tep_db_query("select coupon_id from ". TABLE_COUPON_REDEEM_TRACK . " where coupon_id = '" . $coupon['coupon_id'] . "'");
-      if (tep_db_num_rows($redeem_query) == 0 ) {
-// check for required session variables
-        if (!tep_session_is_registered('gv_id')) {
-          tep_session_register('gv_id');
-        }
-        $gv_id = $coupon['coupon_id'];
-        $error = false;
-      } else {
-        $error = true;
-      }
-    }
-  } else {
-    tep_redirect(FILENAME_DEFAULT);
-  }
-  if ((!$error) && (tep_session_is_registered('customer_id'))) {
-// Update redeem status
-    $gv_query = tep_db_query("insert into  " . TABLE_COUPON_REDEEM_TRACK . " (coupon_id, customer_id, redeem_date, redeem_ip) values ('" . $coupon['coupon_id'] . "', '" . $customer_id . "', now(),'" . $REMOTE_ADDR . "')");
-    $gv_update = tep_db_query("update " . TABLE_COUPONS . " set coupon_active = 'N' where coupon_id = '" . $coupon['coupon_id'] . "'");
-    tep_gv_account_update($customer_id, $gv_id);
-    tep_session_unregister('gv_id');   
-  } 
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_GV_REDEEM);
-
-
-/* 
-GV_REDEEM_EXPLOIT_FIX (GVREF)
----------------------------------------------
-* case: guest accounts can exploit gift voucher sent using "Mail Gift Voucher" (admin area),
-*       by sharing the code until somebody logs with a valid account
-*       or successfully created new account.
-*
-* obv:  the session remains on user while served as a guest. 
-*       The gift voucher can now be reused to all guest users until 
-*       gift voucher is redeemed
-* soln: before releasing the gift voucher, the user must login first
-*       or asked to create an account.
-*
-*
-* -- Frederick Ricaforte
-*/
-
-
-/*
-* connected files:
-*   /catalog/gv_redeem.php
-*   /catalog/login.php
-*   /catalog/create_account.php 
-*   /catalog/includes/languages/english/gv_redeem.php
-*
-*/
-
-/*******************************************************
-**** gv_redeem.php  ************************************
-*******************************************************/
-  //before:  $redeem_query = tep_db_query("select coupon_id from ". TABLE_COUPON_REDEEM_TRACK . " where coupon_id = '" . $coupon['coupon_id'] . "'");
-  //----
-      // add:GVREF
-      if ((tep_session_is_registered('customer_id')) && $voucher_not_redeemed) {
-        $gv_id = $coupon['coupon_id'];
-        $gv_query = tep_db_query("insert into  " . TABLE_COUPON_REDEEM_TRACK . " (coupon_id, customer_id, redeem_date, redeem_ip) values ('" . $coupon['coupon_id'] . "', '" . $customer_id . "', now(),'" . $REMOTE_ADDR . "')");
-        $gv_update = tep_db_query("update " . TABLE_COUPONS . " set coupon_active = 'N' where coupon_id = '" . $coupon['coupon_id'] . "'");
-        tep_gv_account_update($customer_id, $gv_id);
-        $error = false;
-      } elseif($voucher_not_redeemed) {
-      // endof_add:GVREF
-
-      // replace: GVREF
-      /*
-      if (tep_db_num_rows($redeem_query) == 0 ) {
-        // check for required session variables
-        if (!tep_session_is_registered('gv_id')) {
-          tep_session_register('gv_id');
-        }
-        $gv_id = $coupon['coupon_id'];
-        $error = false;
-      } else {
-        $error = true;
-      }
-      */
-
-      // with: GVREF
-        if (!tep_session_is_registered('floating_gv_code')) {
-            tep_session_register('floating_gv_code');
-          //}
-          $floating_gv_code = $HTTP_GET_VARS['gv_no'];
-          $gv_error_message = TEXT_NEEDS_TO_LOGIN;
-      } else {
-        $gv_error_message = TEXT_INVALID_GV;
-     }
-    } else {
-      $gv_error_message = TEXT_INVALID_GV;
-    }
-    // endof_replace: GVREF
-
-  // remove: GVREF
-  /*
-  if ((!$error) && (tep_session_is_registered('customer_id'))) {
-    // Update redeem status
-    $gv_query = tep_db_query("insert into  " . TABLE_COUPON_REDEEM_TRACK . " (coupon_id, customer_id, redeem_date, redeem_ip) values ('" . $coupon['coupon_id'] . "', '" . $customer_id . "', now(),'" . $REMOTE_ADDR . "')");
-    $gv_update = tep_db_query("update " . TABLE_COUPONS . " set coupon_active = 'N' where coupon_id = '" . $coupon['coupon_id'] . "'");
-    tep_gv_account_update($customer_id, $gv_id);
-    tep_session_unregister('gv_id');   
-  } 
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_GV_REDEEM);
-  */
-  // endof_remove: GVREF
-
-  // replace: GVREF
-  // $message = TEXT_INVALID_GV;
-  // with:
-  $message = $gv_error_message;
-  // endof_replace
-  
-  
-
-/*******************************************************
-****  login.php  ******************************************
-*******************************************************/
-  //before:    $cart->restore_contents();
-  //---------
-  //add these new codes:
-        if (tep_session_is_registered('floating_gv_code')) {
-          $gv_query = tep_db_query("SELECT c.coupon_id, c.coupon_amount, IF(rt.coupon_id>0, 'true', 'false') AS redeemed FROM ". TABLE_COUPONS ." c LEFT JOIN ". TABLE_COUPON_REDEEM_TRACK." rt USING(coupon_id), ". TABLE_COUPON_EMAIL_TRACK ." et WHERE c.coupon_code = '". $floating_gv_code ."' AND c.coupon_id = et.coupon_id");
-          // check if coupon exist
-          if (tep_db_num_rows($gv_query) >0) {
-            $coupon = tep_db_fetch_array($gv_query);
-            // check if coupon_id exist and coupon not redeemed
-            if($coupon['coupon_id']>0 && $coupon['redeemed'] == 'false') {
-              tep_session_unregister('floating_gv_code');
-              $gv_query = tep_db_query("insert into  " . TABLE_COUPON_REDEEM_TRACK . " (coupon_id, customer_id, redeem_date, redeem_ip) values ('" . $coupon['coupon_id'] . "', '" . $customer_id . "', now(),'" . $REMOTE_ADDR . "')");
-              $gv_update = tep_db_query("update " . TABLE_COUPONS . " set coupon_active = 'N' where coupon_id = '" . $coupon['coupon_id'] . "'");
-              tep_gv_account_update($customer_id, $coupon['coupon_id']);
-            }
-          }
-        }
-//**********
-
-
-
-/*******************************************************
-****  create_account.php  ***********************************
-*******************************************************/
-  //before: tep_mail($name, $email_address, EMAIL_SUBJECT, $email_text, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-  //---------
-  //add these:
-      if (tep_session_is_registered('floating_gv_code')) {
-        $gv_query = tep_db_query("SELECT c.coupon_id, c.coupon_amount, IF(rt.coupon_id>0, 'true', 'false') AS redeemed FROM ". TABLE_COUPONS ." c LEFT JOIN ". TABLE_COUPON_REDEEM_TRACK." rt USING(coupon_id), ". TABLE_COUPON_EMAIL_TRACK ." et WHERE c.coupon_code = '". $floating_gv_code ."' AND c.coupon_id = et.coupon_id");
-        // check if coupon exist
-        if (tep_db_num_rows($gv_query) >0) {
-          $coupon = tep_db_fetch_array($gv_query);
-          // check if coupon_id exist and coupon not redeemed
-          if($coupon['coupon_id']>0 && $coupon['redeemed'] == 'false') {
-              tep_session_unregister('floating_gv_code');
-              $gv_query = tep_db_query("insert into  " . TABLE_COUPON_REDEEM_TRACK . " (coupon_id, customer_id, redeem_date, redeem_ip) values ('" . $coupon['coupon_id'] . "', '" . $customer_id . "', now(),'" . $REMOTE_ADDR . "')");
-              $gv_update = tep_db_query("update " . TABLE_COUPONS . " set coupon_active = 'N' where coupon_id = '" . $coupon['coupon_id'] . "'");
-              tep_gv_account_update($customer_id, $coupon['coupon_id']);
-          }
-        }
-      }
-
-/*******************************************************
-****  /includes/languages/english/gv_redeem.php ******************
-*******************************************************/
-// add:
-define('TEXT_NEEDS_TO_LOGIN', 'We are sorry but we are unable to process your Gift Voucher claim at this time. You need to login first or create an account with us, if you don\'t already have one, before you can claim your Gift Voucher. Please <a href="' . tep_href_link(FILENAME_LOGIN,'','SSL').'">click here to login or create an account.</a> ');
-  $breadcrumb->add(NAVBAR_TITLE); 
-  $content = CONTENT_GV_REDEEM;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/gv_send.php
===================================================================
--- trunk/direct.openmoko.com/gv_send.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/gv_send.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,97 +0,0 @@
-<?php
-/*
-  $Id: gv_send.php,v 1.1.1.1 2004/03/04 23:37:59 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Gift Voucher System v1.0
-  Copyright (c) 2001, 2002 Ian C Wilson
-  http://www.phesis.org
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require('includes/classes/http_client.php');
-
-// if the customer is not logged on, redirect them to the login page
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_GV_SEND);
-
-  if (($HTTP_POST_VARS['back_x']) || ($HTTP_POST_VARS['back_y'])) {
-    $HTTP_GET_VARS['action'] = '';
-  }
-  if ($HTTP_GET_VARS['action'] == 'send') {
-    $error = false;
-    if (!tep_validate_email(trim($HTTP_POST_VARS['email']))) {
-      $error = true;
-      $error_email = ERROR_ENTRY_EMAIL_ADDRESS_CHECK;
-    }
-    $gv_query = tep_db_query("select amount from " . TABLE_COUPON_GV_CUSTOMER . " where customer_id = '" . $customer_id . "'");
-    $gv_result = tep_db_fetch_array($gv_query);
-    $customer_amount = $gv_result['amount'];
-    $gv_amount = trim($HTTP_POST_VARS['amount']);
-    if (ereg('[^0-9/.]', $gv_amount)) {
-      $error = true;
-      $error_amount = ERROR_ENTRY_AMOUNT_CHECK; 
-    }
-    if ($gv_amount>$customer_amount || $gv_amount == 0) {
-      $error = true; 
-      $error_amount = ERROR_ENTRY_AMOUNT_CHECK; 
-    } 
-  }
-  if ($HTTP_GET_VARS['action'] == 'process') {
-    $id1 = create_coupon_code($mail['customers_email_address']);
-    $gv_query = tep_db_query("select amount from " . TABLE_COUPON_GV_CUSTOMER . " where customer_id='".$customer_id."'");
-    $gv_result=tep_db_fetch_array($gv_query);
-    $new_amount=$gv_result['amount']-(int)$HTTP_POST_VARS['amount'];
-    if ($new_amount<0) {
-      $error= true;
-      $error_amount = ERROR_ENTRY_AMOUNT_CHECK; 
-      $HTTP_GET_VARS['action'] = 'send';
-    } else {
-      $gv_query=tep_db_query("update " . TABLE_COUPON_GV_CUSTOMER . " set amount = '" . $new_amount . "' where customer_id = '" . $customer_id . "'");
-      $gv_query=tep_db_query("select customers_firstname, customers_lastname from " . TABLE_CUSTOMERS . " where customers_id = '" . $customer_id . "'");
-      $gv_customer=tep_db_fetch_array($gv_query);
-      $gv_query=tep_db_query("insert into " . TABLE_COUPONS . " (coupon_type, coupon_code, date_created, coupon_amount) values ('G', '" . $id1 . "', NOW(), '" . $HTTP_POST_VARS['amount'] . "')");
-      $insert_id = tep_db_insert_id($gv_query);
-      $gv_query=tep_db_query("insert into " . TABLE_COUPON_EMAIL_TRACK . " (coupon_id, customer_id_sent, sent_firstname, sent_lastname, emailed_to, date_sent) values ('" . $insert_id . "' ,'" . $customer_id . "', '" . addslashes($gv_customer['customers_firstname']) . "', '" . addslashes($gv_customer['customers_lastname']) . "', '" . tep_db_prepare_input($HTTP_POST_VARS['email']) . "', now())");
-
-      $gv_email = STORE_NAME . "\n" .
-              EMAIL_SEPARATOR . "\n" .
-              sprintf(EMAIL_GV_TEXT_HEADER, $currencies->format($HTTP_POST_VARS['amount'])) . "\n" .
-              EMAIL_SEPARATOR . "\n" . 
-              sprintf(EMAIL_GV_FROM, stripslashes($HTTP_POST_VARS['send_name'])) . "\n";
-      if (isset($HTTP_POST_VARS['message'])) {
-        $gv_email .= EMAIL_GV_MESSAGE . "\n";
-        if (isset($HTTP_POST_VARS['to_name'])) {
-          $gv_email .= sprintf(EMAIL_GV_SEND_TO, stripslashes($HTTP_POST_VARS['to_name'])) . "\n\n";
-        }
-        $gv_email .= stripslashes($HTTP_POST_VARS['message']) . "\n\n";
-      } 
-      $gv_email .= sprintf(EMAIL_GV_REDEEM, $id1) . "\n\n";
-    //  $gv_email .= '<a href="' . tep_href_link(FILENAME_GV_REDEEM, 'gv_no=' . $id1, 'NONSSL', false) . '">' . EMAIL_GV_LINK . '</a>';
-      $gv_email .= EMAIL_GV_LINK . ' ' . "<a HREF='" . tep_href_link(FILENAME_GV_REDEEM, 'gv_no=' . $id1,'NONSSL',false) . "'>" . tep_href_link(FILENAME_GV_REDEEM, 'gv_no=' . $id1,'NONSSL',false) . "</a>\n";
-      $gv_email .= "\n\n";  
-      $gv_email .= EMAIL_GV_FIXED_FOOTER . "\n\n";
-      $gv_email .= EMAIL_GV_SHOP_FOOTER . "\n\n";;
-      $gv_email_subject = sprintf(EMAIL_GV_TEXT_SUBJECT, stripslashes($HTTP_POST_VARS['send_name']));             
-      tep_mail('', $HTTP_POST_VARS['email'], $gv_email_subject, nl2br($gv_email), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, '');
-    }
-  }
-  $breadcrumb->add(NAVBAR_TITLE);
-  $content = CONTENT_GV_SEND;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-
-?>

Deleted: trunk/direct.openmoko.com/iam.php
===================================================================
--- trunk/direct.openmoko.com/iam.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/iam.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1 +0,0 @@
-this is the web root

Deleted: trunk/direct.openmoko.com/index.php
===================================================================
--- trunk/direct.openmoko.com/index.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/index.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,311 +0,0 @@
-<?php
-/*
-  $Id: index.php,v 1.2 2004/03/09 19:56:29 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// the following cPath references come from application_top.php
-  $category_depth = 'top';
-  if (isset($cPath) && tep_not_null($cPath)) {
-    $categories_products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
-    $cateqories_products = tep_db_fetch_array($categories_products_query);
-    if ($cateqories_products['total'] > 0) {
-      $category_depth = 'products'; // display products
-    } else {
-      $category_parent_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$current_category_id . "'");
-      $category_parent = tep_db_fetch_array($category_parent_query);
-      if ($category_parent['total'] > 0) {
-        $category_depth = 'nested'; // navigate through the categories
-      } else {
-        $category_depth = 'products'; // category has no products, but display the 'no products' message
-      }
-    }
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_DEFAULT);
-
-  if ($category_depth == 'nested') {
-//Code change for Categories Description 1.5
-//    $category_query = tep_db_query("select cd.categories_name, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-//Changed to the following
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . $languages_id . "'");
-//End Categories Description 1.5
-
-    $category = tep_db_fetch_array($category_query);
-
-    $content = CONTENT_INDEX_NESTED;
-
-  } elseif ($category_depth == 'products' || isset($HTTP_GET_VARS['manufacturers_id'])) {
-// create column list
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-// Eversun mod for sppc and qty price breaks
-   if(!tep_session_is_registered('sppc_customer_group_id')) {
-     $customer_group_id = '0';
-     } else {
-      $customer_group_id = $sppc_customer_group_id;
-   }
-   // this will build the table with specials prices for the retail group or update it if needed
-   // this function should have been added to includes/functions/database.php
-   if ($customer_group_id == '0') {
-     tep_db_check_age_specials_retail_table();
-   }
-   $status_product_prices_table = false;
-   $status_need_to_get_prices = false;
-
-   // find out if sorting by price has been requested
-   if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-    $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-    if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-      $status_need_to_get_prices = true;
-      }
-   }
-
-   if ($status_need_to_get_prices == true && $customer_group_id != '0') {
-     $product_prices_table = TABLE_PRODUCTS_GROUP_PRICES.$customer_group_id;
-   // the table with product prices for a particular customer group is re-built only a number of times per hour
-   // (setting in /includes/database_tables.php called MAXIMUM_DELAY_UPDATE_PG_PRICES_TABLE, in minutes)
-   // to trigger the update the next function is called (new function that should have been
-   // added to includes/functions/database.php)
-     tep_db_check_age_products_group_prices_cg_table($customer_group_id);
-     $status_product_prices_table = true;
-   } // end if ($status_need_to_get_prices == true && $customer_group_id != '0')
-// Eversun mod end for sppc and qty price breaks
-    $select_column_list = '';
-
-    for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-      switch ($column_list[$i]) {
-        case 'PRODUCT_LIST_MODEL':
-          $select_column_list .= 'p.products_model, ';
-          break;
-        case 'PRODUCT_LIST_NAME':
-          $select_column_list .= 'pd.products_name, ';
-          break;
-        case 'PRODUCT_LIST_MANUFACTURER':
-          $select_column_list .= 'm.manufacturers_name, ';
-          break;
-        case 'PRODUCT_LIST_QUANTITY':
-          $select_column_list .= 'p.products_quantity, ';
-          break;
-        case 'PRODUCT_LIST_IMAGE':
-          $select_column_list .= 'p.products_image, ';
-          break;
-        case 'PRODUCT_LIST_WEIGHT':
-          $select_column_list .= 'p.products_weight, ';
-          break;
-      }
-    }
- // Get the category name and description
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-    $category = tep_db_fetch_array($category_query);
-
-
-// show the products of a specified manufacturer
-    if (isset($HTTP_GET_VARS['manufacturers_id'])) {
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-
-// We are asked to show only a specific category
-//Eversun mod for sppc and qty price breaks
-
-/*
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-      }
-    } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-    */
-      
-    if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from " . TABLE_PRODUCTS . " p
-                      left join (" . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } // end else { // either retail...
-    } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } // end else { // either retail...
-    }
-  } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory;
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p 
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } // end else { // either retail...
-      } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-    } // end else { // either retail...
-// Eversun mod for sppc and qty price breaks
-      }
-    }
-
-    if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-
-    $content = CONTENT_INDEX_PRODUCTS;
-
-  } else { // default page
-
-    $content = CONTENT_INDEX_DEFAULT;
-
-  }
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/info_shopping_cart.php
===================================================================
--- trunk/direct.openmoko.com/info_shopping_cart.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/info_shopping_cart.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,38 +0,0 @@
-<?php
-/*
-  $Id: info_shopping_cart.php,v 1.1.1.1 2004/03/04 23:37:59 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require("includes/application_top.php");
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_INFO_SHOPPING_CART);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body>
-<p class="main"><b><?php echo HEADING_TITLE; ?></b><br><?php echo tep_draw_separator(); ?></p>
-<p class="main"><b><i><?php echo SUB_HEADING_TITLE_1; ?></i></b><br><?php echo SUB_HEADING_TEXT_1; ?></p>
-<p class="main"><b><i><?php echo SUB_HEADING_TITLE_2; ?></i></b><br><?php echo SUB_HEADING_TEXT_2; ?></p>
-<p class="main"><b><i><?php echo SUB_HEADING_TITLE_3; ?></i></b><br><?php echo SUB_HEADING_TEXT_3; ?></p>
-<p align="right" class="main"><a href="javascript:window.close();"><?php echo TEXT_CLOSE_WINDOW; ?></a></p>
-</body>
-</html>
-<?php
-  require("includes/counter.php");
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/information.php
===================================================================
--- trunk/direct.openmoko.com/information.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/information.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,38 +0,0 @@
-<?php
-  /*
-  Module: Information Pages Unlimited
-        File date: 2003/03/03
-      Based on the FAQ script of adgrafics
-        Adjusted by Joeri Stegeman (joeri210 at yahoo.com), The Netherlands
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Released under the GNU General Public License
-  */
-
-  require('includes/application_top.php');
-
-  // Added for information pages
- // if(!$HTTP_GET_VARS['info_id']) die("No page found.");
-  $info_id = $HTTP_GET_VARS['info_id'];
-
-  $sql=tep_db_query('SELECT * FROM '.TABLE_INFORMATION.' WHERE visible=\'1\' AND information_id=\''.(int)$info_id.'\'') or die(tep_db_error());
-  $row=tep_db_fetch_array($sql);
-  $INFO_TITLE = stripslashes($row['info_title']);
-  $INFO_DESCRIPTION = stripslashes($row['description']);
-
-  // Only replace cariage return by <BR> if NO HTML found in text
-  // Added as noticed by infopages module
-  if (!preg_match("/([\<])([^\>]{1,})*([\>])/i", $INFO_DESCRIPTION)) {
-    $INFO_DESCRIPTION = str_replace("\r\n", "<br>\r\n", $INFO_DESCRIPTION ); 
-  }
-
-  $breadcrumb->add($INFO_TITLE, tep_href_link(FILENAME_INFORMATION, 'info_id=' . $row['information_id'], 'NONSSL'));
-
-  $content = CONTENT_INFORMATION;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/ipn.php
===================================================================
--- trunk/direct.openmoko.com/ipn.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/ipn.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,149 +0,0 @@
-<?php
-/*
-  $Id: ipn.php,v 2.8 2004/09/11 devosc Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  DevosC, Developing open source Code
-  http://www.devosc.com
-
-  Copyright (c) 2003 osCommerce
-  Copyright (c) 2004 DevosC.com
-
-  Released under the GNU General Public License
-*/
-/*
-  function debugWriteFile($str,$mode="a") {
-    $fp = @fopen("ipn.txt",$mode);  @flock($fp, LOCK_EX); @fwrite($fp,$str); @flock($fp, LOCK_UN); @fclose($fp);
-  }
-
-  $postString = ''; foreach($_POST as $key => $val) $postString .= $key.' = '.$val."\n";
-  if($postString != '') {
-    debugWriteFile($postString,"w+");
-  }
-*/
-
-  require_once('includes/modules/payment/paypal/application_top.inc.php');
-  require_once(DIR_WS_MODULES . 'payment/paypal/classes/IPN/IPN.class.php');
-  require_once(DIR_WS_MODULES . 'payment/paypal/classes/Debug/Debug.class.php');
-  require_once(DIR_WS_MODULES . 'payment/paypal/functions/general.func.php');
-
-  paypal_include_lng(DIR_WS_MODULES . 'payment/paypal/languages/', $language, 'ipn.lng.php');
-
-  $debug = new PayPal_Debug(MODULE_PAYMENT_PAYPAL_IPN_DEBUG_EMAIL,MODULE_PAYMENT_PAYPAL_IPN_DEBUG);
-  $ipn = new PayPal_IPN($_POST);
-  $ipn->setTestMode(MODULE_PAYMENT_PAYPAL_IPN_TEST_MODE);
-  unset($_POST);
-
-  //post back to PayPal system to validate
-  if(!$ipn->authenticate(MODULE_PAYMENT_PAYPAL_DOMAIN) && $ipn->testMode('Off')) $ipn->dienice('500');
-
-  //Check both the receiver_email and business ID fields match
-  if (!$ipn->validateReceiverEmail(MODULE_PAYMENT_PAYPAL_ID,MODULE_PAYMENT_PAYPAL_BUSINESS_ID)) $ipn->dienice('500');
-
-  if($ipn->uniqueTxnID() && $ipn->isReversal()) {
-
-    //parent_txn_id is the txn_id of the original transaction
-    $ipn_query = tep_db_query("select paypal_id from " . TABLE_PAYPAL . " where txn_id = '" . tep_db_input($ipn->key['parent_txn_id']) . "'");
-    if(tep_db_num_rows($ipn_query)) {
-      $ipn_query_result = tep_db_fetch_array($ipn_query);
-      $ipn->insert();
-      // update the order's status
-      switch ($ipn->reversalType()) {
-        case 'Canceled_Reversal':
-          $order_status = MODULE_PAYMENT_PAYPAL_ORDER_STATUS_ID;
-          break;
-        case 'Reversed':
-        case 'Refunded':
-          $order_status = MODULE_PAYMENT_PAYPAL_ORDER_CANCELED_STATUS_ID;
-          break;
-      }
-      $ipn->updateOrderStatus($ipn_query_result['paypal_id'],$order_status);
-    }
-
-  } elseif ($ipn->isCartPayment() && tep_not_null($PayPal_osC_Order->orderID)) {
-
-
-    //$currency = $PayPal_osC_Order->currency;
-
-    //actually not essential since 'orders_status_name' is not required
-    $languages_id = $PayPal_osC_Order->languageID;
-
-    include(DIR_WS_CLASSES . 'order.php');
-    $order = new order($PayPal_osC_Order->orderID);
-
-    //Check that txn_id has not been previously processed
-    if ($ipn->uniqueTxnID()) { //Payment is either Completed, Pending or Failed
-      $ipn->insert();
-
-      tep_db_query("update " . TABLE_ORDERS . " set payment_id = '" . (int)$ipn->ID() . "' where orders_id = '" . (int)$PayPal_osC_Order->orderID . "'");
-      tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$order->customer['id'] . "'");
-      tep_db_query("delete from " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " where customers_id = '" . (int)$order->customer['id'] . "'");
-
-      switch ($ipn->paymentStatus()) {
-        case 'Completed':
-          if ($ipn->validPayment($PayPal_osC_Order->payment_amount,$PayPal_osC_Order->payment_currency)) {
-            include(DIR_WS_MODULES . 'payment/paypal/catalog/checkout_update.inc.php');
-          } else {
-            $ipn->updateOrderStatus($ipn->ID(),MODULE_PAYMENT_PAYPAL_ORDER_ONHOLD_STATUS_ID);
-          }
-          break;
-        case 'Failed':
-          $ipn->updateOrderStatus($ipn->ID(),MODULE_PAYMENT_PAYPAL_ORDER_CANCELED_STATUS_ID);
-          break;
-        case 'Pending':
-          //Assumed to do nothing since the order is initially in a Pending ORDER Status
-          break;
-      }//end switch
-
-    } else { // not a unique transaction => Pending Payment
-
-      $ipn_query = tep_db_query("select paypal_id, payment_status, pending_reason from " . TABLE_PAYPAL . " where txn_id = '" . tep_db_input($ipn->txnID()) . "' limit 0,1");
-      //Assumes there is only one previous IPN transaction
-      $ipn_query_result = tep_db_fetch_array($ipn_query);
-      if ($ipn_query_result['payment_status'] === 'Pending') {
-        $ipn->updateStatus($ipn_query_result['paypal_id'],$ipn_query_result['pending_reason']);
-        switch ($ipn->paymentStatus()) {
-          case 'Completed':
-           if ($ipn->validPayment($PayPal_osC_Order->payment_amount,$PayPal_osC_Order->payment_currency)) {
-            include(DIR_WS_MODULES . 'payment/paypal/catalog/checkout_update.inc.php');
-           } else {
-            $ipn->updateOrderStatus($ipn_query_result['paypal_id'],MODULE_PAYMENT_PAYPAL_ORDER_ONHOLD_STATUS_ID);
-           }
-           break;
-          case 'Denied':
-            $ipn->updateOrderStatus($ipn_query_result['paypal_id'],MODULE_PAYMENT_PAYPAL_ORDER_CANCELED_STATUS_ID);
-            break;
-        }//end switch
-      }//end if Pending Payment
-    }
-
-  } elseif ($ipn->isAuction()) {
-
-    if ($ipn->uniqueTxnID()) $ipn->insert();
-    if ($debug->enabled) $debug->add(PAYPAL_AUCTION,sprintf(PAYPAL_AUCTION_MSG));
-
-  } elseif ($ipn->txnType('send_money')) {
-
-    if ($ipn->uniqueTxnID()) $ipn->insert();
-    if ($debug->enabled) $debug->add(PAYMENT_SEND_MONEY_DESCRIPTION,sprintf(PAYMENT_SEND_MONEY_DESCRIPTION_MSG,number_format($ipn->key['mc_gross'],2),$ipn->key['mc_currency']));
-
-  } elseif ($debug->enabled && $ipn->testMode('On')) {
-    $debug->raiseError(TEST_INCOMPLETE,sprintf(TEST_INCOMPLETE_MSG),true);
-  }
-  if ($ipn->testMode('On') &&  $ipn->validDigest()) {
-    include(DIR_WS_MODULES . 'payment/paypal/classes/Page/Page.class.php');
-    $page = new PayPal_Page();
-    $page->setBaseDirectory(DIR_WS_MODULES . 'payment/paypal/');
-    $page->setBaseURL(DIR_WS_MODULES . 'payment/paypal/');
-    $page->includeLanguageFile('admin/languages','english','paypal.lng.php');
-    $page->setTitle(HEADING_ITP_RESULTS_TITLE);
-    $page->setContentFile(DIR_WS_MODULES . 'payment/paypal/admin/TestPanel/Results.inc.php');
-    $page->addCSS($page->baseURL . 'templates/css/general.css');
-    $page->addCSS($page->baseURL . 'templates/css/stylesheet.css');
-    $page->setTemplate('default');
-    include($page->template());
-  }
-  require(DIR_WS_MODULES . 'payment/paypal/application_bottom.inc.php');
-?>

Deleted: trunk/direct.openmoko.com/links.php
===================================================================
--- trunk/direct.openmoko.com/links.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/links.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,49 +0,0 @@
-<?php
-/*
-  $Id: links.php,v 1.2 2004/03/12 19:28:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// define our link functions
-  require(DIR_WS_FUNCTIONS . 'links.php');
-
-// calculate link category path
-  if (isset($HTTP_GET_VARS['lPath'])) {
-    $lPath = $HTTP_GET_VARS['lPath'];
-    $current_category_id = $lPath;
-    $display_mode = 'links';
-  } elseif (isset($HTTP_GET_VARS['links_id'])) {
-    $lPath = tep_get_link_path($HTTP_GET_VARS['links_id']);
-  } else {
-    $lPath = '';
-    $display_mode = 'categories';
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LINKS);
-
-  // links breadcrumb
-  $link_categories_query = tep_db_query("select link_categories_name from " . TABLE_LINK_CATEGORIES_DESCRIPTION . " where link_categories_id = '" . (int)$lPath . "' and language_id = '" . (int)$languages_id . "'");
-  $link_categories_value = tep_db_fetch_array($link_categories_query);
-
-  if ($display_mode == 'links') {
-    $breadcrumb->add(NAVBAR_TITLE, FILENAME_LINKS);
-    $breadcrumb->add($link_categories_value['link_categories_name'], FILENAME_LINKS . '?lPath=' . $lPath);
-  } else {
-    $breadcrumb->add(NAVBAR_TITLE, FILENAME_LINKS);
-  }
-
-
-  $content = CONTENT_LINKS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/links_submit.php
===================================================================
--- trunk/direct.openmoko.com/links_submit.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/links_submit.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,144 +0,0 @@
-<?php
-/*
-  $Id: links_submit.php,v 1.1.1.1 2004/03/04 23:38:00 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// needs to be included earlier to set the success message in the messageStack
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LINKS_SUBMIT);
-
-  $process = false;
-  if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
-    $process = true;
-
-    $links_title = tep_db_prepare_input($HTTP_POST_VARS['links_title']);
-    $links_url = tep_db_prepare_input($HTTP_POST_VARS['links_url']);
-    $links_category = tep_db_prepare_input($HTTP_POST_VARS['links_category']);
-    $links_description = tep_db_prepare_input($HTTP_POST_VARS['links_description']);
-    $links_image = tep_db_prepare_input($HTTP_POST_VARS['links_image']);
-    $links_contact_name = tep_db_prepare_input($HTTP_POST_VARS['links_contact_name']);
-    $links_contact_email = tep_db_prepare_input($HTTP_POST_VARS['links_contact_email']);
-    $links_reciprocal_url = tep_db_prepare_input($HTTP_POST_VARS['links_reciprocal_url']);
-
-    $error = false;
-
-    if (strlen($links_title) < ENTRY_LINKS_TITLE_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_LINKS_TITLE_ERROR);
-    }
-
-    if (strlen($links_url) < ENTRY_LINKS_URL_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_LINKS_URL_ERROR);
-    }
-
-    if (strlen($links_description) < ENTRY_LINKS_DESCRIPTION_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_LINKS_DESCRIPTION_ERROR);
-    }
-
-    if (strlen($links_contact_name) < ENTRY_LINKS_CONTACT_NAME_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_LINKS_CONTACT_NAME_ERROR);
-    }
-
-    if (strlen($links_contact_email) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_EMAIL_ADDRESS_ERROR);
-    } elseif (tep_validate_email($links_contact_email) == false) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
-    }
-
-    if (strlen($links_reciprocal_url) < ENTRY_LINKS_URL_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('submit_link', ENTRY_LINKS_RECIPROCAL_URL_ERROR);
-    }
-
-    if ($error == false) {
-      if($links_image == 'http://') {
-        $links_image = '';
-      }
-
-      // default values
-      $links_date_added = 'now()';
-      $links_status = '1'; // Pending approval
-      $links_rating = '0'; 
-
-      $sql_data_array = array('links_url' => $links_url,
-                              'links_image_url' => $links_image,
-                              'links_contact_name' => $links_contact_name,
-                              'links_contact_email' => $links_contact_email,
-                              'links_reciprocal_url' => $links_reciprocal_url, 
-                              'links_date_added' => $links_date_added, 
-                              'links_status' => $links_status, 
-                              'links_rating' => $links_rating);
-
-      tep_db_perform(TABLE_LINKS, $sql_data_array);
-
-      $links_id = tep_db_insert_id();
-
-      $categories_query = tep_db_query("select link_categories_id from " . TABLE_LINK_CATEGORIES_DESCRIPTION . " where link_categories_name = '" . $links_category . "' and language_id = '" . (int)$languages_id . "'");
-
-      $categories = tep_db_fetch_array($categories_query);
-      $link_categories_id = $categories['link_categories_id'];
-
-      tep_db_query("insert into " . TABLE_LINKS_TO_LINK_CATEGORIES . " (links_id, link_categories_id) values ('" . (int)$links_id . "', '" . (int)$link_categories_id . "')");
-
-      $language_id = (int)$languages_id;
-
-      $sql_data_array = array('links_id' => $links_id, 
-                              'language_id' => $language_id, 
-                              'links_title' => $links_title,
-                              'links_description' => $links_description);
-
-      tep_db_perform(TABLE_LINKS_DESCRIPTION, $sql_data_array);
-
-// build the message content
-      $name = $links_contact_name;
-
-      $email_text = sprintf(EMAIL_GREET_NONE, $links_contact_name);
-
-      $email_text .= EMAIL_WELCOME . EMAIL_TEXT . EMAIL_CONTACT . EMAIL_WARNING;
-
-      tep_mail($name, $links_contact_email, EMAIL_SUBJECT, $email_text, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-
-      tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, EMAIL_OWNER_SUBJECT, EMAIL_OWNER_TEXT, $name, $links_contact_email);
-
-      tep_redirect(tep_href_link(FILENAME_LINKS_SUBMIT_SUCCESS, '', 'SSL'));
-    }
-  }
-
-  // links breadcrumb
-  $breadcrumb->add(NAVBAR_TITLE_1, FILENAME_LINKS);
-
-  if (isset($HTTP_GET_VARS['lPath'])) {
-    $link_categories_query = tep_db_query("select link_categories_name from " . TABLE_LINK_CATEGORIES_DESCRIPTION . " where link_categories_id = '" . (int)$HTTP_GET_VARS['lPath'] . "' and language_id = '" . (int)$languages_id . "'");
-    $link_categories_value = tep_db_fetch_array($link_categories_query);
-
-    $breadcrumb->add($link_categories_value['link_categories_name'], FILENAME_LINKS . '?lPath=' . $lPath);
-  } 
-
-  $breadcrumb->add(NAVBAR_TITLE_2);
-
-  $content = CONTENT_LINKS_SUBMIT;
-  $javascript = $content . '.js';
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/links_submit_success.php
===================================================================
--- trunk/direct.openmoko.com/links_submit_success.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/links_submit_success.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,34 +0,0 @@
-<?php
-/*
-  $Id: links_submit_success.php,v 1.1.1.1 2004/03/04 23:38:00 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LINKS_SUBMIT_SUCCESS);
-
-  // links breadcrumb
-  $breadcrumb->add(NAVBAR_TITLE_1, FILENAME_LINKS);
-  $breadcrumb->add(NAVBAR_TITLE_2);
-
-  if (sizeof($navigation->snapshot) > 0) {
-    $origin_href = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array(tep_session_name())), $navigation->snapshot['mode']);
-    $navigation->clear_snapshot();
-  } else {
-    $origin_href = tep_href_link(FILENAME_DEFAULT);
-  }
-
-
-  $content = CONTENT_LINKS_SUBMIT_SUCCESS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/login.php
===================================================================
--- trunk/direct.openmoko.com/login.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/login.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,162 +0,0 @@
-<?php
-/*
-  $Id: login.php,v 1.1.1.1 2004/03/04 23:38:00 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// redirect the customer to a friendly cookie-must-be-enabled page if cookies are disabled (or the session has not started)
-  if ($session_started == false) {
-    tep_redirect(tep_href_link(FILENAME_COOKIE_USAGE));
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LOGIN);
-
-  $error = false;
-
-if($HTTP_GET_VARS['login'] == 'fail') {
-$fail_reason = (!empty($HTTP_GET_VARS['reason'])) ? urldecode($HTTP_GET_VARS['reason']): TEXT_LOGIN_ERROR;
-$messageStack->add('login', $fail_reason);
-}
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
-    $password = tep_db_prepare_input($HTTP_POST_VARS['password']);
-
-  if(ACCOUNT_EMAIL_CONFIRMATION=='true')
-  {
-    if (isset($HTTP_POST_VARS['pass'])){
-    $check_customer_query_val = tep_db_query("select customers_id, customers_group_id, customers_email_address, customers_default_address_id,customers_validation_code from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
-      $new_query_for_val = tep_db_fetch_array($check_customer_query_val);   
-    if ($new_query_for_val['customers_validation_code'] == $HTTP_POST_VARS['pass']) {
-      tep_db_query("update " . TABLE_CUSTOMERS . " set customers_validation = '1', customers_email_registered = '" . tep_db_input($email_address) . "' where customers_id = '" . $new_query_for_val['customers_id']  . "'");
-    }else{tep_redirect(tep_href_link('pw.php', 'verifyid=' . $new_query_for_val['customers_id'] . '&pass=' . $HTTP_POST_VARS['pass'], SSL));}
-    }
-  }
-    
-
- $check_customer_query = tep_db_query("select customers_id, customers_firstname, customers_group_id, customers_password, customers_email_address, customers_validation, customers_default_address_id from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
-
-// Eversun end mod for sppc and qty price breaks
-    
-
-    if (!tep_db_num_rows($check_customer_query)) {
-      $error = true;
-    } else {
-      $check_customer = tep_db_fetch_array($check_customer_query);
-
-      // Check that password is good
-    if(ACCOUNT_EMAIL_CONFIRMATION=='true')
-    {$customers_validation=$check_customer['customers_validation'];}else{$customers_validation=1;}
-    
-       if ((!tep_validate_password($password, $check_customer['customers_password'])) ||  $customers_validation== '0') {
-        $error = true;
-    if ($customers_validation == '0') $setme = true;
-      } else {
-        if (SESSION_RECREATE == 'True') {
-          tep_session_recreate();
-        }
-// Eversun mod for sppc and qty price breaks
-// note that tax rates depend on your registered address!
-    if ($_GET['skip'] != 'true' && $_POST['email_address'] == SPPC_TOGGLE_LOGIN_PASSWORD ) {
-       $existing_customers_query = tep_db_query("select customers_group_id, customers_group_name from " . TABLE_CUSTOMERS_GROUPS . " order by customers_group_id ");
-    echo '<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">';
-    print ("\n<html ");
-    echo HTML_PARAMS;
-    //print (">\n<head>\n<title>Choose a Customer Group</title>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
-    print (">\n<head>\n<title>".LOGIN_TITLE1."</title>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
-    echo CHARSET;
-    print ("\"\n<base href=\"");
-    echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG;
-    print ("\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"stylesheet.css\">\n");
-    echo '<body bgcolor="#ffffff" style="margin:0">';
-    print ("\n<table border=\"0\" width=\"100%\" height=\"100%\">\n<tr>\n<td style=\"vertical-align: middle\" align=\"middle\">\n");
-    echo tep_draw_form('login', tep_href_link(FILENAME_LOGIN, 'action=process&skip=true', 'SSL'));
-    print ("\n<table border=\"0\" bgcolor=\"#f1f9fe\" cellspacing=\"10\" style=\"border: 1px solid #7b9ebd;\">\n<tr>\n<td class=\"main\">\n");
-      $index = 0;
-      while ($existing_customers =  tep_db_fetch_array($existing_customers_query)) {
-     $existing_customers_array[] = array("id" => $existing_customers['customers_group_id'], "text" => "&#160;".$existing_customers['customers_group_name']."&#160;");
-      ++$index;
-      }
-    //print ("<h1>Choose a Customer Group</h1>\n</td>\n</tr>\n<tr>\n<td align=\"center\">\n");
-    print ("<h1>".LOGIN_TITLE1."</h1>\n</td>\n</tr>\n<tr>\n<td align=\"center\">\n");
-    echo tep_draw_pull_down_menu('new_customers_group_id', $existing_customers_array, $check_customer['customers_group_id']);
-    print ("\n<tr>\n<td class=\"main\">&#160;<br />\n&#160;");
-    print ("<input type=\"hidden\" name=\"email_address\" value=\"".$_POST['email_address']."\">");
-    print ("<input type=\"hidden\" name=\"password\" value=\"".$_POST['password']."\">\n</td>\n</tr>\n<tr>\n<td align=\"right\">\n");
-    echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE);
-    print ("</td>\n</tr>\n</table>\n</form>\n</td>\n</tr>\n</table>\n</body>\n</html>\n");
-    exit;
-    }
-//Eversun mod for sppc and qty price breaks
-        $check_country_query = tep_db_query("select entry_country_id, entry_zone_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$check_customer['customers_id'] . "' and address_book_id = '" . (int)$check_customer['customers_default_address_id'] . "'");
-        $check_country = tep_db_fetch_array($check_country_query);
-
-        $customer_id = $check_customer['customers_id'];
-        $customer_default_address_id = $check_customer['customers_default_address_id'];
-        $customer_first_name = $check_customer['customers_firstname'];
-    // Eversun mod for sppc and qty price breaks
-    if ($_GET['skip'] == 'true' && $_POST['email_address'] == SPPC_TOGGLE_LOGIN_PASSWORD && isset($_POST['new_customers_group_id']))  {
-    $sppc_customer_group_id = $_POST['new_customers_group_id'] ;
-    $check_customer_group_tax = tep_db_query("select customers_group_show_tax, customers_group_tax_exempt from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id = '" .(int)$_POST['new_customers_group_id'] . "'");
-    } else {
-    $sppc_customer_group_id = $check_customer['customers_group_id'];
-    $check_customer_group_tax = tep_db_query("select customers_group_show_tax, customers_group_tax_exempt from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id = '" .(int)$check_customer['customers_group_id'] . "'");
-    }
-    $customer_group_tax = tep_db_fetch_array($check_customer_group_tax);
-    $sppc_customer_group_show_tax = (int)$customer_group_tax['customers_group_show_tax'];
-    $sppc_customer_group_tax_exempt = (int)$customer_group_tax['customers_group_tax_exempt'];
-// Eversun mod end for sppc and qty price breaks
-        $customer_country_id = $check_country['entry_country_id'];
-        $customer_zone_id = $check_country['entry_zone_id'];
-        tep_session_register('customer_id');
-        tep_session_register('customer_default_address_id');
-        tep_session_register('customer_first_name');
-    // Eversun mod for sppc and qty price breaks
-    tep_session_register('sppc_customer_group_id');
-    tep_session_register('sppc_customer_group_show_tax');
-    tep_session_register('sppc_customer_group_tax_exempt');
-// Eversun mod end  for sppc and qty price breaks
-        tep_session_register('customer_country_id');
-        tep_session_register('customer_zone_id');
-
-        tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_of_last_logon = now(), customers_info_number_of_logons = customers_info_number_of_logons+1 where customers_info_id = '" . (int)$customer_id . "'");
-
-// restore cart contents
-        $cart->restore_contents();
-
-        if (sizeof($navigation->snapshot) > 0) {
-          $origin_href = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array(tep_session_name())), $navigation->snapshot['mode']);
-          $navigation->clear_snapshot();
-          tep_redirect($origin_href);
-        } else {
-          tep_redirect(tep_href_link(FILENAME_DEFAULT, '', NONSSL));
-       }
-      }
-    }
-  }
-
-  if ($error == true) {
-if ($setme != ''){
-    $messageStack->add('login', TEXT_LOGIN_ERROR_VALIDATION);
-} else {
-    $messageStack->add('login', TEXT_LOGIN_ERROR);
-  }
-}
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-
-  $content = CONTENT_LOGIN;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/logoff.php
===================================================================
--- trunk/direct.openmoko.com/logoff.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/logoff.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,41 +0,0 @@
-<?php
-/*
-  $Id: logoff.php,v 1.1.1.1 2004/03/04 23:38:00 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LOGOFF);
-
-  $breadcrumb->add(NAVBAR_TITLE);
-
-  tep_session_unregister('customer_id');
-  tep_session_unregister('customer_default_address_id');
-  tep_session_unregister('customer_first_name');
-  // Eversun mod for sppc and qty price breaks
-  tep_session_unregister('sppc_customer_group_id');
-  tep_session_unregister('sppc_customer_group_show_tax');
-  tep_session_unregister('sppc_customer_group_tax_exempt');
-// Eversun mod for sppc and qty price breaks
-  tep_session_unregister('customer_country_id');
-  tep_session_unregister('customer_zone_id');
-  tep_session_unregister('comments');
-//ICW - logout -> unregister GIFT VOUCHER sessions - Thanks Fredrik
-  tep_session_unregister('gv_id');
-  tep_session_unregister('cc_id');
-//ICW - logout -> unregister GIFT VOUCHER sessions  - Thanks Fredrik
-  $cart->reset();
-
-  $content = CONTENT_LOGOFF;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/pages.php
===================================================================
--- trunk/direct.openmoko.com/pages.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/pages.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,60 +0,0 @@
-<?php
-/*
-  $Id: pages.php,v 1.2 2004/03/12 19:28:57 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  
-  Chain Reaction Works, Inc
-  
-  Copyright &copy; 2006 Chain Reaction Works, Inc
-  
-  Last Modified By : $Author$
-  Last Modified On : $Date$
-  
-  Latest Revision :  $Revision$
-  
-*/
-
-require('includes/application_top.php');
-
-$cID = 0;
-$pID = 0;
-$display_mode = '';
-
-if (isset($HTTP_GET_VARS['cID']) && tep_not_null($HTTP_GET_VARS['cID'])) {
-  $cID = (int)$HTTP_GET_VARS['cID'];
-  $display_mode = 'categories';
-}
-
-if (isset($HTTP_GET_VARS['pID']) && tep_not_null($HTTP_GET_VARS['pID'])) {
-  $pID = (int)$HTTP_GET_VARS['pID'];
-  $display_mode = 'pages';
-}
-
-require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PAGES);
-
-// pages breadcrumb
-$pages_categories_query = tep_db_query("select icd.categories_name from " . TABLE_PAGES_CATEGORIES_DESCRIPTION . " icd, " . TABLE_PAGES_CATEGORIES . " ic where ic.categories_id = icd.categories_id and icd.categories_id = '" . (int)$cID . "' and icd.language_id = '" . (int)$languages_id . "' and ic.categories_status = '1'");
-$pages_categories_value = tep_db_fetch_array($pages_categories_query);
-
-if (($display_mode == 'pages') || ($display_mode == 'categories')) {
-  $breadcrumb->add(NAVBAR_TITLE, FILENAME_PAGES);
-
-  if (tep_not_null($pages_categories_value['categories_name'])) {
-    $breadcrumb->add($pages_categories_value['categories_name'], FILENAME_PAGES . '?cID=' . $cID);
-  }
-} else {
-  $breadcrumb->add(NAVBAR_TITLE, FILENAME_PAGES);
-}
-
-$content = CONTENT_PAGES;
-
-require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/password_forgotten.php
===================================================================
--- trunk/direct.openmoko.com/password_forgotten.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/password_forgotten.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,47 +0,0 @@
-<?php
-/*
-  $Id: password_forgotten.php,v 1.1.1.1 2004/03/04 23:38:01 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PASSWORD_FORGOTTEN);
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
-
-    $check_customer_query = tep_db_query("select customers_firstname, customers_lastname, customers_password, customers_id from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
-    if (tep_db_num_rows($check_customer_query)) {
-      $check_customer = tep_db_fetch_array($check_customer_query);
-
-      $new_password = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
-      $crypted_password = tep_encrypt_password($new_password);
-
-      tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$check_customer['customers_id'] . "'");
-
-      tep_mail($check_customer['customers_firstname'] . ' ' . $check_customer['customers_lastname'], $email_address, EMAIL_PASSWORD_REMINDER_SUBJECT, sprintf(EMAIL_PASSWORD_REMINDER_BODY, $new_password), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
-
-      $messageStack->add_session('login', SUCCESS_PASSWORD_SENT, 'success');
-
-      tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-    } else {
-      $messageStack->add('password_forgotten', TEXT_NO_EMAIL_ADDRESS_FOUND);
-    }
-  }
-
-  $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_PASSWORD_FORGOTTEN, '', 'SSL'));
-
-  $content = CONTENT_PASSWORD_FORGOTTEN;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/paypal_notify.php
===================================================================
--- trunk/direct.openmoko.com/paypal_notify.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/paypal_notify.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,291 +0,0 @@
-<?php
-/*
-  $Id: paypal_notify.php,v 1.1.1.1 2004/03/04 23:38:01 ccwjr Exp $
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Paypal IPN v0.981 for Milestone 2
-  Copyright (c) 2003 Pablo Pasqualino
-  pablo_osc at osmosisdc.com
-  http://www.osmosisdc.com
-
-  Released under the GNU General Public License
-*/
-
-  include('includes/application_top.php');
-  include(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CHECKOUT_PROCESS);
-
-// load paypal_ipn payment module
-  $payment = 'paypalipn';
-  require(DIR_WS_CLASSES . 'payment.php');
-  $payment_modules = new payment($payment);
-
-  if (phpversion() <= '4.0.6') {
-    $_POST = $HTTP_POST_VARS;
-  }
-
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order((int)$_POST['item_number']);
-
-  $req = 'cmd=_notify-validate';
-
-  foreach ($_POST as $key => $value) {
-    $req .= '&' . $key . '=' . urlencode($value);
-    $$key = $value;
-  }
-
-  $response_verified = '';
-  $paypal_response = '';
-
-  if (MODULE_PAYMENT_PAYPALIPN_TEST_MODE=='True') {
-
-    if ($item_number) {
-      $paypal_response = $_POST[ipnstatus];
-
-//  echo 'TEST IPN Processed for order #'.$item_number;
-  echo PAYPAL_NOTIFY_IPN_TEST_1.$item_number;
-    } else {
-
-//  echo 'You need to specify an order #';
-  echo PAYPAL_NOTIFY_IPN_TEST_2;
-
-    };
-
-  } elseif (MODULE_PAYMENT_PAYPALIPN_CURL=='True') { // IF CURL IS ON, SEND DATA USING CURL (SECURE MODE, TO https://)
-
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL,"https://www.paypal.com/cgi-bin/webscr");
-    curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $req);
-    $paypal_response = curl_exec($ch);
-    curl_close ($ch);
-
-  } else { // ELSE, SEND IT WITH HEADERS (STANDARD MODE, TO http://)
-
-    $header .= "POST /cgi-bin/webscr HTTP/1.0\r\n";
-    $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-    $header .= "Content-Length: " . strlen ($req) . "\r\n\r\n";
-    $fp = fsockopen ("www.paypal.com", 80, $errno, $errstr, 30);
-
-    fputs ($fp, $header . $req);
-    while (!feof($fp)) {
-      $paypal_response .= fgets($fp, 1024);
-    };
-
-    fclose ($fp);
-
-  };
-
-  if (ereg('VERIFIED',$paypal_response)) {
-    $response_verified = 1;
-    $ipn_result = 'VERIFIED';
-  } else if (ereg('INVALID',$paypal_response)) {
-    $response_invalid = 1;
-    $ipn_result = 'INVALID';
-  } else {
-    //echo 'Error: no valid $paypal_response received.';
-    echo PAYPAL_NOTIFY_RECEIVED_ERROR_1. $paypal_response .PAYPAL_NOTIFY_RECEIVED_ERROR_2;
-  };
-
-  if ($txn_id && ($response_verified==1 || $response_invalid==1)) {
-
-    $txn_check = tep_db_query("select txn_id from " . TABLE_PAYPALIPN_TXN . " where txn_id='$txn_id'");
-    if (tep_db_num_rows($txn_check)==0) { // If txn no previously registered, we should register it
-
-      $sql_data_array = array('txn_id' => $txn_id,
-                              'ipn_result' => $ipn_result,
-                              'receiver_email' => $receiver_email,
-                              'business' => $business,
-                              'item_name' => $item_name,
-                              'item_number' => $item_number,
-                              'quantity' => $quantity,
-                              'invoice' => $invoice,
-                              'custom' => $custom,
-                              'option_name1' => $option_name1,
-                              'option_selection1' => $option_selection1,
-                              'option_name2' => $option_name2,
-                              'option_selection2' => $option_selection2,
-                              'num_cart_items' => $num_cart_items,
-                              'payment_status' => $payment_status,
-                              'pending_reason' => $pending_reason,
-                              'payment_date' => $payment_date,
-                              'settle_amount' => $settle_amount,
-                              'settle_currency' => $settle_currency,
-                              'exchange_rate' => $exchange_rate,
-                              'payment_gross' => $payment_gross,
-                              'payment_fee' => $payment_fee,
-                              'mc_gross' => $mc_gross,
-                              'mc_fee' => $mc_fee,
-                              'mc_currency' => $mc_currency,
-                              'tax' => $tax,
-                              'txn_type' => $txn_type,
-                              'for_auction' => $for_auction,
-                              'memo' => $memo,
-                              'first_name' => $first_name,
-                              'last_name' => $last_name,
-                              'address_street' => $address_street,
-                              'address_city' => $address_city,
-                              'address_state' => $address_state,
-                              'address_zip' => $address_zip,
-                              'address_country' => $address_country,
-                              'address_status' => $address_status,
-                              'payer_email' => $payer_email,
-                              'payer_id' => $payer_id,
-                              'payer_status' => $payer_status,
-                              'payment_type' => $payment_type,
-                              'notify_version' => $notify_version,
-                              'verify_sign' => $verify_sign);
-
-      tep_db_perform(TABLE_PAYPALIPN_TXN,$sql_data_array);
-
-    } else { // else we update it to the new status
-
-      $sql_data_array = array('payment_status' => $payment_status,
-                              'pending_reason' => $pending_reason,
-                              'ipn_result' => $ipn_result,
-                              'payer_email' => $payer_email,
-                              'payer_id' => $payer_id,
-                              'payer_status' => $payer_status,
-                              'payment_type' => $payment_type);
-
-      tep_db_perform(TABLE_PAYPALIPN_TXN,$sql_data_array,'update','txn_id=\''.$txn_id.'\'');
-
-    };
-
-  };
-
-  if ($response_verified==1) {
-    if (strtolower($receiver_email)==strtolower(MODULE_PAYMENT_PAYPALIPN_ID) || strtolower($business)==strtolower(MODULE_PAYMENT_PAYPALIPN_ID)) {
-      if ($payment_status=='Completed') {
-        if (MODULE_PAYMENT_PAYPALIPN_UPDATE_STOCK_BEFORE_PAYMENT=='False') {
-          for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
-// Stock Update - Joao Correia
-            if (STOCK_LIMITED == 'true') {
-              $downloadable_product = false;
-      if (DOWNLOAD_ENABLED == 'true') {
-        // see if this product actually has a downloadable file in the attributes
-        $download_check_query_raw = "SELECT products_quantity, pad.products_attributes_filename
-                            FROM " . TABLE_PRODUCTS . " p, 
-                            " . TABLE_PRODUCTS_ATTRIBUTES . " pa,
-                            " . TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD . " pad
-                             WHERE p.products_id = '" . tep_get_prid($order->products[$i]['id']) . "'
-                             and p.products_id=pa.products_id
-                             and pad.products_attributes_id=pa.products_attributes_id ";
-                             
-        $download_check_query = tep_db_query($download_check_query_raw);
-        if (tep_db_num_rows($download_check_query) > 0) {
-          $downloadable_product = true;
-        }
-      }  // end of downloadable product check
-      if ( !$downloadable_product ) {
-        $stock_query = tep_db_query("select products_quantity from " . TABLE_PRODUCTS . " where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        $stock_values = tep_db_fetch_array($stock_query);
-        $stock_left = $stock_values['products_quantity'] - $order->products[$i]['qty'];
-        tep_db_query("update " . TABLE_PRODUCTS . " set products_quantity = '" . $stock_left . "' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        if ( ($stock_left < 1) && (STOCK_ALLOW_CHECKOUT == 'false') ) {
-          tep_db_query("update " . TABLE_PRODUCTS . " set products_status = '0' where products_id = '" . tep_get_prid($order->products[$i]['id']) . "'");
-        }
-      }
-            }
-          }
-        }
-
-        if (is_numeric(MODULE_PAYMENT_PAYPALIPN_ORDER_STATUS_ID) && (MODULE_PAYMENT_PAYPALIPN_ORDER_STATUS_ID > 0) ) {
-          $order_status = MODULE_PAYMENT_PAYPALIPN_ORDER_STATUS_ID;
-        } else {
-          $order_status = DEFAULT_ORDERS_STATUS_ID;
-        };
-
-        $sql_data_array = array('orders_status' => $order_status);
-
-        tep_db_perform(TABLE_ORDERS,$sql_data_array,'update','orders_id='.$item_number);
-
-        $customer_notification = (SEND_EMAILS == 'true') ? '1' : '0';
-        $sql_data_array = array('orders_id' => $item_number,
-                                'orders_status_id' => $order_status,
-                                'date_added' => 'now()',
-                                'customer_notified' => $customer_notification);
-        tep_db_perform(TABLE_ORDERS_STATUS_HISTORY, $sql_data_array);
-
-// lets start with the email confirmation
-        for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
-          if (sizeof($order->products[$i]['attributes']) > 0) {
-            $attributes_exist = '1';
-            $products_ordered_attributes = "\n";
-            for ($j = 0, $k = sizeof($order->products[$i]['attributes']); $j < $k; $j++) {
-              $products_ordered_attributes .= '  '. $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'];
-              if ($order->products[$i]['attributes'][$j]['price'] != '0') $products_ordered_attributes .= ' (' . $order->products[$i]['attributes'][$j]['prefix'] . $currencies->format($order->products[$i]['attributes'][$j]['price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . ')' . "\n";
-            }
-          }
-
-          $products_ordered .= $order->products[$i]['qty'] . ' x ' . $order->products[$i]['name'] . ' (' . $order->products[$i]['model'] . ') = ' . $currencies->display_price($order->products[$i]['final_price'], $order->products[$i]['tax'], $order->products[$i]['qty']) . $products_ordered_attributes . "\n";
-          $products_ordered_attributes = '';
-        }
-
-        $email_order = STORE_NAME . "\n" .
-                       EMAIL_SEPARATOR . "\n" .
-                       EMAIL_TEXT_ORDER_NUMBER . ' ' . $item_number . "\n" .
-                       EMAIL_TEXT_INVOICE_URL . ' ' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $item_number, 'SSL', false) . "\n" .
-                       EMAIL_TEXT_DATE_ORDERED . ' ' . strftime(DATE_FORMAT_LONG) . "\n\n";
-        if ($order->info['comments']) {
-          $email_order .= tep_db_output($order->info['comments']) . "\n\n";
-        }
-        $email_order .= EMAIL_TEXT_PRODUCTS . "\n" .
-                        EMAIL_SEPARATOR . "\n" .
-                        $products_ordered .
-                        EMAIL_SEPARATOR . "\n";
-
-        for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) {
-          $email_order .= strip_tags($order->totals[$i]['title']) . ' ' . strip_tags($order->totals[$i]['text']) . "\n";
-        }
-
-        if ($order->content_type != 'virtual') {
-          $email_order .= "\n" . EMAIL_TEXT_DELIVERY_ADDRESS . "\n" .
-                          EMAIL_SEPARATOR . "\n";
-          if ($order->delivery['company']) { $email_order .= $order->delivery['company'] . "\n"; };
-          $email_order .= $order->delivery['name'] . "\n" .
-                          $order->delivery['street_address'] . "\n";
-          if ($order->delivery['suburb']) { $email_order .= $order->delivery['suburb'] . "\n"; };
-          $email_order .= $order->delivery['city'] . ', ' . $order->delivery['postcode'] . "\n";
-          if ($order->delivery['state']) { $email_order .= $order->delivery['state'] . ', '; };
-          $email_order .= $order->delivery['country'] . "\n";
-        }
-
-        $email_order .= "\n" . EMAIL_TEXT_BILLING_ADDRESS . "\n" .
-                        EMAIL_SEPARATOR . "\n";
-          if ($order->billing['company']) { $email_order .= $order->billing['company'] . "\n"; };
-          $email_order .= $order->billing['name'] . "\n" .
-                          $order->billing['street_address'] . "\n";
-          if ($order->billing['suburb']) { $email_order .= $order->billing['suburb'] . "\n"; };
-          $email_order .= $order->billing['city'] . ', ' . $order->billing['postcode'] . "\n";
-          if ($order->billing['state']) { $email_order .= $order->billing['state'] . ', '; };
-          $email_order .= $order->billing['country'] . "\n\n";
-
-        if (is_object($$payment)) {
-          $email_order .= EMAIL_TEXT_PAYMENT_METHOD . "\n" .
-                          EMAIL_SEPARATOR . "\n";
-          $payment_class = $$payment;
-          $email_order .= $payment_class->title . "\n\n";
-          if ($payment_class->email_footer) {
-            $email_order .= $payment_class->email_footer . "\n\n";
-          }
-        }
-
-        tep_mail($order->customer['name'],$order->customer['email_address'], EMAIL_TEXT_SUBJECT, nl2br($email_order), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, '');
-
-        if (SEND_EXTRA_ORDER_EMAILS_TO != '') { // send emails to other people
-          tep_mail('', SEND_EXTRA_ORDER_EMAILS_TO, EMAIL_TEXT_SUBJECT,  nl2br($email_order), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS, '');
-        };
-
-        tep_db_query("delete from " .TABLE_CUSTOMERS_BASKET. " where customers_id=".$order->customer['id']);
-        tep_db_query("delete from " .TABLE_CUSTOMERS_BASKET_ATTRIBUTES. " where customers_id=".$order->customer['id']);
-
-      };
-
-    };
-
-  };
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_affiliate_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_affiliate_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_affiliate_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,94 +0,0 @@
-<?php
-/*
-  $Id: popup_affiliate_help.php,v 1.1.1.1 2004/03/04 23:38:01 ccwjr Exp $
-
-  OSC-Affiliate
-
-  Contribution based on:
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 - 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (in_array('remove_current_page',get_class_methods($navigation)) ) $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_POPUP_AFFILIATE_HELP);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo STORE_NAME; ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo TEMPLATE_STYLE;?>">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-    $info_box_contents[] = array('text'  => '<font color="' . $font_color . '">' . HEADING_SUMMARY_HELP . '<font color="' . $font_color . '">');
-
-  new infoBoxHeading($info_box_contents, false, false);
-  $info_box_contents = array();
-    switch ($HTTP_GET_VARS['action']) {
-
-      case '1':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_IMPRESSIONS_HELP);
-      break;
-
-      case '2':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_VISITS_HELP);
-      break;
-
-      case '3':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_TRANSACTIONS_HELP);
-      break;
-
-      case '4':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_CONVERSION_HELP);
-      break;
-
-      case '5':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_AMOUNT_HELP);
-      break;
-
-      case '6':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_AVERAGE_HELP);
-      break;
-
-      case '7':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_COMMISSION_RATE_HELP);
-      break;
-
-      case '8':
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_COMMISSION_HELP);
-      break;
-    }
-  new infoBox($info_box_contents);
- $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                                'text'  => tep_draw_separator('pixel_trans.gif', '100%', '1')
-                              );
-  new infoBoxFooter($info_box_contents, false, false);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_coupon_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_coupon_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_coupon_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,108 +0,0 @@
-<?php
-/*
-  $Id: popup_coupon_help.php,v 1.1.1.1 2004/03/04 23:38:01 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_POPUP_COUPON_HELP);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo STORE_NAME; ?></title>
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-// v5.13: security flaw fixed in query
-  $coupon_query = tep_db_query("select * from " . TABLE_COUPONS . " where coupon_id = '" . intval($HTTP_GET_VARS['cID']) . "'");
-  $coupon = tep_db_fetch_array($coupon_query);
-  $coupon_desc_query = tep_db_query("select * from " . TABLE_COUPONS_DESCRIPTION . " where coupon_id = '" . (int)$HTTP_GET_VARS['cID'] . "' and language_id = '" . (int)$languages_id . "'");
-  $coupon_desc = tep_db_fetch_array($coupon_desc_query);
-  $text_coupon_help = TEXT_COUPON_HELP_HEADER;
-  $text_coupon_help .= sprintf(TEXT_COUPON_HELP_NAME, $coupon_desc['coupon_name']);
-  if (tep_not_null($coupon_desc['coupon_description'])) $text_coupon_help .= sprintf(TEXT_COUPON_HELP_DESC, $coupon_desc['coupon_description']);
-  $coupon_amount = $coupon['coupon_amount'];
-  switch ($coupon['coupon_type']) {
-    case 'F':
-    $text_coupon_help .= sprintf(TEXT_COUPON_HELP_FIXED, $currencies->format($coupon['coupon_amount']));
-    break;
-    case 'P':
-    $text_coupon_help .= sprintf(TEXT_COUPON_HELP_FIXED, number_format($coupon['coupon_amount'],2). '%');
-    break;
-    case 'S':
-    $text_coupon_help .= TEXT_COUPON_HELP_FREESHIP;
-    break;
-    default:
-  }
-  if ($coupon['coupon_minimum_order'] > 0 ) $text_coupon_help .= sprintf(TEXT_COUPON_HELP_MINORDER, $currencies->format($coupon['coupon_minimum_order']));
-  $text_coupon_help .= sprintf(TEXT_COUPON_HELP_DATE, tep_date_short($coupon['coupon_start_date']),tep_date_short($coupon['coupon_expire_date']));
-  $text_coupon_help .= '<b>' . TEXT_COUPON_HELP_RESTRICT . '</b>';
-  $text_coupon_help .= '<br><br>' .  TEXT_COUPON_HELP_CATEGORIES;
-  $coupon_get=tep_db_query("select restrict_to_categories from " . TABLE_COUPONS . " where coupon_id='".(int)$HTTP_GET_VARS['cID']."'");
-  $get_result=tep_db_fetch_array($coupon_get);
-
-  $cat_ids = split("[,]", $get_result['restrict_to_categories']);
-  for ($i = 0; $i < count($cat_ids); $i++) {
-    $result = tep_db_query("SELECT * FROM categories, categories_description WHERE categories.categories_id = categories_description.categories_id and categories_description.language_id = '" . (int)$languages_id . "' and categories.categories_id='" . $cat_ids[$i] . "'");
-    if ($row = tep_db_fetch_array($result)) {
-    $cats .= '<br>' . $row["categories_name"];
-    }
-  }
-  if ($cats=='') $cats = '<br>'.TEXT_NONE;
-  $text_coupon_help .= $cats;
-  $text_coupon_help .= '<br><br>' .  TEXT_COUPON_HELP_PRODUCTS;
-  $coupon_get=tep_db_query("select restrict_to_products from " . TABLE_COUPONS . "  where coupon_id='".(int)$HTTP_GET_VARS['cID']."'");
-  $get_result=tep_db_fetch_array($coupon_get);
-
-  $pr_ids = split("[,]", $get_result['restrict_to_products']);
-  for ($i = 0; $i < count($pr_ids); $i++) {
-    $result = tep_db_query("SELECT * FROM products, products_description WHERE products.products_id = products_description.products_id and products_description.language_id = '" . (int)$languages_id . "'and products.products_id = '" . $pr_ids[$i] . "'");
-    if ($row = tep_db_fetch_array($result)) {
-      $prods .= '<br>' . $row["products_name"];
-    }
-  }
-  if ($prods=='') $prods = '<br>'.TEXT_NONE;
-  $text_coupon_help .= $prods;
-
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => '<font color="' . $font_color . '">' . HEADING_COUPON_HELP . '<font color="' . $font_color . '">');
-
-
-  new infoBoxHeading($info_box_contents, false, false);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => $text_coupon_help);
-
-  new infoBox($info_box_contents);
-   $info_box_contents = array();
-   $info_box_contents[] = array('align' => 'left',
-                                  'text'  => tep_draw_separator('pixel_trans.gif', '100%', '1')
-                                );
-    new infoBoxFooter($info_box_contents, false, false);
-
-
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_cvs_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_cvs_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_cvs_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,24 +0,0 @@
-<?php
-// this file was created by Clifton Murphy <blue_glowstick at yahoo.com>
-// using code supplied in a previous release by Thomas Nordstrom <t_nordstrom at yahoo.com>
-// I take no credit for any of this work. I simply fixed this file and 
-// recompiled the distribution zip file with the fixes to prevent parse errors.
-/*
-  $Id: cvs_help.php,v 1.3 2004/02/4 07:28:00 hpdl Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-
-  require('includes/application_top.php');
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_CVS_HELP);
-?>
-

Deleted: trunk/direct.openmoko.com/popup_image.php
===================================================================
--- trunk/direct.openmoko.com/popup_image.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_image.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,71 +0,0 @@
-<?php
-/*
-  $Id: popup_image.php,v 1.1.1.1 2004/03/04 23:38:01 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_POPUP_IMAGE);
-
-  $navigation->remove_current_page();
-
-  $products_query = tep_db_query("select p.products_image, p.products_image_lrg, p.products_image_xl_1, p.products_image_xl_2, p.products_image_xl_3, p.products_image_xl_4, p.products_image_xl_5, p.products_image_xl_6, pd.products_name from " . TABLE_PRODUCTS . " p,  " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$HTTP_GET_VARS['pID'] . "' and p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'");
-  $products = tep_db_fetch_array($products_query);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo $products['products_name']; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<script type="text/javascript"><!--
-var i=0;
-var s=0;
-function resize() {
-   if (navigator.appName == 'Netscape') i=40;
-     if (window.navigator.userAgent.indexOf("SV1") != -1) s=20; //This browser is Internet Explorer in SP2.
-      if (document.images[0]) window.resizeTo(document.images[0].width +30, document.images[0].height+60-i+s);
-      self.focus();
-    if (document.images[0]) {
-    imgHeight = document.images[0].height+120-i;
-    imgWidth = document.images[0].width+30;
-    var height = screen.height;
-    var width = screen.width;
-    var leftpos = width / 2 - imgWidth / 2;
-    var toppos = height / 2 - imgHeight / 2; 
-    window.moveTo(leftpos, toppos);  
-    window.resizeTo(imgWidth, imgHeight);
-  }
-}
-//--></script>
-</head>
-<body onload="resize();">
-<a href="javascript:;" onclick="javascript:top.window.close();"> 
-<?php
-           if (($HTTP_GET_VARS['image'] ==0) && ($products['products_image_lrg'] != '')) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_lrg'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==1) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_1'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==2) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_2'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==3) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_3'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==4) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_4'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==5) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_5'], $products['products_name']);
-     } elseif ($HTTP_GET_VARS['image'] ==6) {
-     echo tep_image(DIR_WS_IMAGES . $products['products_image_xl_6'], $products['products_name']);
-     } else
-     echo tep_image(DIR_WS_IMAGES . $products['products_image'], $products['products_name']);
-     ?>
-     <?php echo  TEXT_CLOSE_WINDOW ;?>
-</body>
-</html>
-<?php require('includes/application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_links_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_links_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_links_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,52 +0,0 @@
-<?php
-/*
-  $Id: popup_links_help.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_LINKS_SUBMIT);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo STORE_NAME; ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo TEMPLATE_STYLE;?>">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' =>  '<font color="' . $font_color . '">' . HEADING_LINKS_HELP . '<font color="' . $font_color . '">');
-
-  new infoBoxHeading($info_box_contents, false, false);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_LINKS_HELP);
-
-  new infoBox($info_box_contents);
-  $info_box_contents = array();
-    $info_box_contents[] = array('align' => 'left',
-                                  'text'  => tep_draw_separator('pixel_trans.gif', '100%', '1')
-                                );
-    new infoBoxFooter($info_box_contents, false, false);
-
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_paypal.php
===================================================================
--- trunk/direct.openmoko.com/popup_paypal.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_paypal.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,48 +0,0 @@
-<?php
-/*
-  $Id: popup_paypal.php,v 2.8 2004/09/11 devosc Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  DevosC, Developing open source Code
-  http://www.devosc.com
-
-  Copyright (c) 2003 osCommerce
-  Copyright (c) 2004 DevosC.com
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/modules/payment/paypal/classes/Page/Page.class.php');
-  $page = new PayPal_Page();
-  $page->setBaseDirectory('includes/modules/payment/paypal/');
-
-  $action = (isset($HTTP_GET_VARS['action'])) ? $HTTP_GET_VARS['action'] : '';
-
-  switch($action) {
-    case 'css':
-      header("Content-Type: text/css");
-      echo $page->getCSS($HTTP_GET_VARS['id']);
-      exit;
-      break;
-  }
-
-  require("includes/application_top.php");
-
-  $navigation->remove_current_page();
-
-  $page->setBaseURL(DIR_WS_MODULES . 'payment/paypal/');
-  $page->addCSS('popup_paypal.php?action=css&id=general');
-  $page->addCSS('popup_paypal.php?action=css&id=stylesheet');
-
-  switch($action) {
-    default:
-      $page->setContentLangaugeFile($page->baseDirectory.'catalog/languages',$language,'info_cc.inc.php');
-      $page->setTemplate('osC_Catalog');
-      break;
-  }
-  require($page->template());
-  require("includes/counter.php");
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_search_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_search_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_search_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,55 +0,0 @@
-<?php
-/*
-  $Id: popup_search_help.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $navigation->remove_current_page();
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ADVANCED_SEARCH);
-
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo STORE_NAME; ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo TEMPLATE_STYLE;?>">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' =>  '<font color="' . $font_color . '">' . HEADING_SEARCH_HELP . '<font color="' . $font_color . '">');
-
-  new infoBoxHeading($info_box_contents, false, false);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('text' => TEXT_SEARCH_HELP);
-
-  new infoBox($info_box_contents);
-  $info_box_contents = array();
-    $info_box_contents[] = array('align' => 'left',
-                                  'text'  => tep_draw_separator('pixel_trans.gif', '100%', '1')
-                                );
-    new infoBoxFooter($info_box_contents, false, false);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php
- require('includes/application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/popup_wishlist_help.php
===================================================================
--- trunk/direct.openmoko.com/popup_wishlist_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/popup_wishlist_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,54 +0,0 @@
-<?php
-/*
-  $Id: popup_wishlist_help.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_WISHLIST_HELP);
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<base href="<?php echo (getenv('HTTPS') == 'on' ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<title><?php echo STORE_NAME; ?></title>
-<link rel="stylesheet" type="text/css" href="<?php echo TEMPLATE_STYLE;?>">
-</head>
-<style type="text/css"><!--
-BODY { margin-bottom: 10px; margin-left: 10px; margin-right: 10px; margin-top: 10px; }
-//--></style>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-<?php
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => '<font color="' . $font_color . '">' . HEADING_TITLE . '</font>');
-  new infoBoxHeading($info_box_contents, false, false);
-
-  $info_box_contents = array();
-  $info_box_contents[] = array('align' => 'left',
-                               'text'  => TEXT_INFORMATION
-                              );
-  new infoBox($info_box_contents);
-   $info_box_contents = array();
-   $info_box_contents[] = array('align' => 'left',
-                                  'text'  => tep_draw_separator('pixel_trans.gif', '100%', '1')
-                                );
-    new infoBoxFooter($info_box_contents, false, false);
-?>
-
-<p class="smallText" align="right"><?php echo '<a href="javascript:window.close()">' . TEXT_CLOSE_WINDOW . '</a>'; ?></p>
-
-</body>
-</html>
-<?php
- require('includes/application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/print.css
===================================================================
--- trunk/direct.openmoko.com/print.css	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/print.css	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,37 +0,0 @@
-/*
-  $Id: print.css,v 1.3 2003 
-  
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Released under the GNU General Public License
-*/
-
-/* links */
-a:link { font-family: Verdana, Arial, sans-serif; font-size: 10px; color: #FF9900; font-weight: normal; }
-a:hover { font-family: Verdana, Arial, sans-serif; font-size: 12px; color: #0000ff; font-weight: bold; }
-
-/* page */
-body { background-color: #ffffff; color: #000000; margin: 0px; }
-.pageHeading { font-family: Verdana, Arial, sans-serif; font-size: 14px; color: #727272; font-weight: bold; }
-
-/* data table */
-.dataTableHeadingRow { background-color: #C9C9C9; }
-.dataTableHeadingContent { font-family: Verdana, Arial, sans-serif; font-size: 10px; color: #000000; font-weight: bold; }
-.dataTableRow { background-color: #F0F1F1; }
-.dataTableRowSelected { background-color: #DEE4E8; }
-.dataTableRowOver { background-color: #FFFFFF; }
-.dataTableContent { font-family: Verdana, Arial, sans-serif; font-size: 10px; color: #000000; }
-
-/* attributes */
-.attributes-odd { background-color: #f4f7fd; }
-.attributes-even { background-color: #ffffff; }
-
-/* miscellaneous */
-.specialPrice { color: #ff0000; }
-.oldPrice { text-decoration: line-through; }
-.fieldRequired { font-family: Verdana, Arial, sans-serif; font-size: 10px; color: #ff0000; }
-.smallText { font-family: Verdana, Arial, sans-serif; font-size: 10px; }
-.main { font-family: Verdana, Arial, sans-serif; font-size: 12px; }
-.titleHeading {font-family: Verdana, Arial, sans-serif; font-size: 18px; color: #727272; font-weight: bold;
-}

Deleted: trunk/direct.openmoko.com/printorder.php
===================================================================
--- trunk/direct.openmoko.com/printorder.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/printorder.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,199 +0,0 @@
-<?php
-/*
-  $Id: printorder.php,v 1.1 2003/01 xaglo
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ORDERS_PRINTABLE);
-  
-  // get the order so we know what we are working with
-  require(DIR_WS_CLASSES . 'order.php');
-  $order = new order((int)$_GET['order_id']);
-  
-  $authorized = false;
-  if ( tep_session_is_registered('noaccount') && $order->customer['id'] == 0 ){
-    $authorized = true;
-  } else if ( $_SESSION['customer_id'] == $order->customer['id'] ){
-    $authorized = true;
-  } else if ( $_SESSION['customer_id'] == '' ){
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  if ( $authorized ) {
-    $payment_info_query = tep_db_query("select payment_info from " . TABLE_ORDERS . " where orders_id = '". (int)$_GET['order_id'] . "'");
-    $payment_info = tep_db_fetch_array($payment_info_query);
-    $payment_info = $payment_info['payment_info'];
-  }
-
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo STORE_NAME . ' - ' . TITLE_PRINT_ORDER . ' #' . (int)$_GET['order_id']; ?></title>
-<base href="<?php echo (getenv('HTTPS') == 'on' ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="print.css">
-</head>
-<body marginwidth="10" marginheight="10" topmargin="10" bottommargin="10" leftmargin="10" rightmargin="10">
-
-
-<!-- body_text //-->
-<table width="600" border="0" align="center" cellpadding="2" cellspacing="0">
-  <tr>
-    <td align="center" class="main"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="5">
-      <tr>
-        <td valign="top" align="left" class="main"><script type="text/javascript">
-  if (window.print) {
-    document.write('<a href="javascript:;" onClick="javascript:window.print()" onMouseOut=document.imprim.src="<?php echo (DIR_WS_IMAGES . 'printimage.gif'); ?>" onMouseOver=document.imprim.src="<?php echo (DIR_WS_IMAGES . 'printimage_over.gif'); ?>"><img src="<?php echo (DIR_WS_IMAGES . 'printimage.gif'); ?>" width="43" height="28" align="absbottom" border="0" name="imprim">' + '<?php echo IMAGE_BUTTON_PRINT; ?></a></center>');
-  }
-  else document.write ('<h2><?php echo IMAGE_BUTTON_PRINT; ?></h2>')
-        </script></td>
-        <td align="right" valign="bottom" class="main"><p align="right" class="main"><a href="javascript:window.close();"><img src='images/close_window.jpg' border=0></a></p></td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr align="left">
-    <td class="titleHeading"><?php echo tep_draw_separator('pixel_trans.gif', '1', '25'); ?></td>
-  </tr>
-  <tr>
-    <td><table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-      <tr>
-        <td><table border="0" align="center" width="75%" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="pageHeading"><?php echo nl2br(STORE_NAME_ADDRESS); ?></td>
-            <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . STORE_LOGO, STORE_NAME); ?></td>
-          </tr>
-          <tr>
-            <td colspan="2" align="center" class="titleHeading"><b><?php echo TITLE_PRINT_ORDER . ' #' . (int)$_GET['order_id']; ?></b></td>
-          </tr>
-          <tr align="left">
-            <td colspan="2" class="titleHeading"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
-          </tr>
-        </table></td>
-      </tr>
-    </table></td>
-  </tr>
-<?php
-if ( $authorized ) {
-?>
-  <tr>
-    <td align="left" class="main"><table width="100%" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td class="main"><?php echo '<b>' . ENTRY_PAYMENT_METHOD . '</b> ' . $order->info['payment_method']; ?></td>
-      </tr>
-      <tr>
-        <td class="main"><?php echo $payment_info; ?></td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td class="main"><?php echo '<b>' . ENTRY_DATE_PURCHASED . '</b> ' . $order->info['date_purchased']; ?></td>
-  </tr>
-  <tr>
-    <td align="center"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td align="center" valign="top"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor=#000000>
-          <tr>
-            <td align="center" valign="top"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="2">
-              <tr class="dataTableHeadingRow">
-                <td class="dataTableHeadingContent"><b><?php echo ENTRY_SOLD_TO; ?></b></td>
-              </tr>
-              <tr class="dataTableRow">
-                <td class="dataTableContent"><?php echo tep_address_format($order->customer['format_id'], $order->customer, 1, '&nbsp;', '<br>'); ?></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-        <td align="center" valign="top"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor=#000000>
-          <tr>
-            <td align="center" valign="top"><table align="center" width="100%" border="0" cellspacing="0" cellpadding="2">
-              <tr class="dataTableHeadingRow">
-                <td class="dataTableHeadingContent"><b><?php echo ENTRY_SHIP_TO; ?></b></td>
-              </tr>
-              <tr class="dataTableRow">
-                <td class="dataTableContent"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, '&nbsp;', '<br>'); ?></td>
-              </tr>
-            </table></td>
-          </tr>
-        </table></td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
-  </tr>
-  <tr>
-    <td><table border="0" width="100%" cellspacing="0" cellpadding="1" bgcolor=#000000>
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-          <tr class="dataTableHeadingRow">
-            <td class="dataTableHeadingContent" colspan="2"><?php echo TABLE_HEADING_PRODUCTS; ?></td>
-            <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_PRODUCTS_MODEL; ?></td>
-            <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TAX; ?></td>
-            <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_PRICE_EXCLUDING_TAX; ?></td>
-            <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_EXCLUDING_TAX; ?></td>
-            <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_TOTAL_INCLUDING_TAX; ?></td>
-          </tr>
-        <?php
-    for ($i = 0, $n = sizeof($order->products); $i < $n; $i++) {
-      echo '      <tr class="dataTableRow">' . "\n" .
-           '        <td class="dataTableContent" valign="top" align="right">' . $order->products[$i]['qty'] . '&nbsp;x</td>' . "\n" .
-           '        <td class="dataTableContent" valign="top">' . $order->products[$i]['name'] . '<br>';
-
-    if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) {
-      for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
-        echo '<nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i><br></small></nobr>';
-      }
-    }
-
-      echo '        </td>' . "\n" .
-           '        <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n";
-      echo '        <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .
-           '        <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
-           '        <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
-           '        <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";
-      echo '      </tr>' . "\n";
-    }
-?>
-        </table></td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="right" colspan="7"><table border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-              <?php
-  for ($i = 0, $n = sizeof($order->totals); $i < $n; $i++) {
-    echo '          <tr>' . "\n" .
-         '            <td align="right" class="smallText">' . $order->totals[$i]['title'] . '</td>' . "\n" .
-         '            <td align="right" class="smallText">' . $order->totals[$i]['text'] . '</td>' . "\n" .
-         '          </tr>' . "\n";
-  }
-?>
-        </table></td>
-      </tr>
-    </table></td>
-  </tr>
-<?php
-} else {
-?>
-  <tr>
-    <td align="left" class="main"><?php echo ENTRY_ACCESS_ERROR; ?></td>
-  </tr>
-<?php
-}
-?>
-</table>
-<!-- body_text_eof //-->
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/product_info.php
===================================================================
--- trunk/direct.openmoko.com/product_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/product_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,44 +0,0 @@
-<?php
-/*
-  $Id: product_info.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCT_INFO);
-
-  $product_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'");
-  $product_check = tep_db_fetch_array($product_check_query);
-
-//check if product is really a subproduct
-  $product_sub_product_query = tep_db_query("select products_parent_id from " . TABLE_PRODUCTS . " p where p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "'");
-  while ($product_sub_product = tep_db_fetch_array($product_sub_product_query)){
-  $product_sub_check = $product_sub_product['products_parent_id'];
-  }
-
-  if ($product_sub_check > 0){
-   tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $product_sub_check,'SSL'));
-  }
-//check to see if products have sub_products
-$product_has_sub = '0';
-$sub_products_sql1 = tep_db_query("select p.products_id, p.products_price, p.products_image, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_parent_id = " . (int)$HTTP_GET_VARS['products_id'] . " and p.products_quantity > '0' and p.products_id = pd.products_id and pd.language_id = " . (int)$languages_id);
-if (tep_db_num_rows($sub_products_sql1) > 0) {
-$product_has_sub = '1';
-}else{
-$product_has_sub = '0';
-}
-
-  $content = CONTENT_PRODUCT_INFO;
-  $javascript = 'popup_window.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/product_info_configureable.php
===================================================================
--- trunk/direct.openmoko.com/product_info_configureable.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/product_info_configureable.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,68 +0,0 @@
-<?php
-/*
-  $Id: product_info.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCT_INFO);
-
-  $product_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'");
-  $product_check = tep_db_fetch_array($product_check_query);
-
-//check if product is really a subproduct
-  $product_sub_product_query = tep_db_query("select products_parent_id from " . TABLE_PRODUCTS . " p where p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "'");
-  while ($product_sub_product = tep_db_fetch_array($product_sub_product_query)){
-  $product_sub_check = $product_sub_product['products_parent_id'];
-  }
-
-  if ($product_sub_check > 0){
-   tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $product_sub_check));
-  }
-//check to see if products have sub_products
-$product_has_sub = '0';
-$sub_products_sql1 = tep_db_query("select p.products_id, p.products_price, p.products_image, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_parent_id = " . (int)$HTTP_GET_VARS['products_id'] . " and p.products_quantity > '0' and p.products_id = pd.products_id and pd.language_id = " . (int)$languages_id);
-if (tep_db_num_rows($sub_products_sql1) > 0) {
-$product_has_sub = '1';
-}else{
-$product_has_sub = '0';
-}
-// BOF MaxiDVD: Modified For Ultimate Images Pack!
-    $product_info_query = tep_db_query("select p.products_id, pd.products_name, pd.products_description, p.products_model, p.products_quantity, p.products_image, p.products_image_med, p.products_image_lrg, p.products_image_sm_1, p.products_image_xl_1, p.products_image_sm_2, p.products_image_xl_2, p.products_image_sm_3, p.products_image_xl_3, p.products_image_sm_4, p.products_image_xl_4, p.products_image_sm_5, p.products_image_xl_5, p.products_image_sm_6, p.products_image_xl_6, pd.products_url, p.products_price, p.products_tax_class_id, p.products_date_added, p.products_date_available, p.manufacturers_id from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "'");
-// EOF MaxiDVD: Modified For Ultimate Images Pack!
-    $product_info = tep_db_fetch_array($product_info_query);
-
-    tep_db_query("update " . TABLE_PRODUCTS_DESCRIPTION . " set products_viewed = products_viewed+1 where products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and language_id = '" . (int)$languages_id . "'");
-
-    if (tep_not_null($product_info['products_model'])) {
-      $products_name = $product_info['products_name'] . '&nbsp;<span class="smallText">[' . $product_info['products_model'] . ']</span>';
-    } else {
-      $products_name = $product_info['products_name'];
-    }
-  
-   // Extra Products Fields are checked and presented
-    // START: Extra Fields Contribution  DMG
-    $extra_fields_query = tep_db_query("SELECT pef.products_extra_fields_status as status, pef.products_extra_fields_name as name, ptf.products_extra_fields_value as value
-                                        FROM ". TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS ." ptf,
-                                             ". TABLE_PRODUCTS_EXTRA_FIELDS ." pef
-                                        WHERE ptf.products_id='".(int)$HTTP_GET_VARS['products_id']."' 
-                                          and ptf.products_extra_fields_value <> ''
-                                          and ptf.products_extra_fields_id = pef.products_extra_fields_id
-                                          and (pef.languages_id='0' or pef.languages_id='".$languages_id."')
-                                        ORDER BY products_extra_fields_order");
-
-
-  $content = CONTENT_PRODUCT_INFO;
-  $javascript = 'popup_window.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/product_reviews.php
===================================================================
--- trunk/direct.openmoko.com/product_reviews.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/product_reviews.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,59 +0,0 @@
-<?php
-/*
-  $Id: product_reviews.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  $product_info_query = tep_db_query("select p.products_id, p.products_model, p.products_image, p.products_price, p.products_tax_class_id, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
-  if (!tep_db_num_rows($product_info_query)) {
-    tep_redirect(tep_href_link(FILENAME_REVIEWS));
-  } else {
-    $product_info = tep_db_fetch_array($product_info_query);
-  }
-// Eversun mod for sppc and qty price breaks
-// global variable (session) $sppc_customer_group_id -> local variable customer_group_id
-
-  if(!tep_session_is_registered('sppc_customer_group_id')) {
-  $customer_group_id = '0';
-  } else {
-   $customer_group_id = $sppc_customer_group_id;
-  }
-
-     if ($customer_group_id !='0') {
-  $customer_group_price_query = tep_db_query("select customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and customers_group_id =  '" . $customer_group_id . "'");
-    if ($customer_group_price = tep_db_fetch_array($customer_group_price_query)) {
-      $product_info['products_price'] = $customer_group_price['customers_group_price'];
-    }
-     }
-// Eversun mod for sppc and qty price breaks
-  if ($new_price = tep_get_products_special_price($product_info['products_id'])) {
-    $products_price = '<s>' . $currencies->display_price($product_info['products_price'], tep_get_tax_rate($product_info['products_tax_class_id'])) . '</s> <span class="productSpecialPrice">' . $currencies->display_price($new_price, tep_get_tax_rate($product_info['products_tax_class_id'])) . '</span>';
-  } else {
-    $products_price = $currencies->display_price($product_info['products_price'], tep_get_tax_rate($product_info['products_tax_class_id']));
-  }
-
-  if (tep_not_null($product_info['products_model'])) {
-    $products_name = $product_info['products_name'] . '<br><span class="smallText">[' . $product_info['products_model'] . ']</span>';
-  } else {
-    $products_name = $product_info['products_name'];
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCT_REVIEWS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params()));
-
-  $content = CONTENT_PRODUCT_REVIEWS;
-  $javascript = 'popup_window.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/product_reviews_info.php
===================================================================
--- trunk/direct.openmoko.com/product_reviews_info.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/product_reviews_info.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,75 +0,0 @@
-<?php
-/*
-  $Id: product_reviews_info.php,v 1.2 2004/03/05 00:36:41 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
- // Eversun mod for sppc and qty price breaks
-// global variable (session) $sppc_customer_group_id -> local variable customer_group_id
-
-  if(!tep_session_is_registered('sppc_customer_group_id')) {
-  $customer_group_id = '0';
-  } else {
-   $customer_group_id = $sppc_customer_group_id;
-  }
-// Eversun mod end for sppc and qty price breaks
-
-  if (isset($HTTP_GET_VARS['reviews_id']) && tep_not_null($HTTP_GET_VARS['reviews_id']) && isset($HTTP_GET_VARS['products_id']) && tep_not_null($HTTP_GET_VARS['products_id'])) {
-    $review_check_query = tep_db_query("select count(*) as total from " . TABLE_REVIEWS . " r, " . TABLE_REVIEWS_DESCRIPTION . " rd where r.reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "' and r.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and r.reviews_id = rd.reviews_id and rd.languages_id = '" . (int)$languages_id . "'");
-    $review_check = tep_db_fetch_array($review_check_query);
-    
-    if ($review_check['total'] < 1) {
-      tep_redirect(tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('reviews_id'))));
-    }
-  } else {
-    tep_redirect(tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('reviews_id'))));
-  }
-
-  tep_db_query("update " . TABLE_REVIEWS . " set reviews_read = reviews_read+1 where reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "'");
-
-  $review_query = tep_db_query("select rd.reviews_text, r.reviews_rating, r.reviews_id, r.customers_name, r.date_added, r.reviews_read, p.products_id, p.products_price, p.products_tax_class_id, p.products_image, p.products_model, pd.products_name from " . TABLE_REVIEWS . " r, " . TABLE_REVIEWS_DESCRIPTION . " rd, " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where r.reviews_id = '" . (int)$HTTP_GET_VARS['reviews_id'] . "' and r.reviews_id = rd.reviews_id and rd.languages_id = '" . (int)$languages_id . "' and r.products_id = p.products_id and p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '". (int)$languages_id . "'");
-  $reviews_info = tep_db_fetch_array($review_query);
-// Eversun mod for sppc and qty price breaks
-  if(!tep_session_is_registered('sppc_customer_group_id')) {
-  $customer_group_id = '0';
-  } else {
-   $customer_group_id = $sppc_customer_group_id;
-  }
-
-     if ($customer_group_id !='0') {
-  $customer_group_price_query = tep_db_query("select customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . $review['products_id'] . "' and customers_group_id =  '" . $customer_group_id . "'");
-    if ($customer_group_price = tep_db_fetch_array($customer_group_price_query)) {
-      $review['products_price'] = $customer_group_price['customers_group_price'];
-    }
-     }
-// Eversun end mod for sppc and qty price breaks
-  if ($new_price = tep_get_products_special_price($reviews_info['products_id'])) {
-    $products_price = '<s>' . $currencies->display_price($reviews_info['products_price'], tep_get_tax_rate($reviews_info['products_tax_class_id'])) . '</s> <span class="productSpecialPrice">' . $currencies->display_price($new_price, tep_get_tax_rate($reviews_info['products_tax_class_id'])) . '</span>';
-  } else {
-    $products_price = $currencies->display_price($reviews_info['products_price'], tep_get_tax_rate($reviews_info['products_tax_class_id']));
-  }
-
-  if (tep_not_null($reviews_info['products_model'])) {
-    $products_name = $reviews_info['products_name'] . '<br><span class="smallText">[' . $reviews_info['products_model'] . ']</span>';
-  } else {
-    $products_name = $reviews_info['products_name'];
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCT_REVIEWS_INFO);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params()));
-
-  $content = CONTENT_PRODUCT_REVIEWS_INFO;
-  $javascript = 'popup_window.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/product_reviews_write.php
===================================================================
--- trunk/direct.openmoko.com/product_reviews_write.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/product_reviews_write.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,92 +0,0 @@
-<?php
-/*
-  $Id: product_reviews_write.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-
-  $product_info_query = tep_db_query("select p.products_id, p.products_model, p.products_image, p.products_price, p.products_tax_class_id, pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
-  if (!tep_db_num_rows($product_info_query)) {
-    tep_redirect(tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('action'))));
-  } else {
-    $product_info = tep_db_fetch_array($product_info_query);
-  }
-
-  $customer_query = tep_db_query("select customers_firstname, customers_lastname from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-  $customer = tep_db_fetch_array($customer_query);
-
-  if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process')) {
-    $rating = tep_db_prepare_input($HTTP_POST_VARS['rating']);
-    $review = tep_db_prepare_input($HTTP_POST_VARS['review']);
-
-    $error = false;
-    if (strlen($review) < REVIEW_TEXT_MIN_LENGTH) {
-      $error = true;
-
-      $messageStack->add('review', JS_REVIEW_TEXT);
-    }
-
-    if (($rating < 1) || ($rating > 5)) {
-      $error = true;
-
-      $messageStack->add('review', JS_REVIEW_RATING);
-    }
-
-    if ($error == false) {
-      tep_db_query("insert into " . TABLE_REVIEWS . " (products_id, customers_id, customers_name, reviews_rating, date_added) values ('" . (int)$HTTP_GET_VARS['products_id'] . "', '" . (int)$customer_id . "', '" . tep_db_input($customer['customers_firstname']) . ' ' . tep_db_input($customer['customers_lastname']) . "', '" . tep_db_input($rating) . "', now())");
-      $insert_id = tep_db_insert_id();
-
-      tep_db_query("insert into " . TABLE_REVIEWS_DESCRIPTION . " (reviews_id, languages_id, reviews_text) values ('" . (int)$insert_id . "', '" . (int)$languages_id . "', '" . tep_db_input($review) . "')");
-
-      tep_redirect(tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('action'))));
-    }
-  }
-// Eversun mod for sppc and qty price breaks
-  if(!tep_session_is_registered('sppc_customer_group_id')) {
-  $customer_group_id = '0';
-  } else {
-   $customer_group_id = $sppc_customer_group_id;
-  }
-
-     if ($customer_group_id !='0') {
-  $customer_group_price_query = tep_db_query("select customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and customers_group_id =  '" . $customer_group_id . "'");
-    if ($customer_group_price = tep_db_fetch_array($customer_group_price_query)) {
-      $product_info['products_price'] = $customer_group_price['customers_group_price'];
-    }
-     }
-// Eversun mod for sppc and qty price breaks
-  if ($new_price = tep_get_products_special_price($product_info['products_id'])) {
-    $products_price = '<s>' . $currencies->display_price($product_info['products_price'], tep_get_tax_rate($product_info['products_tax_class_id'])) . '</s> <span class="productSpecialPrice">' . $currencies->display_price($new_price, tep_get_tax_rate($product_info['products_tax_class_id'])) . '</span>';
-  } else {
-    $products_price = $currencies->display_price($product_info['products_price'], tep_get_tax_rate($product_info['products_tax_class_id']));
-  }
-
-  if (tep_not_null($product_info['products_model'])) {
-    $products_name = $product_info['products_name'] . '<br><span class="smallText">[' . $product_info['products_model'] . ']</span>';
-  } else {
-    $products_name = $product_info['products_name'];
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCT_REVIEWS_WRITE);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params()));
-
-  $content = CONTENT_PRODUCT_REVIEWS_WRITE;
-  $javascript = $content . '.js';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/products_new.php
===================================================================
--- trunk/direct.openmoko.com/products_new.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/products_new.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,144 +0,0 @@
-<?php
-/*
-  $Id: products_new.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-
-this file gets all the reaw data needed by product_listing and product_listing_column to build
-the display
-  
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PRODUCTS_NEW);
-    // Eversun mod for sppc and qty price breaks
-       if(!tep_session_is_registered('sppc_customer_group_id')) {
-         $customer_group_id = 'G';
-         } else {
-          $customer_group_id = $sppc_customer_group_id;
-       }
-
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-
-       // find out if sorting by price has been requested
-       if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-        $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-        if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-          $status_need_to_get_prices = true;
-          }
-       }
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-
-        $select_column_list = '';
-    
-    $listing_sql .= ' order by ';    
-        for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-          switch ($column_list[$i]) {
-            case 'PRODUCT_LIST_MODEL':
-              $select_column_list .= 'p.products_model, ';
-              break;
-            case 'PRODUCT_LIST_NAME':
-              $select_column_list .= 'pd.products_name, ';
-              break;
-            case 'PRODUCT_LIST_MANUFACTURER':
-              $select_column_list .= 'm.manufacturers_name, ';
-              break;
-            case 'PRODUCT_LIST_QUANTITY':
-              $select_column_list .= 'p.products_quantity, ';
-              break;
-            case 'PRODUCT_LIST_IMAGE':
-              $select_column_list .= 'p.products_image, ';
-              break;
-            case 'PRODUCT_LIST_WEIGHT':
-              $select_column_list .= 'p.products_weight, ';
-              break;
-             }
-    }
-   
-    // We show them all
-   // either retail or no need to get correct special prices
-          $listing_sql = "select distinct " . $select_column_list . "  
-                          p.products_id,
-                          p.products_price as final_price,
-                          p.products_tax_class_id,
-                          p.products_image 
-                        from (" . TABLE_PRODUCTS . " p 
-                        left join " . TABLE_SPECIALS . " s using(products_id)),
-                        " . TABLE_PRODUCTS_DESCRIPTION . " pd
-                         where 
-                         p.products_status = '1' 
-                         and pd.products_id = p.products_id
-                         and pd.language_id = '" . (int)$languages_id . "' 
-                         and DATE_SUB(CURDATE(),INTERVAL " .NEW_PRODUCT_INTERVAL ." DAY) <= p.products_date_added";  
- 
-//   }     
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-   //   $sort = ;
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-   }
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_PRODUCTS_NEW));
-
-  $content = CONTENT_PRODUCTS_NEW;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/pw.php
===================================================================
--- trunk/direct.openmoko.com/pw.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/pw.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,311 +0,0 @@
-<?php
-/*
-  $Id: index.php,v 1.2 2004/03/09 19:56:29 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// the following cPath references come from application_top.php
-  $category_depth = 'top';
-  if (isset($cPath) && tep_not_null($cPath)) {
-    $categories_products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
-    $cateqories_products = tep_db_fetch_array($categories_products_query);
-    if ($cateqories_products['total'] > 0) {
-      $category_depth = 'products'; // display products
-    } else {
-      $category_parent_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$current_category_id . "'");
-      $category_parent = tep_db_fetch_array($category_parent_query);
-      if ($category_parent['total'] > 0) {
-        $category_depth = 'nested'; // navigate through the categories
-      } else {
-        $category_depth = 'products'; // category has no products, but display the 'no products' message
-      }
-    }
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_PW);
-
-  if ($category_depth == 'nested') {
-//Code change for Categories Description 1.5
-//    $category_query = tep_db_query("select cd.categories_name, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-//Changed to the following
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-//End Categories Description 1.5
-
-    $category = tep_db_fetch_array($category_query);
-
-    $content = CONTENT_INDEX_NESTED;
-
-  } elseif ($category_depth == 'products' || isset($HTTP_GET_VARS['manufacturers_id'])) {
-// create column list
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-// Eversun mod for sppc and qty price breaks
-   if(!tep_session_is_registered('sppc_customer_group_id')) {
-     $customer_group_id = '0';
-     } else {
-      $customer_group_id = $sppc_customer_group_id;
-   }
-   // this will build the table with specials prices for the retail group or update it if needed
-   // this function should have been added to includes/functions/database.php
-   if ($customer_group_id == '0') {
-     tep_db_check_age_specials_retail_table();
-   }
-   $status_product_prices_table = false;
-   $status_need_to_get_prices = false;
-
-   // find out if sorting by price has been requested
-   if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-    $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-    if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-      $status_need_to_get_prices = true;
-      }
-   }
-
-   if ($status_need_to_get_prices == true && $customer_group_id != '0') {
-     $product_prices_table = TABLE_PRODUCTS_GROUP_PRICES.$customer_group_id;
-   // the table with product prices for a particular customer group is re-built only a number of times per hour
-   // (setting in /includes/database_tables.php called MAXIMUM_DELAY_UPDATE_PG_PRICES_TABLE, in minutes)
-   // to trigger the update the next function is called (new function that should have been
-   // added to includes/functions/database.php)
-     tep_db_check_age_products_group_prices_cg_table($customer_group_id);
-     $status_product_prices_table = true;
-   } // end if ($status_need_to_get_prices == true && $customer_group_id != '0')
-// Eversun mod end for sppc and qty price breaks
-    $select_column_list = '';
-
-    for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-      switch ($column_list[$i]) {
-        case 'PRODUCT_LIST_MODEL':
-          $select_column_list .= 'p.products_model, ';
-          break;
-        case 'PRODUCT_LIST_NAME':
-          $select_column_list .= 'pd.products_name, ';
-          break;
-        case 'PRODUCT_LIST_MANUFACTURER':
-          $select_column_list .= 'm.manufacturers_name, ';
-          break;
-        case 'PRODUCT_LIST_QUANTITY':
-          $select_column_list .= 'p.products_quantity, ';
-          break;
-        case 'PRODUCT_LIST_IMAGE':
-          $select_column_list .= 'p.products_image, ';
-          break;
-        case 'PRODUCT_LIST_WEIGHT':
-          $select_column_list .= 'p.products_weight, ';
-          break;
-      }
-    }
- // Get the category name and description
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-    $category = tep_db_fetch_array($category_query);
-
-
-// show the products of a specified manufacturer
-    if (isset($HTTP_GET_VARS['manufacturers_id'])) {
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-
-// We are asked to show only a specific category
-//Eversun mod for sppc and qty price breaks
-
-/*
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-      }
-    } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-    */
-      
-    if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } // end else { // either retail...
-    } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } // end else { // either retail...
-    }
-  } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory;
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p 
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } // end else { // either retail...
-      } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-    } // end else { // either retail...
-// Eversun mod for sppc and qty price breaks
-      }
-    }
-
-    if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-
-    $content = CONTENT_INDEX_PRODUCTS;
-
-  } else { // default page
-
-    $content = CONTENT_PW;
-
-  }
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/redirect.php
===================================================================
--- trunk/direct.openmoko.com/redirect.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/redirect.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,79 +0,0 @@
-<?php
-/*
-  $Id: redirect.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  switch ($HTTP_GET_VARS['action']) {
-    case 'banner':
-      $banner_query = tep_db_query("select banners_url from " . TABLE_BANNERS . " where banners_id = '" . (int)$HTTP_GET_VARS['goto'] . "'");
-      if (tep_db_num_rows($banner_query)) {
-        $banner = tep_db_fetch_array($banner_query);
-        tep_update_banner_click_count($HTTP_GET_VARS['goto']);
-
-        tep_redirect($banner['banners_url']);
-      }
-      break;
-
-    case 'url':
-      if (isset($HTTP_GET_VARS['goto']) && tep_not_null($HTTP_GET_VARS['goto'])) {
-        $check_query = tep_db_query("select products_url from " . TABLE_PRODUCTS_DESCRIPTION . " where products_url = '" . tep_db_input($HTTP_GET_VARS['goto']) . "' limit 1");
-        if (tep_db_num_rows($check_query)) {
-        tep_redirect('http://' . $HTTP_GET_VARS['goto']);
-        }
-      }
-      break;
-
-    case 'manufacturer':
-      if (isset($HTTP_GET_VARS['manufacturers_id']) && tep_not_null($HTTP_GET_VARS['manufacturers_id'])) {
-        $manufacturer_query = tep_db_query("select manufacturers_url from " . TABLE_MANUFACTURERS_INFO . " where manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and languages_id = '" . (int)$languages_id . "'");
-        if (tep_db_num_rows($manufacturer_query)) {
-// url exists in selected language
-          $manufacturer = tep_db_fetch_array($manufacturer_query);
-
-          if (tep_not_null($manufacturer['manufacturers_url'])) {
-            tep_db_query("update " . TABLE_MANUFACTURERS_INFO . " set url_clicked = url_clicked+1, date_last_click = now() where manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and languages_id = '" . (int)$languages_id . "'");
-
-            tep_redirect($manufacturer['manufacturers_url']);
-          }
-        } else {
-// no url exists for the selected language, lets use the default language then
-          $manufacturer_query = tep_db_query("select mi.languages_id, mi.manufacturers_url from " . TABLE_MANUFACTURERS_INFO . " mi, " . TABLE_LANGUAGES . " l where mi.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and mi.languages_id = l.languages_id and l.code = '" . DEFAULT_LANGUAGE . "'");
-          if (tep_db_num_rows($manufacturer_query)) {
-            $manufacturer = tep_db_fetch_array($manufacturer_query);
-
-            if (tep_not_null($manufacturer['manufacturers_url'])) {
-              tep_db_query("update " . TABLE_MANUFACTURERS_INFO . " set url_clicked = url_clicked+1, date_last_click = now() where manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and languages_id = '" . (int)$manufacturer['languages_id'] . "'");
-
-              tep_redirect($manufacturer['manufacturers_url']);
-            }
-          }
-        }
-      }
-      break;
-
-// VJ Links Manager v1.00 begin
-    case 'links':
-      require(DIR_WS_FUNCTIONS . 'links.php');
-
-      $links_query = tep_db_query("select links_url from " . TABLE_LINKS . " where links_id = '" . (int)$HTTP_GET_VARS['goto'] . "'");
-      if (tep_db_num_rows($links_query)) {
-        $link = tep_db_fetch_array($links_query);
-        tep_update_links_click_count($HTTP_GET_VARS['goto']);
-
-        tep_redirect($link['links_url']);
-      }
-      break;
-// VJ Links Manager v1.00 end
-  }
-
-  tep_redirect(tep_href_link(FILENAME_DEFAULT));
-?>

Deleted: trunk/direct.openmoko.com/reviews.php
===================================================================
--- trunk/direct.openmoko.com/reviews.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/reviews.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,24 +0,0 @@
-<?php
-/*
-  $Id: reviews.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_REVIEWS);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_REVIEWS));
-
-  $content = CONTENT_REVIEWS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/robots.txt
===================================================================
--- trunk/direct.openmoko.com/robots.txt	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/robots.txt	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,91 +0,0 @@
-# CRELoaded Generated Robots.txt
-# Robot Exclusion File -- robots.txt
-# Author:  CRELoaded Team 
-# Last Updated : May 11th 2005
-#enhancements by Ted C
-
-User-Agent: *
-Disallow: /admin/
-Disallow: /download/
-Disallow: /includes/
-Disallow: /temp/
-Disallow: /debug/
-Disallow: /tmp/
-Disallow: /pub/
-Disallow: /templates/
-Disallow: /urchin/
-
-#User-agent: *
-#*Disallow: crawlers.looksmart.com
-
-#Block All Images
-#Disallow: *.gif
-#Disallow: *.jpg
-#Disallow: /*.gif$
-#Disallow: /*.jpg$
-#
-#To block main page due to size from bots
-# Disallow: /index.php
-#
-#To shut down site completely from bots use either
-# Disallow: /
-#
-#If you had search engine friendly URLs on and want to clean them out of the bots
-#Disallow: /default.php/cPath/
-#
-#
-#Block out directories bots don't need to go to
-Disallow: /admin/
-Disallow: /download/
-Disallow: /font/
-Disallow: /includes/
-Disallow: /install/
-Disallow: /tmp/
-Disallow: /templates/
-
-#
-#Block out things that are secure or login oriented
-Disallow: /address_book_process.php
-Disallow: /account.php
-Disallow: /account_edit.php
-Disallow: /account_edit_process.php
-Disallow: /account_history.php
-Disallow: /account_history_info.php
-Disallow: /address_book.php
-Disallow: /checkout_process.php
-Disallow: /advanced_search.php
-Disallow: /advanced_search_result.php
-Disallow: /checkout_address.php
-Disallow: /checkout_confirmation.php
-Disallow: /checkout_payment.php
-Disallow: /checkout_success.php
-Disallow: /conditions.php
-Disallow: /contact_us.php
-Disallow: /create_account.php
-Disallow: /create_account_process.php
-Disallow: /create_account_success.php
-Disallow: /info_shopping_cart.php
-Disallow: /login.php
-Disallow: /logoff.php
-Disallow: /password_forgotten.php
-Disallow: /popup_image.php
-Disallow: /popup_search_help.php
-Disallow: /privacy.php
-Disallow: /product_notifications.php
-Disallow: /product_reviews.php
-Disallow: /product_reviews_info.php
-Disallow: /product_reviews_write.php
-Disallow: /redirect.php
-Disallow: /reviews.php
-Disallow: /shipping.php
-Disallow: /shopping_cart.php
-Disallow: /tell_a_friend.php
-Disallow: /cookie_usage.php
-
-# IF YOU DO NOT WISH TO HAVE THE GOOGLE IMAGE BOT SCAN YOUR DOMAIN FOR IMAGES
-# THEN YOU CAN INCLUDE THE FOLLOWING IN YOUR ROBOTS FILE.
-# I FOUND THAT MY BANDWIDTH USAGE DROPPED BY A MASSIVE AMOUNT AFTER I GOT RID
-# OF THE GOOGLE IMAGE BOT. ALL I HAD WAS IMAGE HUNTERS STEALING PRODUCT SHOTS
-# AND NOT EVEN BROWSING THE SITE.
-#User-agent: Googlebot-Image
-#Disallow: /

Deleted: trunk/direct.openmoko.com/rss.php
===================================================================
--- trunk/direct.openmoko.com/rss.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/rss.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,54 +0,0 @@
-<?php
-/*
-  $Id$
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-  Copyright (c) 2003 Rodolphe Quiedeville <rodolphe at quiedeville.org>
-
-  Author : Rodolphe Quiedeville <rodolphe at quiedeville.org>
-
-  Released under the GNU General Public License
-
-  Usage : call /catalog/rss.php?box=BOX_NAME
-  If no BOX_NAME specified we use whats_new by default
-
-  Remember to define in configure.php :
-
-  define('DIR_WS_RSS', DIR_WS_INCLUDES . 'rss/');
-
-
-  TODO : set channel description correctly
-*/
-
-//header("Content-type: text/plain");
-
-//require('includes/application_top.php');
-
-print '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";
-print '<rss version="0.91">' . "\n";
-print '  <channel>' . "\n";
-print "    <title>".$latest_news['newsdesk_article_name'] ."</title>\n";
-print "    <source></source>\n";
-print "    <link>".'<a href="http://www.yourdomain.com/">RSS Newsfeeds</a>'."</link>\n";
-print "    <language>en-uk</language>\n\n";
-
-
-require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_DEFAULT);
-
-if (!strlen($box))
-{
-  $box = "newsdesk_latest";
-}
-
-$file = DIR_WS_RSS . $box . '.php';
-
-if (file_exists($file))
-{
-  require($file); 
-}
-print "  </channel>\n";
-print "</rss>\n";
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/shipping_estimator_popup.php
===================================================================
--- trunk/direct.openmoko.com/shipping_estimator_popup.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/shipping_estimator_popup.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,48 +0,0 @@
-<?php
-/*
-
-  Shipping Estimator Popup
-
-  Shoppe Enhancement Controller - Copyright (c) 2003 WebMakers.com
-  Linda McGrath - osCommerce at WebMakers.com
-
-*/
-
-  require("includes/application_top.php");
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_SHOPPING_CART);
-
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo SHIPPING_ESTIMATOR_TITLE; ?></title>
-<base href="<?php echo (getenv('HTTPS') == 'on' ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-<?php  include(DIR_WS_JAVASCRIPT . 'popup_window_shipping.js'); ?>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-
-     <table bgcolor="#FFFFFF" border="0" width="100%" height="100%" cellspacing="3" cellpadding="3" align="center" valign="middle">
-      <tr>
-        <td><?php require(DIR_WS_MODULES . 'shipping_estimator.php'); ?></td>
-      </tr>
-
-      <tr>
-        <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
-      </tr>
-
-      <tr>
-        <td align="center">
-          <table align="right" border="1" cellpadding="6" cellspacing="3">
-            <tr>
-              <td class="ShoppingCartShipping_main"><a href="javascript:window.close()"> <!-- Close Window --><?php echo TEXT_CLOSE_WINDOW;?></a></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-
-</body>
-</html>

Deleted: trunk/direct.openmoko.com/shop_by_price.php
===================================================================
--- trunk/direct.openmoko.com/shop_by_price.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/shop_by_price.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,29 +0,0 @@
-<?php
-/*
-  $Id: shop_by_price.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-  
-  Contribution edit by David van der Wel
-  http//www.xlwel.nl
-  
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_SHOP_BY_PRICE);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_SHOP_BY_PRICE, '', 'NONSSL'));
-
-
-
-  $content = CONTENT_SHOP_BY_PRICE;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/shopping_cart.php
===================================================================
--- trunk/direct.openmoko.com/shopping_cart.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/shopping_cart.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,35 +0,0 @@
-<?php
-/*
-  $Id: shopping_cart.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-  Shoppe Enhancement Controller - Copyright (c) 2003 WebMakers.com
-  Linda McGrath - osCommerce at WebMakers.com
-*/
-
-  require("includes/application_top.php");
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_SHOPPING_CART);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_SHOPPING_CART));
-// BOF: WebMakers.com Added: Attributes Sorter and Copier and Quantity Controller
-// Validate Cart for checkout
-  $valid_to_checkout= true;
-  $cart->get_products(true);
-  if (!$valid_to_checkout) {
-//    $messageStack->add_session('header', 'Please update your order ...', 'error');
-//    tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
-  }
-// EOF: WebMakers.com Added: Attributes Sorter and Copier and Quantity Controller
-
-  $content = CONTENT_SHOPPING_CART;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/specials.php
===================================================================
--- trunk/direct.openmoko.com/specials.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/specials.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,134 +0,0 @@
-<?php
-/*
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_SPECIALS);
-
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-
-       // find out if sorting by price has been requested
-       if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-        $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-        if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-          $status_need_to_get_prices = true;
-          }
-       }
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-
-        $select_column_list = '';
-    
-    $listing_sql .= ' order by ';    
-        for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-          switch ($column_list[$i]) {
-            case 'PRODUCT_LIST_MODEL':
-              $select_column_list .= 'p.products_model, ';
-              break;
-            case 'PRODUCT_LIST_NAME':
-              $select_column_list .= 'pd.products_name, ';
-              break;
-            case 'PRODUCT_LIST_MANUFACTURER':
-              $select_column_list .= 'm.manufacturers_name, ';
-              break;
-            case 'PRODUCT_LIST_QUANTITY':
-              $select_column_list .= 'p.products_quantity, ';
-              break;
-            case 'PRODUCT_LIST_IMAGE':
-              $select_column_list .= 'p.products_image, ';
-              break;
-            case 'PRODUCT_LIST_WEIGHT':
-              $select_column_list .= 'p.products_weight, ';
-              break;
-             }
-    }
-   
-    // We show them all
-   // either retail or no need to get correct special prices
-          $listing_sql = "select distinct " . $select_column_list . "  
-                          p.products_id,
-                          p.products_price,
-                          p.products_tax_class_id,
-                          p.products_image, 
-                          IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, 
-        IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                        from " . TABLE_PRODUCTS . " p, 
-                        " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                        " . TABLE_SPECIALS . " s 
-                        where 
-                         p.products_status = '1' 
-                         and s.products_id = p.products_id 
-                         and pd.products_id = p.products_id
-                         and pd.language_id = '" . $languages_id . "' 
-                         and s.status = '1'";
-                          
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-   //   $sort = ;
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-   }
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_SPECIALS));
-
-  $content = CONTENT_SPECIALS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/ssl_check.php
===================================================================
--- trunk/direct.openmoko.com/ssl_check.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/ssl_check.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,24 +0,0 @@
-<?php
-/*
-  $Id: ssl_check.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_SSL_CHECK);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_SSL_CHECK));
-
-  $content = CONTENT_SSL_CHECK;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/style.css
===================================================================
--- trunk/direct.openmoko.com/style.css	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/style.css	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,323 +0,0 @@
-html,body {
-	margin: 0px;
-	padding: 0px;
-	background: #FFF;
-}
-
-body {
-	font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	font-size: 0.75em;
-	color: #333;
-}
-
-h1 {
-	font-size: 1.9em;
-}
-
-h2 {
-	font-size: 1.4em;
-}
-
-h3 {
-	font-size: 1.1em
-}
-
-a {
-	color: #333333;
-	text-decoration: none;
-}
-
-a:hover {
-	color: #FF6600;
-}
-
-img {
-	border: none;
-}
-
-ul {
-	margin: 0 0 0 0.5em;
-	padding: 0 0 0 0;
-	list-style: none;
-}
-
-ul li {
-	background: url(images/list_bullet.png) no-repeat 0 0.5em;
-	padding-left: 0.7em;
-	margin-bottom: 0.4em;
-}
-
-#wrapper {
-	width: 950px;
-	margin: 0px auto;
-}
-
-#header {
-	height: 90px;
-	position: relative;
-}
-
-#site_logo {
-	position: absolute;
-	top: 29px;
-	left: 10px;
-}
-
-/**************/
-/* NAVIGATION */
-/**************/
-
-#main_navigation {
-	float: right;
-	position: absolute;
-	top: 38px;
-	right: 5px;
-}
-
-#main_navigation ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#main_navigation ul li {
-	display: inline;
-	margin: 0;
-	padding: 0;
-	background: none;
-}
-
-
-
-#main_navigation a {
-	float: left;
-	display: block;
-	height: 11px;
-	background-position: 50% 0%;
-	background-repeat:no-repeat;
-}
-
-#main_navigation a:hover {
-	background-position: 50% 100%;
-}
-
-#main_navigation a span{
-	display: none;
-}
-
-#main_navigation .selected {
-	background-position: 50% 100%;
-}
-
-
-.nav_home {
-	background-image:url(images/navigation/home.png);
-	width: 58px;
-}
-
-.nav_about {
-	background-image:url(images/navigation/about.png);
-	width: 64px;
-}
-
-.nav_products {
-	background-image:url(images/navigation/products.png);
-	width: 86px;
-}
-
-.nav_developers {
-	background-image:url(images/navigation/developers.png);
-	width: 98px;
-}
-
-.nav_network {
-	background-image:url(images/navigation/network.png);
-	width: 83px;
-}
-
-.nav_press {
-	background-image:url(images/navigation/press.png);
-	width: 58px;
-}
-
-.nav_careers {
-	background-image:url(images/navigation/careers.png);
-	width: 76px;
-}
-
-.nav_contact {
-	background-image:url(images/navigation/contact.png);
-	width: 79px;
-}
-
-/****************/
-/* MIDDLE BLOCK */
-/****************/
-
-#middleblock {
-	background: #080808 url(images/middleblock_tile.png) repeat-x 0% 0%;
-	position: relative;
-	border-bottom: 1px solid #CCCCCC;
-}
-
-#middleblock_inner {
-	background:url(images/middleblock_left.png) no-repeat 0% 0%;
-}
-
-#middleblock_inner2 {
-	background:url(images/middleblock_right.png) no-repeat 100% 0%;
-	min-height: 300px;
-}
-
-#middleblock_container {
-	min-height: 300px;
-}
-
-#middleblock_tabs {
-	margin: 0px;
-	padding: 0px;
-	list-style: none;
-	font-size: 1.1em;
-	display: block;
-
-	position: relative;
-	top: 1px;
-	
-	margin-left: 348px;
-}
-
-#middleblock_tabs li {	
-	display: inline;
-	margin: 0;
-	padding: 0;
-	background: none;
-}
-
-#middleblock_tabs li a {
-	float: left;
-	display: block;
-	font-weight: bold;
-	color: white;
-	text-decoration: none;
-	margin-right: 5px;
-}
-
-#middleblock_tabs li a span {
-	display: block;
-	padding: 0.5em 0.8em 0.5em 0.9em;
-}
-
-#middleblock_tabs li a:hover {
-	color: #FF6600;
-	background:#FFF url(images/middleblock_tabs_left.png) no-repeat 0% 0%;
-}
-
-#middleblock_tabs li a:hover span {
-	background:url(images/middleblock_tabs_right.png) no-repeat 100% 0%;
-}
-
-#middleblock_tabs li .selected {
-	color: #FF6600;
-	background:#FFF url(images/middleblock_tabs_left.png) no-repeat 0% 0%;
-}
-
-#middleblock_tabs li .selected span {
-	background:url(images/middleblock_tabs_right.png) no-repeat 100% 0%;
-}
-
-.main_container {
-	padding-top: 40px;
-	padding-bottom: 40px;
-}
-
-.clear {
-	clear: both;
-}
-
-
-#left_column {
-	width: 303px;
-	padding-left: 45px;
-	float: left;
-}
-
-#left_column h3 {
-	margin: 0 0 1.1em 0;
-	padding: 0;
-}
-
-#right_column {
-	margin-left: 350px;
-}
-
-#footer {	
-	text-align: center;
-	background: #FAFAFA;
-	border-top: 1px solid #CCC;
-	padding: 5em 0 4em 0;
-	margin: 0 0 20px 0;
-	font-size: 0.9em;
-	color: #666666;
-}
-
-#secundary_navigation {
-	margin: 0;
-	padding: 0 0 2em 0;
-	text-transform: uppercase;
-	margin: 0 auto;
-}
-
-#secundary_navigation li {
-	background: none;
-	padding: 0;
-	display: inline;
-	margin: 0 1em;
-}
-
-#secundary_navigation .selected {
-	font-weight: bold;
-	color: #FF6600;
-}
-
-
-
-/***********/
-/* CONTENT */
-/***********/
-
-.content {
-	line-height: 1.5em;
-	padding-bottom: 20px;
-}
-
-.content p {
-	margin: 0;
-	padding: 0.6em 0;
-}
-
-.content ul,
-.content ol {
-	padding: 0.9em 0 0.8em 2em;
-}
-
-.content blockquote {
-	margin: 0;
-	padding: 0.6em 0 0.6em 2em;
-	color: #999;
-}
-
-.content h2 {
-	margin: 0;
-	padding: 0 0 0.5em 0;
-}
-
-.content .title_container {
-	border-bottom: 1px solid #CCCCCC;
-	margin: 0 0 0.7em 0;
-}
-
-.content img {
-	border-right: 1px solid #CCCCCC;
-	float: left;
-	margin: 0 1em 1em 0;
-}
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/tell_a_friend.php
===================================================================
--- trunk/direct.openmoko.com/tell_a_friend.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/tell_a_friend.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,136 +0,0 @@
-<?php
-/*
-  $Id: tell_a_friend.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_TELL_A_FRIEND);
-  
-//check for valid product
-   $valid_product = "false";
-
-  $tell_products_id = $HTTP_GET_VARS['products_id'];
-
-  if (!tep_session_is_registered('customer_id') && (ALLOW_GUEST_TO_TELL_A_FRIEND == 'false')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  } elseif (tep_session_is_registered('customer_id')) {
-    $account_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-    $account = tep_db_fetch_array($account_query);
-    $from_name = $account['customers_firstname'] . ' ' . $account['customers_lastname'];
-    $from_email_address = $account['customers_email_address'];
-  }
-
-$product_info_query = tep_db_query("select pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
-    if (tep_db_num_rows($product_info_query)) {
-      $valid_product = "true";
-      $product_info = tep_db_fetch_array($product_info_query);
-    } else{
-     $valid_product = "false";
-  tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $tell_products_id));
-   }
-
-//VISUAL VERIFY CODE start  
-  $vccCheckOk="True"; 
-    $code_query = tep_db_query("select code from visual_verify_code where oscsid = '" . tep_session_id() . "'");
-    $code_array = tep_db_fetch_array($code_query);
-    $code = $code_array['code'];
-
-    tep_db_query("DELETE FROM " . TABLE_VISUAL_VERIFY_CODE . " WHERE oscsid='" . tep_session_id() . "'"); //remove the visual verify code associated with this session to clean database and ensure new results
-
-    $user_entered_code = $HTTP_POST_VARS['visual_verify_code'];
-    if (!(strcasecmp($user_entered_code, $code) == 0)) {    //make the check case insensitive
-        $error = true;
-        
-    if(($HTTP_GET_VARS['action'] == 'process'))
-    {
-      $messageStack->add('friend', VISUAL_VERIFY_CODE_ENTRY_ERROR);
-    }
-    
-    $vccCheckOk="False";    
-    }
-    
- 
-if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process') && $vccCheckOk=="True") 
-  {   
-    $error = "false";
-    $_POST['to_email_address'] = preg_replace( "/\n/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\n/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = preg_replace( "/\r/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\r/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = str_replace("Content-Type:","",$_POST['to_email_address']);
-    $_POST['to_name'] = str_replace("Content-Type:","",$_POST['to_name']);
-    
-    $to_email_address = tep_db_prepare_input($HTTP_POST_VARS['to_email_address']);
-    $to_name = tep_db_prepare_input($HTTP_POST_VARS['to_name']);
-    $from_email_address = tep_db_prepare_input($HTTP_POST_VARS['from_email_address']);
-    $from_name = tep_db_prepare_input($HTTP_POST_VARS['from_name']);
-    $message = tep_db_prepare_input($HTTP_POST_VARS['message']);
-    
-       if (empty($from_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_NAME);
-        }
-
-        if (!tep_validate_email($from_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_ADDRESS);
-        }
-    
-        if (empty($to_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_NAME);
-        }
-    
-        if (!tep_validate_email($to_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_ADDRESS);
-        }
-
-  $email_subject = sprintf(TEXT_EMAIL_SUBJECT, $from_name, STORE_NAME);
-  $email_body = sprintf(TEXT_EMAIL_INTRO, $to_name, $from_name, $product_info['products_name'], STORE_NAME) . "\n\n";
-      if (tep_not_null($message)) {
-         $email_body .= $message . "\n\n";
-        }
-     if (TELL_PRODUCT_EMAIL_USE_HTML == "false") {
-            $email_body .= TEXT_EMAIL_LINK_TEXT . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?products_id='.$tell_products_id .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?products_id='. $tell_products_id . '</a>' . "\n\n";
-      $email_body .= TEXT_EMAIL_SIGNATURE. STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
- 
-    }else{ 
-            $email_body .= TEXT_EMAIL_LINK . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?products_id='.$tell_products_id .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_PRODUCT_INFO . '?products_id='. $tell_products_id . '</a>' . "\n\n";
-      $email_body .= TEXT_EMAIL_SIGNATURE. STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
-      
-                }
-                
-      $mimemessage = new email(array('X-Mailer: osCommerce bulk mailer'));
-      
-          if (TELL_PRODUCT_EMAIL_USE_HTML == "false") {
-              $mimemessage->add_text($email_body);
-           } else {
-              $mimemessage->add_html($email_body);
-           }                
-  
-            $mimemessage->build_message();
-            $mimemessage->send($to_name, $to_email_address, $from_name, $from_email_address, $email_subject);
-
-      $messageStack->add_session('header', sprintf(TEXT_EMAIL_SUCCESSFUL_SENT, $product_info['products_name'], tep_output_string_protected($to_name)), 'success');
-      tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $tell_products_id));
-
-
-}         
-
-    $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_TELL_A_FRIEND, 'products_id=' . $tell_products_id));
-
-  $content = CONTENT_TELL_A_FRIEND;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/tell_a_friend_article.php
===================================================================
--- trunk/direct.openmoko.com/tell_a_friend_article.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/tell_a_friend_article.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,136 +0,0 @@
-<?php
-/*
-  $Id: tell_a_friend.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_TELL_A_FRIEND_ARTICLE);
-  
-//check for valid product
-   $valid_article = "false";
-
-  $tell_articles_id = $HTTP_GET_VARS['articles_id'];
-
-  if (!tep_session_is_registered('customer_id') && (ALLOW_GUEST_TO_TELL_A_FRIEND == 'false')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  } elseif (tep_session_is_registered('customer_id')) {
-    $account_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-    $account = tep_db_fetch_array($account_query);
-    $from_name = $account['customers_firstname'] . ' ' . $account['customers_lastname'];
-    $from_email_address = $account['customers_email_address'];
-  }
-
-    $article_info_query = tep_db_query("select pd.articles_name from " . TABLE_ARTICLES . " p, " . TABLE_ARTICLES_DESCRIPTION . " pd where p.articles_status = '1' and p.articles_id = '" . (int)$HTTP_GET_VARS['articles_id'] . "' and p.articles_id = pd.articles_id and pd.language_id = '" . (int)$languages_id . "'");
-    if (tep_db_num_rows($article_info_query)) {
-      $valid_article = "true";
-      $article_info = tep_db_fetch_array($article_info_query);
-    } else {
-     $valid_article = "false";
- //    tep_redirect(tep_href_link(FILENAME_ARTICLE_INFO, 'articles_id=' . $tell_articles_id));
-    }
-
-//VISUAL VERIFY CODE start  
-  $vccCheckOk="True"; 
-    $code_query = tep_db_query("select code from visual_verify_code where oscsid = '" . tep_session_id() . "'");
-    $code_array = tep_db_fetch_array($code_query);
-    $code = $code_array['code'];
-
-    tep_db_query("DELETE FROM " . TABLE_VISUAL_VERIFY_CODE . " WHERE oscsid='" . tep_session_id() . "'"); //remove the visual verify code associated with this session to clean database and ensure new results
-
-    $user_entered_code = $HTTP_POST_VARS['visual_verify_code'];
-    if (!(strcasecmp($user_entered_code, $code) == 0)) {    //make the check case insensitive
-        $error = true;
-        
-    if(($HTTP_GET_VARS['action'] == 'process'))
-    {
-      $messageStack->add('friend', VISUAL_VERIFY_CODE_ENTRY_ERROR);
-    }
-    
-    $vccCheckOk="False";    
-    }
-    
- 
-if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process') && $vccCheckOk=="True") 
-  {   
-    $error = "false";
-    $_POST['to_email_address'] = preg_replace( "/\n/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\n/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = preg_replace( "/\r/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\r/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = str_replace("Content-Type:","",$_POST['to_email_address']);
-    $_POST['to_name'] = str_replace("Content-Type:","",$_POST['to_name']);
-    
-    $to_email_address = tep_db_prepare_input($HTTP_POST_VARS['to_email_address']);
-    $to_name = tep_db_prepare_input($HTTP_POST_VARS['to_name']);
-    $from_email_address = tep_db_prepare_input($HTTP_POST_VARS['from_email_address']);
-    $from_name = tep_db_prepare_input($HTTP_POST_VARS['from_name']);
-    $message = tep_db_prepare_input($HTTP_POST_VARS['message']);
-    
-       if (empty($from_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_NAME);
-        }
-
-        if (!tep_validate_email($from_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_ADDRESS);
-        }
-    
-        if (empty($to_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_NAME);
-        }
-    
-        if (!tep_validate_email($to_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_ADDRESS);
-        }
-
-          $email_subject = sprintf(TEXT_EMAIL_SUBJECT, $from_name, STORE_NAME);
-          $email_body_article = sprintf(TEXT_EMAIL_INTRO, $to_name, $from_name, $article_info['articles_name'], STORE_NAME) . "\n\n";
-          if (tep_not_null($message)) {
-            $email_body_article .= $message . "\n\n";
-          }
-     if (TELL_ARTICLE_EMAIL_USE_HTML == 'false') {
-            $email_body_article .= TEXT_EMAIL_LINK_TEXT . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_ARTICLE_INFO . '?articles_id='.$tell_articles_id .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_ARTICLE_INFO . '?articles_id='. $tell_articles_id . '</a>' . "\n\n";
-      $email_body_article .= TEXT_EMAIL_SIGNATURE. STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
- 
-    }else{ 
-            $email_body_article .= TEXT_EMAIL_LINK . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_ARTICLE_INFO . '?articles_id='.$tell_articles_id .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . FILENAME_ARTICLE_INFO . '?articles_id='. $tell_articles_id . '</a>' . "\n\n";
-      $email_body_article .= TEXT_EMAIL_SIGNATURE. STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
-      
-                }
-                
-         $mimemessage = new email(array('X-Mailer: osCommerce bulk mailer'));
-  
- 
-          if (TELL_ARTICLE_EMAIL_USE_HTML == 'false') {
-              $mimemessage->add_text($email_body_article);
-           } else {
-              $mimemessage->add_html($email_body_article);
-           }                
-  
-            $mimemessage->build_message();
-            $mimemessage->send($to_name, $to_email_address, $from_name, $from_email_address, $email_subject);
-
-  $messageStack->add_session('header', sprintf(TEXT_EMAIL_SUCCESSFUL_SENT, $article_info['articles_name'], tep_output_string_protected($to_name)), 'success');  
-    tep_redirect(tep_href_link(FILENAME_ARTICLE_INFO, 'articles_id=' . $tell_articles_id));
- 
-}         
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_TELL_A_FRIEND_ARTICLE, 'articles_id=' . $tell_articles_id));
-
-  $content = CONTENT_TELL_A_FRIEND_ARTICLE;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file

Deleted: trunk/direct.openmoko.com/upcoming_products.php
===================================================================
--- trunk/direct.openmoko.com/upcoming_products.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/upcoming_products.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,146 +0,0 @@
-<?php
-/*
-  $Id: products_new.php,v 1.1.1.1 2004/03/04 23:38:02 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_UPCOMING_PRODUCTS);
-    // Eversun mod for sppc and qty price breaks
-       if(!tep_session_is_registered('sppc_customer_group_id')) {
-         $customer_group_id = 'G';
-         } else {
-          $customer_group_id = $sppc_customer_group_id;
-       }
-
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW,
-                         'PRODUCT_LIST_DATE_EXPECTED' => PRODUCT_LIST_DATE_EXPECTED);
-
-    asort($define_list);
-    $page_set= 'upcoming_products';
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-
-       // find out if sorting by price has been requested
-       if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-        $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-        if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-          $status_need_to_get_prices = true;
-          }
-       }
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-
-        $select_column_list = '';
-    
-    $listing_sql .= ' order by ';    
-        for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-          switch ($column_list[$i]) {
-            case 'PRODUCT_LIST_MODEL':
-              $select_column_list .= 'p.products_model, ';
-              break;
-            case 'PRODUCT_LIST_NAME':
-              $select_column_list .= 'pd.products_name, ';
-              break;
-            case 'PRODUCT_LIST_MANUFACTURER':
-              $select_column_list .= 'm.manufacturers_name, ';
-              break;
-            case 'PRODUCT_LIST_QUANTITY':
-              $select_column_list .= 'p.products_quantity, ';
-              break;
-            case 'PRODUCT_LIST_IMAGE':
-              $select_column_list .= 'p.products_image, ';
-              break;
-            case 'PRODUCT_LIST_WEIGHT':
-              $select_column_list .= 'p.products_weight, ';
-              break;
-           case 'PRODUCT_LIST_DATE_EXPECTED':
-        $select_column_list .= 'p.products_date_available, ';
-              break;
-             }
-    }
-   
-    // We show them all
- // either retail or no need to get correct special prices
-          $listing_sql = "select distinct " . $select_column_list . "  
-                          p.products_id,
-                          p.products_price as final_price,
-                          p.products_tax_class_id,
-                          p.products_image 
-                        from (" . TABLE_PRODUCTS . " p 
-                        left join " . TABLE_SPECIALS . " s using(products_id)),
-                                  " . TABLE_PRODUCTS_DESCRIPTION . " pd
-                        where 
-                         p.products_status = '1' 
-                         and pd.products_id = p.products_id
-                         and pd.language_id = '" . (int)$languages_id . "' 
-                         and to_days(p.products_date_available) >= to_days(now()) ";  
-        
- if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-   //   $sort = ;
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_DATE_EXPECTED':
-        $listing_sql .= "p.products_date_available " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;  
-      }
-   }
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_UPCOMING_PRODUCTS));
-
-  $content = CONTENT_UPCOMING_PRODUCTS;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/validate_new.php
===================================================================
--- trunk/direct.openmoko.com/validate_new.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/validate_new.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,311 +0,0 @@
-<?php
-/*
-  $Id: index.php,v 1.2 2004/03/09 19:56:29 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-// the following cPath references come from application_top.php
-  $category_depth = 'top';
-  if (isset($cPath) && tep_not_null($cPath)) {
-    $categories_products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
-    $cateqories_products = tep_db_fetch_array($categories_products_query);
-    if ($cateqories_products['total'] > 0) {
-      $category_depth = 'products'; // display products
-    } else {
-      $category_parent_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$current_category_id . "'");
-      $category_parent = tep_db_fetch_array($category_parent_query);
-      if ($category_parent['total'] > 0) {
-        $category_depth = 'nested'; // navigate through the categories
-      } else {
-        $category_depth = 'products'; // category has no products, but display the 'no products' message
-      }
-    }
-  }
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_VALIDATE_NEW);
-
-  if ($category_depth == 'nested') {
-//Code change for Categories Description 1.5
-//    $category_query = tep_db_query("select cd.categories_name, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-//Changed to the following
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-//End Categories Description 1.5
-
-    $category = tep_db_fetch_array($category_query);
-
-    $content = CONTENT_INDEX_NESTED;
-
-  } elseif ($category_depth == 'products' || isset($HTTP_GET_VARS['manufacturers_id'])) {
-// create column list
-    $define_list = array('PRODUCT_LIST_MODEL' => PRODUCT_LIST_MODEL,
-                         'PRODUCT_LIST_NAME' => PRODUCT_LIST_NAME,
-                         'PRODUCT_LIST_MANUFACTURER' => PRODUCT_LIST_MANUFACTURER,
-                         'PRODUCT_LIST_PRICE' => PRODUCT_LIST_PRICE,
-                         'PRODUCT_LIST_QUANTITY' => PRODUCT_LIST_QUANTITY,
-                         'PRODUCT_LIST_WEIGHT' => PRODUCT_LIST_WEIGHT,
-                         'PRODUCT_LIST_IMAGE' => PRODUCT_LIST_IMAGE,
-                         'PRODUCT_LIST_BUY_NOW' => PRODUCT_LIST_BUY_NOW);
-
-    asort($define_list);
-
-    $column_list = array();
-    reset($define_list);
-    while (list($key, $value) = each($define_list)) {
-      if ($value > 0) $column_list[] = $key;
-    }
-// Eversun mod for sppc and qty price breaks
-   if(!tep_session_is_registered('sppc_customer_group_id')) {
-     $customer_group_id = '0';
-     } else {
-      $customer_group_id = $sppc_customer_group_id;
-   }
-   // this will build the table with specials prices for the retail group or update it if needed
-   // this function should have been added to includes/functions/database.php
-   if ($customer_group_id == '0') {
-     tep_db_check_age_specials_retail_table();
-   }
-   $status_product_prices_table = false;
-   $status_need_to_get_prices = false;
-
-   // find out if sorting by price has been requested
-   if ( (isset($HTTP_GET_VARS['sort'])) && (ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) && (substr($HTTP_GET_VARS['sort'], 0, 1) <= sizeof($column_list)) && $customer_group_id != '0' ){
-    $_sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-    if ($column_list[$_sort_col-1] == 'PRODUCT_LIST_PRICE') {
-      $status_need_to_get_prices = true;
-      }
-   }
-
-   if ($status_need_to_get_prices == true && $customer_group_id != '0') {
-     $product_prices_table = TABLE_PRODUCTS_GROUP_PRICES.$customer_group_id;
-   // the table with product prices for a particular customer group is re-built only a number of times per hour
-   // (setting in /includes/database_tables.php called MAXIMUM_DELAY_UPDATE_PG_PRICES_TABLE, in minutes)
-   // to trigger the update the next function is called (new function that should have been
-   // added to includes/functions/database.php)
-     tep_db_check_age_products_group_prices_cg_table($customer_group_id);
-     $status_product_prices_table = true;
-   } // end if ($status_need_to_get_prices == true && $customer_group_id != '0')
-// Eversun mod end for sppc and qty price breaks
-    $select_column_list = '';
-
-    for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
-      switch ($column_list[$i]) {
-        case 'PRODUCT_LIST_MODEL':
-          $select_column_list .= 'p.products_model, ';
-          break;
-        case 'PRODUCT_LIST_NAME':
-          $select_column_list .= 'pd.products_name, ';
-          break;
-        case 'PRODUCT_LIST_MANUFACTURER':
-          $select_column_list .= 'm.manufacturers_name, ';
-          break;
-        case 'PRODUCT_LIST_QUANTITY':
-          $select_column_list .= 'p.products_quantity, ';
-          break;
-        case 'PRODUCT_LIST_IMAGE':
-          $select_column_list .= 'p.products_image, ';
-          break;
-        case 'PRODUCT_LIST_WEIGHT':
-          $select_column_list .= 'p.products_weight, ';
-          break;
-      }
-    }
- // Get the category name and description
-    $category_query = tep_db_query("select cd.categories_name, cd.categories_heading_title, cd.categories_description, c.categories_image from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = '" . (int)$current_category_id . "' and cd.categories_id = '" . (int)$current_category_id . "' and cd.language_id = '" . (int)$languages_id . "'");
-    $category = tep_db_fetch_array($category_query);
-
-
-// show the products of a specified manufacturer
-    if (isset($HTTP_GET_VARS['manufacturers_id'])) {
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-
-// We are asked to show only a specific category
-//Eversun mod for sppc and qty price breaks
-
-/*
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-      }
-    } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_MANUFACTURERS . " m, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.manufacturers_id = m.manufacturers_id and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-      } else {
-// We show them all
-        $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id where p.products_status = '1' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
-    */
-      
-    if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'";
-    } // end else { // either retail...
-    } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m
-                      where p.products_status = '1'
-                        and pd.products_id = p.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['manufacturers_id'] . "'";
-    } // end else { // either retail...
-    }
-  } else {
-// show the products in a given categorie
-      if (isset($HTTP_GET_VARS['filter_id']) && tep_not_null($HTTP_GET_VARS['filter_id'])) {
-// We are asked to show only specific catgeory;
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p 
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id)),
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_MANUFACTURERS . " m,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and m.manufacturers_id = '" . (int)$HTTP_GET_VARS['filter_id'] . "'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } // end else { // either retail...
-      } else {
-// We show them all
-        if ($status_product_prices_table == true) {
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, tmp_pp.products_price, p.products_tax_class_id, IF(tmp_pp.status, tmp_pp.specials_new_products_price, NULL) as specials_new_products_price, IF(tmp_pp.status, tmp_pp.specials_new_products_price, tmp_pp.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . $product_prices_table . " as tmp_pp using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-        } else { // either retail or no need to get correct special prices
-      $listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price
-                      from (" . TABLE_PRODUCTS . " p
-                      left join " . TABLE_SPECIALS_RETAIL_PRICES . " s using(products_id))
-                      left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id,
-                           " . TABLE_PRODUCTS_DESCRIPTION . " pd,
-                           " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c
-                      where p.products_status = '1'
-                        and p.products_id = p2c.products_id
-                        and pd.products_id = p2c.products_id
-                        and pd.language_id = '" . (int)$languages_id . "'
-                        and p2c.categories_id = '" . (int)$current_category_id . "'";
-    } // end else { // either retail...
-// Eversun mod for sppc and qty price breaks
-      }
-    }
-
-    if ( (!isset($HTTP_GET_VARS['sort'])) || (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) || (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
-      $sort_column = CATEGORIES_SORT_ORDER;
-      $sort_order = 'a';
-    } else {
-      $sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
-      $sort_column = $column_list[$sort_col-1];
-      $sort_order = substr($HTTP_GET_VARS['sort'], 1);
-    }
-    $listing_sql .= ' order by ';
-    switch ($sort_column) {
-      case 'PRODUCT_LIST_MODEL':
-        $listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_NAME':
-        $listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
-        break;
-      case 'PRODUCT_LIST_MANUFACTURER':
-        $listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_QUANTITY':
-        $listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_IMAGE':
-        $listing_sql .= "pd.products_name";
-        break;
-      case 'PRODUCT_LIST_WEIGHT':
-        $listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      case 'PRODUCT_LIST_PRICE':
-        $listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
-        break;
-      }
-
-    $content = CONTENT_INDEX_PRODUCTS;
-
-  } else { // default page
-
-    $content = CONTENT_VALIDATE_NEW;
-
-  }
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/vvc_display.php
===================================================================
--- trunk/direct.openmoko.com/vvc_display.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/vvc_display.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,29 +0,0 @@
-<?php
-/*
-///////////////////////////////////////////////////
-  file: vvc_display.php,v 1.0 26SEP03
-
-Written for use with:
-  osCommerce, Open Source E-Commerce Solutions http://www.oscommerce.com
-Part of Contribution Named:
-  Visual Verify Code (VVC) by William L. Peer, Jr. (wpeer at forgepower.com) for www.onlyvotives.com
-
-[Modified By] [Date] [Mods Made]
--------------------------------------------
-
-
--------------------------------------------
-
-Released under the GNU General Public License
-Please retain all of this header information
-///////////////////////////////////////////////////
-*/
-require('includes/application_top.php');
-require(DIR_WS_FUNCTIONS . 'visual_verify_code.php');
-
-  $code_query = tep_db_query("select code from visual_verify_code where oscsid = '" . tep_db_prepare_input($HTTP_GET_VARS['vvc']) . "'");
-  $code_array = tep_db_fetch_array($code_query);
-  $code = $code_array['code'];
-  vvcode_render_code($code);
-?>
-

Deleted: trunk/direct.openmoko.com/wishlist.php
===================================================================
--- trunk/direct.openmoko.com/wishlist.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/wishlist.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,50 +0,0 @@
-<?php
-/*
- // wishlist.php,v 2.0  2003/11/22 Jesse Labrocca
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2002 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  if (!tep_session_is_registered('customer_id')) {
-  $SESSION_WISHLIST = (int)$HTTP_POST_VARS['products_id'];
-  tep_session_register('SESSION_WISHLIST');
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  }
-  //ADDED FOR WHEN USERS ARE NOT LOGGED IN TO KEEP THE PRODUCT_ID
-
-  if(tep_session_is_registered('SESSION_WISHLIST')) {
-
-   // Queries below replace old product instead of adding to quantity.
-   tep_db_query("delete from " . TABLE_WISHLIST . " where products_id = '" . $SESSION_WISHLIST . "' and customers_id = '" . (int)$customer_id . "'");
-   tep_db_query("insert into " . TABLE_WISHLIST . " (customers_id, products_id, products_model, products_name, products_price) values ('" . (int)$customer_id . "', '" . $SESSION_WISHLIST . "', '" . tep_db_prepare_input($products_model) . "', '" . tep_db_prepare_input($products_name) . "', '" . tep_db_prepare_input($products_price) . "' )");
-   tep_db_query("delete from " . TABLE_WISHLIST_ATTRIBUTES . " where products_id = '" . $SESSION_WISHLIST . "' and customers_id = '" . (int)$customer_id . "'");
-
-   // Read array of options and values for attributes in id[]
-    if (isset ($id)) {
-    foreach($id as $att_option=>$att_value) {
-    // Add to customers_wishlist_attributes table
-    tep_db_query("insert into " . TABLE_WISHLIST_ATTRIBUTES . " (customers_id, products_id, products_options_id , products_options_value_id) values ('" . (int)$customer_id . "', '" . $SESSION_WISHLIST . "', '" . (int)$att_option . "', '" . (int)$att_value . "' )");
-    }
-   }
-  tep_session_unregister('SESSION_WISHLIST');
-  }
-
-  //END OF ADDITION
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_WISHLIST);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_WISHLIST, '', 'NONSSL'));
-
-  $content = CONTENT_WISHLIST;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/wishlist_email.php
===================================================================
--- trunk/direct.openmoko.com/wishlist_email.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/wishlist_email.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,148 +0,0 @@
-<?php
-/*
- $Id: wishlist_email.php,v 2.0  2004/08/11
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_WISHLIST_SEND);
-  require(DIR_WS_FUNCTIONS . 'visual_verify_code.php');
-
-//check for valid product
-   $valid_product = "false";
-
-  $wish_products_id = (int)$HTTP_GET_VARS['products_id'];
-  
-  
-  $wishlist_query_raw = "select tab2.products_id, tab1.products_name from " . TABLE_WISHLIST . " as tab2, " . TABLE_PRODUCTS_DESCRIPTION . " as tab1 WHERE tab2.customers_id='" . (int)$customer_id . "' and tab1.products_id = tab2.products_id and tab1.language_id = '" . (int)$languages_id . "' order by products_name";
-  $wishlist_query = tep_db_query($wishlist_query_raw);
-while ($resultarray=mysql_fetch_row($wishlist_query)) {
-$wishliststring .=" "."<a href=\"".HTTP_SERVER . DIR_WS_CATALOG ."product_info.php?products_id=".$resultarray[0] ."\">".$resultarray[1]."</a><br>"."";
-//$wishliststring .= $resultarray[1]."\n" . HTTP_SERVER . DIR_WS_CATALOG ."product_info.php?products_id=".$resultarray[0] . "\n\n";
-}
-
-
-  if (!tep_session_is_registered('customer_id') && (ALLOW_GUEST_TO_TELL_A_FRIEND == 'false')) {
-    $navigation->set_snapshot();
-    tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
-  } elseif (tep_session_is_registered('customer_id')) {
-    $account_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
-    $account = tep_db_fetch_array($account_query);
-    $from_name = $account['customers_firstname'] . ' ' . $account['customers_lastname'];
-    $from_email_address = $account['customers_email_address'];
-  }
-
-$product_info_query = tep_db_query("select pd.products_name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_status = '1' and p.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
-    if (tep_db_num_rows($product_info_query)) {
-      $valid_product = "true";
-      $product_info = tep_db_fetch_array($product_info_query);
-    } else{
-     $valid_product = "false";
-//  tep_redirect(tep_href_link(FILENAME_WISHLIST));
-   }
-
-//VISUAL VERIFY CODE start  
-  $vccCheckOk="True"; 
-    $code_query = tep_db_query("select code from visual_verify_code where oscsid = '" . tep_session_id($HTTP_GET_VARS[tep_session_name()]) . "'");
-    $code_array = tep_db_fetch_array($code_query);
-    $code = $code_array['code'];
-
-    tep_db_query("DELETE FROM " . TABLE_VISUAL_VERIFY_CODE . " WHERE oscsid='" . tep_session_id($HTTP_GET_VARS[tep_session_name()]) . "'"); //remove the visual verify code associated with this session to clean database and ensure new results
-
-    $user_entered_code = $HTTP_POST_VARS['visual_verify_code'];
-    if (!(strcasecmp($user_entered_code, $code) == 0)) {    //make the check case insensitive
-        $error = true;
-        
-    if(($HTTP_GET_VARS['action'] == 'process'))
-    {
-      $messageStack->add('friend', VISUAL_VERIFY_CODE_ENTRY_ERROR);
-    }
-    
-    $vccCheckOk="False";    
-    }
-    
- 
-if (isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] == 'process') && $vccCheckOk=="True") 
-  {   
-    $error = "false";
-    $_POST['to_email_address'] = preg_replace( "/\n/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\n/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = preg_replace( "/\r/", " ", $_POST['to_email_address'] );
-    $_POST['to_name'] = preg_replace( "/\r/", " ", $_POST['to_name'] );
-    $_POST['to_email_address'] = str_replace("Content-Type:","",$_POST['to_email_address']);
-    $_POST['to_name'] = str_replace("Content-Type:","",$_POST['to_name']);
-    
-    $to_email_address = tep_db_prepare_input($HTTP_POST_VARS['to_email_address']);
-    $to_name = tep_db_prepare_input($HTTP_POST_VARS['to_name']);
-    $from_email_address = tep_db_prepare_input($HTTP_POST_VARS['from_email_address']);
-    $from_name = tep_db_prepare_input($HTTP_POST_VARS['from_name']);
-    $message = tep_db_prepare_input($HTTP_POST_VARS['message']);
-    
-       if (empty($from_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_NAME);
-        }
-
-        if (!tep_validate_email($from_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_FROM_ADDRESS);
-        }
-    
-        if (empty($to_name)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_NAME);
-        }
-    
-        if (!tep_validate_email($to_email_address)) {
-          $error = "true";
-          $messageStack->add('friend', ERROR_TO_ADDRESS);
-        }
-
-  $email_subject = sprintf(TEXT_EMAIL_SUBJECT, $from_name, STORE_NAME);
-  $email_body = sprintf(TEXT_EMAIL_INTRO, $to_name, $from_name, STORE_NAME) . "\n\n";
-      if (tep_not_null($message)) {
-         $email_body .= $message . "\n\n";
-        }
-     if (WISH_EMAIL_USE_HTML == "false") {
-            $email_body .= TEXT_EMAIL_LINK_TEXT . FORM_FIELD_TEXT_AREA ;
-            $email_body .= $wishliststring ;
-      $email_body .= TEXT_EMAIL_SIGNATURE . STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
- 
-    }else{ 
-            $email_body .= TEXT_EMAIL_LINK . FORM_FIELD_TEXT_AREA;
-            $email_body .= $wishliststring ;
-      $email_body .= TEXT_EMAIL_SIGNATURE. STORE_NAME . "\n" . '<a href="' . HTTP_SERVER  . DIR_WS_CATALOG .'">' .  HTTP_SERVER  . DIR_WS_CATALOG . '</a>';
-      
-                }
-                
-         $mimemessage = new email(array('X-Mailer: osCommerce bulk mailer'));
-  
- 
-          if (WISH_EMAIL_USE_HTML == "false") {
-              $mimemessage->add_text($email_body);
-           } else {
-              $mimemessage->add_html($email_body);
-           }                
-  
-            $mimemessage->build_message();
-            $mimemessage->send($to_name, $to_email_address, $from_name, $from_email_address, $email_subject);
-
-      $messageStack->add_session('header', sprintf(TEXT_EMAIL_SUCCESSFUL_SENT, $product_info['products_name'], tep_output_string_protected($to_name)), 'success');
-     tep_redirect(tep_href_link(FILENAME_WISHLIST));
-
-}         
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_WISHLIST_SEND, '', 'NONSSL'));
-
-$content = CONTENT_WISHLIST_SEND;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/wishlist_help.php
===================================================================
--- trunk/direct.openmoko.com/wishlist_help.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/wishlist_help.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,25 +0,0 @@
-<?php
-/*
-  $Id: wishlist_help.php,v 1.1.1.1 2004/03/04 23:38:03 ccwjr Exp $
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_WISHLIST_HELP);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_WISHLIST_HELP, '', 'NONSSL'));
-
-  $content = CONTENT_WISHLIST_HELP;
-  $content_template = TEMPLATENAME_STATIC;
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>

Deleted: trunk/direct.openmoko.com/wpcallback.php
===================================================================
--- trunk/direct.openmoko.com/wpcallback.php	2007-07-04 14:37:46 UTC (rev 69)
+++ trunk/direct.openmoko.com/wpcallback.php	2007-07-04 14:48:57 UTC (rev 70)
@@ -1,42 +0,0 @@
-<?php
-/*
-  $Id: wpcallback.php,v MS1a 2003/04/06 21:30
-  Author :  Graeme Conkie (graeme at conkie.net)
-  Title: WorldPay Payment Callback Module V4.0 Version 1.4
-
-  Revisions:
-  
-    Version 1.8 - cleaned up coding errors in wpcallback.php
-                - reduced "refresh" to 2 seconds (less chance of callback failing)
-                
-            Gary Burton - www.oscbooks.com
-            
-  Version MS1a Cleaned up code, moved static English to language file to allow for bi-lingual use,
-          Now posting language code to WP, Redirect on failure now to Checkout Payment,
-      Reduced re-direct time to 8 seconds, added MD5, made callback dynamic 
-      NOTE: YOU MUST CHANGE THE CALLBACK URL IN WP ADMIN TO <wpdisplay item="MC_callback">
-  Version 1.4 Removes boxes to prevent users from clicking away before update, 
-      Fixes currency for Yen, 
-      Redirects to Checkout_Process after 10 seconds or click by user
-  Version 1.3 Fixes problem with Multi Currency
-  Version 1.2 Added Sort Order and Default order status to work with snapshots after 14 Jan 2003
-  Version 1.1 Added Worldpay Pre-Authorisation ability
-  Version 1.0 Initial Payment Module
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003
-  Released under the GNU General Public License
-*/
-
-  require('includes/application_top.php');
-
-  require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_WPCALLBACK);
-
-  $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_WPCALLBACK, '', 'NONSSL'));
-  $content = 'wpcallback';
-
-  require(DIR_WS_TEMPLATES . TEMPLATE_NAME . '/' . TEMPLATENAME_MAIN_PAGE);
-  require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>





More information about the webdesign-commitlog mailing list