EGroupware /
egroupware
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | * Get versions of available updates |
| 47 | 47 | * |
| 48 | 48 | * @param string $api =null major api version to return security for, default latest |
| 49 | - * @return array verions for keys "current" and "security" |
|
| 49 | + * @return string verions for keys "current" and "security" |
|
| 50 | 50 | */ |
| 51 | 51 | public static function available($api=null) |
| 52 | 52 | { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * @param string $api =null major api version to return security for, default latest |
| 49 | 49 | * @return array verions for keys "current" and "security" |
| 50 | 50 | */ |
| 51 | - public static function available($api=null) |
|
| 51 | + public static function available($api = null) |
|
| 52 | 52 | { |
| 53 | 53 | $versions = Cache::getTree(__CLASS__, 'versions', function() use ($api) |
| 54 | 54 | { |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | $current = array_shift($all_versions); |
| 61 | 61 | if (empty($all_versions)) $all_versions = array($current); |
| 62 | 62 | // find latest security release for optional API version |
| 63 | - foreach(array_reverse($all_versions) as $security) |
|
| 63 | + foreach (array_reverse($all_versions) as $security) |
|
| 64 | 64 | { |
| 65 | 65 | if (isset($api) && $api === substr($security, 0, strlen($api))) break; |
| 66 | 66 | } |
| 67 | 67 | $versions = array( |
| 68 | - 'current' => $current, // last maintenance update |
|
| 69 | - 'security' => $security, // last security update |
|
| 68 | + 'current' => $current, // last maintenance update |
|
| 69 | + 'security' => $security, // last security update |
|
| 70 | 70 | ); |
| 71 | 71 | } |
| 72 | 72 | return $versions; |
@@ -107,8 +107,7 @@ discard block |
||
| 107 | 107 | if ($GLOBALS['egw_info']['user']['apps']['admin'] && version_compare($api, $versions['current'], '<')) |
| 108 | 108 | { |
| 109 | 109 | $msg = substr($versions['current'], 0, strlen($api_major)) == $api_major ? |
| 110 | - lang('EGroupware maintenance update %1 available', $versions['current']) : |
|
| 111 | - lang('New EGroupware release %1 available', $versions['current']); |
|
| 110 | + lang('EGroupware maintenance update %1 available', $versions['current']) : lang('New EGroupware release %1 available', $versions['current']); |
|
| 112 | 111 | return Html::a_href(Html::image('api', 'update', $msg), |
| 113 | 112 | 'http://www.egroupware.org/changelog', null, ' target="_blank"'); |
| 114 | 113 | } |
@@ -136,7 +135,7 @@ discard block |
||
| 136 | 135 | */ |
| 137 | 136 | protected static function update_older($version, $days) |
| 138 | 137 | { |
| 139 | - list(,,$date) = explode('.', $version); |
|
| 138 | + list(,, $date) = explode('.', $version); |
|
| 140 | 139 | if ($date < 20140000) return false; |
| 141 | 140 | $version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4)); |
| 142 | 141 | |
@@ -149,7 +148,7 @@ discard block |
||
| 149 | 148 | * @param string &$changelog on return path to changelog |
| 150 | 149 | * @return string |
| 151 | 150 | */ |
| 152 | - public static function api_version(&$changelog=null) |
|
| 151 | + public static function api_version(&$changelog = null) |
|
| 153 | 152 | { |
| 154 | 153 | $changelog = EGW_SERVER_ROOT.'/doc/rpm-build/debian.changes'; |
| 155 | 154 | |
@@ -58,11 +58,17 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | $all_versions = explode("\n", $remote); |
| 60 | 60 | $current = array_shift($all_versions); |
| 61 | - if (empty($all_versions)) $all_versions = array($current); |
|
| 61 | + if (empty($all_versions)) |
|
| 62 | + { |
|
| 63 | + $all_versions = array($current); |
|
| 64 | + } |
|
| 62 | 65 | // find latest security release for optional API version |
| 63 | 66 | foreach(array_reverse($all_versions) as $security) |
| 64 | 67 | { |
| 65 | - if (isset($api) && $api === substr($security, 0, strlen($api))) break; |
|
| 68 | + if (isset($api) && $api === substr($security, 0, strlen($api))) |
|
| 69 | + { |
|
| 70 | + break; |
|
| 71 | + } |
|
| 66 | 72 | } |
| 67 | 73 | $versions = array( |
| 68 | 74 | 'current' => $current, // last maintenance update |
@@ -137,7 +143,10 @@ discard block |
||
| 137 | 143 | protected static function update_older($version, $days) |
| 138 | 144 | { |
| 139 | 145 | list(,,$date) = explode('.', $version); |
| 140 | - if ($date < 20140000) return false; |
|
| 146 | + if ($date < 20140000) |
|
| 147 | + { |
|
| 148 | + return false; |
|
| 149 | + } |
|
| 141 | 150 | $version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4)); |
| 142 | 151 | |
| 143 | 152 | return (time() - $version_timestamp) / 86400 > $days; |
