FishEye: history osCommerce/branches/frank/Alpha4_TinyMCE/includes/classes/database.php

latest revision trunk

1498 annotated / raw | Diffs: previous, other | Lines: 793 ( +3, -1 )

Created: 2007-03-29 16:04:50 +0200 (2 years 7 months ago) | Author: hpdl | Changeset: 1498

Copied (2 times):

update version number to 3.0 Alpha 4
update copyright notice / license notice

merge from hpdl r1497

Tags: oscommerce-3.0a4

Properties

svn:eol-style = native
svn:keywords = Id

1385 annotated / raw | Diffs: previous, other | Lines: 791 ( +99, -33 )

Created: 2007-03-06 09:55:55 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1385

merge from hpdl r1299, r1384

extend batch page links functionality

Properties

svn:eol-style = native
svn:keywords = Id

1372 annotated / raw | Diffs: previous, other | Lines: 725 ( +82, -5 )

Created: 2007-03-05 23:58:51 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1372

merge from hpdl r1290-r1291, r1293

introduce the administrators log class to log database changes performed from the administration tool
introduce the new Administrators Log section on the Administration Tool to displayed the logged actions

Properties

svn:eol-style = native
svn:keywords = Id

1319 annotated / raw | Diffs: previous, other | Lines: 648 ( +1, -11 )

Created: 2007-03-05 21:43:07 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1319

merge from hpdl r1117-r1120

mysql_fetch_assoc() exists from PHP 4.0.3
mysql_escape_string() exists as from PHP 4.0.3 so use that as the default value instead of addslashes()
move the string parsing logic to its own class method
use call_user_func() to call the defined function
pass the string value to the parseString() method

Properties

svn:eol-style = native
svn:keywords = Id

1076 annotated / raw | Diffs: previous, other | Lines: 658 ( +8, -6 )

Created: 2006-10-25 17:37:50 +0200 (3 years ago) | Author: hpdl | Changeset: 1076

Copied (3 times):

merge from hpdl r1016, r1025 - r1027; modularize the administration tool pages

Branch point for: modom weisser

Properties

svn:eol-style = native
svn:keywords = Id

1037 annotated / raw | Diffs: previous, other | Lines: 656 ( +2, -6 )

Created: 2006-10-22 11:16:01 +0200 (3 years 1 month ago) | Author: hpdl | Changeset: 1037

simplify logic - addresses #129

Properties

svn:eol-style = native
svn:keywords = Id

784 annotated / raw | Diffs: previous, other | Lines: 660 ( +3, -3 )

Created: 2006-08-24 00:09:09 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 784

merge from hpdl r783
partly fix #44

replace calls to PHP_SELF with SCRIPT_FILENAME

Branch point for: tag:oscommerce-3.0a3

Properties

svn:eol-style = native
svn:keywords = Id

757 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-08-23 14:22:54 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 757

merge from hpdl r725, r728, r729, r732, r733, r734
- standardize general.php functions
- new osC_Address class for adadress related functions (incl. address format string being moved to the countries database table)

Properties

svn:eol-style = native
svn:keywords = Id

754 annotated / raw | Diffs: previous, other | Lines: 660 ( +6, -8 )

Created: 2006-08-23 13:56:56 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 754

merge from hpdl r685 to r688
- css/xhtml updates
- standardize html_output.php functions
- convert & to & in the href_link function

Properties

svn:eol-style = native
svn:keywords = Id

658 annotated / raw | Diffs: previous, other | Lines: 662 ( +2, -0 )

Created: 2006-07-27 15:31:21 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 658

initialize a variable as the last query was not imported if comments followed afterwards

fix #58

Branch point for: frank garrone

Properties

svn:eol-style = native
svn:keywords = Id

648 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-07-19 14:00:35 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 648

merge hpdl r647

remove the tep_draw_form() function

fix #52

Properties

svn:eol-style = native
svn:keywords = Id

448 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-02-21 07:27:28 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 448

merge from hpdl -r443

- fixes from 2.2MS2 update package
- remove John Doe from new installations
- add the possibility to define special product prices by gross value (incl. tax)

Tags: oscommerce-3.0a2

Properties

svn:eol-style = native
svn:keywords = Id

410 annotated / raw | Diffs: previous, other | Lines: 660 ( +8, -6 )

Created: 2006-01-26 10:17:09 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 410

merge from hpdl -r 383:head ; mainly related to the new XML based languages implementation

Properties

svn:eol-style = native
svn:keywords = Id

368 annotated / raw | Diffs: previous, other | Lines: 658 ( +69, -20 )

Created: 2005-12-22 17:27:23 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 368

merge from hpdl -r152 (having problems merging the includes/content directory and hope to get that fixed in the next commit)

Tags: oscommerce-3.0a1

Properties

svn:eol-style = native
svn:keywords = Id

151 annotated / raw | Diffs: previous, other | Lines: 609 ( +0, -0 )

Created: 2005-08-02 16:33:25 +0200 (4 years 3 months ago) | Author: mattice | Changeset: 151

Update linefeeds

Properties

svn:eol-style = native
svn:keywords = Id

108 annotated / raw | Diffs: previous, other | Lines: 609 ( +3, -3 )

Created: 2005-03-29 19:53:36 +0200 (4 years 7 months ago) | Author: hpdl | Changeset: 108

merged from hpdl branch changes 43:107 into the trunk

Properties

svn:keywords = Id

15 annotated / raw | Diffs: previous, other | Lines: 609 ( +5, -7 )

Created: 2005-02-24 02:44:20 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 15

register_globals fix

Branch point for: hpdl

Properties

svn:keywords = Id

5 annotated / raw | Diffs: previous, other | Lines: 611 ( +0, -0 )

Created: 2005-01-31 02:40:15 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 5

Added svn:keywords Id property

Properties

svn:keywords = Id

1 new annotated / raw | Lines: 611 ( +611, -0 )

Created: 2005-01-31 01:06:19 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 1

Initial import

latest revision Branch apamdal

1265 new/moved annotated / raw | Diffs: previous, other | Lines: 658 ( +658, -0 )

Created: 2007-02-26 23:27:15 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1265

Moved from: branches/oscommerce/includes/classes/database.php 1263

move the oscommerce directory into Anders' branch

Properties

svn:eol-style = native
svn:keywords = Id

1262 new/copied annotated / raw | Diffs: previous, other | Lines: 658 ( +658, -0 )

Created: 2007-02-26 23:22:37 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1262

Copied from: trunk/oscommerce/includes/classes/database.php 1076

create a branch for Anders Pamdal (Tech2000)

Branch point for: oscommerce

Properties

svn:eol-style = native
svn:keywords = Id

latest revision Branch frank

1503 new/copied annotated / raw | Diffs: previous, other | Lines: 793 ( +793, -0 )

Created: 2007-03-29 22:30:22 +0200 (2 years 7 months ago) | Author: frank | Changeset: 1503

Copied from: trunk/oscommerce/includes/classes/database.php 1498

Copy of current trunk

Properties

svn:eol-style = native
svn:keywords = Id

1093 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-10-30 23:49:36 +0100 (3 years ago) | Author: frank | Changeset: 1093

osCommerce V3.0 Alpha 3 modified to be W3C CSS/XHTML valid. Update.
Remarks:
- Pop-up image mod isn't working on MAC. Need to be sorted out later
- templates/head folder has been added. Need to be discussed.
- Warning/error box on the bottom of the catalog has been moved into the template instead of the application_bottom.php, else the code will be added outside the body tag (which isn't allowed) this should be placed back later. The changes are tested on a Windows machine with Opera 9.01, Firefox 1.5 and Internet Explorer 6.0. If there are problems with viewing this version in other (or these) browsers please notify me (please add a screenshot)!

Properties

svn:eol-style = native
svn:keywords = Id

994 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-10-04 23:54:15 +0200 (3 years 1 month ago) | Author: frank | Changeset: 994

osCommerce V3.0 Alpha 3 modified to be W3C CSS/XHTML valid.
Remarks:
- Pop-up image mod isn't working on MAC. Need to be sorted out later
- templates/head folder has been added. Need to be discussed.
- In admin products is one problem left:
<form name="product" method="post" enctype="multipart/form-data">
This line (in products.php) misses an action.
- Warning/error box on the bottom of the catalog has been moved into the template instead of the application_bottom.php, else the code will be added outside the body tag (which isn't allowed) this should be placed back later.

The changes are tested on a Windows machine with Opera 9.01, Firefox 1.5 and Internet Explorer 6.0. If there are problems with viewing this version in other (or these) browsers please notify me (please add a screenshot)!

Properties

svn:eol-style = native
svn:keywords = Id

979 annotated / raw | Diffs: previous, other | Lines: 660 ( +7, -9 )

Created: 2006-09-02 13:38:58 +0200 (3 years 2 months ago) | Author: frank | Changeset: 979

merge from r977

Properties

svn:eol-style = native
svn:keywords = Id

678 new annotated / raw | Diffs: previous, other | Lines: 662 ( +0, -0 )

Created: 2006-08-10 23:31:42 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 678

copy trunk to franks branch

Properties

svn:eol-style = native
svn:keywords = Id

latest revision Branch garrone

700 new annotated / raw | Diffs: previous, other | Lines: 662 ( +0, -0 )

Created: 2006-08-16 11:10:05 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 700

taken from /trunk/oscommerce

Properties

svn:eol-style = native
svn:keywords = Id

latest revision Branch hpdl

1497 annotated / raw | Diffs: previous, other | Lines: 793 ( +3, -1 )

Created: 2007-03-29 15:40:05 +0200 (2 years 7 months ago) | Author: hpdl | Changeset: 1497

update version number to 3.0 Alpha 4
update copyright notice / license notice

Properties

svn:eol-style = native
svn:keywords = Id

1384 annotated / raw | Diffs: previous, other | Lines: 791 ( +98, -44 )

Created: 2007-03-06 09:52:49 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1384

extend batch page links functionality

Properties

svn:eol-style = native
svn:keywords = Id

1299 annotated / raw | Diffs: previous, other | Lines: 737 ( +16, -4 )

Created: 2007-03-02 02:45:18 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1299

ugly way to define separate previous/next page links for the administration tool and catalog

Properties

svn:eol-style = native
svn:keywords = Id

1293 annotated / raw | Diffs: previous, other | Lines: 725 ( +3, -3 )

Created: 2007-03-02 01:07:08 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1293

logging: automatically determine if the sql queries are wrapped in a transaction

Properties

svn:eol-style = native
svn:keywords = Id

1290 annotated / raw | Diffs: previous, other | Lines: 725 ( +82, -5 )

Created: 2007-03-01 20:36:08 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1290

introduce an administrators log class to log actions performed at the administration tool

Properties

svn:eol-style = native
svn:keywords = Id

1118 annotated / raw | Diffs: previous, other | Lines: 648 ( +1, -11 )

Created: 2006-11-09 16:49:00 +0100 (3 years ago) | Author: hpdl | Changeset: 1118

mysql_escape_string() exists as from PHP 4.0.3 so use that as the default value instead of addslashes()
move the string parsing logic to its own class method

Properties

svn:eol-style = native
svn:keywords = Id

1036 annotated / raw | Diffs: previous, other | Lines: 658 ( +2, -6 )

Created: 2006-10-22 11:15:09 +0200 (3 years 1 month ago) | Author: hpdl | Changeset: 1036

simplify logic

Properties

svn:eol-style = native
svn:keywords = Id

1026 annotated / raw | Diffs: previous, other | Lines: 662 ( +8, -6 )

Created: 2006-10-20 02:53:11 +0200 (3 years 1 month ago) | Author: hpdl | Changeset: 1026

logic update

this commit includes changes to osc_href_link() which the administration tool was also going to use - it is not yet known if this change will be kept or not

Properties

svn:eol-style = native
svn:keywords = Id

783 annotated / raw | Diffs: previous, other | Lines: 660 ( +3, -3 )

Created: 2006-08-24 00:06:44 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 783

replace calls to PHP_SELF with SCRIPT_FILENAME

Properties

svn:eol-style = native
svn:keywords = Id

725 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-08-18 14:51:04 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 725

standardize some general functions

Properties

svn:eol-style = native
svn:keywords = Id

686 annotated / raw | Diffs: previous, other | Lines: 660 ( +3, -3 )

Created: 2006-08-15 00:33:22 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 686

finalize standardization of the html_output functions

Properties

svn:eol-style = native
svn:keywords = Id

685 annotated / raw | Diffs: previous, other | Lines: 660 ( +3, -5 )

Created: 2006-08-14 19:17:56 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 685

css/xhtml updates
standardize html_output functions
convert & to & in the href_link function

Properties

svn:eol-style = native
svn:keywords = Id

660 annotated / raw | Diffs: previous, other | Lines: 662 ( +2, -0 )

Created: 2006-07-27 15:48:44 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 660

merge trunk r658

initialize a variable as the last query was not imported if comments followed afterwards

Properties

svn:eol-style = native
svn:keywords = Id

647 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-07-19 13:54:48 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 647

remove the tep_draw_form() function

Properties

svn:eol-style = native
svn:keywords = Id

444 annotated / raw | Diffs: previous, other | Lines: 660 ( +1, -1 )

Created: 2006-02-20 13:55:57 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 444

fixes from the MS2 update package

Properties

svn:eol-style = native
svn:keywords = Id

387 annotated / raw | Diffs: previous, other | Lines: 660 ( +8, -6 )

Created: 2006-01-18 17:49:58 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 387

the start of moving the language definitions over to xml files which can easily be imported into the database

currently only for the english language and currently stores a cached version of the definitions from the xml file instead of retrieving the values from the database

new xml class to take care of xml files

Properties

svn:eol-style = native
svn:keywords = Id

322 annotated / raw | Diffs: previous, other | Lines: 658 ( +2, -2 )

Created: 2005-12-05 01:40:05 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 322

move the template instantiating logic to the template class

Properties

svn:eol-style = native
svn:keywords = Id

298 annotated / raw | Diffs: previous, other | Lines: 658 ( +3, -5 )

Created: 2005-11-30 19:11:48 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 298

logic updates, reduce number of queries, show number of search results in output

Properties

svn:eol-style = native
svn:keywords = Id

284 annotated / raw | Diffs: previous, other | Lines: 660 ( +2, -1 )

Created: 2005-11-28 17:52:42 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 284

fix return by reference problem

Properties

svn:eol-style = native
svn:keywords = Id

280 annotated / raw | Diffs: previous, other | Lines: 659 ( +13, -7 )

Created: 2005-11-24 20:31:08 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 280

update the sql error query logic

don't use , as the RPC response separate as the javascript split(string, 2) function returns only a maximum of two elements, instead of the second element being the remaining string; it is now using :osCRPC: as the response separator

Properties

svn:eol-style = native
svn:keywords = Id

246 annotated / raw | Diffs: previous, other | Lines: 653 ( +1, -3 )

Created: 2005-11-14 16:06:41 +0100 (4 years ago) | Author: hpdl | Changeset: 246

add products_keyword and products_tags to the products description table, and move products_model from the products table to it

use the products_keyword value to link to products

administration tool updates still pending

there is a small problem when changing languages on a product information page with the product_keyword being different - will be fixed!

Properties

svn:eol-style = native
svn:keywords = Id

241 annotated / raw | Diffs: previous, other | Lines: 655 ( +3, -3 )

Created: 2005-11-13 23:56:32 +0100 (4 years ago) | Author: hpdl | Changeset: 241

sync from xtrian-ms3's branch

Properties

svn:eol-style = native
svn:keywords = Id

235 annotated / raw | Diffs: previous, other | Lines: 655 ( +1, -1 )

Created: 2005-11-13 14:39:16 +0100 (4 years ago) | Author: hpdl | Changeset: 235

merge from xtrian-ms3

Properties

svn:eol-style = native
svn:keywords = Id

234 annotated / raw | Diffs: previous, other | Lines: 655 ( +8, -4 )

Created: 2005-11-12 18:46:31 +0100 (4 years ago) | Author: hpdl | Changeset: 234

show the query in the message stack class next to the error message

Properties

svn:eol-style = native
svn:keywords = Id

220 annotated / raw | Diffs: previous, other | Lines: 651 ( +39, -0 )

Created: 2005-10-09 03:36:01 +0200 (4 years 1 month ago) | Author: hpdl | Changeset: 220

add mysql fulltext support for searching; disabled by default

this commit removes the products_model field from the search criteria as it does not exist in the products_description table and cannot be used in the fulltext search routine (not possible with multiple tables)

Properties

svn:eol-style = native
svn:keywords = Id

219 annotated / raw | Diffs: previous, other | Lines: 612 ( +7, -0 )

Created: 2005-10-09 01:50:15 +0200 (4 years 1 month ago) | Author: hpdl | Changeset: 219

introduce new search classes; one to get a listing of products (classes/products.php) and a more enhanced version (classes/search.php) which extends on the products class to fine tune the listing further (price, date, ..)

Properties

svn:eol-style = native
svn:keywords = Id

196 annotated / raw | Diffs: previous, other | Lines: 605 ( +0, -4 )

Created: 2005-09-16 14:59:17 +0200 (4 years 2 months ago) | Author: hpdl | Changeset: 196

remove PHP < 4.1 compatibliity logic

Properties

svn:eol-style = native
svn:keywords = Id

153 annotated / raw | Diffs: previous, other | Lines: 609 ( +0, -0 )

Created: 2005-08-04 14:57:59 +0200 (4 years 3 months ago) | Author: hpdl | Changeset: 153

merge from trunk r149

Properties

svn:eol-style = native
svn:keywords = Id

56 annotated / raw | Diffs: previous, other | Lines: 609 ( +1, -1 )

Created: 2005-03-09 06:33:00 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 56

set default values

Properties

svn:keywords = Id

55 annotated / raw | Diffs: previous, other | Lines: 609 ( +2, -2 )

Created: 2005-03-09 06:31:57 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 55

set the default batch number value to 1

Properties

svn:keywords = Id

43 new annotated / raw | Diffs: previous, other | Lines: 609 ( +0, -0 )

Created: 2005-03-08 21:54:59 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 43

creating private branch

Properties

svn:keywords = Id

FishEye

Line History

View Mode

Show Arbitrary Diff

History

latest revision trunk

latest revision Branch apamdal

latest revision Branch frank

latest revision Branch garrone

latest revision Branch hpdl

latest revision Branch modom

latest revision Branch oscommerce

latest revision Branch tag:oscommerce-3.0a3

latest revision Branch weisser