forked from phpmyadmin/phpmyadmin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature request: phpmyadmin#1476 Favourite tables select box.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Changes in "create_tables.sql". Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Minor fix in structure.lib.php. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Ripped Trailing White spaces. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Removed irrelevant comments from "FavouriteTable.class.php". Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fixed Table Summary colspan. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Changed Favourite to Favorite Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fixed failing test. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Feature request: phpmyadmin#1476 Favourite tables select box. (Icon only) Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Gray and Golden Icons. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Removed unwanted icon from "img". Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Fixed error in PMA_buildActionTitles_test.php. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Re-positioned star icon and added tooltip to it. Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com> Ripped trailing spaces from "structure.lib.php" and "db_structure.js". Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
- Loading branch information
1 parent
69e2d84
commit 8bc21b7
Showing
20 changed files
with
434 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,271 @@ | ||
| <?php | ||
| /* vim: set expandtab sw=4 ts=4 sts=4: */ | ||
| /** | ||
| * Favorite table list handling | ||
| * | ||
| * @package PhpMyAdmin | ||
| */ | ||
|
|
||
| if (! defined('PHPMYADMIN')) { | ||
| exit; | ||
| } | ||
|
|
||
| require_once './libraries/Message.class.php'; | ||
|
|
||
| /** | ||
| * Handles the favorite tables list. | ||
| * | ||
| * | ||
| * @package PhpMyAdmin | ||
| */ | ||
| class PMA_FavoriteTable | ||
| { | ||
| /** | ||
| * Defines the internal PMA table which contains favorite tables. | ||
| * | ||
| * @access private | ||
| * @var string | ||
| */ | ||
| private $_pmaTable; | ||
|
|
||
| /** | ||
| * Reference to session variable containing favorite used tables. | ||
| * | ||
| * @access public | ||
| * @var array | ||
| */ | ||
| public $tables; | ||
|
|
||
| /** | ||
| * PMA_FavoriteTable instance. | ||
| * | ||
| * @var PMA_FavoriteTable | ||
| */ | ||
| private static $_instance; | ||
|
|
||
| /** | ||
| * Creates a new instance of PMA_FavoriteTable | ||
| */ | ||
| public function __construct() | ||
| { | ||
| if (strlen($GLOBALS['cfg']['Server']['pmadb']) | ||
| && strlen($GLOBALS['cfg']['Server']['favorite']) | ||
| ) { | ||
| $this->_pmaTable | ||
| = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) . "." | ||
| . PMA_Util::backquote($GLOBALS['cfg']['Server']['favorite']); | ||
| } | ||
| $server_id = $GLOBALS['server']; | ||
| if (! isset($_SESSION['tmpval']['favorite_tables'][$server_id])) { | ||
| $_SESSION['tmpval']['favorite_tables'][$server_id] | ||
| = isset($this->_pmaTable) ? $this->getFromDb() : array(); | ||
| } | ||
| $this->tables =& $_SESSION['tmpval']['favorite_tables'][$server_id]; | ||
| } | ||
|
|
||
| /** | ||
| * Returns class instance. | ||
| * | ||
| * @return PMA_FavoriteTable | ||
| */ | ||
| public static function getInstance() | ||
| { | ||
| if (is_null(self::$_instance)) { | ||
| self::$_instance = new PMA_FavoriteTable(); | ||
| } | ||
| return self::$_instance; | ||
| } | ||
|
|
||
| /** | ||
| * Returns favorite tables from phpMyAdmin database. | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getFromDb() | ||
| { | ||
| // Read from phpMyAdmin database, if favorite tables are not in session | ||
| $sql_query | ||
| = " SELECT `tables` FROM " . $this->_pmaTable . | ||
| " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'"; | ||
|
|
||
| $return = array(); | ||
| $result = PMA_queryAsControlUser($sql_query, false); | ||
| if ($result) { | ||
| $row = $GLOBALS['dbi']->fetchArray($result); | ||
| if (isset($row[0])) { | ||
| $return = json_decode($row[0], true); | ||
| } | ||
| } | ||
| return $return; | ||
| } | ||
|
|
||
| /** | ||
| * Save favorite tables into phpMyAdmin database. | ||
| * | ||
| * @return true|PMA_Message | ||
| */ | ||
| public function saveToDb() | ||
| { | ||
| $username = $GLOBALS['cfg']['Server']['user']; | ||
| $sql_query | ||
| = " REPLACE INTO " . $this->_pmaTable . " (`username`, `tables`)" . | ||
| " VALUES ('" . $username . "', '" | ||
| . PMA_Util::sqlAddSlashes( | ||
| json_encode($this->tables) | ||
| ) . "')"; | ||
|
|
||
| $success = $GLOBALS['dbi']->tryQuery($sql_query, $GLOBALS['controllink']); | ||
|
|
||
| if (! $success) { | ||
| $message = PMA_Message::error(__('Could not save favorite table!')); | ||
| $message->addMessage('<br /><br />'); | ||
| $message->addMessage( | ||
| PMA_Message::rawError( | ||
| $GLOBALS['dbi']->getError($GLOBALS['controllink']) | ||
| ) | ||
| ); | ||
| return $message; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Remove favorite tables from phpMyAdmin database. | ||
| * | ||
| * @return true|PMA_Message | ||
| */ | ||
| public function removeFromDb() | ||
| { | ||
| $username = $GLOBALS['cfg']['Server']['user']; | ||
| $sql_query | ||
| = " REPLACE INTO " . $this->_pmaTable . " (`username`, `tables`)" . | ||
| " VALUES ('" . $username . "', '" | ||
| . PMA_Util::sqlAddSlashes( | ||
| json_encode($this->tables) | ||
| ) . "')"; | ||
|
|
||
| $success = $GLOBALS['dbi']->tryQuery($sql_query, $GLOBALS['controllink']); | ||
|
|
||
| if (! $success) { | ||
| $message = PMA_Message::error(__('Could not remove favorite table!')); | ||
| $message->addMessage('<br /><br />'); | ||
| $message->addMessage( | ||
| PMA_Message::rawError( | ||
| $GLOBALS['dbi']->getError($GLOBALS['controllink']) | ||
| ) | ||
| ); | ||
| return $message; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Trim favorite table according to the NumFavoriteTables configuration. | ||
| * | ||
| * @return boolean True if trimming occurred | ||
| */ | ||
| public function trim() | ||
| { | ||
| $max = max($GLOBALS['cfg']['NumFavoriteTables'], 0); | ||
| $trimming_occurred = count($this->tables) > $max; | ||
| while (count($this->tables) > $max) { | ||
| array_pop($this->tables); | ||
| } | ||
| return $trimming_occurred; | ||
| } | ||
|
|
||
| /** | ||
| * Return options for HTML select. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getHtmlSelectOption() | ||
| { | ||
| // trim and save, in case where the configuration is changed | ||
| if ($this->trim() && isset($this->_pmaTable)) { | ||
| $this->saveToDb(); | ||
| } | ||
|
|
||
| $html = '<option value="">(' . __('Favorite tables') . ') ...</option>'; | ||
| if (count($this->tables)) { | ||
| foreach ($this->tables as $table) { | ||
| $html .= '<option value="' | ||
| . htmlspecialchars(json_encode($table)) . '">' | ||
| . htmlspecialchars( | ||
| '`' . $table['db'] . '`.`' . $table['table'] . '`' | ||
| ) | ||
| . '</option>'; | ||
| } | ||
| } else { | ||
| $html .= '<option value="">' | ||
| . __('There are no favorite tables.') | ||
| . '</option>'; | ||
| } | ||
| return $html; | ||
| } | ||
|
|
||
| /** | ||
| * Return HTML select. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getHtmlSelect() | ||
| { | ||
| $html = '<select name="selected_favorite_table" id="favoriteTable">'; | ||
| $html .= $this->getHtmlSelectOption(); | ||
| $html .= '</select>'; | ||
|
|
||
| return $html; | ||
| } | ||
|
|
||
| /** | ||
| * Add favorite tables. | ||
| * | ||
| * @param string $db database name where the table is located | ||
| * @param string $table table name | ||
| * | ||
| * @return true|PMA_Message True if success, PMA_Message if not | ||
| */ | ||
| public function add($db, $table) | ||
| { | ||
| $table_arr = array(); | ||
| $table_arr['db'] = $db; | ||
| $table_arr['table'] = $table; | ||
|
|
||
| // add only if this is new table | ||
| if (! isset($this->tables[0]) || $this->tables[0] != $table_arr) { | ||
| array_unshift($this->tables, $table_arr); | ||
| $this->tables = array_merge(array_unique($this->tables, SORT_REGULAR)); | ||
| $this->trim(); | ||
| if (isset($this->_pmaTable)) { | ||
| return $this->saveToDb(); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Remove favorite tables. | ||
| * | ||
| * @param string $db database name where the table is located | ||
| * @param string $table table name | ||
| * | ||
| * @return true|PMA_Message True if success, PMA_Message if not | ||
| */ | ||
| public function remove($db, $table) | ||
| { | ||
| $table_arr = array(); | ||
| $table_arr['db'] = $db; | ||
| $table_arr['table'] = $table; | ||
| foreach ($this->tables as $key => $value) { | ||
| if ($value['db'] == $db && $value['table'] == $table) { | ||
| unset($this->tables[$key]); | ||
| } | ||
| } | ||
| if (isset($this->_pmaTable)) { | ||
| return $this->removeFromDb(); | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.