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

Merge branch 'extended_classes' into sql_criteria

Browse Source
This commit is contained in:
Alexander Demidov
2013-09-26 13:22:49 +04:00
parent 3f6b2adefd 0fc1884c93
commit d1cf95b82c
3 changed files with 25 additions and 3 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
*
* @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()));
exit();
}

7
logger/CliLogger.php
View File

@ -14,8 +14,13 @@ class CliLogger extends Logger
{
// Заменяем окончания строк на их символы
$message = str_replace(array("\r", "\n"), array('\r', '\n'), $message);
$out = microtime(true) . " \t: " . $this->pid . trim($message) . PHP_EOL;
$out = $this->generateOutString($message);
print($out);
}
protected function generateOutString($message)
{
return microtime(true) . " \t: " . $this->pid . trim($message) . PHP_EOL;
}
}

15
view/helpers/MsgViewHelper.php
View File

@ -18,6 +18,13 @@ class MsgViewHelper extends ViewHelper
const WARNING = 'warning';
private static $type_to_class = array(
self::SUCCESS => 'success',
self::ERROR => 'error',
self::INFO => 'info',
self::WARNING => 'warning',
);
protected $css_prefix = '';
public function msg($msg = null, $type = null)
@ -67,8 +74,14 @@ class MsgViewHelper extends ViewHelper
$msg = Session::get(__CLASS__, false);
if ($msg) {
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 '';
}
protected static function getTypeToClass()
{
return self::$type_to_class;
}
}