diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 805f9b304..7e04819cd 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -192,7 +192,7 @@ if (top != self) { ?>
-'; + return ''; } elseif ($big_icon) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' . __('Documentation') . ''; } else { - return '[' . __('Documentation') . ']'; + return '[' . __('Documentation') . ']'; } } // end of the 'PMA_showMySQLDocu()' function @@ -2425,7 +2425,7 @@ function PMA_getDbLink($database = null) function PMA_externalBug($functionality, $component, $minimum_version, $bugref) { if ($component == 'mysql' && PMA_MYSQL_INT_VERSION < $minimum_version) { - echo PMA_showHint(sprintf(__('The %s functionality is affected by a known bug, see %s'), $functionality, './url.php?url=http://bugs.mysql.com/' . $bugref)); + echo PMA_showHint(sprintf(__('The %s functionality is affected by a known bug, see %s'), $functionality, PMA_linkURL('http://bugs.mysql.com/') . $bugref)); } } diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php index b07ac3a1e..41c421fb4 100644 --- a/libraries/config/FormDisplay.class.php +++ b/libraries/config/FormDisplay.class.php @@ -681,7 +681,7 @@ class FormDisplay if ($test == 'Export') { $opt_name = substr($opt_name, 7); } - return './url.php?url=http://wiki.phpmyadmin.net/pma/Config#' . $opt_name; + return PMA_linkURL('http://wiki.phpmyadmin.net/pma/Config#' . $opt_name); } /** diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php index 0d26cb562..8aac9ef33 100644 --- a/libraries/config/config_functions.lib.php +++ b/libraries/config/config_functions.lib.php @@ -93,10 +93,8 @@ function PMA_lang_link_replace($link, $text) if (!preg_match('#^https?://#', $link)) { $link = str_replace('&', $separator, $link); - } elseif (defined('PMA_SETUP')) { - $link = '../url.php?url=' . $link; } else { - $link = './url.php?url=' . $link; + $link = PMA_linkURL($link); } return '' . $text . ''; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 54da58c47..a3d80f5be 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -656,4 +656,21 @@ function PMA_array_remove($path, &$array) } } } + +/** + * Returns link to (possibly) external site using defined redirector. + * + * @param string $url URL where to go. + * + * @return string URL for a link. + */ +function PMA_linkURL($url) { + if (!preg_match('#^https?://#', $url)) { + return $url; + } elseif (defined('PMA_SETUP')) { + return '../url.php?url=' . $url; + } else { + return './url.php?url=' . $url; + } +} ?> diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index fc2065f3b..ac223dc41 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -235,7 +235,7 @@ if(isset($_GET['sql_query'])) { } $message = new PMA_Message(__('This value is interpreted using %1$sstrftime%2$s, so you can use time formatting strings. Additionally the following transformations will happen: %3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details.')); - $message->addParam('', false); $message->addParam('', false); $message->addParam($trans); diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php index 4065bf309..5f9b17586 100644 --- a/libraries/engines/pbms.lib.php +++ b/libraries/engines/pbms.lib.php @@ -91,15 +91,15 @@ class PMA_StorageEngine_pbms extends PMA_StorageEngine function getPageDocumentation() { $output = '

Documentation and further information about PBMS can be found on ' . "\n" - . 'The PrimeBase Media Streaming home page.

' . "\n" + . 'The PrimeBase Media Streaming home page.

' . "\n" . '' . "\n" . '' . "\n" . '' . "\n" . '' . "\n" diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index 66da56ad0..eb0dad39b 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -122,15 +122,15 @@ class PMA_StorageEngine_pbxt extends PMA_StorageEngine function getPageDocumentation() { $output = '

Documentation and further information about PBXT can be found on the ' . "\n" - . 'PrimeBase XT Home Page.

' . "\n" + . 'PrimeBase XT Home Page.

' . "\n" . '

' . "\n" . '' . "\n" . '' . "\n" . '' . "\n" diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index adb8df2fa..a362ebdea 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -74,7 +74,7 @@ function PMA_sanitize($message, $escape = false, $safe = false) } if (substr($found[1], 0, 4) == 'http') { - $message = preg_replace($pattern, '', $message); + $message = preg_replace($pattern, '', $message); } else { $message = preg_replace($pattern, '', $message); } diff --git a/main.php b/main.php index 3d0323482..1361391ea 100644 --- a/main.php +++ b/main.php @@ -210,16 +210,16 @@ echo '

phpMyAdmin

'; echo '