1
0
Fork 0
- removed unnecessary brackets in case statements
Dieser Commit ist enthalten in:
DSB 2012-08-04 17:31:19 +00:00
Ursprung ae87af916f
Commit 2c0641c348
8 geänderte Dateien mit 35 neuen und 35 gelöschten Zeilen

Datei anzeigen

@ -53,9 +53,9 @@ class Msd_Form_Decorator_Default extends Msd_Form_Decorator_Abstract
$separator = $this->getSeparator(); $separator = $this->getSeparator();
$placement = $this->getPlacement(); $placement = $this->getPlacement();
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $output . $separator . $content; return $output . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $output; return $content . $separator . $output;
} }

Datei anzeigen

@ -56,9 +56,9 @@ class Msd_Form_Decorator_DisplayGroup extends Msd_Form_Decorator_Abstract
$placement = $this->getPlacement(); $placement = $this->getPlacement();
$separator = $this->getSeparator(); $separator = $this->getSeparator();
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $sElements . $separator . $content; return $sElements . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $sElements; return $content . $separator . $sElements;
} }

Datei anzeigen

@ -85,9 +85,9 @@ class Msd_Form_Decorator_DoubleLabel extends Msd_Form_Decorator_Abstract
</tr>'; </tr>';
$output = sprintf($output, $label, $input, $secondLabel); $output = sprintf($output, $label, $input, $secondLabel);
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $output . $separator . $content; return $output . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $output; return $content . $separator . $output;
} }

Datei anzeigen

@ -33,9 +33,9 @@ class Msd_Form_Decorator_LineEnd extends Msd_Form_Decorator_Abstract
$separator = $this->getSeparator(); $separator = $this->getSeparator();
$placement = $this->getPlacement(); $placement = $this->getPlacement();
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $output . $separator . $content; return $output . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $output; return $content . $separator . $output;
} }

Datei anzeigen

@ -34,9 +34,9 @@ class Msd_Form_Decorator_LineMiddle extends Msd_Form_Decorator_Abstract
$separator = $this->getSeparator(); $separator = $this->getSeparator();
$placement = $this->getPlacement(); $placement = $this->getPlacement();
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $output . $separator . $content; return $output . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $output; return $content . $separator . $output;
} }

Datei anzeigen

@ -38,9 +38,9 @@ class Msd_Form_Decorator_LineStart extends Msd_Form_Decorator_Abstract
$input = $this->buildInput(); $input = $this->buildInput();
$output = '<tr><td>' . $label . '</td>' . '<td>' . $input; $output = '<tr><td>' . $label . '</td>' . '<td>' . $input;
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $output . $separator . $content; return $output . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $output; return $content . $separator . $output;
} }

Datei anzeigen

@ -43,9 +43,9 @@ class Msd_Form_Decorator_SubForm extends Msd_Form_Decorator_Abstract
$separator = $this->getSeparator(); $separator = $this->getSeparator();
$placement = $this->getPlacement(); $placement = $this->getPlacement();
switch ($placement) { switch ($placement) {
case (self::PREPEND): case self::PREPEND:
return $htmlOutput . $separator . $content; return $htmlOutput . $separator . $content;
case (self::APPEND): case self::APPEND:
default: default:
return $content . $separator . $htmlOutput; return $content . $separator . $htmlOutput;
} }

Datei anzeigen

@ -17,10 +17,10 @@
class Msd_Log class Msd_Log
{ {
// Define constants // Define constants
const PHP = 'PHP-Log'; const PHP = 'PHP-Log';
const PERL = 'PERL-Log'; const PERL = 'PERL-Log';
const PERL_COMPLETE = 'PERL-Complete-Log'; const PERL_COMPLETE = 'PERL-Complete-Log';
const ERROR = 'Error-Log'; const ERROR = 'Error-Log';
// Define static Instance // Define static Instance
private static $_instance = NULL; private static $_instance = NULL;
@ -34,15 +34,14 @@ class Msd_Log
public function __construct() public function __construct()
{ {
// define instance handler // define instance handler
$this->handle = array(); $this->handle = array();
$this->handle[self::PHP] = false; $this->handle[self::PHP] = false;
$this->handle[self::PERL] = false; $this->handle[self::PERL] = false;
$this->handle[self::PERL_COMPLETE] = false; $this->handle[self::PERL_COMPLETE] = false;
$this->handle[self::ERROR] = false; $this->handle[self::ERROR] = false;
// get config $config = Msd_Registry::getConfig();
$config = Msd_Registry::getConfig(); $this->_paths = (object)$config->getParam('paths');
$this->_paths = (object) $config->getParam('paths');
} }
/** /**
@ -73,7 +72,7 @@ class Msd_Log
*/ */
private function _close($file) private function _close($file)
{ {
$filename = $this->getFile($file); $filename = $this->getFile($file);
$extension = pathinfo($filename, PATHINFO_EXTENSION); $extension = pathinfo($filename, PATHINFO_EXTENSION);
if ($extension == 'gz') { if ($extension == 'gz') {
gzclose($this->handle[$file]); gzclose($this->handle[$file]);
@ -108,9 +107,9 @@ class Msd_Log
public function getLogInstance($type) public function getLogInstance($type)
{ {
if (!isset($this->_logInstance[$type])) { if (!isset($this->_logInstance[$type])) {
$writer = new Zend_Log_Writer_Stream($this->getFile($type)); $writer = new Zend_Log_Writer_Stream($this->getFile($type));
$formatter = $formatter =
new Zend_Log_Formatter_Simple("%timestamp% %message%\n"); new Zend_Log_Formatter_Simple("%timestamp% %message%\n");
$writer->setFormatter($formatter); $writer->setFormatter($formatter);
$this->_logInstance[$type] = new Zend_Log($writer); $this->_logInstance[$type] = new Zend_Log($writer);
} }
@ -129,7 +128,7 @@ class Msd_Log
{ {
// @todo if log_maxsize reached => archive/delete log // @todo if log_maxsize reached => archive/delete log
$logger = self::getInstance(); $logger = self::getInstance();
$log = $logger->getLogInstance($type); $log = $logger->getLogInstance($type);
return $log->info($message); return $log->info($message);
} }
@ -162,7 +161,7 @@ class Msd_Log
/** /**
* Delete a log file and recreate it. * Delete a log file and recreate it.
* *
* @param string $file Filename * @param string $type Filename
* *
* @return void * @return void
*/ */
@ -174,30 +173,31 @@ class Msd_Log
$translator = Msd_Language::getInstance()->getTranslator(); $translator = Msd_Language::getInstance()->getTranslator();
$this->write($type, $translator->_('L_LOG_CREATED')); $this->write($type, $translator->_('L_LOG_CREATED'));
} }
/** /**
* Read a logfile and return content as array. * Read a logfile and return content as array.
* *
* If $revers is set to true the ordering of lines is reversed. * If $revers is set to true the ordering of lines is reversed.
* *
* @param parent::const $type The type of logfile to read * @param string $type The type of logfile to read
* @param boolean $reverse Wether to place latest entries first * @param bool $reverse Whether to place latest entries first
* *
* @return array Log data from file as array * @return array Log data from file as array
*/ */
public function read($type = self::PHP, $reverse = false) public function read($type = self::PHP, $reverse = false)
{ {
$filename = $this->getFile($type); $filename = $this->getFile($type);
if (!is_readable($filename)) { if (!is_readable($filename)) {
$timestamp = Zend_Date::ISO_8601; $timestamp = Zend_Date::ISO_8601;
$lang = Msd_Language::getInstance()->getTranslator(); $lang = Msd_Language::getInstance()->getTranslator();
$msg = $timestamp . ' <span class="error">' . $msg = $timestamp . ' <span class="error">' .
sprintf($lang->_('L_LOG_NOT_READABLE'), $filename) . '</span>'; sprintf($lang->_('L_LOG_NOT_READABLE'), $filename) . '</span>';
return array($msg); return array($msg);
} else { } else {
$output = file($filename); $output = file($filename);
} }
if ($reverse == 1) { if ($reverse == 1) {
$output = array_reverse($output); $output = array_reverse($output);
} }
return $output; return $output;