From c49d00b9d35dee1925d01da7ca8bd5cae06d0368 Mon Sep 17 00:00:00 2001
From: Leif Andersson <leif.andersson@control.lth.se>
Date: Mon, 21 Sep 2015 17:15:08 +0200
Subject: [PATCH] =?UTF-8?q?Flyttade=20kod=20fr=C3=A5n=20changeDatabase=20t?=
=?UTF-8?q?ill=20add=5Fedit.=20Tog=20bort=20changeDatabase.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
action.add_edit.php | 46 +++++++++++++++++++++++++----
action.changeDatabase.php | 61 ---------------------------------------
2 files changed, 40 insertions(+), 67 deletions(-)
delete mode 100644 action.changeDatabase.php
diff --git a/action.add_edit.php b/action.add_edit.php
index 346e1bc..9c5d253 100644
--- a/action.add_edit.php
+++ b/action.add_edit.php
@@ -6,11 +6,6 @@ $canChangeRecord = False;
if ($this->CheckPermission('Use ReglerAddress')) {$canChangeRecord = True; }
-$fields = array(
- 'ID', 'Fornamn', 'Efternamn', 'Titel', 'Personnummer', 'SkolaForetag',
- 'Avdelning', 'Adress', 'Besok', 'Hem', 'Epost', 'Telefon', 'TelefonMobil',
- 'TelefonHem', 'URL', 'AnknytningTillInst', 'DiverseInfo');
-
$simpleFields = array(
'ID' => 'ID',
'Fornamn' => 'Förnamn',
@@ -35,6 +30,30 @@ $areaFields = array(
'ICE' => 'ICE',
);
+if (isset($params['submit'])) {
+ $record = new Person($params);
+ //echo '<pre>'; print_r($record); echo '</pre>';
+ $record->updateRecord();
+ $paramsB['module_message'] = 'Adressinformation ändrad';
+ foreach (Person::$firstFields as $field) {
+ if (isset($params[$field])) {
+ $paramsB[$field] = $params[$field];
+ }
+ }
+ if (isset($params['oldEpost']) && isset($params['Epost'])) {
+ if ($params['oldEpost'] != $params['Epost']) Group::setMailLists();
+ }
+ $this->Redirect($id, 'defaultadmin', $returnid, $paramsB);
+}
+if (isset($params['doGroups'])) {
+ $paramsB = array();
+ foreach (Person::$firstFields as $field) {
+ if (isset($params[$field])) {
+ $paramsB[$field] = $params[$field];
+ }
+ }
+ $this->Redirect($id, 'changeGroups', $returnid, $paramsB);
+}
if (isset($params['ID'])) {
$ID = $params['ID'];
@@ -43,6 +62,21 @@ if (isset($params['ID'])) {
$person = new Person();
$ID = null;
}
+
+if (isset($params['cancelUpdate'])) {
+ $paramsB = array();
+ foreach (Person::$firstFields as $field) {
+ if (isset($params[$field])) {
+ $paramsB[$field] = $params[$field];
+ }
+ }
+ if ($this->CheckPermission('Use ReglerAddress')) {
+ $paramsB['module_message'] = 'Adressändring avbruten';
+ }
+ $this->Redirect($id, 'defaultadmin', $returnid, $paramsB);
+ return;
+}
+
$smarty = $this->smarty;
$headline = $person->Fornamn . ' ' .$person->Efternamn;
@@ -52,7 +86,7 @@ if ($canChangeRecord) { $headline = 'Redigera adress: ' . $headline; }
$smarty->assign('headline',$headline);
-$place = $this->CreateFormStart($id, 'changeDatabase', $returnid);
+$place = $this->CreateFormStart($id, 'add_edit', $returnid);
$smarty->assign('start_form', $place);
$smarty->assign('end_form', $this->CreateFormEnd());
diff --git a/action.changeDatabase.php b/action.changeDatabase.php
deleted file mode 100644
index 7db93af..0000000
--- a/action.changeDatabase.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-require_once 'lib/class.Group.php';
-
-if (!isset($gCms)) exit;
-//echo '<pre>'; print_r($params); echo '</pre>'; exit;
-
-if (isset($params['cancelUpdate'])) {
- $paramsB = array();
- foreach (Person::$firstFields as $field) {
- if (isset($params[$field])) {
- $paramsB[$field] = $params[$field];
- }
- }
- if ($this->CheckPermission('Use ReglerAddress')) {
- $paramsB['module_message'] = 'Adressändring avbruten';
- }
- $this->Redirect($id, 'defaultadmin', $returnid, $paramsB);
- return;
-}
-
-
-if (! $this->CheckPermission('Use ReglerAddress')) {
- return $this->DisplayErrorPage($id, $params, $returnid,
- 'ReglerAddress access denied.');
-}
-
-
-if (isset($params['doGroups'])) {
- $paramsB = array();
- foreach (Person::$firstFields as $field) {
- if (isset($params[$field])) {
- $paramsB[$field] = $params[$field];
- }
- }
- $this->Redirect($id, 'changeGroups', $returnid, $paramsB);
-}
-
-
-
-
-if (isset($params['submit'])) {
- $record = new Person($params);
- //echo '<pre>'; print_r($record); echo '</pre>';
- $record->updateRecord();
- $paramsB['module_message'] = 'Adressinformation ändrad';
- foreach (Person::$firstFields as $field) {
- if (isset($params[$field])) {
- $paramsB[$field] = $params[$field];
- }
- }
- if (isset($params['oldEpost']) && isset($params['Epost'])) {
- if ($params['oldEpost'] != $params['Epost']) Group::setMailLists();
- }
-
- $this->Redirect($id, 'defaultadmin', $returnid, $paramsB);
-}
-
-
-
-
-?>
--
GitLab