Skip to content

Commit

Permalink
More readable coding. Now, I understand everything. :)
Browse files Browse the repository at this point in the history
  • Loading branch information
ethem committed May 13, 2006
1 parent 1180c98 commit 6720074
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions enrol/authorize/locallib.php
Expand Up @@ -50,7 +50,7 @@ function authorize_print_orders()
if (!empty($popupcrs)) {
print_simple_box_start('center', '100%');
echo "$strs->status: ";
echo popup_form($baseurl.'&course='.$courseid.'&status=',$statusmenu,'statusmenu',$status,'', '', '',true);
echo popup_form($baseurl.'&course='.$courseid.'&status=',$statusmenu,'statusmenu',$status,'','','',true);
echo "   $strs->course: ";
echo popup_form($baseurl.'&status='.$status.'&course=',$popupcrs,'coursesmenu',$courseid,'','','',true);
print_simple_box_end();
Expand All @@ -72,28 +72,31 @@ function authorize_print_orders()
$table->pageable(true);
$table->setup();

$select = "SELECT E.id, E.transid, E.courseid, E.userid, E.status, E.ccname, E.timecreated, E.settletime";
$from = " FROM {$CFG->prefix}enrol_authorize E ";
$select = "SELECT E.id, E.transid, E.courseid, E.userid, E.status, E.ccname, E.timecreated, E.settletime ";
$from = "FROM {$CFG->prefix}enrol_authorize E ";
$where = "WHERE (1=1) ";

if ($status > AN_STATUS_NONE) {
if ($status == AN_STATUS_CREDIT) {
switch ($status)
{
case AN_STATUS_CREDIT:
$from .= "INNER JOIN {$CFG->prefix}enrol_authorize_refunds R ON E.id = R.orderid ";
$where = "WHERE (E.status = '" . AN_STATUS_AUTHCAPTURE . "') ";
}
elseif ($status == AN_STATUS_TEST) {
$where .= "AND (E.status = '" . AN_STATUS_AUTHCAPTURE . "') ";
break;

case AN_STATUS_TEST:
$newordertime = time() - 120; // -2 minutes. Order may be still in process.
$where = "WHERE (E.status = '" . AN_STATUS_NONE . "') AND (E.transid='0') AND (E.timecreated<$newordertime) ";
}
else {
$where = "WHERE (E.status = '$status') ";
$where .= "AND (E.status = '" . AN_STATUS_NONE . "') AND (E.transid = '0') AND (E.timecreated<$newordertime) ";
break;

default:
$where .= "AND (E.status = '$status') ";
break;
}
}
else { // No filter
if (empty($CFG->an_test)) {
$where = "WHERE (E.status != '" . AN_STATUS_NONE . "') ";
}
else {
$where = "WHERE (1=1) ";
$where .= "AND (E.status != '" . AN_STATUS_NONE . "') ";
}
}

Expand Down

0 comments on commit 6720074

Please sign in to comment.