diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-03-28 03:42:39 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-03-28 03:42:40 +0400 |
commit | ae4b03163792f0b6e933933e5d37df87dc3fd566 (patch) | |
tree | d1d7510a9728f587d3d63ebd03e4ecf3d904838b /core/Period/Week.php | |
parent | 158c2150f5f2e13ece459b8d131244c11b763997 (diff) |
Mass conversion of all files to the newly agreed coding standard: PSR 1/2
Converting Piwik core source files, PHP, JS, TPL, CSS
More info: http://piwik.org/participate/coding-standards/
Diffstat (limited to 'core/Period/Week.php')
-rw-r--r-- | core/Period/Week.php | 149 |
1 files changed, 73 insertions, 76 deletions
diff --git a/core/Period/Week.php b/core/Period/Week.php index f5dd546764..9b84f05b11 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -1,10 +1,10 @@ <?php /** * Piwik - Open source web analytics - * + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * + * * @category Piwik * @package Piwik */ @@ -15,83 +15,80 @@ */ class Piwik_Period_Week extends Piwik_Period { - protected $label = 'week'; + protected $label = 'week'; - /** - * Returns the current period as a localized short string - * - * @return string - */ - public function getLocalizedShortString() - { - //"30 Dec - 6 Jan 09" - $dateStart = $this->getDateStart(); - $dateEnd = $this->getDateEnd(); - - $string = Piwik_Translate('CoreHome_ShortWeekFormat'); - $string = self::getTranslatedRange($string, $dateStart, $dateEnd); - return $string; - } + /** + * Returns the current period as a localized short string + * + * @return string + */ + public function getLocalizedShortString() + { + //"30 Dec - 6 Jan 09" + $dateStart = $this->getDateStart(); + $dateEnd = $this->getDateEnd(); - /** - * Returns the current period as a localized long string - * - * @return string - */ - public function getLocalizedLongString() - { - $format = Piwik_Translate('CoreHome_LongWeekFormat'); - $string = self::getTranslatedRange($format, $this->getDateStart(), $this->getDateEnd()); - return Piwik_Translate('CoreHome_PeriodWeek') . " " . $string; - } + $string = Piwik_Translate('CoreHome_ShortWeekFormat'); + $string = self::getTranslatedRange($string, $dateStart, $dateEnd); + return $string; + } - static protected function getTranslatedRange($format, $dateStart, $dateEnd) - { - $string = str_replace('From%', '%', $format); - $string = $dateStart->getLocalized($string); - $string = str_replace('To%', '%', $string); - $string = $dateEnd->getLocalized($string); - return $string; - } - - /** - * Returns the current period as a string - * - * @return string - */ - public function getPrettyString() - { - $out = Piwik_Translate('General_DateRangeFromTo', - array($this->getDateStart()->toString(), - $this->getDateEnd()->toString()) + /** + * Returns the current period as a localized long string + * + * @return string + */ + public function getLocalizedLongString() + { + $format = Piwik_Translate('CoreHome_LongWeekFormat'); + $string = self::getTranslatedRange($format, $this->getDateStart(), $this->getDateEnd()); + return Piwik_Translate('CoreHome_PeriodWeek') . " " . $string; + } + + static protected function getTranslatedRange($format, $dateStart, $dateEnd) + { + $string = str_replace('From%', '%', $format); + $string = $dateStart->getLocalized($string); + $string = str_replace('To%', '%', $string); + $string = $dateEnd->getLocalized($string); + return $string; + } + + /** + * Returns the current period as a string + * + * @return string + */ + public function getPrettyString() + { + $out = Piwik_Translate('General_DateRangeFromTo', + array($this->getDateStart()->toString(), + $this->getDateEnd()->toString()) ); - return $out; - } + return $out; + } + + /** + * Generates the subperiods - one for each day in the week + */ + protected function generate() + { + if ($this->subperiodsProcessed) { + return; + } + parent::generate(); + $date = $this->date; + + if ($date->toString('N') > 1) { + $date = $date->subDay($date->toString('N') - 1); + } + + $startWeek = $date; - /** - * Generates the subperiods - one for each day in the week - */ - protected function generate() - { - if($this->subperiodsProcessed) - { - return; - } - parent::generate(); - $date = $this->date; - - if( $date->toString('N') > 1) - { - $date = $date->subDay($date->toString('N')-1); - } - - $startWeek = $date; - - $currentDay = clone $startWeek; - while($currentDay->compareWeek($startWeek) == 0) - { - $this->addSubperiod(new Piwik_Period_Day($currentDay) ); - $currentDay = $currentDay->addDay(1); - } - } + $currentDay = clone $startWeek; + while ($currentDay->compareWeek($startWeek) == 0) { + $this->addSubperiod(new Piwik_Period_Day($currentDay)); + $currentDay = $currentDay->addDay(1); + } + } } |