wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'extended_classes' of dimti.ru:majestic into extended_classes

Browse Source
This commit is contained in:
Alexander Demidov
2013-10-21 15:51:34 +04:00
parent 645ffd9ed1 0fc1884c93
commit 8311fa1c26
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Action.php
View File

@ -39,9 +39,13 @@ abstract class Action
* Redirect * Redirect
* *
* @param mixed $url * @param mixed $url
* @param bool $permanently
*/ */
protected function redirect($url = null) protected function redirect($url = null, $permanently = false)
{ {
if ($permanently) {
header('HTTP/1.1 301 Moved Permanently');
}
header('Location: ' . (($url) ? $url : Env::getRequestUri())); header('Location: ' . (($url) ? $url : Env::getRequestUri()));
exit(); exit();
} }

15
view/helpers/MsgViewHelper.php
View File

@ -18,6 +18,13 @@ class MsgViewHelper extends ViewHelper
const WARNING = 'warning'; const WARNING = 'warning';
private static $type_to_class = array(
self::SUCCESS => 'success',
self::ERROR => 'error',
self::INFO => 'info',
self::WARNING => 'warning',
);
protected $css_prefix = ''; protected $css_prefix = '';
public function msg($msg = null, $type = null) public function msg($msg = null, $type = null)
@ -67,8 +74,14 @@ class MsgViewHelper extends ViewHelper
$msg = Session::get(__CLASS__, false); $msg = Session::get(__CLASS__, false);
if ($msg) { if ($msg) {
Session::del(__CLASS__); Session::del(__CLASS__);
return '<div class="' . $this->css_prefix . $msg['type'] . '">' . $this->view->escape($msg['message']) . '</div>'; $type_to_class = static::getTypeToClass();
return '<div class="' . $this->css_prefix . $type_to_class[$msg['type']] . '">' . $this->view->escape($msg['message']) . '</div>';
} }
return ''; return '';
} }
protected static function getTypeToClass()
{
return self::$type_to_class;
}
} }