Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Support nested Actions (Admin/ZoneGroups Application)

  • Loading branch information...
commit d0cfd8f93703e67bd210c03354e0422ae8a570f3 1 parent f2de786
Harald Ponce de Leon haraldpdl authored committed
Showing with 223 additions and 127 deletions.
  1. +0 −22 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDelete.php
  2. +38 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDelete/Process.php
  3. +0 −22 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDeleteEntries.php
  4. +38 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDeleteEntries/Process.php
  5. +0 −13 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Delete.php
  6. +29 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Delete/Process.php
  7. +0 −13 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntryDelete.php
  8. +29 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntryDelete/Process.php
  9. +0 −17 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntrySave.php
  10. +33 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntrySave/Process.php
  11. +0 −16 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Save.php
  12. +32 −0 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Save/Process.php
  13. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/batch_delete.php
  14. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/delete.php
  15. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/edit.php
  16. +4 −4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries.php
  17. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_batch_delete.php
  18. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_delete.php
  19. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_edit.php
  20. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_new.php
  21. +4 −4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/main.php
  22. +2 −2 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/new.php
22 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDelete.php
View
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchDelete {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('batch_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $error = false;
-
- foreach ( $_POST['batch'] as $id ) {
- if ( !ZoneGroups::delete($id) ) {
- $error = true;
- break;
- }
- }
-
- if ( $error === false ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
}
38 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDelete/Process.php
View
@@ -0,0 +1,38 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\BatchDelete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $error = false;
+
+ foreach ( $_POST['batch'] as $id ) {
+ if ( !ZoneGroups::delete($id) ) {
+ $error = true;
+ break;
+ }
+ }
+
+ if ( $error === false ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
22 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDeleteEntries.php
View
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchDeleteEntries {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('entries_batch_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $error = false;
-
- foreach ( $_POST['batch'] as $id ) {
- if ( !ZoneGroups::deleteEntry($id) ) {
- $error = true;
- break;
- }
- }
-
- if ( $error === false ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
}
38 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/BatchDeleteEntries/Process.php
View
@@ -0,0 +1,38 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\BatchDeleteEntries;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $error = false;
+
+ foreach ( $_POST['batch'] as $id ) {
+ if ( !ZoneGroups::deleteEntry($id) ) {
+ $error = true;
+ break;
+ }
+ }
+
+ if ( $error === false ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
13 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Delete.php
View
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Delete {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( ZoneGroups::delete($_GET['id']) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
?>
29 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Delete/Process.php
View
@@ -0,0 +1,29 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\Delete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( ZoneGroups::delete($_GET['id']) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
13 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntryDelete.php
View
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class EntryDelete {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('entries_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( ZoneGroups::deleteEntry($_GET['zID']) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
?>
29 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntryDelete/Process.php
View
@@ -0,0 +1,29 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\EntryDelete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( ZoneGroups::deleteEntry($_GET['zID']) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
17 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntrySave.php
View
@@ -11,9 +11,6 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class EntrySave {
public static function execute(ApplicationAbstract $application) {
@@ -22,20 +19,6 @@ public static function execute(ApplicationAbstract $application) {
} else {
$application->setPageContent('entries_new.php');
}
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('group_id' => $_GET['id'],
- 'country_id' => $_POST['zone_country_id'],
- 'zone_id' => $_POST['zone_id']);
-
- if ( ZoneGroups::saveEntry((isset($_GET['zID']) && is_numeric($_GET['zID']) ? $_GET['zID'] : null), $data) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
- }
}
}
?>
33 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/EntrySave/Process.php
View
@@ -0,0 +1,33 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\EntrySave;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('group_id' => $_GET['id'],
+ 'country_id' => $_POST['zone_country_id'],
+ 'zone_id' => $_POST['zone_id']);
+
+ if ( ZoneGroups::saveEntry((isset($_GET['zID']) && is_numeric($_GET['zID']) ? $_GET['zID'] : null), $data) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink(null, null, 'id=' . $_GET['id']));
+ }
+ }
+?>
16 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Save.php
View
@@ -11,9 +11,6 @@
namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Save {
public static function execute(ApplicationAbstract $application) {
@@ -22,19 +19,6 @@ public static function execute(ApplicationAbstract $application) {
} else {
$application->setPageContent('new.php');
}
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('zone_name' => $_POST['zone_name'],
- 'zone_description' => $_POST['zone_description']);
-
- if ( ZoneGroups::save((isset($_GET['id']) && is_numeric($_GET['id']) ? $_GET['id'] : null), $data) ) {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
- } else {
- Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
- }
-
- osc_redirect_admin(OSCOM::getLink());
- }
}
}
?>
32 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/Action/Save/Process.php
View
@@ -0,0 +1,32 @@
+<?php
+/*
+ osCommerce Online Merchant $osCommerce-SIG$
+ Copyright (c) 2010 osCommerce (http://www.oscommerce.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License v2 (1991)
+ as published by the Free Software Foundation.
+*/
+
+ namespace osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\Action\Save;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\ZoneGroups\ZoneGroups;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('zone_name' => $_POST['zone_name'],
+ 'zone_description' => $_POST['zone_description']);
+
+ if ( ZoneGroups::save((isset($_GET['id']) && is_numeric($_GET['id']) ? $_GET['id'] : null), $data) ) {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_success_action_performed'), 'success');
+ } else {
+ Registry::get('MessageStack')->add(null, OSCOM::getDef('ms_error_action_not_performed'), 'error');
+ }
+
+ osc_redirect_admin(OSCOM::getLink());
+ }
+ }
+?>
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/batch_delete.php
View
@@ -23,7 +23,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . OSCOM::getDef('action_heading_batch_delete_zone_groups'); ?></h3>
- <form name="zDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=BatchDelete'); ?>" method="post">
+ <form name="zDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDelete&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_zone_groups'); ?></p>
@@ -45,7 +45,7 @@
}
if ( !empty($names_string) ) {
- $names_string = substr($names_string, 0, -2) . osc_draw_hidden_field('subaction', 'confirm');
+ $names_string = substr($names_string, 0, -2);
}
echo '<p>' . $names_string . '</p>';
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/delete.php
View
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . $OSCOM_ObjectInfo->getProtected('geo_zone_name'); ?></h3>
- <form name="zDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $OSCOM_ObjectInfo->getInt('geo_zone_id') . '&action=Delete'); ?>" method="post">
+ <form name="zDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Delete&Process&id=' . $OSCOM_ObjectInfo->getInt('geo_zone_id')); ?>" method="post">
<?php
if ( ZoneGroups::hasTaxRate($OSCOM_ObjectInfo->getInt('geo_zone_id')) ) {
@@ -44,7 +44,7 @@
<p><?php echo '<b>' . $OSCOM_ObjectInfo->getProtected('geo_zone_name') . ' (' . sprintf(OSCOM::getDef('total_entries'), $OSCOM_ObjectInfo->getInt('total_entries')) . ')</b>'; ?></p>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
<?php
}
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/edit.php
View
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . $OSCOM_ObjectInfo->getProtected('geo_zone_name'); ?></h3>
- <form name="zEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $OSCOM_ObjectInfo->getInt('geo_zone_id') . '&action=Save'); ?>" method="post">
+ <form name="zEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Save&Process&id=' . $OSCOM_ObjectInfo->getInt('geo_zone_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_zone_group'); ?></p>
@@ -35,7 +35,7 @@
<p><label for="zone_description"><?php echo OSCOM::getDef('field_description'); ?></label><?php echo osc_draw_input_field('zone_description', $OSCOM_ObjectInfo->get('geo_zone_description')); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
8 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries.php
View
@@ -22,7 +22,7 @@
<form id="liveSearchForm">
<input type="text" id="liveSearchField" name="search" class="searchField fieldTitleAsDefault" title="Search.." /><?php echo osc_draw_button(array('type' => 'button', 'params' => 'onclick="osC_DataTable.reset();"', 'title' => 'Reset')); ?>
- <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=EntrySave'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'EntrySave&id=' . $_GET['id']), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -43,7 +43,7 @@
</thead>
<tfoot>
<tr>
- <th align="right" colspan="3"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=BatchDeleteEntries') . '\';" />'; ?></th>
+ <th align="right" colspan="3"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchDeleteEntries&id=' . $_GET['id']) . '\';" />'; ?></th>
<th align="center" width="20"><?php echo osc_draw_checkbox_field('batchFlag', null, null, 'onclick="flagCheckboxes(this);"'); ?></th>
</tr>
</tfoot>
@@ -74,10 +74,10 @@
var dataTableName = 'zoneGroupEntriesDataTable';
var dataTableDataURL = '<?php echo OSCOM::getRPCLink(null, null, 'id=' . $_GET['id'] . '&action=getAllEntries'); ?>';
- var entryEditLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&zID=ENTRYID&action=EntrySave'); ?>';
+ var entryEditLink = '<?php echo OSCOM::getLink(null, null, 'EntrySave&id=' . $_GET['id'] . '&zID=ENTRYID'); ?>';
var entryEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var entryDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&zID=ENTRYID&action=EntryDelete'); ?>';
+ var entryDeleteLink = '<?php echo OSCOM::getLink(null, null, 'EntryDelete&id=' . $_GET['id'] . '&zID=ENTRYID'); ?>';
var entryDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var allCountries = '<?php echo addslashes(OSCOM::getDef('all_countries')); ?>';
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_batch_delete.php
View
@@ -22,7 +22,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . OSCOM::getDef('action_heading_batch_delete_zone_entries'); ?></h3>
- <form name="zDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=BatchDeleteEntries'); ?>" method="post">
+ <form name="zDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDeleteEntries&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_zone_entries'); ?></p>
@@ -43,7 +43,7 @@
echo '<p>' . $names_string . '</p>';
- echo '<p>' . osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))) . '</p>';
+ echo '<p>' . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))) . '</p>';
?>
</form>
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_delete.php
View
@@ -26,13 +26,13 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . $OSCOM_ObjectInfo->getProtected('countries_name') . ': ' . $OSCOM_ObjectInfo->getProtected('zone_name'); ?></h3>
- <form name="zDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&zID=' . $OSCOM_ObjectInfo->getInt('association_id') . '&action=EntryDelete'); ?>" method="post">
+ <form name="zDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntryDelete&Process&id=' . $_GET['id'] . '&zID=' . $OSCOM_ObjectInfo->getInt('association_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_delete_zone_entry'); ?></p>
<p><?php echo '<b>' . $OSCOM_ObjectInfo->getProtected('countries_name') . ': ' . $OSCOM_ObjectInfo->getProtected('zone_name') . '</b>'; ?></p>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'trash', 'title' => OSCOM::getDef('button_delete'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_edit.php
View
@@ -61,7 +61,7 @@ function update_zone(theForm) {
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . $OSCOM_ObjectInfo->getProtected('countries_name') . ': ' . $OSCOM_ObjectInfo->getProtected('zone_name'); ?></h3>
- <form name="zEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&zID=' . $OSCOM_ObjectInfo->getInt('association_id') . '&action=EntrySave'); ?>" method="post">
+ <form name="zEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntrySave&Process&id=' . $_GET['id'] . '&zID=' . $OSCOM_ObjectInfo->getInt('association_id')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_zone_entry'); ?></p>
@@ -70,7 +70,7 @@ function update_zone(theForm) {
<p><label for="zone_id"><?php echo OSCOM::getDef('field_zone'); ?></label><?php echo osc_draw_pull_down_menu('zone_id', $zones_array, $OSCOM_ObjectInfo->get('zone_id')); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/entries_new.php
View
@@ -50,7 +50,7 @@ function update_zone(theForm) {
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_new_zone_entry'); ?></h3>
- <form name="zeNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=EntrySave'); ?>" method="post">
+ <form name="zeNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EntrySave&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_new_zone_entry'); ?></p>
@@ -59,7 +59,7 @@ function update_zone(theForm) {
<p><label for="zone_id"><?php echo OSCOM::getDef('field_zone'); ?></label><?php echo osc_draw_pull_down_menu('zone_id', $zones_array); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
8 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/main.php
View
@@ -22,7 +22,7 @@
<form id="liveSearchForm">
<input type="text" id="liveSearchField" name="search" class="searchField fieldTitleAsDefault" title="Search.." /><?php echo osc_draw_button(array('type' => 'button', 'params' => 'onclick="osC_DataTable.reset();"', 'title' => 'Reset')); ?>
- <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'action=Save'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'Save'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -42,7 +42,7 @@
</thead>
<tfoot>
<tr>
- <th align="right" colspan="2"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'action=BatchDelete') . '\';" />'; ?></th>
+ <th align="right" colspan="2"><?php echo '<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchDelete') . '\';" />'; ?></th>
<th align="center" width="20"><?php echo osc_draw_checkbox_field('batchFlag', null, null, 'onclick="flagCheckboxes(this);"'); ?></th>
</tr>
</tfoot>
@@ -76,10 +76,10 @@
var groupLink = '<?php echo OSCOM::getLink(null, null, 'id=GROUPID'); ?>';
var groupLinkIcon = '<?php echo osc_icon('folder.png'); ?>';
- var groupEditLink = '<?php echo OSCOM::getLink(null, null, 'id=GROUPID&action=Save'); ?>';
+ var groupEditLink = '<?php echo OSCOM::getLink(null, null, 'Save&id=GROUPID'); ?>';
var groupEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var groupDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=GROUPID&action=Delete'); ?>';
+ var groupDeleteLink = '<?php echo OSCOM::getLink(null, null, 'Delete&id=GROUPID'); ?>';
var groupDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var osC_DataTable = new osC_DataTable();
4 osCommerce/OM/Core/Site/Admin/Application/ZoneGroups/pages/new.php
View
@@ -22,7 +22,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_new_zone_group'); ?></h3>
- <form name="zNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=Save'); ?>" method="post">
+ <form name="zNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Save&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_new_zone_group'); ?></p>
@@ -31,7 +31,7 @@
<p><label for="zone_description"><?php echo OSCOM::getDef('field_description'); ?></label><?php echo osc_draw_input_field('zone_description'); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
+ <p><?php echo osc_draw_button(array('priority' => 'primary', 'icon' => 'check', 'title' => OSCOM::getDef('button_save'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.