diff options
| author | Simon Rettberg | 2016-05-10 19:17:28 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-05-10 19:17:28 +0200 |
| commit | a79bbfa1a23838b91e9a08f7014c2c7304976714 (patch) | |
| tree | fafb56190707d10b01cb282bc14b99156e100dcb /inc | |
| parent | Translating module strings and custom sections works (diff) | |
| download | slx-admin-a79bbfa1a23838b91e9a08f7014c2c7304976714.tar.gz slx-admin-a79bbfa1a23838b91e9a08f7014c2c7304976714.tar.xz slx-admin-a79bbfa1a23838b91e9a08f7014c2c7304976714.zip | |
Migrated messages to modules
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/taskmanager.inc.php | 8 | ||||
| -rw-r--r-- | inc/util.inc.php | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/inc/taskmanager.inc.php b/inc/taskmanager.inc.php index 2cdaf69f..c82d2b1a 100644 --- a/inc/taskmanager.inc.php +++ b/inc/taskmanager.inc.php @@ -164,20 +164,20 @@ class Taskmanager static $failure = false; if ($task === false) { if (!$failure) { - Message::addError('taskmanager-error'); + Message::addError('main.taskmanager-error'); $failure = true; } return; } if (!isset($task['statusCode'])) { - Message::addError('taskmanager-format'); + Message::addError('main.taskmanager-format'); return; } if (isset($task['data']['error'])) { - Message::addError('task-error', $task['statusCode'] . ' (' . $task['data']['error'] . ')'); + Message::addError('main.task-error', $task['statusCode'] . ' (' . $task['data']['error'] . ')'); return; } - Message::addError('task-error', $task['statusCode']); + Message::addError('main.task-error', $task['statusCode']); } /** diff --git a/inc/util.inc.php b/inc/util.inc.php index f951290b..5eed3ddc 100644 --- a/inc/util.inc.php +++ b/inc/util.inc.php @@ -98,11 +98,11 @@ SADFACE; */ public static function verifyToken() { - if (Session::get('token') === false) + if (Session::get('main.token') === false) return true; - if (isset($_REQUEST['token']) && Session::get('token') === $_REQUEST['token']) + if (isset($_REQUEST['main.token']) && Session::get('main.token') === $_REQUEST['main.token']) return true; - Message::addError('token'); + Message::addError('main.token'); return false; } @@ -265,7 +265,7 @@ SADFACE; @ob_end_clean(); $fh = @fopen($file, 'rb'); if ($fh === false) { - Message::addError('error-read', $file); + Message::addError('main.error-read', $file); return false; } Header('Content-Type: application/octet-stream', true); |