diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rw-r--r-- | lib/private/config.php | 2 | ||||
| -rw-r--r-- | lib/private/helper.php | 9 | ||||
| -rw-r--r-- | lib/private/setup.php | 2 | ||||
| -rw-r--r-- | lib/private/template/functions.php | 8 | ||||
| -rwxr-xr-x | lib/private/util.php | 16 |
6 files changed, 28 insertions, 11 deletions
diff --git a/lib/base.php b/lib/base.php index ee925b8f736..ef574b2d895 100644 --- a/lib/base.php +++ b/lib/base.php @@ -181,7 +181,7 @@ class OC { OC_Template::printErrorPage( "Can't write into config directory!", 'This can usually be fixed by ' - .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.' + .'<a href="' . link_to_docs('admin-dir_permissions') . '" target="_blank">giving the webserver write access to the config directory</a>.' ); } } diff --git a/lib/private/config.php b/lib/private/config.php index 72423137fa3..caf7b1d7066 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -172,7 +172,7 @@ class Config { $result = @file_put_contents($this->configFilename, $content); if (!$result) { $defaults = new \OC_Defaults; - $url = $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions'; + $url = \OC_Helper::linkToDocs('admin-dir-permissions'); throw new HintException( "Can't write into config directory!", 'This can usually be fixed by ' diff --git a/lib/private/helper.php b/lib/private/helper.php index e9b129db0ca..fca08adca8b 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -59,6 +59,15 @@ class OC_Helper { } /** + * @param $key + * @return string url to the online documentation + */ + public static function linkToDocs($key) { + $theme = new OC_Defaults(); + return $theme->getDocBaseUrl() . '/server/5.0/go.php?to=' . $key; + } + + /** * @brief Creates an absolute url * @param string $app app * @param string $file file diff --git a/lib/private/setup.php b/lib/private/setup.php index 6bf3c88370f..3cc1d29c6a4 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -183,7 +183,7 @@ class OC_Setup { $error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.'); $hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.', - 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); + link_to_docs('admin-install')); OC_Template::printErrorPage($error, $hint); exit(); diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 0aa2b27b96b..ce42633b364 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -36,6 +36,14 @@ function link_to( $app, $file, $args = array() ) { } /** + * @param $key + * @return string url to the online documentation + */ +function link_to_docs($key) { + return OC_Helper::linkToDocs($key); +} + +/** * @brief make OC_Helper::imagePath available as a simple function * @param string $app app * @param string $image image diff --git a/lib/private/util.php b/lib/private/util.php index 885cce87541..f63884c0f32 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -303,16 +303,16 @@ class OC_Util { //common hint for all file permissions error messages $permissionsHint = 'Permissions can usually be fixed by ' - .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html' - .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'; + .'<a href="' . OC_Helper::linkToDocs('admin-dir_permissions') + .'" target="_blank">giving the webserver write access to the root directory</a>.'; // Check if config folder is writable. if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { $errors[] = array( 'error' => "Can't write into config directory", 'hint' => 'This can usually be fixed by ' - .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html' - .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.' + .'<a href="' . OC_Helper::linkToDocs('admin-dir_permissions') + .'" target="_blank">giving the webserver write access to the config directory</a>.' ); } @@ -324,8 +324,8 @@ class OC_Util { $errors[] = array( 'error' => "Can't write into apps directory", 'hint' => 'This can usually be fixed by ' - .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html' - .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> ' + .'<a href="' . OC_Helper::linkToDocs('admin-dir_permissions') + .'" target="_blank">giving the webserver write access to the apps directory</a> ' .'or disabling the appstore in the config file.' ); } @@ -340,8 +340,8 @@ class OC_Util { $errors[] = array( 'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")", 'hint' => 'This can usually be fixed by ' - .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html' - .'#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.' + .'<a href="' . OC_Helper::linkToDocs('admin-dir_permissions') + .'" target="_blank">giving the webserver write access to the root directory</a>.' ); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { |