Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Support nested Actions (Admin/Languages Application)

  • Loading branch information...
commit 84d03f7568b2abf9712dfc87a6a1ef6b713f04f4 1 parent 18b2bd4
@haraldpdl haraldpdl authored committed
Showing with 383 additions and 206 deletions.
  1. +0 −22 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDelete.php
  2. +38 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDelete/Process.php
  3. +0 −22 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDeleteDefinitions.php
  4. +38 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDeleteDefinitions/Process.php
  5. +0 −13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchSaveDefinitions.php
  6. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchSaveDefinitions/Process.php
  7. +0 −13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Delete.php
  8. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Delete/Process.php
  9. +0 −13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteDefinition.php
  10. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteDefinition/Process.php
  11. +0 −12 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteGroup.php
  12. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteGroup/Process.php
  13. +0 −13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/EditDefinition.php
  14. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/EditDefinition/Process.php
  15. +0 −5 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Export.php
  16. +21 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Export/Process.php
  17. +0 −13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Import.php
  18. +29 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Import/Process.php
  19. +0 −16 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/InsertDefinition.php
  20. +32 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/InsertDefinition/Process.php
  21. +0 −27 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Save.php
  22. +43 −0 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Save/Process.php
  23. +4 −4 osCommerce/OM/Core/Site/Admin/Application/Languages/Languages.php
  24. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/batch_delete.php
  25. +4 −4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions.php
  26. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_batch_delete.php
  27. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_batch_edit.php
  28. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_delete.php
  29. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_edit.php
  30. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_new.php
  31. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/delete.php
  32. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/edit.php
  33. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/export.php
  34. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/groups.php
  35. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/groups_delete.php
  36. +2 −2 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/import.php
  37. +5 −5 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/main.php
View
22 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDelete.php
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- 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 ( !Languages::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());
- }
}
}
}
View
38 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDelete/Process.php
@@ -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\Languages\Action\BatchDelete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ 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 ( !Languages::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());
+ }
+ }
+?>
View
22 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDeleteDefinitions.php
@@ -11,33 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchDeleteDefinitions {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('definitions_batch_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $error = false;
-
- foreach ( $_POST['batch'] as $id ) {
- if ( !Languages::deleteDefinitions($_GET['id'], $_GET['group'], $_POST['batch']) ) {
- $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'] . '&group=' . $_GET['group']));
- }
}
}
}
View
38 ...mmerce/OM/Core/Site/Admin/Application/Languages/Action/BatchDeleteDefinitions/Process.php
@@ -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\Languages\Action\BatchDeleteDefinitions;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ 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 ( !Languages::deleteDefinitions($_GET['id'], $_GET['group'], $_POST['batch']) ) {
+ $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'] . '&group=' . $_GET['group']));
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchSaveDefinitions.php
@@ -11,24 +11,11 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class BatchSaveDefinitions {
public static function execute(ApplicationAbstract $application) {
if ( isset($_POST['batch']) && is_array($_POST['batch']) && !empty($_POST['batch']) ) {
$application->setPageContent('definitions_batch_edit.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( Languages::updateDefinitions($_GET['id'], $_GET['group'], $_POST['def']) ) {
- 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'] . '&group=' . $_GET['group']));
- }
}
}
}
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/BatchSaveDefinitions/Process.php
@@ -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\Languages\Action\BatchSaveDefinitions;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::updateDefinitions($_GET['id'], $_GET['group'], $_POST['def']) ) {
+ 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'] . '&group=' . $_GET['group']));
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Delete.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- 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 ( Languages::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());
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Delete/Process.php
@@ -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\Languages\Action\Delete;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::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());
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteDefinition.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class DeleteDefinition {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('definitions_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( Languages::deleteDefinitions($_GET['id'], $_GET['group'], array($_GET['dID'])) ) {
- 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'] . '&group=' . $_GET['group']));
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteDefinition/Process.php
@@ -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\Languages\Action\DeleteDefinition;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::deleteDefinitions($_GET['id'], $_GET['group'], array($_GET['dID'])) ) {
+ 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'] . '&group=' . $_GET['group']));
+ }
+ }
+?>
View
12 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteGroup.php
@@ -12,23 +12,11 @@
use osCommerce\OM\Core\ApplicationAbstract;
use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class DeleteGroup {
public static function execute(ApplicationAbstract $application) {
if ( Languages::isDefinitionGroup($_GET['id'], $_GET['group']) ) {
$application->setPageContent('groups_delete.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( Languages::deleteDefinitionGroup($_GET['group']) ) {
- 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']));
- }
}
}
}
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/DeleteGroup/Process.php
@@ -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\Languages\Action\DeleteGroup;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::deleteDefinitionGroup($_GET['group']) ) {
+ 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']));
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/EditDefinition.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class EditDefinition {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('definitions_edit.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( Languages::updateDefinitions($_GET['id'], $_GET['group'], $_POST['def']) ) {
- 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'] . '&group=' . $_GET['group']));
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/EditDefinition/Process.php
@@ -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\Languages\Action\EditDefinition;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::updateDefinitions($_GET['id'], $_GET['group'], $_POST['def']) ) {
+ 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'] . '&group=' . $_GET['group']));
+ }
+ }
+?>
View
5 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Export.php
@@ -11,15 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
class Export {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('export.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- Languages::export($_GET['id'], $_POST['groups'], (isset($_POST['include_data']) && ($_POST['include_data'] == 'on')));
- }
}
}
?>
View
21 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Export/Process.php
@@ -0,0 +1,21 @@
+<?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\Languages\Action\Export;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ Languages::export($_GET['id'], $_POST['groups'], (isset($_POST['include_data']) && ($_POST['include_data'] == 'on')));
+ }
+ }
+?>
View
13 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Import.php
@@ -11,23 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Import {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('import.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- if ( Languages::import($_POST['language_import'], $_POST['import_type']) ) {
- 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());
- }
}
}
?>
View
29 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Import/Process.php
@@ -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\Languages\Action\Import;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ if ( Languages::import($_POST['language_import'], $_POST['import_type']) ) {
+ 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());
+ }
+ }
+?>
View
16 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/InsertDefinition.php
@@ -11,26 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class InsertDefinition {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('definitions_new.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('key' => $_POST['key'],
- 'value' => $_POST['value']);
-
- if ( Languages::insertDefinition($_POST['defgroup'], $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'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '')));
- }
}
}
?>
View
32 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/InsertDefinition/Process.php
@@ -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\Languages\Action\InsertDefinition;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('key' => $_POST['key'],
+ 'value' => $_POST['value']);
+
+ if ( Languages::insertDefinition($_POST['defgroup'], $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'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '')));
+ }
+ }
+?>
View
27 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Save.php
@@ -11,37 +11,10 @@
namespace osCommerce\OM\Core\Site\Admin\Application\Languages\Action;
use osCommerce\OM\Core\ApplicationAbstract;
- use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
- use osCommerce\OM\Core\Registry;
- use osCommerce\OM\Core\OSCOM;
class Save {
public static function execute(ApplicationAbstract $application) {
$application->setPageContent('edit.php');
-
- if ( isset($_POST['subaction']) && ($_POST['subaction'] == 'confirm') ) {
- $data = array('name' => $_POST['name'],
- 'code' => $_POST['code'],
- 'locale' => $_POST['locale'],
- 'charset' => $_POST['charset'],
- 'date_format_short' => $_POST['date_format_short'],
- 'date_format_long' => $_POST['date_format_long'],
- 'time_format' => $_POST['time_format'],
- 'text_direction' => $_POST['text_direction'],
- 'currencies_id' => $_POST['currencies_id'],
- 'numeric_separator_decimal' => $_POST['numeric_separator_decimal'],
- 'numeric_separator_thousands' => $_POST['numeric_separator_thousands'],
- 'parent_id' => $_POST['parent_id'],
- 'sort_order' => $_POST['sort_order']);
-
- if ( Languages::update($_GET['id'], $data, (isset($_POST['default']) && ($_POST['default'] == 'on'))) ) {
- 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());
- }
}
}
?>
View
43 osCommerce/OM/Core/Site/Admin/Application/Languages/Action/Save/Process.php
@@ -0,0 +1,43 @@
+<?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\Languages\Action\Save;
+
+ use osCommerce\OM\Core\ApplicationAbstract;
+ use osCommerce\OM\Core\Site\Admin\Application\Languages\Languages;
+ use osCommerce\OM\Core\Registry;
+ use osCommerce\OM\Core\OSCOM;
+
+ class Process {
+ public static function execute(ApplicationAbstract $application) {
+ $data = array('name' => $_POST['name'],
+ 'code' => $_POST['code'],
+ 'locale' => $_POST['locale'],
+ 'charset' => $_POST['charset'],
+ 'date_format_short' => $_POST['date_format_short'],
+ 'date_format_long' => $_POST['date_format_long'],
+ 'time_format' => $_POST['time_format'],
+ 'text_direction' => $_POST['text_direction'],
+ 'currencies_id' => $_POST['currencies_id'],
+ 'numeric_separator_decimal' => $_POST['numeric_separator_decimal'],
+ 'numeric_separator_thousands' => $_POST['numeric_separator_thousands'],
+ 'parent_id' => $_POST['parent_id'],
+ 'sort_order' => $_POST['sort_order']);
+
+ if ( Languages::update($_GET['id'], $data, (isset($_POST['default']) && ($_POST['default'] == 'on'))) ) {
+ 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());
+ }
+ }
+?>
View
8 osCommerce/OM/Core/Site/Admin/Application/Languages/Languages.php
@@ -501,7 +501,7 @@ public static function export($id, $groups, $include_language_data = true) {
public static function getDirectoryListing() {
$result = array();
- $OSCOM_DirectoryListing = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'languages');
+ $OSCOM_DirectoryListing = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'Core/Site/Shop/Languages');
$OSCOM_DirectoryListing->setIncludeDirectories(false);
$OSCOM_DirectoryListing->setCheckExtension('xml');
@@ -515,8 +515,8 @@ public static function getDirectoryListing() {
public static function import($file, $type) {
$OSCOM_Database = Registry::get('Database');
- if ( file_exists(OSCOM::BASE_DIRECTORY . 'languages/' . $file . '.xml') ) {
- $source = array('language' => XML::toArray(simplexml_load_file(OSCOM::BASE_DIRECTORY . 'languages/' . $file . '.xml')));
+ if ( file_exists(OSCOM::BASE_DIRECTORY . 'Core/Site/Shop/Languages/' . $file . '.xml') ) {
+ $source = array('language' => XML::toArray(simplexml_load_file(OSCOM::BASE_DIRECTORY . 'Core/Site/Shop/Languages/' . $file . '.xml')));
$language = array('name' => $source['language']['data']['title'],
'code' => $source['language']['data']['code'],
@@ -606,7 +606,7 @@ public static function import($file, $type) {
}
if ( $error === false ) {
- $OSCOM_DirectoryListing = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'languages/' . $file);
+ $OSCOM_DirectoryListing = new DirectoryListing(OSCOM::BASE_DIRECTORY . 'Core/Site/Shop/Languages/' . $file);
$OSCOM_DirectoryListing->setRecursive(true);
$OSCOM_DirectoryListing->setIncludeDirectories(false);
$OSCOM_DirectoryListing->setAddDirectoryToFilename(true);
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/batch_delete.php
@@ -22,7 +22,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . OSCOM::getDef('action_heading_batch_delete_languages'); ?></h3>
- <form name="lDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=BatchDelete'); ?>" method="post">
+ <form name="lDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDelete&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_languages'); ?></p>
@@ -50,7 +50,7 @@
echo '<p>' . $names_string . '</p>';
if ( $check_default_flag === false ) {
- 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(), '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(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))) . '</p>';
} else {
echo '<p><b>' . OSCOM::getDef('introduction_delete_language_invalid') . '</b></p>';
View
8 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions.php
@@ -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, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=InsertDefinition'), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'id=' . $_GET['id']), 'priority' => 'secondary', 'icon' => 'triangle-1-w', 'title' => OSCOM::getDef('button_back'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(null, null, 'InsertDefinition&id=' . $_GET['id'] . '&group=' . $_GET['group']), '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('edit.png') . '" title="' . OSCOM::getDef('icon_edit') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=BatchSaveDefinitions') . '\';" />&nbsp;<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'] . '&group=' . $_GET['group'] . '&action=BatchDeleteDefinitions') . '\';" />'; ?></th>
+ <th align="right" colspan="3"><?php echo '<input type="image" src="' . osc_icon_raw('edit.png') . '" title="' . OSCOM::getDef('icon_edit') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchSaveDefinitions&id=' . $_GET['id'] . '&group=' . $_GET['group']) . '\';" />&nbsp;<input type="image" src="' . osc_icon_raw('trash.png') . '" title="' . OSCOM::getDef('icon_trash') . '" onclick="document.batch.action=\'' . OSCOM::getLink(null, null, 'BatchDeleteDefinitions&id=' . $_GET['id'] . '&group=' . $_GET['group']) . '\';" />'; ?></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 = 'defsDataTable';
var dataTableDataURL = '<?php echo OSCOM::getRPCLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=getDefinitions'); ?>';
- var defEditLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=DEFINITIONID&action=EditDefinition'); ?>';
+ var defEditLink = '<?php echo OSCOM::getLink(null, null, 'EditDefinition&id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=DEFINITIONID'); ?>';
var defEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var defDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=DEFINITIONID&action=DeleteDefinition'); ?>';
+ var defDeleteLink = '<?php echo OSCOM::getLink(null, null, 'DeleteDefinition&id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=DEFINITIONID'); ?>';
var defDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var osC_DataTable = new osC_DataTable();
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_batch_delete.php
@@ -24,7 +24,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . osc_output_string_protected($_GET['group']); ?></h3>
- <form name="lDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=BatchDeleteDefinitions'); ?>" method="post">
+ <form name="lDeleteBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchDeleteDefinitions&Process&id=' . $_GET['id'] . '&group=' . $_GET['group']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_batch_delete_language_definitions'); ?></p>
@@ -48,7 +48,7 @@
</fieldset>
- <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'] . '&group=' . $_GET['group']), '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'] . '&group=' . $_GET['group']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_batch_edit.php
@@ -24,7 +24,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . osc_output_string_protected($_GET['group']); ?></h3>
- <form name="lDefineBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=BatchSaveDefinitions'); ?>" method="post">
+ <form name="lDefineBatch" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'BatchSaveDefinitions&Process&id=' . $_GET['id'] . '&group=' . $_GET['group']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_language_definitions'); ?></p>
@@ -40,7 +40,7 @@
</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'] . '&group=' . $_GET['group']), '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'] . '&group=' . $_GET['group']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_delete.php
@@ -26,13 +26,13 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . $OSCOM_ObjectInfo->getProtected('definition_key'); ?></h3>
- <form name="lDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=' . $_GET['dID'] . '&action=DeleteDefinition'); ?>" method="post">
+ <form name="lDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'DeleteDefinition&Process&id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&dID=' . $_GET['dID']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_delete_language_definition'); ?></p>
<p><?php echo '<b>' . $OSCOM_ObjectInfo->getProtected('definition_key') . '</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'] . '&group=' . $_GET['group']), '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'] . '&group=' . $_GET['group']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_edit.php
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . osc_output_string_protected($_GET['group']); ?></h3>
- <form name="lDefine" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=EditDefinition'); ?>" method="post">
+ <form name="lDefine" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'EditDefinition&Process&id=' . $_GET['id'] . '&group=' . $_GET['group']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_language_definitions'); ?></p>
@@ -34,7 +34,7 @@
<p><label for="def[<?php echo $OSCOM_ObjectInfo->getProtected('definition_key'); ?>]"><?php echo $OSCOM_ObjectInfo->getProtected('definition_key'); ?></label><?php echo osc_draw_textarea_field('def[' . $OSCOM_ObjectInfo->get('definition_key') . ']', $OSCOM_ObjectInfo->get('definition_value')); ?></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'] . '&group=' . $_GET['group']), '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'] . '&group=' . $_GET['group']), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/definitions_new.php
@@ -29,7 +29,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_new_language_definition'); ?></h3>
- <form name="lNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '') . '&action=InsertDefinition'); ?>" method="post">
+ <form name="lNew" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'InsertDefinition&Process&id=' . $_GET['id'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '')); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_new_language_definition'); ?></p>
@@ -47,7 +47,7 @@
<p><label for="defgroup"><?php echo OSCOM::getDef('field_definition_group'); ?></label><?php echo osc_draw_input_field('defgroup', (isset($_GET['group']) ? $_GET['group'] : null)); ?></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'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '')), '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'] . (isset($_GET['group']) ? '&group=' . $_GET['group'] : '')), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/delete.php
@@ -38,13 +38,13 @@
} else {
?>
- <form name="lDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=Delete'); ?>" method="post">
+ <form name="lDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Delete&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_delete_language'); ?></p>
<p><?php echo '<b>' . $OSCOM_ObjectInfo->getProtected('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(), '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>
</form>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/edit.php
@@ -44,7 +44,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('edit.png') . ' ' . $OSCOM_ObjectInfo->getProtected('name'); ?></h3>
- <form name="lEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=Save'); ?>" method="post">
+ <form name="lEdit" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Save&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_edit_language'); ?></p>
@@ -75,7 +75,7 @@
</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>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/export.php
@@ -33,7 +33,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('export.png') . ' ' . $OSCOM_ObjectInfo->getProtected('name'); ?></h3>
- <form name="lExport" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&action=Export'); ?>" method="post">
+ <form name="lExport" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Export&Process&id=' . $_GET['id']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_export_language'); ?></p>
@@ -43,7 +43,7 @@
<p><?php echo osc_draw_checkbox_field('include_data', array(array('id' => '', 'text' => OSCOM::getDef('field_export_with_data'))), true); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'triangle-1-nw', 'title' => OSCOM::getDef('button_export'))) . ' ' . 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' => 'triangle-1-nw', 'title' => OSCOM::getDef('button_export'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/groups.php
@@ -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=InsertDefinition'), '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, 'InsertDefinition&id=' . $_GET['id']), 'icon' => 'plus', 'title' => OSCOM::getDef('button_insert'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -70,7 +70,7 @@
var groupLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=GROUPCODE'); ?>';
var groupLinkIcon = '<?php echo osc_icon('folder.png'); ?>';
- var groupDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=GROUPCODE&action=DeleteGroup'); ?>';
+ var groupDeleteLink = '<?php echo OSCOM::getLink(null, null, 'DeleteGroup&id=' . $_GET['id'] . '&group=GROUPCODE'); ?>';
var groupDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var osC_DataTable = new osC_DataTable();
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/groups_delete.php
@@ -26,7 +26,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('trash.png') . ' ' . osc_output_string_protected($_GET['group']); ?></h3>
- <form name="gDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'id=' . $_GET['id'] . '&group=' . $_GET['group'] . '&action=DeleteGroup'); ?>" method="post">
+ <form name="gDelete" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'DeleteGroup&Process&id=' . $_GET['id'] . '&group=' . $_GET['group']); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_delete_definition_group'); ?></p>
@@ -42,7 +42,7 @@
</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>
View
4 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/import.php
@@ -30,7 +30,7 @@
<div class="infoBox">
<h3><?php echo osc_icon('new.png') . ' ' . OSCOM::getDef('action_heading_import_language'); ?></h3>
- <form name="lImport" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'action=Import'); ?>" method="post">
+ <form name="lImport" class="dataForm" action="<?php echo OSCOM::getLink(null, null, 'Import&Process'); ?>" method="post">
<p><?php echo OSCOM::getDef('introduction_import_language'); ?></p>
@@ -39,7 +39,7 @@
<p><label for="import_type"><?php echo OSCOM::getDef('field_import_type'); ?></label><br /><?php echo osc_draw_radio_field('import_type', array(array('id' => 'add', 'text' => OSCOM::getDef('only_add_new_records')), array('id' => 'update', 'text' => OSCOM::getDef('only_update_existing_records')), array('id' => 'replace', 'text' => OSCOM::getDef('replace_all'))), 'add', null, '<br />'); ?></p>
</fieldset>
- <p><?php echo osc_draw_hidden_field('subaction', 'confirm') . osc_draw_button(array('priority' => 'primary', 'icon' => 'triangle-1-se', 'title' => OSCOM::getDef('button_import'))) . ' ' . 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' => 'triangle-1-se', 'title' => OSCOM::getDef('button_import'))) . ' ' . osc_draw_button(array('href' => OSCOM::getLink(), 'priority' => 'secondary', 'icon' => 'close', 'title' => OSCOM::getDef('button_cancel'))); ?></p>
</form>
</div>
View
10 osCommerce/OM/Core/Site/Admin/Application/Languages/pages/main.php
@@ -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=Import'), 'icon' => 'triangle-1-se', 'title' => OSCOM::getDef('button_import'))); ?></span>
+ <span style="float: right;"><?php echo osc_draw_button(array('href' => OSCOM::getLink(null, null, 'Import'), 'icon' => 'triangle-1-se', 'title' => OSCOM::getDef('button_import'))); ?></span>
</form>
<div style="padding: 20px 5px 5px 5px; height: 16px;">
@@ -44,7 +44,7 @@
</thead>
<tfoot>
<tr>
- <th align="right" colspan="4"><?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="4"><?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>
@@ -80,13 +80,13 @@
var languageIcon = '<?php echo osc_image('images/worldflags/LANGUAGECODE.png', 'LANGUAGENAME'); ?>';
- var languageEditLink = '<?php echo OSCOM::getLink(null, null, 'id=LANGUAGEID&action=Save'); ?>';
+ var languageEditLink = '<?php echo OSCOM::getLink(null, null, 'Save&id=LANGUAGEID'); ?>';
var languageEditLinkIcon = '<?php echo osc_icon('edit.png'); ?>';
- var languageExportLink = '<?php echo OSCOM::getLink(null, null, 'id=LANGUAGEID&action=Export'); ?>';
+ var languageExportLink = '<?php echo OSCOM::getLink(null, null, 'Export&id=LANGUAGEID'); ?>';
var languageExportLinkIcon = '<?php echo osc_icon('export.png'); ?>';
- var languageDeleteLink = '<?php echo OSCOM::getLink(null, null, 'id=LANGUAGEID&action=Delete'); ?>';
+ var languageDeleteLink = '<?php echo OSCOM::getLink(null, null, 'Delete&id=LANGUAGEID'); ?>';
var languageDeleteLinkIcon = '<?php echo osc_icon('trash.png'); ?>';
var defaultLanguage = '<?php echo DEFAULT_LANGUAGE; ?>';
Please sign in to comment.
Something went wrong with that request. Please try again.