Skip to content

Commit d523e5c

Browse files
machadojohnmachadojohn
authored
Merge pull request #49 from CSI-5510/aside_updates
syncing with daiyaan
2 parents 003791b + 01a727b commit d523e5c

File tree

8 files changed

+70
-56
lines changed

8 files changed

+70
-56
lines changed

‎backend/collector.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22

3-
include_once('../functions/functions.pricing_algorithm.php');
43
include_once('../functions/functions.collector.php');
54

65
if(!isset($_POST)){

‎frontend/add_item.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// FRONTEND
55
include('../functions/functions.add_item.php');
6-
drawAddItem($options);
6+
echo drawAddItem($options);
77

88

99
?>

‎frontend/collector.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
include_once('../functions/functions.item.php');
77

88
try{
9-
switch($GLOBALS['url_loc'][2]){
9+
switch(URL_LOC_2){
1010
case URL_ADD_EVENT:
11-
header('location: '.PROJECT_ROOT.'/'.URL_LOC_0.'/'.URL_ITEM.'/'.$item_id);
11+
$url = generalNavigation(array(URL_ITEM, $item_id));
12+
header('location: '.$url);
1213
break;
1314
case ADD_ITEM:
14-
header("location: /public_html/item/".$item_id);
15+
$url = generalNavigation(array(URL_ITEM, $item_id));
16+
header("location: ".$url);
1517
break;
1618
case EDIT_PROFILE:
1719
$url = generalNavigation(array(URL_PROFILE, URL_PROFILE_UPDATED));

‎frontend/profile.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// if($GLOBALS['user_profile_updated']){
77
// alertBox('Notice', 'Your profile has been updated successfully.');
88
// }
9+
10+
911
switch(URL_LOC_2){
1012
case EDIT_PROFILE:
1113
echo drawEditProfile($user_data);

‎functions/functions.add_item.php

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @return void draws to page
1010
*/
1111
function drawAffidavit($name, $verify, $text){
12-
echo '
12+
return '
1313
<div class="grid grid-rows-3 gri-cols-2 p-4 m-10 ml-5 mr-40 w-3/5 border-2 border-gray-900">
1414
<div class="row-start-1 row-span-1 col-start-1 col-span-2 p-4 m-2">
1515
'. $text .'
@@ -24,7 +24,6 @@ function drawAffidavit($name, $verify, $text){
2424
<input name="'.$verify.'" type="radio" class="row-start-3 row-span-1 col-start-2 col-span-1 p-4 m-2border-2 border-gray-900">
2525
</div>
2626
';
27-
return;
2827
}
2928

3029

@@ -37,79 +36,81 @@ function drawAddItem($options){
3736
// CONSTANTS
3837
$OPEN_ROW = '<div class="'.FLEX_ROW_JUSTIFY.'">';
3938
$CLOSE_ROW = '</div>';
39+
$url = generalNavigation(array(COLLECTOR, ADD_ITEM));
4040

41+
return
4142
// OPEN FORM
42-
echo '<form method="POST" action="./'.COLLECTOR.'/'.ADD_ITEM.'" enctype="multipart/form-data">';
43+
'<form method="POST" action="'.$url.'" enctype="multipart/form-data">'.
4344

4445
// ROW TITLE
45-
echo $OPEN_ROW;
46-
echo drawLabel('TITLE', LISTING_LABEL);
47-
echo drawTextInput(ITEM_QUERY_NAME, LISTING_INPUT_AREA, 45, TRUE, '');
48-
echo $CLOSE_ROW;
46+
$OPEN_ROW.
47+
drawLabel('TITLE', LISTING_LABEL).
48+
drawTextInput(ITEM_QUERY_NAME, LISTING_INPUT_AREA, 45, TRUE, '').
49+
$CLOSE_ROW.
4950

5051
// ROW CATEGORY
51-
echo $OPEN_ROW;
52-
echo drawLabel('CATEGORY', LISTING_LABEL);
53-
echo drawSelectOption(ITEM_QUERY_CATEGORY, LISTING_INPUT_AREA, $options);
54-
echo $CLOSE_ROW;
52+
$OPEN_ROW.
53+
drawLabel('CATEGORY', LISTING_LABEL).
54+
drawSelectOption(ITEM_QUERY_CATEGORY, LISTING_INPUT_AREA, $options).
55+
$CLOSE_ROW.
5556

5657
// ROW SERIAL NUMBER
57-
echo $OPEN_ROW;
58-
echo drawLabel('SERIAL NUMBER', LISTING_LABEL);
59-
echo drawTextInput(ITEM_QUERY_SERIAL_NUMBER, LISTING_INPUT_AREA, 11, TRUE, '');
60-
echo $CLOSE_ROW;
58+
$OPEN_ROW.
59+
drawLabel('SERIAL NUMBER', LISTING_LABEL).
60+
drawTextInput(ITEM_QUERY_SERIAL_NUMBER, LISTING_INPUT_AREA, 11, TRUE, '').
61+
$CLOSE_ROW.
6162

6263
// ROW DESCRIPTION
63-
echo $OPEN_ROW;
64-
echo drawLabel('DESCRIPTION', LISTING_LABEL);
65-
echo drawTextArea(ITEM_QUERY_DESCRIPTION, LISTING_INPUT_AREA, 5, TRUE);
66-
echo $CLOSE_ROW;
64+
$OPEN_ROW.
65+
drawLabel('DESCRIPTION', LISTING_LABEL).
66+
drawTextArea(ITEM_QUERY_DESCRIPTION, LISTING_INPUT_AREA, 250, TRUE).
67+
$CLOSE_ROW.
6768

6869
// ROW IMAGE
69-
echo $OPEN_ROW;
70-
echo drawLabel('IMAGE', LISTING_LABEL);
71-
echo drawFileUpload(ITEM_QUERY_IMAGE, ITEM_QUERY_IMAGE, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES);
72-
echo $CLOSE_ROW;
70+
$OPEN_ROW.
71+
drawLabel('IMAGE', LISTING_LABEL).
72+
drawFileUpload(ITEM_QUERY_IMAGE, ITEM_QUERY_IMAGE, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES).
73+
$CLOSE_ROW.
7374

7475
// ROW DOCUMENTATION
75-
echo $OPEN_ROW;
76-
echo drawLabel('DOCUMENTATION', LISTING_LABEL);
77-
echo drawFileUpload(ITEM_QUERY_DOCUMENTATION, ITEM_QUERY_DOCUMENTATION, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES);
78-
echo $CLOSE_ROW;
76+
$OPEN_ROW.
77+
drawLabel('DOCUMENTATION', LISTING_LABEL).
78+
drawFileUpload(ITEM_QUERY_DOCUMENTATION, ITEM_QUERY_DOCUMENTATION, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES).
79+
$CLOSE_ROW.
7980

8081
// ROW RECEIPT
81-
echo $OPEN_ROW;
82-
echo drawLabel('RECEIPT', LISTING_LABEL);
83-
echo drawFileUpload(ITEM_QUERY_RECEIPT, ITEM_QUERY_RECEIPT, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES);
84-
echo $CLOSE_ROW;
82+
$OPEN_ROW.
83+
drawLabel('RECEIPT', LISTING_LABEL).
84+
drawFileUpload(ITEM_QUERY_RECEIPT, ITEM_QUERY_RECEIPT, LISTING_DROPZONE, ACCEPTED_IMAGE_TYPES).
85+
$CLOSE_ROW.
8586

8687
// ROW PURCHASE DATE
87-
echo $OPEN_ROW;
88-
echo drawLabel('PURCHASE DATE', LISTING_LABEL);
89-
echo drawDateInput(ITEM_QUERY_ORIGINAL_PURCHASE_DATE, LISTING_INPUT_AREA);
90-
echo $CLOSE_ROW;
88+
$OPEN_ROW.
89+
drawLabel('PURCHASE DATE', LISTING_LABEL).
90+
drawDateInput(ITEM_QUERY_ORIGINAL_PURCHASE_DATE, LISTING_INPUT_AREA).
91+
$CLOSE_ROW.
9192

9293
// ROW PURCHASE PRICE
93-
echo $OPEN_ROW;
94-
echo drawLabel('PURCHASE PRICE', LISTING_LABEL);
95-
echo drawTextInput(ITEM_QUERY_ORIGINAL_PURCHASE_PRICE, LISTING_INPUT_AREA, 20, TRUE, '');
96-
echo $CLOSE_ROW;
94+
$OPEN_ROW.
95+
drawLabel('PURCHASE PRICE', LISTING_LABEL).
96+
drawTextInput(ITEM_QUERY_ORIGINAL_PURCHASE_PRICE, LISTING_INPUT_AREA, 20, TRUE, '').
97+
$CLOSE_ROW.
9798

9899
// ROW AFFIDAVIT OF QUALITY
99-
// echo $OPEN_ROW;
100-
// drawLabel('AFFIDAVIT OF QUALITY', LISTING_LABEL);
101-
// drawAffidavit(ADD_ITEM_AFFIDAVIT_NAME, ADD_ITEM_AFFIDAVIT_VERIFY, 'i gaurantee that this thing works...');
102-
// echo $CLOSE_ROW;
100+
// $OPEN_ROW.
101+
// drawLabel('AFFIDAVIT OF QUALITY', LISTING_LABEL).
102+
// drawAffidavit(ADD_ITEM_AFFIDAVIT_NAME, ADD_ITEM_AFFIDAVIT_VERIFY, 'i gaurantee that this thing works...').
103+
// $CLOSE_ROW.
103104

104105
// ROW SUBMIT BUTTON
105-
echo $OPEN_ROW;
106-
echo drawSubmitButton(BLUE_BUTTON." mx-40 my-10 w-full");
107-
echo $CLOSE_ROW;
106+
$OPEN_ROW.
107+
drawSubmitButton(BLUE_BUTTON." mx-40 my-10 w-full").
108+
$CLOSE_ROW.
108109

109110
// CLOSE FORM
110-
echo '</form>';
111+
'</form>'
111112

112-
return;
113+
;
113114

114115
}
115116

‎functions/functions.collector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
* @return array for use with DatabaseConnect::addEvent(EVENT_NEW_ITEM)
99
*/
1010
function addNewItemReducer(){
11-
include_once('../functions/functions.pricing_algorithm.php');
11+
$clean_price = numbersOnly($_POST[ITEM_QUERY_ORIGINAL_PURCHASE_PRICE]);
1212
$price = pricing(
13-
$_POST[ITEM_QUERY_ORIGINAL_PURCHASE_PRICE],
13+
$clean_price,
1414
$_POST[ITEM_QUERY_ORIGINAL_PURCHASE_DATE],
1515
PRICE_FLOOR,
1616
DAYS_TO_MINIMUM_PIRCE
@@ -23,7 +23,7 @@ function addNewItemReducer(){
2323
ITEM_TABLE_IMAGE => (file_get_contents($_FILES[ITEM_QUERY_IMAGE]["tmp_name"])),
2424
ITEM_TABLE_CATEGORY_ID => intval($_POST[ITEM_QUERY_CATEGORY]),
2525
ITEM_TABLE_SERIAL_NUMBER => intval($_POST[ITEM_QUERY_SERIAL_NUMBER]),
26-
ITEM_TABLE_ORIGINAL_PRICE => $_POST[ITEM_QUERY_ORIGINAL_PURCHASE_PRICE],
26+
ITEM_TABLE_ORIGINAL_PRICE => $clean_price,
2727
ITEM_TABLE_IS_APPROVED => 0,
2828
ITEM_TABLE_OWNER_ID => USER_ID,
2929
ITEM_TABLE_DAYS_TO_MINIMUM_PRICE => DAYS_TO_MINIMUM_PIRCE,

‎functions/functions.input_validation.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
function numbersOnly($string){
4+
$_r = floatval(preg_replace("/[^0-9.]/", "", $string));
5+
return $_r;
6+
}
7+
8+
?>

‎loader.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
include('../functions/functions.header.php');
4343
include('../functions/functions.navigation.php');
4444
include('../functions/functions.ui.php');
45+
include('../functions/functions.input_validation.php');
46+
include('../functions/functions.pricing_algorithm.php');
4547
include("../classes/class.database.php");
4648
include("../classes/class.user.php");
4749
include("../classes/class.order.php");

0 commit comments

Comments
 (0)