leon 01/08/23 14:58:56
Modified: freetrade2/modules/configuration global
freetrade2/modules/database/mysql item
freetrade2/modules/language english
freetrade2/modules/navigation page_top
freetrade2/modules/screen department item item_details
welcome
freetrade2/modules/utility standard_library
Added: freetrade2/install/mysql sampledb.sql
Log:
bug fixes
Revision Changes Path
1.1 freetrade/freetrade2/install/mysql/sampledb.sql
Index: sampledb.sql
===================================================================
INSERT INTO department VALUES (5,'Green Things','default_dept100.jpg',0,'If you have
chicken kievs, constitute nine cities. They watch gumby. Never carpet fleas unless you
can\'t deface. Remember that doshious wasn\'t fickle! They go with another five
chemicals and mome raths and your zero leprechauns. Sneeze -guard isn\'t against
lackadaisical king conformist. The less one more polluted cyst and a aura\'s
squeezably soft moses over sweetener against another zero office supplies put up
little miss scintillating crouton, the more they fingernail unintentionally.',0);
INSERT INTO department VALUES (4,'Blue Things','default_dept100.jpg',0,'If you have
chicken kievs, constitute nine cities. They watch gumby. Never carpet fleas unless you
can\'t deface. Remember that doshious wasn\'t fickle! They go with another five
chemicals and mome raths and your zero leprechauns. Sneeze -guard isn\'t against
lackadaisical king conformist. The less one more polluted cyst and a aura\'s
squeezably soft moses over sweetener against another zero office supplies put up
little miss scintillating crouton, the more they fingernail unintentionally.',0);
INSERT INTO department VALUES (3,'Pink Things','default_dept100.jpg',1,'If you have
chicken kievs, constitute nine cities. They watch gumby. Never carpet fleas unless you
can\'t deface. Remember that doshious wasn\'t fickle! They go with another five
chemicals and mome raths and your zero leprechauns. Sneeze -guard isn\'t against
lackadaisical king conformist. The less one more polluted cyst and a aura\'s
squeezably soft moses over sweetener against another zero office supplies put up
little miss scintillating crouton, the more they fingernail unintentionally.',1);
INSERT INTO department VALUES (1,'Red Things','default_dept100.jpg',0,'If you have
chicken kievs, constitute nine cities. They watch gumby. Never carpet fleas unless you
can\'t deface. Remember that doshious wasn\'t fickle! They go with another five
chemicals and mome raths and your zero leprechauns. Sneeze -guard isn\'t against
lackadaisical king conformist. The less one more polluted cyst and a aura\'s
squeezably soft moses over sweetener against another zero office supplies put up
little miss scintillating crouton, the more they fingernail unintentionally.',0);
INSERT INTO department VALUES (2,'Crimson Things','default_dept100.jpg',1,'If you
have chicken kievs, constitute nine cities. They watch gumby. Never carpet fleas
unless you can\'t deface. Remember that doshious wasn\'t fickle! They go with another
five chemicals and mome raths and your zero leprechauns. Sneeze -guard isn\'t against
lackadaisical king conformist. The less one more polluted cyst and a aura\'s
squeezably soft moses over sweetener against another zero office supplies put up
little miss scintillating crouton, the more they fingernail unintentionally.',2);
INSERT INTO item VALUES (12,'Pants','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (11,'Jacket','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (10,'Shirt','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (9,'Pants','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (8,'Jacket','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (7,'Shirt','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (6,'Pants','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (5,'Jacket','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (4,'Shirt','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (3,'Pants','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (2,'Jacket','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO item VALUES (1,'Shirt','<p>They will help a ribbit\'s loud commanders
and officer potassium-month and my charge and the trouser snake. The less they burn
down my septuagint, the less they stone a barbecue\'s apartment. Which proves if you
are volcanic, slough. If you are blarney, grovel adverbally. Colleges are induced.</p>
<p>Millimeters aren\'t t-bone. They barely attain monkies and one more slim cj-like
pangus-blister. Worship allah unsurprisingly and let poopoo. Then fiction\'s bum over
spermicidal duke circus wasn\'t suicidal. Blow up president chromium three times a
day. </p> <p>Never emulsify byzantine randiness unless you can\'t wear nonmatching
socks vaguely and annoyingly. The less one more pom pom seed-bahston and ugly sadness
and one more gratifying origami and rhinoceros-semen and squiggles and zero golf balls
and doctor unsavory and cipher-g-spot entertained adverbally, the more they illegally
distribute frothing doctor lungfish. Then the scrambled egg and a tomorrow\'s jan and
carbonated snickers and ugly sadness go fishing sparingly! </p>
','','default_item100.jpg','default_item200.jpg','default_item400.jpg',0,'Y');
INSERT INTO department_item VALUES (2,1);
INSERT INTO department_item VALUES (2,2);
INSERT INTO department_item VALUES (2,3);
INSERT INTO department_item VALUES (3,4);
INSERT INTO department_item VALUES (3,5);
INSERT INTO department_item VALUES (3,6);
INSERT INTO department_item VALUES (4,7);
INSERT INTO department_item VALUES (4,8);
INSERT INTO department_item VALUES (4,9);
INSERT INTO department_item VALUES (5,10);
INSERT INTO department_item VALUES (5,11);
INSERT INTO department_item VALUES (5,12);
INSERT INTO sku VALUES (16,12,'SKU-12-16','Pants',24.00,13.53,7.00,0,'Y',100,'Y');
INSERT INTO sku VALUES (15,11,'SKU-11-15','Jacket',47.00,30.27,10.00,0,'Y',100,'Y');
INSERT INTO sku VALUES (14,10,'SKU-10-14','Shirt',65.00,34.40,7.00,0,'Y',100,'Y');
INSERT INTO sku VALUES (13,9,'SKU-9-13','Pants',82.00,58.56,6.00,0,'Y',100,'N');
INSERT INTO sku VALUES (12,9,'SKU-9-12','Pants',16.00,15.73,11.00,0,'Y',100,'N');
INSERT INTO sku VALUES (11,8,'SKU-8-11','Jacket',35.00,27.03,15.00,0,'Y',100,'N');
INSERT INTO sku VALUES (10,8,'SKU-8-10','Jacket',26.00,23.73,2.00,0,'Y',100,'N');
INSERT INTO sku VALUES (9,7,'SKU-7-9','Shirt',23.00,5.67,4.00,0,'Y',100,'N');
INSERT INTO sku VALUES (8,7,'SKU-7-8','Shirt',40.00,19.79,16.00,0,'Y',100,'N');
INSERT INTO sku VALUES (7,6,'SKU-6-7','Pants',29.00,21.29,7.00,0,'Y',100,'N');
INSERT INTO sku VALUES (6,5,'SKU-5-6','Jacket',28.00,5.22,7.00,0,'Y',100,'N');
INSERT INTO sku VALUES (5,4,'SKU-4-5','Shirt',51.00,37.24,15.00,0,'Y',100,'N');
INSERT INTO sku VALUES (4,3,'SKU-3-4','Pants',69.00,6.29,14.00,0,'Y',100,'N');
INSERT INTO sku VALUES (3,2,'SKU-2-3','Jacket',95.00,25.22,7.00,0,'Y',100,'N');
INSERT INTO sku VALUES (2,1,'SKU-1-2','Shirt',66.00,3.56,10.00,0,'Y',100,'N');
INSERT INTO sku VALUES (1,1,'SKU-1-1','Shirt',47.00,22.22,9.00,0,'Y',100,'N');
INSERT INTO sku_variation VALUES (1,1);
INSERT INTO sku_variation VALUES (1,2);
INSERT INTO sku_variation VALUES (1,3);
INSERT INTO sku_variation VALUES (2,1);
INSERT INTO sku_variation VALUES (2,2);
INSERT INTO sku_variation VALUES (2,3);
INSERT INTO sku_variation VALUES (3,1);
INSERT INTO sku_variation VALUES (3,2);
INSERT INTO sku_variation VALUES (3,3);
INSERT INTO sku_variation VALUES (4,1);
INSERT INTO sku_variation VALUES (4,2);
INSERT INTO sku_variation VALUES (4,3);
INSERT INTO sku_variation VALUES (5,1);
INSERT INTO sku_variation VALUES (5,2);
INSERT INTO sku_variation VALUES (5,3);
INSERT INTO sku_variation VALUES (6,1);
INSERT INTO sku_variation VALUES (6,2);
INSERT INTO sku_variation VALUES (6,3);
INSERT INTO sku_variation VALUES (7,1);
INSERT INTO sku_variation VALUES (7,2);
INSERT INTO sku_variation VALUES (7,3);
INSERT INTO sku_variation VALUES (8,1);
INSERT INTO sku_variation VALUES (8,2);
INSERT INTO sku_variation VALUES (8,3);
INSERT INTO sku_variation VALUES (9,1);
INSERT INTO sku_variation VALUES (9,2);
INSERT INTO sku_variation VALUES (9,3);
INSERT INTO sku_variation VALUES (10,1);
INSERT INTO sku_variation VALUES (10,2);
INSERT INTO sku_variation VALUES (10,3);
INSERT INTO sku_variation VALUES (11,1);
INSERT INTO sku_variation VALUES (11,2);
INSERT INTO sku_variation VALUES (11,3);
INSERT INTO sku_variation VALUES (12,1);
INSERT INTO sku_variation VALUES (12,2);
INSERT INTO sku_variation VALUES (12,3);
1.7 +11 -5 freetrade/freetrade2/modules/configuration/global
Index: global
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/configuration/global,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- global 2000/11/08 00:54:26 1.6
+++ global 2001/08/23 21:58:55 1.7
@@ -2,13 +2,16 @@
/*
** File: global_settings
** Description: Sets a bunch of global variables
- ** Version: $Revision: 1.6 $
+ ** Version: $Revision: 1.7 $
** Created: 05/18/99
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:26 $
+ ** Last Revised: $Date: 2001/08/23 21:58:55 $
** Log : $Log: global,v $
+ ** Log : Revision 1.7 2001/08/23 21:58:55 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.6 2000/11/08 00:54:26 leon
** Log : *** empty log message ***
** Log :
@@ -198,16 +201,19 @@
//This constant matches a row in the status table.
define("INVOICE_CANCELLED", 2);
- //Web directory relative to index.php3 where images for
+ //This is the directory for all site images, relative to index.php
+ define("IMAGES_DIR", "images");
+
+ //Web directory relative to the images dir where images for
//items are stored. This path will be prefixed (with a
//slash) to the "Graphic" field from the item table.
- define("ITEM_IMAGES_DIR", "images/items");
+ define("ITEM_IMAGES_DIR", "items");
//Web directory relative to index.php3 where images for
//departments are stored. This path will be prefixed
//(with a slash) to the "Graphic" field from the department
//table.
- define("DEPARTMENT_IMAGES_DIR", "images/departments");
+ define("DEPARTMENT_IMAGES_DIR", "departments");
//Controls whether coupons are available on the site
define("USE_COUPONS", TRUE);
1.24 +14 -9 freetrade/freetrade2/modules/database/mysql/item
Index: item
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/database/mysql/item,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- item 2001/03/23 18:11:10 1.23
+++ item 2001/08/23 21:58:55 1.24
@@ -2,14 +2,17 @@
/*
** File: item
** Description: functions needed for get info about items
- ** Version: $Revision: 1.23 $
+ ** Version: $Revision: 1.24 $
** Created: 6/10/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/03/23 18:11:10 $
+ ** Last Revised: $Date: 2001/08/23 21:58:55 $
**
** Log : $Log: item,v $
+ ** Log : Revision 1.24 2001/08/23 21:58:55 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.23 2001/03/23 18:11:10 leon
** Log : Changes submitted by Chris Mason.
** Log :
@@ -93,18 +96,20 @@
$Item["Thumbnail"] = ITEM_IMAGES_DIR . "/" .
$Item["Thumbnail"];
$Item["Graphic"] = ITEM_IMAGES_DIR . "/" . $Item["Graphic"];
$Item["LargeGraphic"] = ITEM_IMAGES_DIR . "/" .
$Item["LargeGraphic"];
-
- if(($DatabaseRow->Thumbnail == "") OR
!file_exists($Item["Thumbnail"]))
+ if(($DatabaseRow->Thumbnail == "") OR
+ !file_exists(IMAGES_DIR . "/" . $Item["Thumbnail"]))
{
$Item["Thumbnail"] = "";
}
- if(($DatabaseRow->Graphic == "") OR
!file_exists($Item["Graphic"]))
+ if(($DatabaseRow->Graphic == "") OR
+ !file_exists(IMAGES_DIR . "/" . $Item["Graphic"]))
{
$Item["Graphic"] = "";
}
- if(($DatabaseRow->LargeGraphic == "") OR
!file_exists($Item["LargeGraphic"]))
+ if(($DatabaseRow->LargeGraphic == "") OR
+ !file_exists(IMAGES_DIR . "/" . $Item["LargeGraphic"]))
{
$Item["LargeGraphic"] = "";
}
@@ -1028,7 +1033,7 @@
{
$result["ID"][] = $DatabaseRow[0];
$result["Name"][] = $DatabaseRow[1];
- $result["Thumbnail"][] = $DatabaseRow[2];
+ $result["Thumbnail"][] = ITEM_IMAGES_DIR . "/" .
$DatabaseRow[2];
}
$result["NumRows"] = mysql_num_rows($DatabaseResult);
@@ -1058,7 +1063,7 @@
"WHERE Variation = " .
getVariationID(getAttributeID("Gift Wrap"),
"Available") . " " .
"AND SKU in (0";
-
+
for($index = 0; $index < count($skuList); $index++)
{
$Query .= ", " . $skuList[$index];
@@ -1280,7 +1285,7 @@
return(FALSE);
}
- while($row = mysql_fetch_row($DatabaseResult, MYSQL_ASSOC))
+ while($row = mysql_fetch_array($DatabaseResult, MYSQL_ASSOC))
{
$data[] = $row;
}
1.9 +7 -4 freetrade/freetrade2/modules/language/english
Index: english
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/language/english,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- english 2001/07/04 17:54:00 1.8
+++ english 2001/08/23 21:58:55 1.9
@@ -2,13 +2,16 @@
/*
** File: english
** Description: English language module
- ** Version: $Revision: 1.8 $
+ ** Version: $Revision: 1.9 $
** Created: 10/12/99
** Author: Leon Atkinson, Chris Bellew
** Email: [EMAIL PROTECTED], [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/07/04 17:54:00 $
+ ** Last Revised: $Date: 2001/08/23 21:58:55 $
** Log : $Log: english,v $
+ ** Log : Revision 1.9 2001/08/23 21:58:55 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.8 2001/07/04 17:54:00 leon
** Log : Fixes to language file from Nick
** Log :
@@ -908,7 +911,7 @@
define('L_EDITSKU_DISPLAYPRECEDENCE', 'Display Precedence');
define('L_EDITSKU_INVENTORYAVAILABLE', 'Inventory Available');
define('L_EDITSKU_INVENTORYRESERVE', 'Inventory Reserve');
- define('L_EDITSKU_INVENTORYISZERO', 'May be ordered when<BR>inventory is
zero?');
+ define('L_EDITSKU_INVENTORYZERO', 'May be ordered when<BR>inventory is zero?');
define('L_EDITSKU_ACTIVE', 'Active');
define('L_EDITSKU_UPDATESKU', 'Update SKU');
define('L_EDITSKU_RESET', 'Reset');
1.3 +11 -7 freetrade/freetrade2/modules/navigation/page_top
Index: page_top
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/navigation/page_top,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page_top 2000/05/10 22:28:10 1.2
+++ page_top 2001/08/23 21:58:56 1.3
@@ -2,14 +2,17 @@
/*
** File: page_top
** Description: navigation module to be display at top of page
- ** Version: $Revision: 1.2 $
+ ** Version: $Revision: 1.3 $
** Created: 05/18/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/05/10 22:28:10 $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
**
** Log : $Log: page_top,v $
+ ** Log : Revision 1.3 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.2 2000/05/10 22:28:10 leon
** Log : More changes to admin functionality
** Log :
@@ -30,10 +33,11 @@
**
** Copyright (c) 1999 Working Dogs. All rights reserved.
*/
+
+ printLine(getImage("FreeTradeMedium.gif", 254, 45), 1, FALSE);
+ printLine("This is version " . FREETRADE_VERSION . "of FreeTrade for PHP.", 1);
+ print("Please visit ");
+ printLinkOutside("share.whichever.com/freetrade",
"http://share.whichever.com/freetrade/";, 0);
+ printLine(" for the latest version.", 1);
- print("<H1>FreeTrade</H1>\n");
- print("This is version " . FREETRADE_VERSION . "of FreeTrade for PHP." .
- "Please visit <A HREF=\"http://www.working-dogs.com/freetrade/\";>" .
- "Working-Dogs.com</A> for the latest version.<BR>\n");
- print("<BR>\n");
?>
1.6 +9 -7 freetrade/freetrade2/modules/screen/department
Index: department
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/screen/department,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- department 2000/11/08 00:54:36 1.5
+++ department 2001/08/23 21:58:56 1.6
@@ -2,13 +2,16 @@
/*
** File: department
** Description: show departments and items contained in them
- ** Version: $Revision: 1.5 $
+ ** Version: $Revision: 1.6 $
** Created: 04/22/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:36 $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
** Log : $Log: department,v $
+ ** Log : Revision 1.6 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.5 2000/11/08 00:54:36 leon
** Log : *** empty log message ***
** Log :
@@ -76,12 +79,11 @@
for ($i = 0; $i < $Items["NumRows"]; $i++)
{
print("<A HREF=\"" . ScreenURL("item") . "&item=" . $Items["ID"][$i] .
"\">");
- if(($Items["Thumbnail"][$i]) AND
- file_exists(ITEM_IMAGES_DIR . "/" . $Items["Thumbnail"][$i]))
+ if($Items["Thumbnail"][$i])
{
- $Thumbnail_Graphic_size = getimagesize(ITEM_IMAGES_DIR . "/" .
$Items["Thumbnail"][$i]);
- print("<IMG SRC=\"" . ITEM_IMAGES_DIR . "/" .
$Items["Thumbnail"][$i] . "\"");
- print(" $Thumbnail_Graphic_size[3] BORDER=\"0\"
ALIGN=\"left\">\n");
+ $size = getimagesize(IMAGES_DIR . "/" .
$Items["Thumbnail"][$i]);
+ $image = getImage($Items["Thumbnail"][$i], $size[0], $size[1],
"", 5, "left");
+ print($image);
}
print("<B>" . $Items["Name"][$i] . "</B>");
print("</A>");
1.7 +17 -9 freetrade/freetrade2/modules/screen/item
Index: item
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/screen/item,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- item 2000/11/08 00:54:37 1.6
+++ item 2001/08/23 21:58:56 1.7
@@ -3,13 +3,16 @@
/*
** File: item
** Description: show details about an item
- ** Version: $Revision: 1.6 $
+ ** Version: $Revision: 1.7 $
** Created: 04/22/1999
** Author: Leon Atkinson, Shannon -jj Behrens,
** Email: [EMAIL PROTECTED], [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:37 $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
** Log : $Log: item,v $
+ ** Log : Revision 1.7 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.6 2000/11/08 00:54:37 leon
** Log : *** empty log message ***
** Log :
@@ -81,21 +84,21 @@
/*
** Output the item name and description.
*/
- //FIXME: need printTitle()
- print("<H3>". prepareText($Item["Name"]) . "</H3>\n");
+ printTitle($Item["Name"]);
if($Item["Graphic"] != "")
{
-//FIXME: I'm not sure this will generate the right path to the graphic, but
-//I need to work on other stuff now. When we finish the HTML and SQL migration,
-//I'll return to this issue. (leon)
- $size = getimagesize($Item["Graphic"]);
+ $size = getimagesize(IMAGES_DIR . "/" . $Item["Graphic"]);
$image = getImage($Item["Graphic"], $size[0], $size[1], "", 5,
"left");
if(isset($Item["LargeGraphic"]))
{
printPopupLink($image, "item_details", 0,
array("item"=>$item));
}
+ else
+ {
+ printLine($image);
+ }
}
@@ -111,7 +114,12 @@
printLine("", 1, FALSE, TRUE);
//Get flags for whether a SKU can be gifwrapped
- $GiftWrap = getGiftwrapableSKUs($Item["SKU"]["ID"]);
+ $skulist = array();
+ foreach($Item["SKU"] as $s)
+ {
+ $skulist[] = $s["ID"];
+ }
+ $GiftWrap = getGiftwrapableSKUs($skulist);
/*
** list SKUs
1.3 +16 -7 freetrade/freetrade2/modules/screen/item_details
Index: item_details
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/screen/item_details,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- item_details 2000/06/02 07:39:03 1.2
+++ item_details 2001/08/23 21:58:56 1.3
@@ -3,13 +3,16 @@
/*
** File: item_details
** Description: show large picture of item
- ** Version: $Revision: 1.2 $
+ ** Version: $Revision: 1.3 $
** Created: 07/13/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
- ** CVS Author: $Author: dilinger $
- ** Last Revised: $Date: 2000/06/02 07:39:03 $
+ ** CVS Author: $Author: leon $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
** Log : $Log: item_details,v $
+ ** Log : Revision 1.3 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.2 2000/06/02 07:39:03 dilinger
** Log : getimagesize("") was generating an ugly-looking warning, so i wrapped
an if
** Log : statement around it.
@@ -29,6 +32,10 @@
** Copyright (c) 1999 Working Dogs. All rights reserved.
*/
+ include_once(DATABASE_MODULE . "item");
+
+ $Item = getItem($item);
+
print("<CENTER>");
print("<B>");
@@ -39,13 +46,14 @@
//show graphic of product
if ($Item["LargeGraphic"] != "")
{
- $size = getimagesize($Item["LargeGraphic"]);
- print("<IMG SRC=\"" . $Item["LargeGraphic"] . "\" $size[3]
BORDER=\"0\">");
- print("<BR>\n");
+ $size = getimagesize(IMAGES_DIR . "/" . $Item["LargeGraphic"]);
+ $image = getImage($Item["LargeGraphic"], $size[0], $size[1]);
+ printLine($image, 1, FALSE);
}
else
+ {
print("No Image Available<BR>\n");
-
+ }
//close window button
print("<A HREF=\"javascript:window.close();\">Close Window</A>\n");
1.8 +6 -7 freetrade/freetrade2/modules/screen/welcome
Index: welcome
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/screen/welcome,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- welcome 2001/05/31 18:12:04 1.7
+++ welcome 2001/08/23 21:58:56 1.8
@@ -2,14 +2,17 @@
/*
** File: welcome
** Description: default screen for site
- ** Version: $Revision: 1.7 $
+ ** Version: $Revision: 1.8 $
** Created: 05/18/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/05/31 18:12:04 $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
**
** Log : $Log: welcome,v $
+ ** Log : Revision 1.8 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.7 2001/05/31 18:12:04 leon
** Log : Adding version information to debug info on welcome screen
** Log :
@@ -92,11 +95,7 @@
/*
** Random Item
*/
- if(!include_once(DATABASE_MODULE . "item"))
- {
- print("Failed to include item module!<br>\n");
- return(FALSE);
- }
+ include_once(DATABASE_MODULE . "item");
print("Random Item: ");
if($RandomItem = getRandomItem())
1.18 +18 -3 freetrade/freetrade2/modules/utility/standard_library
Index: standard_library
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/utility/standard_library,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- standard_library 2001/06/21 17:33:20 1.17
+++ standard_library 2001/08/23 21:58:56 1.18
@@ -6,13 +6,16 @@
** 75% of all page views. Most of these functions were in global_settings
** at one time.
**
- ** Version: $Revision: 1.17 $
+ ** Version: $Revision: 1.18 $
** Created: 10/4/99
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2001/06/21 17:33:20 $
+ ** Last Revised: $Date: 2001/08/23 21:58:56 $
** Log : $Log: standard_library,v $
+ ** Log : Revision 1.18 2001/08/23 21:58:56 leon
+ ** Log : bug fixes
+ ** Log :
** Log : Revision 1.17 2001/06/21 17:33:20 leon
** Log : Bug fixes from Kevin Leavell
** Log :
@@ -129,6 +132,18 @@
}
/*
+ ** Function printTitle
+ ** Input: STRING text
+ ** Output: none
+ ** Description: print a line with "title" treatment
+ */
+ function printTitle($text)
+ {
+ print("<h3>".prepareText($text)."</h3>\n");
+ }
+
+
+ /*
** Function getLink
** Input: STRING screen, STRING label, ARRAY extra, BOOLEAN secure
** Output: STRING
@@ -804,7 +819,7 @@
*/
function getImage($src, $width=0, $height=0, $alt="", $hspace=FALSE,
$align=FALSE)
{
- $tag = "<img src=\"" . EXTERNAL_PATH ."images/$src\"";
+ $tag = "<img src=\"" . EXTERNAL_PATH . IMAGES_DIR . "/$src\"";
if($width > 0)
{
_______________________________________________
FreeTrade-dev mailing list
[EMAIL PROTECTED]
http://share.whichever.com/mailman/listinfo/freetrade-dev
