| @@ -19,14 +19,10 @@ | ||
| 19 | 19 | acym_redirect(acym_completeLink('dashboard&task=upgrade&version=enterprise', false, true)); |
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - private function _saveActions(bool $isMassAction = false): array | |
| 23 | + private function getSaveActions(bool $isMassAction = false): array | |
| 24 | 24 | { |
| 25 | - if ($isMassAction) { | |
| 26 | - acym_session(); | |
| 27 | - } | |
| 28 | - | |
| 29 | 25 | $automationID = acym_getVar('int', 'id'); |
| 30 | 26 | $actionId = acym_getVar('int', 'actionId'); |
| 31 | 27 | $action = acym_getVar('array', 'acym_action'); |
| 32 | 28 | $actionClass = new ActionClass(); |
| @@ -45,9 +41,11 @@ | ||
| 45 | 41 | $action['actions'] = []; |
| 46 | 42 | } |
| 47 | 43 | |
| 48 | 44 | if ($isMassAction) { |
| 49 | - $_SESSION['massAction']['actions'] = $action['actions']; | |
| 45 | + $massAction = acym_getVar('array', 'massAction', [], 'SESSION'); | |
| 46 | + $massAction['actions'] = $action['actions']; | |
| 47 | + acym_setSession('massAction', $massAction); | |
| 50 | 48 | |
| 51 | 49 | return []; |
| 52 | 50 | } |
| 53 | 51 | |
| @@ -56,8 +54,9 @@ | ||
| 56 | 54 | foreach ($action as $column => $value) { |
| 57 | 55 | acym_secureDBColumn($column); |
| 58 | 56 | } |
| 59 | 57 | |
| 58 | + //We need an object to save it so we make a object | |
| 60 | 59 | $action = (object)$action; |
| 61 | 60 | |
| 62 | 61 | $action->id = $actionClass->save($action); |
| 63 | 62 | |
| @@ -69,10 +68,12 @@ | ||
| 69 | 68 | } |
| 70 | 69 | |
| 71 | 70 | public function saveExitActions(): void |
| 72 | 71 | { |
| 73 | - $this->_saveActions(); | |
| 72 | + wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token'); | |
| 74 | 73 | |
| 74 | + $this->getSaveActions(); | |
| 75 | + | |
| 75 | 76 | acym_enqueueMessage(acym_translation('ACYM_SUCCESSFULLY_SAVED')); |
| 76 | 77 | |
| 77 | 78 | $this->listing(); |
| 78 | 79 | } |
| @@ -78,10 +79,12 @@ | ||
| 78 | 79 | } |
| 79 | 80 | |
| 80 | 81 | public function saveActions(): void |
| 81 | 82 | { |
| 82 | - $ids = $this->_saveActions(); | |
| 83 | + wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token'); | |
| 83 | 84 | |
| 85 | + $ids = $this->getSaveActions(); | |
| 86 | + | |
| 84 | 87 | acym_setVar('id', $ids['automationId']); |
| 85 | 88 | acym_setVar('stepId', $ids['stepId']); |
| 86 | 89 | acym_setVar('actionId', $ids['actionId']); |
| 87 | 90 | $this->filter(); |
| @@ -88,8 +91,10 @@ | ||
| 88 | 91 | } |
| 89 | 92 | |
| 90 | 93 | public function createMail(): void |
| 91 | 94 | { |
| 95 | + wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token'); | |
| 96 | + | |
| 92 | 97 | $id = acym_getVar('int', 'id'); |
| 93 | 98 | $idAdmin = acym_getVar('boolean', 'automation_admin'); |
| 94 | 99 | $type = MailClass::TYPE_AUTOMATION; |
| 95 | 100 | if ($idAdmin) { |
| @@ -96,15 +101,16 @@ | ||
| 96 | 101 | $type = 'automation_admin'; |
| 97 | 102 | } |
| 98 | 103 | |
| 99 | 104 | $and = acym_getVar('string', 'and_action'); |
| 100 | - $this->_saveActions(empty($id)); | |
| 105 | + $this->getSaveActions(empty($id)); | |
| 101 | 106 | |
| 102 | 107 | $actions = acym_getVar('array', 'acym_action'); |
| 103 | 108 | $mailId = $actions['actions'][$and]['acy_add_queue']['mail_id']; |
| 104 | 109 | $mailId = empty($mailId) ? '' : '&id='.$mailId; |
| 105 | 110 | |
| 106 | - $favoriteTemplate = $this->config->get('favorite_template', 0); | |
| 111 | + $mailClass = new MailClass(); | |
| 112 | + $favoriteTemplate = $mailClass->getFavoriteTemplateId(); | |
| 107 | 113 | $startFrom = empty($favoriteTemplate) || !empty($mailId) ? '' : '&from='.$favoriteTemplate; |
| 108 | 114 | |
| 109 | 115 | acym_redirect( |
| 110 | 116 | acym_completeLink( |
