From 2e7d4d9f0f99503ecebe98206651f513bd2017e7 Mon Sep 17 00:00:00 2001 From: Daniel Barreto Date: Fri, 30 Jan 2015 10:26:28 -0500 Subject: [PATCH] Move admin view to admin_view.php, update tpl - refs BT#9092 --- .../advancedsubscription/ajax/advsub.ajax.php | 11 ---- .../advancedsubscription/src/admin_view.php | 62 +++++++++++++++++++ .../views/{index.tpl => admin_view.tpl} | 13 ++-- 3 files changed, 71 insertions(+), 15 deletions(-) create mode 100644 plugin/advancedsubscription/src/admin_view.php rename plugin/advancedsubscription/views/{index.tpl => admin_view.tpl} (89%) diff --git a/plugin/advancedsubscription/ajax/advsub.ajax.php b/plugin/advancedsubscription/ajax/advsub.ajax.php index f7dc1f0501..6dada518f3 100644 --- a/plugin/advancedsubscription/ajax/advsub.ajax.php +++ b/plugin/advancedsubscription/ajax/advsub.ajax.php @@ -113,17 +113,6 @@ if (!empty($a) && !empty($u)) { $result['pass'] = false; } break; - case 'admin': - $studentList = $plugin->listAllStudentsInQueueBySession($s); - $sessionList = $plugin->listAllSessions(); - $tpl = new Template('TESTING'); - $tpl->assign('session', $studentList['session']); - $tpl->assign('sessionItems', $sessionList); - $tpl->assign('students', $studentList['students']); - $content = $tpl->fetch('/advancedsubscription/views/index.tpl'); - $tpl->assign('content', $content); - $tpl->display_one_col_template(); - exit; default: $result['errorMessage'] = 'Action do not exist!'; } diff --git a/plugin/advancedsubscription/src/admin_view.php b/plugin/advancedsubscription/src/admin_view.php new file mode 100644 index 0000000000..d1cc7fddb4 --- /dev/null +++ b/plugin/advancedsubscription/src/admin_view.php @@ -0,0 +1,62 @@ + 16 ? + $plugin->decrypt($_REQUEST['data']) : + null : + null; +// Get data +if (isset($data) && is_array($data)) { + // Action code + $a = isset($data['a']) ? $data['a'] : null; + // User ID + $u = isset($data['u']) ? intval($data['u']) : null; + // Session ID + $s = isset($data['s']) ? intval($data['s']) : null; + // More data + $params['is_connected'] = isset($data['is_connected']) ? $data['is_connected'] : false; + $params['profile_completed'] = isset($data['profile_completed']) ? $data['profile_completed'] : 0; + $params['accept'] = isset($data['accept']) ? $data['accept'] : false; +} else { + // Action code + $a = isset($_REQUEST['a']) ? Security::remove_XSS($_REQUEST['a']) : null; + // User ID + $u = isset($_REQUEST['u']) ? intval($_REQUEST['u']) : null; + // Session ID + $s = isset($_REQUEST['s']) ? intval($_REQUEST['s']) : null; + // More data + $params['is_connected'] = isset($_REQUEST['is_connected']) ? $_REQUEST['is_connected'] : false; + $params['profile_completed'] = isset($_REQUEST['profile_completed']) ? $_REQUEST['profile_completed'] : 0; + $params['accept'] = isset($_REQUEST['accept']) ? $_REQUEST['accept'] : false; +} +// Get student list in queue +$studentList = $plugin->listAllStudentsInQueueBySession($s); +// Get all sessions +$sessionList = $plugin->listAllSessions(); +// Set selected to current session +$sessionList[$s]['selected'] = 'selected="selected"'; +// Init template +$tpl = new Template('TESTING'); +// Assign variables +$tpl->assign('session', $studentList['session']); +$tpl->assign('sessionItems', $sessionList); +$tpl->assign('students', $studentList['students']); +// Get rendered template +$content = $tpl->fetch('/advancedsubscription/views/admin_view.tpl'); +// Assign into content +$tpl->assign('content', $content); +// Display +$tpl->display_one_col_template(); diff --git a/plugin/advancedsubscription/views/index.tpl b/plugin/advancedsubscription/views/admin_view.tpl similarity index 89% rename from plugin/advancedsubscription/views/index.tpl rename to plugin/advancedsubscription/views/admin_view.tpl index 73f5f9e073..ac5fad3dd3 100644 --- a/plugin/advancedsubscription/views/index.tpl +++ b/plugin/advancedsubscription/views/admin_view.tpl @@ -1,7 +1,7 @@ - \ No newline at end of file + + \ No newline at end of file