[TEP-COMMIT] [CVS admin] updates to the new template structure / standards updates

Commit in admin/admin on MAIN

banner_manager.php +98 -390 1.74 -> 1.75

includes/languages/english/banner_manager.php +16 1.17 -> 1.18

includes/languages/german/banner_manager.php +24 -8 1.25 -> 1.26

includes/languages/espanol/banner_manager.php +17 -1 1.21 -> 1.22

templates/pages/banner_manager.php +238 added 1.1

/banner_manager_statistics.php +113 added 1.1

includes/graphs/banner_daily.php +28 -30 1.2 -> 1.3

/banner_infobox.php +24 -30 1.4 -> 1.5

/banner_monthly.php +32 -26 1.3 -> 1.4

/banner_yearly.php +23 -28 1.3 -> 1.4

+613 -513

2 added + 8 modified, total 10 files

updates to the new template structure / standards updates

use panachart to create statistical graph images

----------

admin /admin

banner_manager.php 1.74 -> 1.75

diff -u -r1.74 -r1.75
--- banner_manager.php 2004/07/22 23:33:00 1.74
+++ banner_manager.php 2004/08/15 18:18:31 1.75
@@ -5,7 +5,7 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2003 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

@@ -14,170 +14,148 @@

$selected_box = 'tools';

- $action = (isset($HTTP_GET_VARS['action']) ? $HTTP_GET_VARS['action'] : '');

+ $action = (isset($_GET['action']) ? $_GET['action'] : '');

- $banner_extension = tep_banner_image_extension();

+ if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
+ $_GET['page'] = 1;
+ }

- if (tep_not_null($action)) {
- switch ($action) {
- case 'setflag':
- if ( ($HTTP_GET_VARS['flag'] == '0') || ($HTTP_GET_VARS['flag'] == '1') ) {
- tep_set_banner_status($HTTP_GET_VARS['bID'], $HTTP_GET_VARS['flag']);
-
- $messageStack->add_session(SUCCESS_BANNER_STATUS_UPDATED, 'success');
- } else {
- $messageStack->add_session(ERROR_UNKNOWN_STATUS_FLAG, 'error');
- }

+ $image_extension = tep_dynamic_image_extension();

- tep_redirect(tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $HTTP_GET_VARS['bID']));
- break;
- case 'insert':
- case 'update':
- if (isset($HTTP_POST_VARS['banners_id'])) $banners_id = tep_db_prepare_input($HTTP_POST_VARS['banners_id']);
- $banners_title = tep_db_prepare_input($HTTP_POST_VARS['banners_title']);
- $banners_url = tep_db_prepare_input($HTTP_POST_VARS['banners_url']);
- $new_banners_group = tep_db_prepare_input($HTTP_POST_VARS['new_banners_group']);
- $banners_group = (empty($new_banners_group)) ? tep_db_prepare_input($HTTP_POST_VARS['banners_group']) : $new_banners_group;
- $banners_html_text = tep_db_prepare_input($HTTP_POST_VARS['banners_html_text']);
- $banners_image_local = tep_db_prepare_input($HTTP_POST_VARS['banners_image_local']);
- $banners_image_target = tep_db_prepare_input($HTTP_POST_VARS['banners_image_target']);
- $db_image_location = '';
- $expires_date = tep_db_prepare_input($HTTP_POST_VARS['expires_date']);
- $expires_impressions = tep_db_prepare_input($HTTP_POST_VARS['expires_impressions']);
- $date_scheduled = tep_db_prepare_input($HTTP_POST_VARS['date_scheduled']);
-

+ if (!empty($action)) {
+ switch ($action) {
+ case 'save':

$banner_error = false;

- if (empty($banners_title)) {

+
+ if (empty($_POST['banners_title'])) {

$messageStack->add(ERROR_BANNER_TITLE_REQUIRED, 'error');
$banner_error = true;
}

- if (empty($banners_group)) {

+ if (empty($_POST['banners_group'])) {

$messageStack->add(ERROR_BANNER_GROUP_REQUIRED, 'error');
$banner_error = true;
}

- if (empty($banners_html_text)) {
- if (empty($banners_image_local)) {
- $banners_image = new upload('banners_image');
- $banners_image->set_destination(DIR_FS_CATALOG_IMAGES . $banners_image_target);
- if ( ($banners_image->parse() == false) || ($banners_image->save() == false) ) {

+ if (empty($_POST['banners_html_text'])) {
+ if (empty($_POST['banners_image_local'])) {
+ if (!$banners_image = new upload('banners_image', realpath('../images/' . $_POST['banners_image_target']))) {

$banner_error = true;
}
}
}

- if ($banner_error == false) {
- $db_image_location = (tep_not_null($banners_image_local)) ? $banners_image_local : $banners_image_target . $banners_image->filename;
- $sql_data_array = array('banners_title' => $banners_title,
- 'banners_url' => $banners_url,
- 'banners_image' => $db_image_location,
- 'banners_group' => $banners_group,
- 'banners_html_text' => $banners_html_text);

+ if ($banner_error === false) {
+ $db_image_location = (!empty($_POST['banners_image_local'])) ? $_POST['banners_image_local'] : $_POST['banners_image_target'] . $banners_image->filename;

- if ($action == 'insert') {
- $insert_sql_data = array('date_added' => 'now()',
- 'status' => '1');
-
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
-
- tep_db_perform(TABLE_BANNERS, $sql_data_array);
-
- $banners_id = tep_db_insert_id();
-
- $messageStack->add_session(SUCCESS_BANNER_INSERTED, 'success');
- } elseif ($action == 'update') {
- tep_db_perform(TABLE_BANNERS, $sql_data_array, 'update', "banners_id = '" . (int)$banners_id . "'");
-
- $messageStack->add_session(SUCCESS_BANNER_UPDATED, 'success');

+ if (isset($_GET['bID']) && is_numeric($_GET['bID'])) {
+ $Qbanner = $osC_Database->query('update :table_banners set banners_title = :banners_title, banners_url = :banners_url, banners_image = :banners_image, banners_group = :banners_group, banners_html_text = :banners_html_text, expires_date = :expires_date, expires_impressions = :expires_impressions, date_scheduled = :date_scheduled, status = :status where banners_id = :banners_id');
+ $Qbanner->bindInt(':banners_id', $_GET['bID']);
+ } else {
+ $Qbanner = $osC_Database->query('insert into :table_banners (banners_title, banners_url, banners_image, banners_group, banners_html_text, expires_date, expires_impressions, date_scheduled, status, date_added) values (:banners_title, :banners_url, :banners_image, :banners_group, :banners_html_text, :expires_date, :expires_impressions, :date_scheduled, :status, now())');

}

-
- if (tep_not_null($expires_date)) {
- list($day, $month, $year) = explode('/', $expires_date);

+ $Qbanner->bindTable(':table_banners', TABLE_BANNERS);
+ $Qbanner->bindValue(':banners_title', $_POST['banners_title']);
+ $Qbanner->bindValue(':banners_url', $_POST['banners_url']);
+ $Qbanner->bindValue(':banners_image', $db_image_location);
+ $Qbanner->bindValue(':banners_group', (!empty($_POST['new_banners_group']) ? $_POST['new_banners_group'] : $_POST['banners_group']));
+ $Qbanner->bindValue(':banners_html_text', $_POST['banners_html_text']);
+
+ if (empty($_POST['date_expires'])) {
+ $Qbanner->bindRaw(':expires_date', 'null');
+ $Qbanner->bindInt(':expires_impressions', $_POST['expires_impressions']);
+ } else {
+ $Qbanner->bindValue(':expires_date', $_POST['date_expires']);
+ $Qbanner->bindInt(':expires_impressions', '0');
+ }

- $expires_date = $year .
- ((strlen($month) == 1) ? '0' . $month : $month) .
- ((strlen($day) == 1) ? '0' . $day : $day);
-
- tep_db_query("update " . TABLE_BANNERS . " set expires_date = '" . tep_db_input($expires_date) . "', expires_impressions = null where banners_id = '" . (int)$banners_id . "'");
- } elseif (tep_not_null($expires_impressions)) {
- tep_db_query("update " . TABLE_BANNERS . " set expires_impressions = '" . tep_db_input($expires_impressions) . "', expires_date = null where banners_id = '" . (int)$banners_id . "'");

+ if (empty($_POST['date_scheduled'])) {
+ $Qbanner->bindRaw(':date_scheduled', 'null');
+ $Qbanner->bindInt(':status', ((isset($_POST['status']) && ($_POST['status'] == 'on')) ? 1 : 0));
+ } else {
+ $Qbanner->bindValue(':date_scheduled', $_POST['date_scheduled']);
+ $Qbanner->bindInt(':status', ($_POST['date_scheduled'] > date('Y-m-d') ? 0 : ((isset($_POST['status']) && ($_POST['status'] == 'on')) ? 1 : 0)));

}

- if (tep_not_null($date_scheduled)) {
- list($day, $month, $year) = explode('/', $date_scheduled);

+ $Qbanner->execute();

- $date_scheduled = $year .
- ((strlen($month) == 1) ? '0' . $month : $month) .
- ((strlen($day) == 1) ? '0' . $day : $day);

+ if ($osC_Database->isError() === false) {
+ if (isset($_GET['bID']) && is_numeric($_GET['bID'])) {
+ $banners_id = $_GET['bID'];
+ } else {
+ $banners_id = $osC_Database->nextID();
+ }

- tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_scheduled = '" . tep_db_input($date_scheduled) . "' where banners_id = '" . (int)$banners_id . "'");

+ $messageStack->add_session(SUCCESS_DB_ROWS_UPDATED, 'success');
+ } else {
+ $messageStack->add_session(ERROR_DB_ROWS_NOT_UPDATED, 'error');

}

- tep_redirect(tep_href_link(FILENAME_BANNER_MANAGER, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'bID=' . $banners_id));
- } else {
- $action = 'new';

+ tep_redirect(tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $banners_id));

}
break;
case 'deleteconfirm':

- $banners_id = tep_db_prepare_input($HTTP_GET_VARS['bID']);
-
- if (isset($HTTP_POST_VARS['delete_image']) && ($HTTP_POST_VARS['delete_image'] == 'on')) {
- $banner_query = tep_db_query("select banners_image from " . TABLE_BANNERS . " where banners_id = '" . (int)$banners_id . "'");
- $banner = tep_db_fetch_array($banner_query);
-
- if (is_file(DIR_FS_CATALOG_IMAGES . $banner['banners_image'])) {
- if (is_writeable(DIR_FS_CATALOG_IMAGES . $banner['banners_image'])) {
- unlink(DIR_FS_CATALOG_IMAGES . $banner['banners_image']);

+ if (isset($_GET['bID']) && is_numeric($_GET['bID'])) {
+ if (isset($_POST['delete_image']) && ($_POST['delete_image'] == 'on')) {
+ $Qimage = $osC_Database->query('select banners_image from :table_banners where banners_id = :banners_id');
+ $Qimage->bindTable(':table_banners', TABLE_BANNERS);
+ $Qimage->bindInt(':banners_id', $_GET['bID']);
+ $Qimage->execute();
+
+ if (is_file('../images/' . $Qimage->value('banners_image'))) {
+ if (is_writeable('../images/' . $Qimage->value('banners_image'))) {
+ unlink('../images/' . $Qimage->value('banners_image'));
+ } else {
+ $messageStack->add_session(ERROR_IMAGE_IS_NOT_WRITEABLE, 'error');
+ }

} else {

- $messageStack->add_session(ERROR_IMAGE_IS_NOT_WRITEABLE, 'error');

+ $messageStack->add_session(ERROR_IMAGE_DOES_NOT_EXIST, 'error');

}

- } else {
- $messageStack->add_session(ERROR_IMAGE_DOES_NOT_EXIST, 'error');

}

- }

- tep_db_query("delete from " . TABLE_BANNERS . " where banners_id = '" . (int)$banners_id . "'");
- tep_db_query("delete from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . (int)$banners_id . "'");

+ $Qdelete = $osC_Database->query('delete from :table_banners where banners_id = :banners_id');
+ $Qdelete->bindTable(':table_banners', TABLE_BANNERS);
+ $Qdelete->bindInt(':banners_id', $_GET['bID']);
+ $Qdelete->execute();

- if (function_exists('imagecreate') && tep_not_null($banner_extensio)) {
- if (is_file(DIR_WS_IMAGES . 'graphs/banner_infobox-' . $banners_id . '.' . $banner_extension)) {
- if (is_writeable(DIR_WS_IMAGES . 'graphs/banner_infobox-' . $banners_id . '.' . $banner_extension)) {
- unlink(DIR_WS_IMAGES . 'graphs/banner_infobox-' . $banners_id . '.' . $banner_extension);
- }
- }

+ $Qdelete = $osC_Database->query('delete from :table_banners_history where banners_id = :banners_id');
+ $Qdelete->bindTable(':table_banners_history', TABLE_BANNERS_HISTORY);
+ $Qdelete->bindInt(':banners_id', $_GET['bID']);
+ $Qdelete->execute();

- if (is_file(DIR_WS_IMAGES . 'graphs/banner_yearly-' . $banners_id . '.' . $banner_extension)) {
- if (is_writeable(DIR_WS_IMAGES . 'graphs/banner_yearly-' . $banners_id . '.' . $banner_extension)) {
- unlink(DIR_WS_IMAGES . 'graphs/banner_yearly-' . $banners_id . '.' . $banner_extension);

+ if (!empty($image_extension)) {
+ if (is_file('images/graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension)) {
+ if (is_writeable('images/graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension)) {
+ unlink('images/graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension);
+ }

}

- }

- if (is_file(DIR_WS_IMAGES . 'graphs/banner_monthly-' . $banners_id . '.' . $banner_extension)) {
- if (is_writeable(DIR_WS_IMAGES . 'graphs/banner_monthly-' . $banners_id . '.' . $banner_extension)) {
- unlink(DIR_WS_IMAGES . 'graphs/banner_monthly-' . $banners_id . '.' . $banner_extension);

+ if (is_file('images/graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension)) {
+ if (is_writeable('images/graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension)) {
+ unlink('images/graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension);
+ }

}

- }

- if (is_file(DIR_WS_IMAGES . 'graphs/banner_daily-' . $banners_id . '.' . $banner_extension)) {
- if (is_writeable(DIR_WS_IMAGES . 'graphs/banner_daily-' . $banners_id . '.' . $banner_extension)) {
- unlink(DIR_WS_IMAGES . 'graphs/banner_daily-' . $banners_id . '.' . $banner_extension);

+ if (is_file('images/graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension)) {
+ if (is_writeable('images/graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension)) {
+ unlink('images/graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension);
+ }

}
}

- }

- $messageStack->add_session(SUCCESS_BANNER_REMOVED, 'success');

+ $messageStack->add_session(SUCCESS_BANNER_REMOVED, 'success');

- tep_redirect(tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page']));

+ tep_redirect(tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page']));
+ }

break;
}
}

// check if the graphs directory exists
$dir_ok = false;

- if (function_exists('imagecreate') && tep_not_null($banner_extension)) {
- if (is_dir(DIR_WS_IMAGES . 'graphs')) {
- if (is_writeable(DIR_WS_IMAGES . 'graphs')) {

+ if (!empty($image_extension)) {
+ if (is_dir('images/graphs')) {
+ if (is_writeable('images/graphs')) {

$dir_ok = true;
} else {
$messageStack->add(ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE, 'error');

@@ -186,283 +164,13 @@

$messageStack->add(ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST, 'error');
}
}

-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
-<script language="javascript" src="includes/general.js"></script>
-<script language="javascript"><!--
-function popupImageWindow(url) {
- window.open(url,'popupImageWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=100,height=100,screenX=150,screenY=150,top=150,left=150')
-}
-//--></script>
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0" bgcolor="#FFFFFF">
-<div id="spiffycalendar" class="text"></div>
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="1" cellpadding="1" class="columnLeft">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
- </table></td>
-<!-- body_text //-->
- <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
-<?php
- if ($action == 'new') {
- $form_action = 'insert';
-
- $parameters = array('expires_date' => '',
- 'date_scheduled' => '',
- 'banners_title' => '',
- 'banners_url' => '',
- 'banners_group' => '',
- 'banners_image' => '',
- 'banners_html_text' => '',
- 'expires_impressions' => '');
-
- $bInfo = new objectInfo($parameters);
-
- if (isset($HTTP_GET_VARS['bID'])) {
- $form_action = 'update';
-
- $bID = tep_db_prepare_input($HTTP_GET_VARS['bID']);
-
- $banner_query = tep_db_query("select banners_title, banners_url, banners_image, banners_group, banners_html_text, status, date_format(date_scheduled, '%d/%m/%Y') as date_scheduled, date_format(expires_date, '%d/%m/%Y') as expires_date, expires_impressions, date_status_change from " . TABLE_BANNERS . " where banners_id = '" . (int)$bID . "'");
- $banner = tep_db_fetch_array($banner_query);
-
- $bInfo->objectInfo($banner);
- } elseif (tep_not_null($HTTP_POST_VARS)) {
- $bInfo->objectInfo($HTTP_POST_VARS);
- }
-
- $groups_array = array();
- $groups_query = tep_db_query("select distinct banners_group from " . TABLE_BANNERS . " order by banners_group");
- while ($groups = tep_db_fetch_array($groups_query)) {
- $groups_array[] = array('id' => $groups['banners_group'], 'text' => $groups['banners_group']);
- }
-?>
-<link rel="stylesheet" type="text/css" href="includes/javascript/spiffyCal/spiffyCal_v2_1.css">
-<script language="JavaScript" src="includes/javascript/spiffyCal/spiffyCal_v2_1.js"></script>
-<script language="javascript">
- var dateExpires = new ctlSpiffyCalendarBox("dateExpires", "new_banner", "expires_date","btnDate1","<?php echo $bInfo->expires_date; ?>",scBTNMODE_CUSTOMBLUE);
- var dateScheduled = new ctlSpiffyCalendarBox("dateScheduled", "new_banner", "date_scheduled","btnDate2","<?php echo $bInfo->date_scheduled; ?>",scBTNMODE_CUSTOMBLUE);
-</script>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr><?php echo tep_draw_form('new_banner', FILENAME_BANNER_MANAGER, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'action=' . $form_action, 'post', 'enctype="multipart/form-data"'); if ($form_action == 'update') echo tep_draw_hidden_field('banners_id', $bID); ?>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo TEXT_BANNERS_TITLE; ?></td>
- <td class="main"><?php echo tep_draw_input_field('banners_title', $bInfo->banners_title, '', true); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo TEXT_BANNERS_URL; ?></td>
- <td class="main"><?php echo tep_draw_input_field('banners_url', $bInfo->banners_url); ?></td>
- </tr>
- <tr>
- <td class="main" valign="top"><?php echo TEXT_BANNERS_GROUP; ?></td>
- <td class="main"><?php echo tep_draw_pull_down_menu('banners_group', $groups_array, $bInfo->banners_group) . TEXT_BANNERS_NEW_GROUP . '<br>' . tep_draw_input_field('new_banners_group', '', '', ((sizeof($groups_array) > 0) ? false : true)); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main" valign="top"><?php echo TEXT_BANNERS_IMAGE; ?></td>
- <td class="main"><?php echo tep_draw_file_field('banners_image') . ' ' . TEXT_BANNERS_IMAGE_LOCAL . '<br>' . DIR_FS_CATALOG_IMAGES . tep_draw_input_field('banners_image_local', (isset($bInfo->banners_image) ? $bInfo->banners_image : '')); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo TEXT_BANNERS_IMAGE_TARGET; ?></td>
- <td class="main"><?php echo DIR_FS_CATALOG_IMAGES . tep_draw_input_field('banners_image_target'); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td valign="top" class="main"><?php echo TEXT_BANNERS_HTML_TEXT; ?></td>
- <td class="main"><?php echo tep_draw_textarea_field('banners_html_text', 'soft', '60', '5', $bInfo->banners_html_text); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo TEXT_BANNERS_SCHEDULED_AT; ?><br><small>(dd/mm/yyyy)</small></td>
- <td valign="top" class="main"><script language="javascript">dateScheduled.writeControl(); dateScheduled.dateFormat="dd/MM/yyyy";</script></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td valign="top" class="main"><?php echo TEXT_BANNERS_EXPIRES_ON; ?><br><small>(dd/mm/yyyy)</small></td>
- <td class="main"><script language="javascript">dateExpires.writeControl(); dateExpires.dateFormat="dd/MM/yyyy";</script><?php echo TEXT_BANNERS_OR_AT . '<br>' . tep_draw_input_field('expires_impressions', $bInfo->expires_impressions, 'maxlength="7" size="7"') . ' ' . TEXT_BANNERS_IMPRESSIONS; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo TEXT_BANNERS_BANNER_NOTE . '<br>' . TEXT_BANNERS_INSERT_NOTE . '<br>' . TEXT_BANNERS_EXPIRCY_NOTE . '<br>' . TEXT_BANNERS_SCHEDULE_NOTE; ?></td>
- <td class="main" align="right" valign="top" nowrap><?php echo (($form_action == 'insert') ? tep_image_submit('button_insert.gif', IMAGE_INSERT) : tep_image_submit('button_update.gif', IMAGE_UPDATE)). '&nbsp;&nbsp;<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . (isset($HTTP_GET_VARS['bID']) ? 'bID=' . $HTTP_GET_VARS['bID'] : '')) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>'; ?></td>
- </tr>
- </table></td>
- </form></tr>
-<?php
- } else {
-?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="dataTableHeadingRow">
- <td class="dataTableHeadingContent"><?php echo TABLE_HEADING_BANNERS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_GROUPS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_STATISTICS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_STATUS; ?></td>
- <td class="dataTableHeadingContent" align="right"><?php echo TABLE_HEADING_ACTION; ?>&nbsp;</td>
- </tr>
-<?php
- $banners_query_raw = "select banners_id, banners_title, banners_image, banners_group, status, expires_date, expires_impressions, date_status_change, date_scheduled, date_added from " . TABLE_BANNERS . " order by banners_title, banners_group";
- $banners_split = new splitPageResults($HTTP_GET_VARS['page'], MAX_DISPLAY_SEARCH_RESULTS, $banners_query_raw, $banners_query_numrows);
- $banners_query = tep_db_query($banners_query_raw);
- while ($banners = tep_db_fetch_array($banners_query)) {
- $info_query = tep_db_query("select sum(banners_shown) as banners_shown, sum(banners_clicked) as banners_clicked from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . (int)$banners['banners_id'] . "'");
- $info = tep_db_fetch_array($info_query);
-
- if ((!isset($HTTP_GET_VARS['bID']) || (isset($HTTP_GET_VARS['bID']) && ($HTTP_GET_VARS['bID'] == $banners['banners_id']))) && !isset($bInfo) && (substr($action, 0, 3) != 'new')) {
- $bInfo_array = array_merge($banners, $info);
- $bInfo = new objectInfo($bInfo_array);
- }
-
- $banners_shown = ($info['banners_shown'] != '') ? $info['banners_shown'] : '0';
- $banners_clicked = ($info['banners_clicked'] != '') ? $info['banners_clicked'] : '0';

- if (isset($bInfo) && is_object($bInfo) && ($banners['banners_id'] == $bInfo->banners_id)) {
- echo ' <tr id="defaultSelected" class="dataTableRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_BANNER_STATISTICS, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $bInfo->banners_id) . '\'">' . "\n";
- } else {
- echo ' <tr class="dataTableRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href=\'' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $banners['banners_id']) . '\'">' . "\n";
- }
-?>
- <td class="dataTableContent"><?php echo '<a href="javascript:popupImageWindow(\'' . FILENAME_POPUP_IMAGE . '?banner=' . $banners['banners_id'] . '\')">' . tep_image(DIR_WS_IMAGES . 'icon_popup.gif', 'View Banner') . '</a>&nbsp;' . $banners['banners_title']; ?></td>
- <td class="dataTableContent" align="right"><?php echo $banners['banners_group']; ?></td>
- <td class="dataTableContent" align="right"><?php echo $banners_shown . ' / ' . $banners_clicked; ?></td>
- <td class="dataTableContent" align="right">
-<?php
- if ($banners['status'] == '1') {
- echo tep_image(DIR_WS_IMAGES . 'icon_status_green.gif', 'Active', 10, 10) . '&nbsp;&nbsp;<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $banners['banners_id'] . '&action=setflag&flag=0') . '">' . tep_image(DIR_WS_IMAGES . 'icon_status_red_light.gif', 'Set Inactive', 10, 10) . '</a>';
- } else {
- echo '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $banners['banners_id'] . '&action=setflag&flag=1') . '">' . tep_image(DIR_WS_IMAGES . 'icon_status_green_light.gif', 'Set Active', 10, 10) . '</a>&nbsp;&nbsp;' . tep_image(DIR_WS_IMAGES . 'icon_status_red.gif', 'Inactive', 10, 10);
- }
-?></td>
- <td class="dataTableContent" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_BANNER_STATISTICS, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $banners['banners_id']) . '">' . tep_image(DIR_WS_ICONS . 'statistics.gif', ICON_STATISTICS) . '</a>&nbsp;'; if (isset($bInfo) && is_object($bInfo) && ($banners['banners_id'] == $bInfo->banners_id)) { echo tep_image(DIR_WS_IMAGES . 'icon_arrow_right.gif', ''); } else { echo '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $banners['banners_id']) . '">' . tep_image(DIR_WS_IMAGES . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>&nbsp;</td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td colspan="5"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="smallText" valign="top"><?php echo $banners_split->display_count($banners_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $HTTP_GET_VARS['page'], TEXT_DISPLAY_NUMBER_OF_BANNERS); ?></td>
- <td class="smallText" align="right"><?php echo $banners_split->display_links($banners_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $HTTP_GET_VARS['page']); ?></td>
- </tr>
- <tr>
- <td align="right" colspan="2"><?php echo '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'action=new') . '">' . tep_image_button('button_new_banner.gif', IMAGE_NEW_BANNER) . '</a>'; ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
-<?php
- $heading = array();
- $contents = array();

switch ($action) {

- case 'delete':
- $heading[] = array('text' => '<b>' . $bInfo->banners_title . '</b>');
-
- $contents = array('form' => tep_draw_form('banners', FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $bInfo->banners_id . '&action=deleteconfirm'));
- $contents[] = array('text' => TEXT_INFO_DELETE_INTRO);
- $contents[] = array('text' => '<br><b>' . $bInfo->banners_title . '</b>');
- if ($bInfo->banners_image) $contents[] = array('text' => '<br>' . tep_draw_checkbox_field('delete_image', 'on', true) . ' ' . TEXT_INFO_DELETE_IMAGE);
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_image_submit('button_delete.gif', IMAGE_DELETE) . '&nbsp;<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $HTTP_GET_VARS['bID']) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>');
- break;
- default:
- if (is_object($bInfo)) {
- $heading[] = array('text' => '<b>' . $bInfo->banners_title . '</b>');
-
- $contents[] = array('align' => 'center', 'text' => '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $bInfo->banners_id . '&action=new') . '">' . tep_image_button('button_edit.gif', IMAGE_EDIT) . '</a> <a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $HTTP_GET_VARS['page'] . '&bID=' . $bInfo->banners_id . '&action=delete') . '">' . tep_image_button('button_delete.gif', IMAGE_DELETE) . '</a>');
- $contents[] = array('text' => '<br>' . TEXT_BANNERS_DATE_ADDED . ' ' . tep_date_short($bInfo->date_added));
-
- if ( (function_exists('imagecreate')) && ($dir_ok) && ($banner_extension) ) {
- $banner_id = $bInfo->banners_id;
- $days = '3';
- include(DIR_WS_INCLUDES . 'graphs/banner_infobox.php');
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_image(DIR_WS_IMAGES . 'graphs/banner_infobox-' . $banner_id . '.' . $banner_extension));
- } else {
- include(DIR_WS_FUNCTIONS . 'html_graphs.php');
- $contents[] = array('align' => 'center', 'text' => '<br>' . tep_banner_graph_infoBox($bInfo->banners_id, '3'));
- }
-
- $contents[] = array('text' => tep_image(DIR_WS_IMAGES . 'graph_hbar_blue.gif', 'Blue', '5', '5') . ' ' . TEXT_BANNERS_BANNER_VIEWS . '<br>' . tep_image(DIR_WS_IMAGES . 'graph_hbar_red.gif', 'Red', '5', '5') . ' ' . TEXT_BANNERS_BANNER_CLICKS);
-
- if ($bInfo->date_scheduled) $contents[] = array('text' => '<br>' . sprintf(TEXT_BANNERS_SCHEDULED_AT_DATE, tep_date_short($bInfo->date_scheduled)));
-
- if ($bInfo->expires_date) {
- $contents[] = array('text' => '<br>' . sprintf(TEXT_BANNERS_EXPIRES_AT_DATE, tep_date_short($bInfo->expires_date)));
- } elseif ($bInfo->expires_impressions) {
- $contents[] = array('text' => '<br>' . sprintf(TEXT_BANNERS_EXPIRES_AT_IMPRESSIONS, $bInfo->expires_impressions));
- }
-
- if ($bInfo->date_status_change) $contents[] = array('text' => '<br>' . sprintf(TEXT_BANNERS_STATUS_CHANGE, tep_date_short($bInfo->date_status_change)));
- }
- break;

+ case 'statistics': $page_contents = 'banner_manager_statistics.php'; break;
+ default: $page_contents = 'banner_manager.php';

}

-
- if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
- echo ' <td width="25%" valign="top">' . "\n";

- $box = new box;
- echo $box->infoBox($heading, $contents);

+ require('templates/default.php');

- echo ' </td>' . "\n";
- }
-?>
- </tr>
- </table></td>
- </tr>
-<?php
- }

+ require('includes/application_bottom.php');

?>

- </table></td>
-<!-- body_text_eof //-->
- </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

----------

admin /admin /includes /languages /english

banner_manager.php 1.17 -> 1.18

diff -u -r1.17 -r1.18
--- banner_manager.php 2002/08/18 18:54:47 1.17
+++ banner_manager.php 2004/08/15 18:18:32 1.18
@@ -64,4 +64,20 @@

define('ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST', 'Error: Graphs directory does not exist. Please create a \'graphs\' directory inside \'images\'.');
define('ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE', 'Error: Graphs directory is not writeable.');

+
+define('TABLE_HEADING_SOURCE', 'Source');
+define('TABLE_HEADING_VIEWS', 'Views');
+define('TABLE_HEADING_CLICKS', 'Clicks');
+
+define('TEXT_BANNERS_DAILY_STATISTICS', '%s Daily Statistics For %s %s');
+define('TEXT_BANNERS_MONTHLY_STATISTICS', '%s Monthly Statistics For %s');
+define('TEXT_BANNERS_YEARLY_STATISTICS', '%s Yearly Statistics');
+
+define('STATISTICS_TYPE_DAILY', 'Daily');
+define('STATISTICS_TYPE_MONTHLY', 'Monthly');
+define('STATISTICS_TYPE_YEARLY', 'Yearly');
+
+define('TITLE_TYPE', 'Type:');
+define('TITLE_YEAR', 'Year:');
+define('TITLE_MONTH', 'Month:');

?>

----------

admin /admin /includes /languages /german

banner_manager.php 1.25 -> 1.26

diff -u -r1.25 -r1.26
--- banner_manager.php 2003/02/16 02:09:20 1.25
+++ banner_manager.php 2004/08/15 18:18:32 1.26
@@ -18,20 +18,20 @@

define('TABLE_HEADING_STATUS', 'Status');
define('TABLE_HEADING_ACTION', 'Aktion');

-define('TEXT_BANNERS_TITLE', 'Titel des Banners:');
-define('TEXT_BANNERS_URL', 'Banner-URL:');
-define('TEXT_BANNERS_GROUP', 'Banner-Gruppe:');
-define('TEXT_BANNERS_NEW_GROUP', ', oder geben Sie unten eine neue Banner-Gruppe ein');
-define('TEXT_BANNERS_IMAGE', 'Bild (Datei):');
-define('TEXT_BANNERS_IMAGE_LOCAL', ', oder geben Sie unten die lokale Datei auf Ihrem Server an');
-define('TEXT_BANNERS_IMAGE_TARGET', 'Bildziel (Speichern nach):');

+define('TEXT_BANNERS_TITLE', 'Titel des Banners:');
+define('TEXT_BANNERS_URL', 'Banner-URL:');
+define('TEXT_BANNERS_GROUP', 'Banner-Gruppe:');
+define('TEXT_BANNERS_NEW_GROUP', ', oder geben Sie unten eine neue Banner-Gruppe ein');
+define('TEXT_BANNERS_IMAGE', 'Bild (Datei):');
+define('TEXT_BANNERS_IMAGE_LOCAL', ', oder geben Sie unten die lokale Datei auf Ihrem Server an');
+define('TEXT_BANNERS_IMAGE_TARGET', 'Bildziel (Speichern nach):');

define('TEXT_BANNERS_HTML_TEXT', 'HTML Text:');
define('TEXT_BANNERS_EXPIRES_ON', 'G&uuml;ltigkeit bis:');
define('TEXT_BANNERS_OR_AT', ', oder bei');
define('TEXT_BANNERS_IMPRESSIONS', 'Impressionen/Anzeigen.');
define('TEXT_BANNERS_SCHEDULED_AT', 'G&uuml;ltigkeit ab:');
define('TEXT_BANNERS_BANNER_NOTE', '<b>Banner Bemerkung:</b><ul><li>Sie k&ouml;nnen Bild- oder HTML-Text-Banner verwenden, beides gleichzeitig ist nicht m&ouml;glich.</li><li>Wenn Sie beide Bannerarten gleichzeitig verwenden, wird nur der HTML-Text Banner angezeigt.</li></ul>');

-define('TEXT_BANNERS_INSERT_NOTE', '<b>Bemerkung:</b><ul><li>Auf das Bildverzeichnis muss ein Schreibrecht bestehen!</li><li>F&uuml;llen Sie das Feld \'Bildziel (Speichern nach)\' nicht aus, wenn Sie kein Bild auf Ihren Server kopieren m&ouml;chten (z.B. wenn sich das Bild bereits auf dem Server befindet).</li><li>Das \'Bildziel (Speichern nach)\' Feld muss ein bereits existierendes Verzeichnis mit \'/\' am Ende sein (z.B. banners/).</li></ul>');

+define('TEXT_BANNERS_INSERT_NOTE', '<b>Bemerkung:</b><ul><li>Auf das Bildverzeichnis muss ein Schreibrecht bestehen!</li><li>F&uuml;llen Sie das Feld \'Bildziel (Speichern nach)\' nicht aus, wenn Sie kein Bild auf Ihren Server kopieren m&ouml;chten (z.B. wenn sich das Bild bereits auf dem Server befindet).</li><li>Das \'Bildziel (Speichern nach)\' Feld muss ein bereits existierendes Verzeichnis mit \'/\' am Ende sein (z.B. banners/).</li></ul>');

define('TEXT_BANNERS_EXPIRCY_NOTE', '<b>G&uuml;ltigkeit Bemerkung:</b><ul><li>Nur ein Feld ausf&uuml;llen!</li><li>Wenn der Banner unbegrenzt angezeigt werden soll, tragen Sie in diesen Feldern nichts ein.</li></ul>');
define('TEXT_BANNERS_SCHEDULE_NOTE', '<b>G&uuml;ltigkeit ab Bemerkung:</b><ul><li>Bei Verwendung dieser Funktion, wird der Banner erst ab dem angegeben Datum angezeigt.</li><li>Alle Banner mit dieser Funktion werden bis ihrer Aktivierung, als Deaktiviert angezeigt.</li></ul>');

@@ -64,4 +64,20 @@

define('ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST', 'Fehler: Das Verzeichnis \'graphs\' ist nicht vorhanden! Bitte erstellen Sie ein Verzeichnis \'graphs\' im Verzeichnis \'images\'.');
define('ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE', 'Fehler: Das Verzeichnis \'graphs\' ist schreibgesch&uuml;tzt!');

+
+define('TABLE_HEADING_SOURCE', 'Grundlage');
+define('TABLE_HEADING_VIEWS', 'Anzeigen');
+define('TABLE_HEADING_CLICKS', 'Klicks');
+
+define('TEXT_BANNERS_DAILY_STATISTICS', '%s Tagesstatistik fr %s %s');
+define('TEXT_BANNERS_MONTHLY_STATISTICS', '%s Monatsstatistik fr %s');
+define('TEXT_BANNERS_YEARLY_STATISTICS', '%s Jahresstatistik');
+
+define('STATISTICS_TYPE_DAILY', 't&auml;glich');
+define('STATISTICS_TYPE_MONTHLY', 'monatlich');
+define('STATISTICS_TYPE_YEARLY', 'j&auml;hrlich');
+
+define('TITLE_TYPE', 'Typ:');
+define('TITLE_YEAR', 'Jahr:');
+define('TITLE_MONTH', 'Monat:');

?>

----------

admin /admin /includes /languages /espanol

banner_manager.php 1.21 -> 1.22

diff -u -r1.21 -r1.22
--- banner_manager.php 2003/07/07 09:23:06 1.21
+++ banner_manager.php 2004/08/15 18:18:33 1.22
@@ -64,4 +64,20 @@

define('ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST', 'Error: No existe el directorio de gr&aacute;ficos. Por favor cree un directorio llamado \'graphs\' dentro de \'images\'.');
define('ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE', 'Error: No se puede escribir en el directorio de gr&aacute;ficos.');

-?>

+
+define('TABLE_HEADING_SOURCE', 'Fecha');
+define('TABLE_HEADING_VIEWS', 'Vistas');
+define('TABLE_HEADING_CLICKS', 'Clicks');
+
+define('TEXT_BANNERS_DAILY_STATISTICS', '%s Estadisticas Diarias de %s %s');
+define('TEXT_BANNERS_MONTHLY_STATISTICS', '%s Estadisticas Mensuales de %s');
+define('TEXT_BANNERS_YEARLY_STATISTICS', '%s Estadisticas Anuales');
+
+define('STATISTICS_TYPE_DAILY', 'Diarias');
+define('STATISTICS_TYPE_MONTHLY', 'Mensuales');
+define('STATISTICS_TYPE_YEARLY', 'Anuales');
+
+define('TITLE_TYPE', 'Tipo:');
+define('TITLE_YEAR', 'A&ntilde;o:');
+define('TITLE_MONTH', 'Mes:');
+?>

\ No newline at end of file

----------

admin /admin /templates /pages

banner_manager.php added at 1.1

diff -N banner_manager.php
--- /dev/null Sun Aug 15 20:18:33 2004
+++ /tmp/cvsAAAKpaq61 Sun Aug 15 20:18:34 2004
@@ -0,0 +1,238 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+
+ $groups_array = array();
+ $Qgroups = $osC_Database->query('select distinct banners_group from :table_banners order by banners_group');
+ $Qgroups->bindTable(':table_banners', TABLE_BANNERS);
+ $Qgroups->execute();
+
+ while ($Qgroups->next()) {
+ $groups_array[] = array('id' => $Qgroups->value('banners_group'), 'text' => $Qgroups->value('banners_group'));
+ }
+?>
+
+<style type="text/css">@import url('external/jscalendar/calendar-win2k-1.css');</style>
+<script type="text/javascript" src="external/jscalendar/calendar.js"></script>
+<script type="text/javascript" src="external/jscalendar/lang/calendar-en.js"></script>
+<script type="text/javascript" src="external/jscalendar/calendar-setup.js"></script>
+
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<div id="infoBox_bDefault" <?php if (!empty($action)) { echo 'style="display: none;"'; } ?>>
+ <table border="0" width="100%" cellspacing="0" cellpadding="2" class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo TABLE_HEADING_BANNERS; ?></th>
+ <th><?php echo TABLE_HEADING_GROUPS; ?></th>
+ <th><?php echo TABLE_HEADING_STATISTICS; ?></th>
+ <th><?php echo TABLE_HEADING_STATUS; ?></th>
+ <th><?php echo TABLE_HEADING_ACTION; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+<?php
+ $Qbanners = $osC_Database->query('select banners_id, banners_title, banners_group, status from :table_banners order by banners_title, banners_group');
+ $Qbanners->bindTable(':table_banners', TABLE_BANNERS);
+ $Qbanners->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS);
+ $Qbanners->execute();
+
+ while ($Qbanners->next()) {
+ $Qinfo = $osC_Database->query('select banners_url, banners_image, banners_html_text, date_format(date_scheduled, "%Y-%m-%d") as date_scheduled, date_format(expires_date, "%Y-%m-%d") as expires_date, expires_impressions from :table_banners where banners_id = :banners_id');
+ $Qinfo->bindTable(':table_banners', TABLE_BANNERS);
+ $Qinfo->bindInt(':banners_id', $Qbanners->valueInt('banners_id'));
+ $Qinfo->execute();
+
+ $Qstats = $osC_Database->query('select sum(banners_shown) as banners_shown, sum(banners_clicked) as banners_clicked from :table_banners_history where banners_id = :banners_id');
+ $Qstats->bindTable(':table_banners_history', TABLE_BANNERS_HISTORY);
+ $Qstats->bindInt(':banners_id', $Qbanners->valueInt('banners_id'));
+ $Qstats->execute();
+
+ if (!isset($bInfo) && (!isset($_GET['bID']) || (isset($_GET['bID']) && ($_GET['bID'] == $Qbanners->valueInt('banners_id'))))) {
+ $bInfo = new objectInfo(array_merge($Qbanners->toArray(), $Qinfo->toArray(), $Qstats->toArray()));
+ }
+
+ if (isset($bInfo) && ($Qbanners->valueInt('banners_id') == $bInfo->banners_id)) {
+ echo ' <tr class="selected">' . "\n";
+ } else {
+ echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);" onClick="document.location.href=\'' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $Qbanners->valueInt('banners_id')) . '\';">' . "\n";
+ }
+?>
+ <td><?php echo '<a href="' . tep_href_link(FILENAME_POPUP_IMAGE, 'banner=' . $Qbanners->valueInt('banners_id')) . '" target="_blank">' . tep_image('templates/' . $template . '/images/icons/16x16/windows.png', 'View Banner', '16', '16') . '&nbsp;' . $Qbanners->valueProtected('banners_title') . '</a>'; ?></td>
+ <td><?php echo $Qbanners->valueProtected('banners_group'); ?></td>
+ <td><?php echo $Qstats->valueInt('banners_shown') . ' / ' . $Qstats->valueInt('banners_clicked'); ?></td>
+ <td align="center"><?php echo tep_image('templates/' . $template . '/images/icons/' . (($Qbanners->valueInt('status') === 1) ? 'checkbox_ticked.gif' : 'checkbox_crossed.gif')); ?></td>
+ <td align="right">
+<?php
+ echo '<a href="#" onClick="document.location.href=\'' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $Qbanners->valueInt('banners_id') . '&action=statistics') . '\';">' . tep_image('templates/' . $template . '/images/icons/16x16/graph.png', ICON_STATISTICS, '16', '16') . '</a>&nbsp;';
+
+ if (isset($bInfo) && ($Qbanners->valueInt('banners_id') == $bInfo->banners_id)) {
+ echo '<a href="#" onClick="toggleInfoBox(\'bEdit\');">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>&nbsp;' .
+ '<a href="#" onClick="toggleInfoBox(\'bDelete\');">' . tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $Qbanners->valueInt('banners_id') . '&action=bEdit') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . '</a>&nbsp;' .
+ '<a href="' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $Qbanners->valueInt('banners_id') . '&action=bDelete') . '">' . tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . '</a>';
+ }
+?>
+ </td>
+ </tr>
+<?php
+ }
+?>
+ </tbody>
+ </table>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="smallText"><?php echo $Qbanners->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_BANNERS); ?></td>
+ <td class="smallText" align="right"><?php echo $Qbanners->displayBatchLinksPullDown(); ?></td>
+ </tr>
+ </table>
+
+ <p align="right"><?php echo '<input type="button" value="' . IMAGE_NEW_BANNER . '" class="infoBoxButton" onClick="toggleInfoBox(\'bNew\');">'; ?></p>
+</div>
+
+<div id="infoBox_bNew" <?php if ($action != 'bNew') { echo 'style="display: none;"'; } ?>>
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/new.png', IMAGE_INSERT, '16', '16') . ' ' . TEXT_INFO_HEADING_NEW_BANNER; ?></div>
+ <div class="infoBoxContent">
+ <?php echo tep_draw_form('bNew', FILENAME_BANNER_MANAGER, 'action=save', 'post', 'enctype="multipart/form-data"'); ?>
+
+ <p><?php echo TEXT_INFO_INSERT_INTRO; ?></p>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_TITLE . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('banners_title', '', 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_URL . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('banners_url', '', 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_GROUP . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_pull_down_menu('banners_group', $groups_array) . TEXT_BANNERS_NEW_GROUP . '<br>' . osc_draw_input_field('new_banners_group', '', 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_IMAGE . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_file_field('banners_image') . ' ' . TEXT_BANNERS_IMAGE_LOCAL . '<br>' . realpath('../images/') . '/' . osc_draw_input_field('banners_image_local'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_IMAGE_TARGET . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo realpath('../images') . '/' . osc_draw_input_field('banners_image_target'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_HTML_TEXT . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo tep_draw_textarea_field('banners_html_text', 'soft', '60', '5'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_SCHEDULED_AT . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('date_scheduled', '', 'id="calendarValueDS"'); ?><input type="button" value="..." id="calendarTriggerDS" class="operationButton"><script type="text/javascript">Calendar.setup( { inputField: "calendarValueDS", ifFormat: "%Y-%m-%d", button: "calendarTriggerDS" } );</script></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_EXPIRES_ON . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('date_expires', '', 'id="calendarValueDE"'); ?><input type="button" value="..." id="calendarTriggerDE" class="operationButton"><script type="text/javascript">Calendar.setup( { inputField: "calendarValueDE", ifFormat: "%Y-%m-%d", button: "calendarTriggerDE" } );</script><?php echo TEXT_BANNERS_OR_AT . '<br>' . osc_draw_input_field('expires_impressions', '', 'maxlength="7" size="7"') . ' ' . TEXT_BANNERS_IMPRESSIONS; ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_STATUS . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_checkbox_field('status'); ?></td>
+ </tr>
+ </table>
+
+ <p align="center"><?php echo '<input type="submit" value="' . IMAGE_SAVE . '" class="operationButton"> <input type="button" value="' . IMAGE_CANCEL . '" onClick="toggleInfoBox(\'bDefault\');" class="operationButton">'; ?></p>
+
+ </form>
+ </div>
+
+ <p><?php echo TEXT_BANNERS_BANNER_NOTE . '<br>' . TEXT_BANNERS_INSERT_NOTE . '<br>' . TEXT_BANNERS_EXPIRCY_NOTE . '<br>' . TEXT_BANNERS_SCHEDULE_NOTE; ?></p>
+</div>
+
+<?php
+ if (isset($bInfo)) {
+?>
+
+<div id="infoBox_bDelete" <?php if ($action != 'bDelete') { echo 'style="display: none;"'; } ?>>
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/trash.png', IMAGE_DELETE, '16', '16') . ' ' . $bInfo->banners_title; ?></div>
+ <div class="infoBoxContent">
+ <?php echo tep_draw_form('bDelete', FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id . '&action=deleteconfirm'); ?>
+
+ <p><?php echo TEXT_INFO_DELETE_INTRO; ?></p>
+ <p><?php echo '<b>' . $bInfo->banners_title . '</b>'; ?></p>
+
+<?php
+ if (!empty($bInfo->banners_image)) {
+ echo ' <p>' . osc_draw_checkbox_field('delete_image', array(array('id' => 'on', 'text' => TEXT_INFO_DELETE_IMAGE)), true) . '</p>';
+ }
+?>
+
+ <p align="center"><?php echo '<input type="submit" value="' . IMAGE_DELETE . '" class="operationButton"> <input type="button" value="' . IMAGE_CANCEL . '" onClick="toggleInfoBox(\'bDefault\');" class="operationButton">'; ?></p>
+
+ </form>
+ </div>
+</div>
+
+
+<div id="infoBox_bEdit" <?php if ($action != 'bEdit') { echo 'style="display: none;"'; } ?>>
+ <div class="infoBoxHeading"><?php echo tep_image('templates/' . $template . '/images/icons/16x16/configure.png', IMAGE_EDIT, '16', '16') . ' ' . $bInfo->banners_title; ?></div>
+ <div class="infoBoxContent">
+ <?php echo tep_draw_form('bEdit', FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $bInfo->banners_id . '&action=save', 'post', 'enctype="multipart/form-data"'); ?>
+
+ <p><?php echo TEXT_INFO_INSERT_INTRO; ?></p>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_TITLE . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('banners_title', $bInfo->banners_title, 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_URL . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('banners_url', $bInfo->banners_url, 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_GROUP . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_pull_down_menu('banners_group', $groups_array, $bInfo->banners_group) . TEXT_BANNERS_NEW_GROUP . '<br>' . osc_draw_input_field('new_banners_group', '', 'style="width: 100%;"'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_IMAGE . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_file_field('banners_image') . ' ' . TEXT_BANNERS_IMAGE_LOCAL . '<br>' . realpath('../images/') . '/' . osc_draw_input_field('banners_image_local', $bInfo->banners_image); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_IMAGE_TARGET . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo realpath('../images') . '/' . osc_draw_input_field('banners_image_target'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_HTML_TEXT . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo tep_draw_textarea_field('banners_html_text', 'soft', '60', '5', $bInfo->banners_html_text); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_SCHEDULED_AT . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('date_scheduled', $bInfo->date_scheduled, 'id="calendarValueDSE"'); ?><input type="button" value="..." id="calendarTriggerDSE" class="operationButton"><script type="text/javascript">Calendar.setup( { inputField: "calendarValueDSE", ifFormat: "%Y-%m-%d", button: "calendarTriggerDSE" } );</script></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_EXPIRES_ON . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_input_field('date_expires', $bInfo->expires_date, 'id="calendarValueDEE"'); ?><input type="button" value="..." id="calendarTriggerDEE" class="operationButton"><script type="text/javascript">Calendar.setup( { inputField: "calendarValueDEE", ifFormat: "%Y-%m-%d", button: "calendarTriggerDEE" } );</script><?php echo TEXT_BANNERS_OR_AT . '<br>' . osc_draw_input_field('expires_impressions', $bInfo->expires_impressions, 'maxlength="7" size="7"') . ' ' . TEXT_BANNERS_IMPRESSIONS; ?></td>
+ </tr>
+ <tr>
+ <td class="smallText" width="40%"><?php echo '<b>' . TEXT_BANNERS_STATUS . '</b>'; ?></td>
+ <td class="smallText" width="60%"><?php echo osc_draw_checkbox_field('status', 'on', (($bInfo->status == 1) ? true : false)); ?></td>
+ </tr>
+ </table>
+
+ <p align="center"><?php echo '<input type="submit" value="' . IMAGE_SAVE . '" class="operationButton"> <input type="button" value="' . IMAGE_CANCEL . '" onClick="toggleInfoBox(\'bDefault\');" class="operationButton">'; ?></p>
+
+ </form>
+ </div>
+
+ <p><?php echo TEXT_BANNERS_BANNER_NOTE . '<br>' . TEXT_BANNERS_INSERT_NOTE . '<br>' . TEXT_BANNERS_EXPIRCY_NOTE . '<br>' . TEXT_BANNERS_SCHEDULE_NOTE; ?></p>
+</div>
+
+<?php
+ }
+?>

----------

admin /admin /templates /pages

banner_manager_statistics.php added at 1.1

diff -N banner_manager_statistics.php
--- /dev/null Sun Aug 15 20:18:33 2004
+++ /tmp/cvsAAAhyaG61 Sun Aug 15 20:18:35 2004
@@ -0,0 +1,113 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+
+ $type = (isset($_GET['type']) ? $_GET['type'] : '');
+
+ $Qbanner = $osC_Database->query('select banners_title from :table_banners where banners_id = :banners_id');
+ $Qbanner->bindTable(':table_banners', TABLE_BANNERS);
+ $Qbanner->bindInt(':banners_id', $_GET['bID']);
+ $Qbanner->execute();
+
+ $years_array = array();
+ $Qyears = $osC_Database->query('select distinct year(banners_history_date) as banner_year from :table_banners_history where banners_id = :banners_id');
+ $Qyears->bindTable(':table_banners_history', TABLE_BANNERS_HISTORY);
+ $Qyears->bindInt(':banners_id', $_GET['bID']);
+ $Qyears->execute();
+
+ while ($Qyears->next()) {
+ $years_array[] = array('id' => $Qyears->valueInt('banner_year'),
+ 'text' => $Qyears->valueInt('banner_year'));
+ }
+
+ $Qyears->freeResult();
+
+ $months_array = array();
+ for ($i=1; $i<13; $i++) {
+ $months_array[] = array('id' => $i,
+ 'text' => strftime('%B', mktime(0,0,0,$i)));
+ }
+
+ $type_array = array(array('id' => 'daily',
+ 'text' => STATISTICS_TYPE_DAILY),
+ array('id' => 'monthly',
+ 'text' => STATISTICS_TYPE_MONTHLY),
+ array('id' => 'yearly',
+ 'text' => STATISTICS_TYPE_YEARLY));
+?>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td><h1><?php echo HEADING_TITLE . ': ' . $Qbanner->value('banners_title'); ?></h1></td>
+ <td class="smallText" align="right">
+<?php
+ echo tep_draw_form('type', FILENAME_BANNER_MANAGER, '', 'get') . osc_draw_hidden_field('page', $_GET['page']) . osc_draw_hidden_field('bID', $_GET['bID']) . osc_draw_hidden_field('action', 'statistics') .
+ TITLE_TYPE . ' ' . osc_draw_pull_down_menu('type', $type_array, 'daily', 'onChange="this.form.submit();"');
+
+ switch ($type) {
+ case 'yearly': break;
+ case 'monthly':
+ echo TITLE_YEAR . ' ' . osc_draw_pull_down_menu('year', $years_array, date('Y'), 'onChange="this.form.submit();"');
+ break;
+ default:
+ case 'daily':
+ echo TITLE_MONTH . ' ' . osc_draw_pull_down_menu('month', $months_array, date('n'), 'onChange="this.form.submit();"') . TITLE_YEAR . ' ' . osc_draw_pull_down_menu('year', $years_array, date('Y'), 'onChange="this.form.submit();"');
+ break;
+ }
+
+ echo '</form>';
+?>
+ </td>
+ </tr>
+</table>
+
+<?php
+ if (($dir_ok == true) && !empty($image_extension)) {
+ switch ($type) {
+ case 'yearly':
+ include(DIR_WS_INCLUDES . 'graphs/banner_yearly.php');
+ echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
+ break;
+ case 'monthly':
+ include(DIR_WS_INCLUDES . 'graphs/banner_monthly.php');
+ echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
+ break;
+ default:
+ case 'daily':
+ include(DIR_WS_INCLUDES . 'graphs/banner_daily.php');
+ echo '<p align="center">' . tep_image(DIR_WS_IMAGES . 'graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension) . '</p>';
+ break;
+ }
+ }
+?>
+
+<table border="0" width="600" cellspacing="0" cellpadding="2" class="dataTable" align="center">
+ <thead>
+ <tr>
+ <th><?php echo TABLE_HEADING_SOURCE; ?></th>
+ <th><?php echo TABLE_HEADING_VIEWS; ?></th>
+ <th><?php echo TABLE_HEADING_CLICKS; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+<?php
+ for ($i=0, $n=sizeof($stats); $i<$n; $i++) {
+ echo ' <tr>' . "\n" .
+ ' <td>' . $stats[$i][0] . '</td>' . "\n" .
+ ' <td>' . number_format($stats[$i][1]) . '</td>' . "\n" .
+ ' <td>' . number_format($stats[$i][2]) . '</td>' . "\n" .
+ ' </tr>' . "\n";
+ }
+?>
+ </tbody>
+</table>
+
+<p align="right"><?php echo '<input type="button" value="' . IMAGE_BACK . '" class="operationButton" onClick="document.location.href=\'' . tep_href_link(FILENAME_BANNER_MANAGER, 'page=' . $_GET['page'] . '&bID=' . $_GET['bID']) . '\';">'; ?></p>

----------

admin /admin /includes /graphs

banner_daily.php 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- banner_daily.php 2002/05/09 14:09:38 1.2
+++ banner_daily.php 2004/08/15 18:18:35 1.3
@@ -5,49 +5,47 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

- include(DIR_WS_CLASSES . 'phplot.php');

+ require('external/panachart/panachart.php');

- $year = (($HTTP_GET_VARS['year']) ? $HTTP_GET_VARS['year'] : date('Y'));
- $month = (($HTTP_GET_VARS['month']) ? $HTTP_GET_VARS['month'] : date('n'));

+ $views = array();
+ $clicks = array();
+ $vLabels = array();

- $days = (date('t', mktime(0,0,0,$month))+1);

+ $year = isset($_GET['year']) ? $_GET['year'] : date('Y');
+ $month = isset($_GET['month']) ? $_GET['month'] : date('n');
+
+ $days = date('t', mktime(0,0,0,$month))+1;

$stats = array();
for ($i=1; $i<$days; $i++) {
$stats[] = array($i, '0', '0');

+
+ $views[$i-1] = 0;
+ $clicks[$i-1] = 0;
+ $vLabels[] = $i;

}

- $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as banner_day, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and month(banners_history_date) = '" . $month . "' and year(banners_history_date) = '" . $year . "'");

+ $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as banner_day, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $_GET['bID'] . "' and month(banners_history_date) = '" . $month . "' and year(banners_history_date) = '" . $year . "'");

while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
$stats[($banner_stats['banner_day']-1)] = array($banner_stats['banner_day'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));

- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_daily-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);

- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');
-
- $graph->SetPlotBorderType('left');
- $graph->SetTitleFontSize('4');
- $graph->SetTitle(sprintf(TEXT_BANNERS_DAILY_STATISTICS, $banner['banners_title'], strftime('%B', mktime(0,0,0,$month)), $year));
-
- $graph->SetBackgroundColor('white');
-
- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();

+ $views[($banner_stats['banner_day']-1)] = $banner_stats['value'];
+ $clicks[($banner_stats['banner_day']-1)] = $banner_stats['dvalue'];
+ }

- $graph->PrintImage();

+ $ochart = new chart(600,350, 5, '#eeeeee');
+ $ochart->setTitle(sprintf(TEXT_BANNERS_DAILY_STATISTICS, $Qbanner->value('banners_title'), strftime('%B', mktime(0,0,0,$month)), $year), '#000000', 2);
+ $ochart->setPlotArea(SOLID, '#444444', '#dddddd');
+ $ochart->setFormat(0, ',', '.');
+ $ochart->setXAxis('#000000', SOLID, 1, '');
+ $ochart->setYAxis('#000000', SOLID, 2, '');
+ $ochart->setLabels($vLabels, '#000000', 1, VERTICAL);
+ $ochart->setGrid('#bbbbbb', DASHED, '#bbbbbb', DOTTED);
+ $ochart->addSeries($views, 'area', 'Series1', SOLID, '#000000', '#0000ff');
+ $ochart->addSeries($clicks, 'area', 'Series1', SOLID, '#000000', '#ff0000');
+ $ochart->plot('images/graphs/banner_daily-' . $_GET['bID'] . '.' . $image_extension);

?>

----------

admin /admin /includes /graphs

banner_infobox.php 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- banner_infobox.php 2003/07/30 18:07:14 1.4
+++ banner_infobox.php 2004/08/15 18:18:35 1.5
@@ -5,43 +5,37 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

- include(DIR_WS_CLASSES . 'phplot.php');

+ require('external/panachart/panachart.php');

- $stats = array();
- $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and to_days(now()) - to_days(banners_history_date) < " . $days . " order by banners_history_date");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[] = array($banner_stats['name'], $banner_stats['value'], $banner_stats['dvalue']);
- }
-
- if (sizeof($stats) < 1) $stats = array(array(date('j'), 0, 0));
-
- $graph = new PHPlot(200, 220, 'images/graphs/banner_infobox-' . $banner_id . '.' . $banner_extension);

+ $views = array(0, 0, 0);
+ $clicks = array(0, 0, 0);
+ $vLabels = array(0, 0, 0);

- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);

+ $index = 2;

- $graph->draw_vert_ticks = 0;
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawXDataLabels(0);
- $graph->SetDrawYGrid(0);
- $graph->SetPlotType('bars');
- $graph->SetDrawDataLabels(1);
- $graph->SetLabelScalePosition(1);
- $graph->SetMarginsPixels(15,15,15,30);
-
- $graph->SetTitleFontSize('4');
- $graph->SetTitle(TEXT_BANNERS_LAST_3_DAYS);
-
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));

+ $banner_stats_query = tep_db_query("select date_format(banners_history_date, '%e-%b') as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' order by banners_history_date desc limit " . $days);
+ while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
+ $views[$index] = $banner_stats['value'];
+ $clicks[$index] = $banner_stats['dvalue'];
+ $vLabels[$index] = $banner_stats['name'];

- $graph->DrawGraph();

+ $index--;
+ }

- $graph->PrintImage();

+ $ochart = new chart(200, 220, 5, '#eeeeee');
+ $ochart->setTitle(TEXT_BANNERS_LAST_3_DAYS, '#000000', 2);
+ $ochart->setPlotArea(SOLID, '#444444', '#dddddd');
+ $ochart->setFormat(0, ',', '.');
+ $ochart->setXAxis('#000000', SOLID, 1, '');
+ $ochart->setYAxis('#000000', SOLID, 2, '');
+ $ochart->setLabels($vLabels, '#000000', 1, VERTICAL);
+ $ochart->setGrid('#bbbbbb', DASHED, '#bbbbbb', DOTTED);
+ $ochart->addSeries($views, 'area', 'Series1', SOLID, '#000000', '#0000ff');
+ $ochart->addSeries($clicks, 'area', 'Series1', SOLID, '#000000', '#ff0000');
+ $ochart->plot('images/graphs/banner_infobox-' . $banner_id . '.' . $image_extension);

?>

----------

admin /admin /includes /graphs

banner_monthly.php 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- banner_monthly.php 2002/05/09 18:28:46 1.3
+++ banner_monthly.php 2004/08/15 18:18:35 1.4
@@ -5,47 +5,53 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

- include(DIR_WS_CLASSES . 'phplot.php');

+ require('external/panachart/panachart.php');

- $year = (($HTTP_GET_VARS['year']) ? $HTTP_GET_VARS['year'] : date('Y'));

+ $year = isset($_GET['year']) ? $_GET['year'] : date('Y');

$stats = array();
for ($i=1; $i<13; $i++) {
$stats[] = array(strftime('%b', mktime(0,0,0,$i)), '0', '0');
}

- $banner_stats_query = tep_db_query("select month(banners_history_date) as banner_month, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and year(banners_history_date) = '" . $year . "' group by banner_month");

+ $views = array();
+ $clicks = array();
+
+ $banner_stats_query = tep_db_query("select month(banners_history_date) as banner_month, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $_GET['bID'] . "' and year(banners_history_date) = '" . $year . "' group by banner_month");

while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
$stats[($banner_stats['banner_month']-1)] = array(strftime('%b', mktime(0,0,0,$banner_stats['banner_month'])), (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));

- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_monthly-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');

- $graph->SetPlotBorderType('left');
- $graph->SetTitleFontSize('4');
- $graph->SetTitle(sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $banner['banners_title'], $year));
-
- $graph->SetBackgroundColor('white');

+ $views[($banner_stats['banner_month']-1)] = $banner_stats['value'];
+ $clicks[($banner_stats['banner_month']-1)] = $banner_stats['dvalue'];
+ }

- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));

+ $vLabels = array();
+ for ($i=1; $i<13; $i++) {
+ $vLabels[] = strftime('%b', mktime(0,0,0,$i));

- $graph->DrawGraph();

+ if (!isset($views[$i-1])) {
+ $views[$i-1] = 0;
+ }
+
+ if (!isset($clicks[$i-1])) {
+ $clicks[$i-1] = 0;
+ }
+ }

- $graph->PrintImage();

+ $ochart = new chart(600,350, 5, '#eeeeee');
+ $ochart->setTitle(sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $Qbanner->value('banners_title'), $year), '#000000', 2);
+ $ochart->setPlotArea(SOLID, '#444444', '#dddddd');
+ $ochart->setFormat(0, ',', '.');
+ $ochart->setXAxis('#000000', SOLID, 1, $year);
+ $ochart->setYAxis('#000000', SOLID, 2, '');
+ $ochart->setLabels($vLabels, '#000000', 1, VERTICAL);
+ $ochart->setGrid('#bbbbbb', DASHED, '#bbbbbb', DOTTED);
+ $ochart->addSeries($views, 'area', 'Series1', SOLID, '#000000', '#0000ff');
+ $ochart->addSeries($clicks, 'area', 'Series1', SOLID, '#000000', '#ff0000');
+ $ochart->plot('images/graphs/banner_monthly-' . $_GET['bID'] . '.' . $image_extension);

?>

----------

admin /admin /includes /graphs

banner_yearly.php 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- banner_yearly.php 2002/05/09 18:28:46 1.3
+++ banner_yearly.php 2004/08/15 18:18:35 1.4
@@ -5,41 +5,36 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

- include(DIR_WS_CLASSES . 'phplot.php');

+ require('external/panachart/panachart.php');

- $stats = array(array('0', '0', '0'));
- $banner_stats_query = tep_db_query("select year(banners_history_date) as year, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' group by year");

+ $views = array();
+ $clicks = array();
+ $vLabels = array();
+
+ $stats = array();
+ $banner_stats_query = tep_db_query("select year(banners_history_date) as year, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $_GET['bID'] . "' group by year");

while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
$stats[] = array($banner_stats['year'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));

- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_yearly-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');

- $graph->SetPlotBorderType('left');
- $graph->SetTitleFontSize('4');
- $graph->SetTitle(sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $banner['banners_title']));
-
- $graph->SetBackgroundColor('white');
-
- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();

+ $views[] = $banner_stats['value'];
+ $clicks[] = $banner_stats['dvalue'];
+ $vLabels[] = $banner_stats['year'];
+ }

- $graph->PrintImage();

+ $ochart = new chart(600,350, 5, '#eeeeee');
+ $ochart->setTitle(sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $Qbanner->value('banners_title')), '#000000', 2);
+ $ochart->setPlotArea(SOLID, '#444444', '#dddddd');
+ $ochart->setFormat(0, ',', '.');
+ $ochart->setXAxis('#000000', SOLID, 1, '');
+ $ochart->setYAxis('#000000', SOLID, 2, '');
+ $ochart->setLabels($vLabels, '#000000', 1, VERTICAL);
+ $ochart->setGrid('#bbbbbb', DASHED, '#bbbbbb', DOTTED);
+ $ochart->addSeries($views, 'area', 'Series1', SOLID, '#000000', '#0000ff');
+ $ochart->addSeries($clicks, 'area', 'Series1', SOLID, '#000000', '#ff0000');
+ $ochart->plot('images/graphs/banner_yearly-' . $_GET['bID'] . '.' . $image_extension);

?>

CVSspam 0.2.9

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285