reworked bookmarking

This commit is contained in:
Sebastian Mendel
2008-05-09 12:37:30 +00:00
parent 58b3661876
commit 32c61a2ff6
4 changed files with 99 additions and 96 deletions

View File

@@ -37,8 +37,7 @@ require_once './libraries/bookmark.lib.php'; // used for file listing
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['cfg']['DefaultQueryDatabase']
* @uses $GLOBALS['cfg']['DefaultQueryTable']
* @uses $GLOBALS['cfg']['Bookmark']['db']
* @uses $GLOBALS['cfg']['Bookmark']['table']
* @uses $GLOBALS['cfg']['Bookmark']
* @uses $GLOBALS['strSuccess']
* @uses PMA_generate_common_url()
* @uses PMA_backquote()
@@ -151,9 +150,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
// Bookmark Support
if ($display_tab === 'full' || $display_tab === 'history') {
if (! empty($GLOBALS['cfg']['Bookmark'])
&& $GLOBALS['cfg']['Bookmark']['db']
&& $GLOBALS['cfg']['Bookmark']['table']) {
if (! empty($GLOBALS['cfg']['Bookmark'])) {
PMA_sqlQueryFormBookmark();
}
}
@@ -330,9 +327,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
echo '<div class="clearfloat"></div>' . "\n";
echo '</div>' . "\n";
if (! empty($GLOBALS['cfg']['Bookmark'])
&& $GLOBALS['cfg']['Bookmark']['db']
&& $GLOBALS['cfg']['Bookmark']['table']) {
if (! empty($GLOBALS['cfg']['Bookmark'])) {
?>
<div id="bookmarkoptions">
<div class="formelement">
@@ -395,10 +390,9 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
* prints bookmark fieldset
*
* @usedby PMA_sqlQueryForm()
* @uses PMA_listBookmarks()
* @uses PMA_Bookmark_getList()
* @uses $GLOBALS['db']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['Bookmark']
* @uses $GLOBALS['cfg']['ReplaceHelpImg']
* @uses $GLOBALS['strBookmarkQuery']
* @uses $GLOBALS['strBookmarkView']
@@ -412,7 +406,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
*/
function PMA_sqlQueryFormBookmark()
{
$bookmark_list = PMA_listBookmarks($GLOBALS['db'], $GLOBALS['cfg']['Bookmark']);
$bookmark_list = PMA_Bookmark_getList($GLOBALS['db']);
if (! $bookmark_list || count($bookmark_list) < 1) {
return;
}