nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #782966

Browse Source
This commit is contained in:
Garvin Hicking
2003-08-05 17:03:29 +00:00
parent 54db701f8b
commit defa87298e
2 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-08-05 Garvin Hicking <me@supergarv.de>
* libraries/common.lib.php3: Moved docu function (PHP3 compatbility)
(Bug #782966)
2003-08-05 Michal Cihar <nijel@users.sourceforge.net> 2003-08-05 Michal Cihar <nijel@users.sourceforge.net>
* sql.php3: Fixed regular expression. * sql.php3: Fixed regular expression.
* libraries/export/latex.php3: Use "table (field)" instead of * libraries/export/latex.php3: Use "table (field)" instead of

85
libraries/common.lib.php3
View File

@@ -390,6 +390,48 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
} // end of the "PMA_formatSql()" function } // end of the "PMA_formatSql()" function
/**
* Displays a link to the official MySQL documentation
*
* @param chapter of "HTML, one page per chapter" documentation
* @param contains name of page/anchor that is being linked
*
* @return string the html link
*
* @access public
*/
function PMA_showMySQLDocu($chapter, $link)
{
if (!empty($GLOBALS['cfg']['MySQLManualBase'])) {
if (!empty($GLOBALS['cfg']['MySQLManualType'])) {
switch ($GLOBALS['cfg']['MySQLManualType']) {
case 'old':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'chapters':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'big':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'none':
return '';
case 'searchable':
default:
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
}
} else {
// no Type defined, show the old one
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
}
} else {
// no URL defined
if (!empty($GLOBALS['cfg']['ManualBaseShort'])) {
// the old configuration
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
} else {
return '';
}
}
} // end of the 'PMA_showDocu()' function
/** /**
* Displays a MySQL error message in the right frame. * Displays a MySQL error message in the right frame.
* *
@@ -1507,49 +1549,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
} // end of the 'PMA_showMessage()' function } // end of the 'PMA_showMessage()' function
/**
* Displays a link to the official MySQL documentation
*
* @param chapter of "HTML, one page per chapter" documentation
* @param contains name of page/anchor that is being linked
*
* @return string the html link
*
* @access public
*/
function PMA_showMySQLDocu($chapter, $link)
{
if (!empty($GLOBALS['cfg']['MySQLManualBase'])) {
if (!empty($GLOBALS['cfg']['MySQLManualType'])) {
switch ($GLOBALS['cfg']['MySQLManualType']) {
case 'old':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'chapters':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/manual_' . $chapter . '.html#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'big':
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '#' . $link . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
case 'none':
return '';
case 'searchable':
default:
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
}
} else {
// no Type defined, show the old one
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
}
} else {
// no URL defined
if (!empty($GLOBALS['cfg']['ManualBaseShort'])) {
// the old configuration
return '[<a href="' . $GLOBALS['cfg']['MySQLManualBase'] . '/' . $link[0] . '/' . $link[1] . '/' . $link . '.html" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
} else {
return '';
}
}
} // end of the 'PMA_showDocuShort()' function
/** /**
* Formats $value to byte view * Formats $value to byte view
* *