Permalink
Browse files

Merge branch 'master' of git://github.com/osCommerce/oscommerce

Revert all previous modifications, admin translations and more...
Conflicts:
	osCommerce/OM/Core/Site/Admin/Application/Administrators/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/Configuration/pages/entries.php
	osCommerce/OM/Core/Site/Admin/Application/Configuration/pages/entries_edit.php
	osCommerce/OM/Core/Site/Admin/Application/Configuration/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/Countries/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/Countries/pages/zones.php
	osCommerce/OM/Core/Site/Admin/Application/CreditCards/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/Currencies/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/ErrorLog/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions.php
	osCommerce/OM/Core/Site/Admin/Application/Languages/pages/groups.php
	osCommerce/OM/Core/Site/Admin/Application/Languages/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/PaymentModules/pages/install.php
	osCommerce/OM/Core/Site/Admin/Application/PaymentModules/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/ServerInfo/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/entries.php
	osCommerce/OM/Core/Site/Admin/Application/TaxClasses/pages/main.php
	osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries.php
	osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/main.php
	osCommerce/OM/Core/Site/Shop/Application/Products/Controller.php
	osCommerce/OM/Core/Site/Shop/Application/Products/pages/main.php
	osCommerce/OM/Core/Site/Shop/Application/Products/pages/product_listing.php
	osCommerce/OM/Core/Site/Shop/Application/Search/Controller.php
	osCommerce/OM/Core/Site/Shop/Product.php
	osCommerce/OM/Core/Site/Shop/Products.php
	osCommerce/OM/Core/Site/Shop/Search.php
	public/sites/Shop/javascript/products/info.js
	public/sites/Shop/templates/oscom/stylesheets/general.css

Signed-off-by: Gergely <t-gely@freemail.hu>
  • Loading branch information...
2 parents 1660b8f + 50f2d5e commit f5cc475f76e750b94525821059dc0263ba8f2c8e @tgely committed Apr 1, 2011
Showing 1,741 changed files with 12,492 additions and 68,241 deletions.
View
@@ -1,9 +1,7 @@
-# osCommerce Online Merchant $osCommerce-SIG$
-# Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+# osCommerce Online Merchant
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License v2 (1991)
-# as published by the Free Software Foundation.
+# @copyright Copyright (c) 2011 osCommerce; http://www.oscommerce.com
+# @license BSD License; http://www.oscommerce.com/bsdlicense.txt
# This is used with Apache web servers. For this to work, you must include the
# parameter 'Options' to the AllowOverride configuration.
View
54 README
@@ -0,0 +1,54 @@
+osCommerce Online Merchant
+
+(c) Copyright 2011 osCommerce; http://www.oscommerce.com
+BSD License; http://www.oscommerce.com/bsdlicense.txt
+
+Welcome to osCommerce Online Merchant!
+
+We are ready to share our new foundation with you and are excited to disrupt the
+developer community with our future goals. The Countdown website used to promote
+v3.0 will remain online to keep the community informed of our actual plans and
+roadmap. The Countdown website can be reached at:
+
+http://countdown.oscommerce.com
+
+The v3.0 release focused primarily on freezing the new framework API to start
+building onto with the community. v3.0 does not contain a full user feature set
+to be able to run an online store on. Now that the framework is frozen, the
+missing features will be worked on and pushed through the new CoreUpdate
+delivery mechanism that can easily upgrade running installations.
+
+If you are interested in helping out, please don't forget to review our
+Contributor License Agreement at:
+
+http://countdown.oscommerce.com/index.php?Developers&CLA
+
+The Community Forum can be reached at:
+
+http://forums.oscommerce.com
+
+We look forward to working with you in improving and extending osCommerce
+Online Merchant!
+
+To install osCommerce Online Merchant v3.0, copy the contents of the release
+package to your public html directory. The "osCommerce" directory can be added
+to the PHP include directory and be moved outside of the public html directory.
+
+The Setup Site will first load to setup and configure a new installation. Once
+installed and configured, the Shop and Admin Sites can be reached with:
+
+http://demo.oscommerce.com/index.php (for Shop)
+http://demo.oscommerce.com/index.php?Admin (for Admin)
+
+Please note that the Setup Site is still reachable and should be deleted. This
+can be performed by deleting the following directory:
+
+osCommerce/OM/Core/Site/Setup
+
+For customizations, please copy the file with the same directory structure to
+the custom namespace located at:
+
+osCommerce/OM/Custom
+
+The Custom directory can mimick the Core directory to override core files with
+customizations.
View
@@ -1,116 +0,0 @@
-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2005 osCommerce
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License v2 (1991)
- as published by the Free Software Foundation.
-*/
-
- $_SERVER['SCRIPT_FILENAME'] = __FILE__;
-
- include('includes/application_top.php');
-
- if ($osC_Customer->isLoggedOn() == false) die;
-
-// Check download.php was called with proper GET parameters
- if ((isset($_GET['order']) && !is_numeric($_GET['order'])) || (isset($_GET['id']) && !is_numeric($_GET['id'])) ) {
- die;
- }
-
-// Check that order_id, customer id and filename match
- $Qdownloads = $osC_Database->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 = :customers_id and o.orders_id = :orders_id and o.orders_id = op.orders_id and op.orders_products_id = opd.orders_products_id and opd.orders_products_download_id = :orders_products_download_id and opd.orders_products_filename != ""');
- $Qdownloads->bindTable(':table_orders', TABLE_ORDERS);
- $Qdownloads->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS);
- $Qdownloads->bindTable(':table_orders_products_download', TABLE_ORDERS_PRODUCTS_DOWNLOAD);
- $Qdownloads->bindInt(':customers_id', $osC_Customer->getID());
- $Qdownloads->bindInt(':orders_id', $_GET['order']);
- $Qdownloads->bindInt(':orders_products_download_id', $_GET['id']);
- $Qdownloads->execute();
-
- if ($Qdownloads->numberOfRows() < 1) {
- die();
- }
-
-// MySQL 3.22 does not have INTERVAL
- list($dt_year, $dt_month, $dt_day) = explode('-', $Qdownloads->value('date_purchased_day'));
- $download_timestamp = mktime(23, 59, 59, $dt_month, $dt_day + $Qdownloads->value('download_maxdays'), $dt_year);
-
-// Die if time expired (maxdays = 0 means no time limit)
- if (($Qdownloads->value('download_maxdays') != 0) && ($download_timestamp <= time())) die;
-// Die if remaining count is <=0
- if ($Qdownloads->value('download_count') <= 0) die;
-// Die if file is not there
- if (!file_exists(DIR_FS_DOWNLOAD . $Qdownloads->value('orders_products_filename'))) die;
-
-// Now decrement counter
- $Qupdate = $osC_Database->query('update :table_orders_products_download set download_count = download_count-1 where orders_products_download_id = :orders_products_download_id');
- $Qupdate->bindTable(':table_orders_products_download', TABLE_ORDERS_PRODUCTS_DOWNLOAD);
- $Qupdate->bindInt(':orders_products_download_id', $_GET['id']);
- $Qupdate->execute();
-
-// 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 osc_random_name() {
- $letters = 'abcdefghijklmnopqrstuvwxyz';
- $dirname = '.';
- $length = floor(osc_rand(16,20));
-
- for ($i = 1; $i <= $length; $i++) {
- $q = floor(osc_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 osc_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=" . $Qdownloads->value('orders_products_filename'));
-
- if (DOWNLOAD_BY_REDIRECT == '1') {
-// This will work only on Unix/Linux hosts
- osc_unlink_temp_dir(DIR_FS_DOWNLOAD_PUBLIC);
- $tempdir = osc_random_name();
- umask(0000);
- mkdir(DIR_FS_DOWNLOAD_PUBLIC . $tempdir, 0777);
- symlink(DIR_FS_DOWNLOAD . $Qdownloads->value('orders_products_filename'), DIR_FS_DOWNLOAD_PUBLIC . $tempdir . '/' . $Qdownloads->value('orders_products_filename'));
- osc_redirect(DIR_WS_DOWNLOAD_PUBLIC . $tempdir . '/' . $Qdownloads->value('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 . $Qdownloads->value('orders_products_filename'));
- }
-?>
View
@@ -1,5 +0,0 @@
-AuthType Basic
-AuthName "No access"
-AuthUserFile .htnopasswd
-AuthGroupFile /dev/null
-Require valid-user
View
Binary file not shown.
View
@@ -1,91 +0,0 @@
-<?php
-/*
-** PHP implementation of the Secure Hash Algorithm, SHA-1, as defined
-** in FIPS PUB 180-1
-*
-** Version 1.1
-** Copyright 2002 - 2003 Marcus Campbell
-** http://www.tecknik.net/sha-1/
-*
-** This code is available under the GNU Lesser General Public License:
-** http://www.gnu.org/licenses/lgpl.txt
-*
-** Based on the JavaScript implementation by Paul Johnston
-** http://pajhome.org.uk/
-*/
-function str2blks_SHA1($str) {
- $nblk = ((strlen($str) + 8) >> 6) + 1;
- for($i=0; $i < $nblk * 16; $i++) $blks[$i] = 0;
- for($i=0; $i < strlen($str); $i++) {
- $blks[$i >> 2] |= ord(substr($str, $i, 1)) << (24 - ($i % 4) * 8);
- }
- $blks[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
- $blks[$nblk * 16 - 1] = strlen($str) * 8;
- return $blks;
-}
-function safe_add($x, $y) {
- $lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
- $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
- return ($msw << 16) | ($lsw & 0xFFFF);
-}
-function rol($num, $cnt) {
- return ($num << $cnt) | zeroFill($num, 32 - $cnt);
-}
-function zeroFill($a, $b) {
- $bin = decbin($a);
- if (strlen($bin) < $b) $bin = 0;
- else $bin = substr($bin, 0, strlen($bin) - $b);
- for ($i=0; $i < $b; $i++) {
- $bin = "0".$bin;
- }
- return bindec($bin);
-}
-function ft($t, $b, $c, $d) {
- if($t < 20) return ($b & $c) | ((~$b) & $d);
- if($t < 40) return $b ^ $c ^ $d;
- if($t < 60) return ($b & $c) | ($b & $d) | ($c & $d);
- return $b ^ $c ^ $d;
-}
-function kt($t) {
- if ($t < 20) {
- return 1518500249;
- } else if ($t < 40) {
- return 1859775393;
- } else if ($t < 60) {
- return -1894007588;
- } else {
- return -899497514;
- }
-}
-function calc_sha1($str) {
- $x = str2blks_SHA1($str);
- $a = 1732584193;
- $b = -271733879;
- $c = -1732584194;
- $d = 271733878;
- $e = -1009589776;
- for($i = 0; $i < sizeof($x); $i += 16) {
- $olda = $a;
- $oldb = $b;
- $oldc = $c;
- $oldd = $d;
- $olde = $e;
- for($j = 0; $j < 80; $j++) {
- if($j < 16) $w[$j] = $x[$i + $j];
- else $w[$j] = rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
- $t = safe_add(safe_add(rol($a, 5), ft($j, $b, $c, $d)), safe_add(safe_add($e, $w[$j]), kt($j)));
- $e = $d;
- $d = $c;
- $c = rol($b, 30);
- $b = $a;
- $a = $t;
- }
- $a = safe_add($a, $olda);
- $b = safe_add($b, $oldb);
- $c = safe_add($c, $oldc);
- $d = safe_add($d, $oldd);
- $e = safe_add($e, $olde);
- }
- return sprintf("%08s%08s%08s%08s%08s", dechex($a), dechex($b), dechex($c), dechex($d), dechex($e));
-}
-?>
Oops, something went wrong.

0 comments on commit f5cc475

Please sign in to comment.