diff --git a/module/dev/model.php b/module/dev/model.php index 7a74751a11..9ffe57914f 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -168,10 +168,7 @@ class devModel extends model $comment = preg_split('/\r?\n\r?/', $comment); // Trim asterisks and whitespace from the beginning and whitespace from the end of lines. - $comment = array_map(function($line) - { - return ltrim(rtrim($line), "* \t\n\r\0\x0B"); - }, $comment); + $comment = array_map(array('devModel', "trimSpace"), $comment); // Group the lines together by @tags $blocks = array(); @@ -246,4 +243,16 @@ class devModel extends model } return $modules; } + + /** + * Trim asterisks and whitespace from the beginning and whitespace from the end of lines. + * + * @param string $line + * @access public + * @return string + */ + public function trimSpace($line) + { + return ltrim(rtrim($line), "* \t\n\r\0\x0B"); + } } diff --git a/module/report/model.php b/module/report/model.php index ade5d5c274..4722ca7120 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -37,10 +37,30 @@ class reportModel extends model public function createSingleJSON($sets, $dateList) { $data = '['; + $now = date('Y-m-d'); + $preValue = ''; + $setsDate = array_keys($sets); foreach($dateList as $i => $date) { $date = date('Y-m-d', strtotime($date)); - $data .= isset($sets[$date]) ? "{$sets[$date]->value}," : "'',"; + if($date > $now) break; + if(!isset($sets[$date]) and $sets) + { + $tmpDate = $setsDate; + $tmpDate[] = $date; + sort($tmpDate); + $tmpDateStr = ',' . join(',', $tmpDate); + $preDate = rtrim(substr($tmpDateStr, 0, strpos($tmpDateStr, $date)), ','); + $preDate = substr($preDate, strrpos($preDate, ',') + 1); + + if($preDate) + { + $preValue = $sets[$preDate]; + $preValue = $preValue->value; + } + } + + $data .= isset($sets[$date]) ? "{$sets[$date]->value}," : "{$preValue},"; } $data = rtrim($data, ','); $data .= ']'; diff --git a/module/svn/model.php b/module/svn/model.php index 5b8bde5529..0ad7ad7ce9 100644 --- a/module/svn/model.php +++ b/module/svn/model.php @@ -440,7 +440,7 @@ class svnModel extends model foreach($this->config->svn->repos as $repo) { if(empty($repo['path'])) continue; - if(strpos($url, $repo['path']) !== false) return (object)$repo; + if(strpos(strtolower($url), strtolower($repo['path'])) !== false) return (object)$repo; } return false; }