diff options
author | VirtualTam <virtualtam+github@flibidi.net> | 2016-10-20 20:41:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-20 20:41:24 +0200 |
commit | fb6c8f770a07e38d5250ca4d6717445002e7bfb3 (patch) | |
tree | 499d26ccee0d0df3aeac5fe9d27faf2800721698 /application/ApplicationUtils.php | |
parent | ceeb8fbeb89f69e41791ae192d073d6afea00f4b (diff) | |
parent | 7af9a41881ed0b9d44d18a0ce03a123a8441adf5 (diff) | |
download | Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.tar.gz Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.tar.zst Shaarli-fb6c8f770a07e38d5250ca4d6717445002e7bfb3.zip |
Merge pull request #671 from ArthurHoaro/cleanup-code
Minor code cleanup: PHPDoc, spelling, unused variables, etc.
Diffstat (limited to 'application/ApplicationUtils.php')
-rw-r--r-- | application/ApplicationUtils.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index e67b2902..7f963e97 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -15,6 +15,9 @@ class ApplicationUtils | |||
15 | * | 15 | * |
16 | * The code is read from the raw content of the version file on the Git server. | 16 | * The code is read from the raw content of the version file on the Git server. |
17 | * | 17 | * |
18 | * @param string $url URL to reach to get the latest version. | ||
19 | * @param int $timeout Timeout to check the URL (in seconds). | ||
20 | * | ||
18 | * @return mixed the version code from the repository if available, else 'false' | 21 | * @return mixed the version code from the repository if available, else 'false' |
19 | */ | 22 | */ |
20 | public static function getLatestGitVersionCode($url, $timeout=2) | 23 | public static function getLatestGitVersionCode($url, $timeout=2) |
@@ -49,6 +52,7 @@ class ApplicationUtils | |||
49 | * @param int $checkInterval the minimum interval between update checks (in seconds | 52 | * @param int $checkInterval the minimum interval between update checks (in seconds |
50 | * @param bool $enableCheck whether to check for new versions | 53 | * @param bool $enableCheck whether to check for new versions |
51 | * @param bool $isLoggedIn whether the user is logged in | 54 | * @param bool $isLoggedIn whether the user is logged in |
55 | * @param string $branch check update for the given branch | ||
52 | * | 56 | * |
53 | * @throws Exception an invalid branch has been set for update checks | 57 | * @throws Exception an invalid branch has been set for update checks |
54 | * | 58 | * |
@@ -152,7 +156,7 @@ class ApplicationUtils | |||
152 | } | 156 | } |
153 | } | 157 | } |
154 | 158 | ||
155 | // Check cache and data directories are readable and writeable | 159 | // Check cache and data directories are readable and writable |
156 | foreach (array( | 160 | foreach (array( |
157 | $conf->get('resource.thumbnails_cache'), | 161 | $conf->get('resource.thumbnails_cache'), |
158 | $conf->get('resource.data_dir'), | 162 | $conf->get('resource.data_dir'), |
@@ -167,7 +171,7 @@ class ApplicationUtils | |||
167 | } | 171 | } |
168 | } | 172 | } |
169 | 173 | ||
170 | // Check configuration files are readable and writeable | 174 | // Check configuration files are readable and writable |
171 | foreach (array( | 175 | foreach (array( |
172 | $conf->getConfigFileExt(), | 176 | $conf->getConfigFileExt(), |
173 | $conf->get('resource.datastore'), | 177 | $conf->get('resource.datastore'), |