August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15882-g3fe234a
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 3fe234a029308b370b014c755d60540cc553881d (commit) from 98e71f8805faef9787731c861543f07ff5529bda (commit) - Log ----------------------------------------------------------------- commit 3fe234a029308b370b014c755d60540cc553881d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:55:19 2011 +0200 Move PMD help to documentation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 8 ++++++++ pmd_general.php | 2 +- pmd_help.php | 27 --------------------------- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pmd_help.php diff --git a/Documentation.html b/Documentation.html index 758a2bc..d7c76e1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4409,6 +4409,14 @@ chmod o+rwx tmp </li> </ul> +<h4 id="faq6_31"> + <a href="#faq6_31">6.30 How do I create a relation in designer?</a></h4> + + <p>To select relation, click :</p> + + <img src="pmd/images/help_relation.png"></p> + <p>The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.</p> + <h3 id="faqproject">phpMyAdmin project</h3> <h4 id="faq7_1"> diff --git a/pmd_general.php b/pmd_general.php index 45b6955..3613f1f 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -79,7 +79,7 @@ echo $script_tabs . $script_contr . $script_display_field; /></a><a href="javascript:location.reload();" onmousedown="return false;" class="M_butt" target="_self" ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" - /></a><a href="javascript:Help();" onmousedown="return false;" + /></a><a href="Documentation.html#faq6_31" target="documentation" class="M_butt" target="_self" ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt="" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" diff --git a/pmd_help.php b/pmd_help.php deleted file mode 100644 index f81df43..0000000 --- a/pmd_help.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * - * @package phpMyAdmin-Designer - */ - -/** - * - */ -require_once './libraries/pmd_common.php'; -?> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css"> -<title>Designer</title> -</head> - -<body> -<?php - echo '<p>' . __('To select relation, click :') . '<br />'; - echo '<img src="pmd/images/help_relation.png" border="1"></p>'; - echo '<p>' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '</p>'; -?> -</body> -</html> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15881-g98e71f8
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 98e71f8805faef9787731c861543f07ff5529bda (commit) from cd69e5bdf2081561e5d8891d72820d16a4d99266 (commit) - Log ----------------------------------------------------------------- commit 98e71f8805faef9787731c861543f07ff5529bda Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:50:28 2011 +0200 First attempt to integrate designer into rest For now works only in pmahomme and needs lot of cleanups and fixes ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 30 +-- themes/pmahomme/css/theme_right.css.php | 541 +++++++++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 19 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index d270cbd..45b6955 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -8,6 +8,8 @@ * */ require_once './libraries/pmd_common.php'; +require './libraries/db_common.inc.php'; +require './libraries/db_info.inc.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); @@ -17,17 +19,6 @@ $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); $hidden = "hidden"; -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="icon" href="pmd/images/favicon.ico" type="image/x-icon" /> - <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> - <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> - <title>Designer</title> -<?php $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; @@ -125,10 +116,6 @@ echo $script_tabs . $script_contr . $script_display_field; title="<?php echo __('Move Menu'); ?>" /></a> </div> -<div id="osn_tab"> - <CANVAS id="canvas" width="100" height="100" onclick="Canvas_click(this)"></CANVAS> -</div> - <form action="" method="post" name="form1"> <div id="layer_menu" style="visibility:<?php echo $hidden ?>;"> <div align="center" style="padding-top:5px;"> @@ -166,8 +153,8 @@ for ($i = 0; $i < $name_cnt; $i++) { echo 'checked="checked"'; } ?> /></td> - <td class="Tabs" onmouseover="this.className='Tabs2'" - onmouseout="this.className='Tabs'" + <td class="pmd_Tabs" onmouseover="this.className='pmd_Tabs2'" + onmouseout="this.className='pmd_Tabs'" onclick="Select_tab('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>');"> <?php echo $GLOBALS['PMD_OUT']["TABLE_NAME"][$i]; ?></td> </tr> @@ -185,6 +172,11 @@ for ($i = 0; $i < $name_cnt; $i++) { </div> </div> </div> + +<div id="osn_tab"> + <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas> +</div> + <?php for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { $t_n = $GLOBALS['PMD']["TABLE_NAME"][$i]; @@ -196,7 +188,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <input name="t_v[<?php echo $t_n_url ?>]" type="hidden" id="t_v_<?php echo $t_n_url ?>_" /> <input name="t_h[<?php echo $t_n_url ?>]" type="hidden" id="t_h_<?php echo $t_n_url ?>_" /> -<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="tab" +<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="pmd_tab" style="position: absolute; left: <?php if (isset($tab_pos[$t_n])) echo $tab_pos[$t_n]["X"]; else echo rand(180, 800); ?>px; top: <?php if (isset($tab_pos[$t_n])) echo $tab_pos[$t_n]["Y"]; else echo rand(30, 500); ?>px; @@ -332,7 +324,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?> </form> -<div id="hint"></div> +<div id="pmd_hint"></div> <div id='layer_action' style="visibility:<?php echo $hidden ?>;">Load...</div> <table id="layer_new_relation" style="visibility:<?php echo $hidden ?>;" diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 25aeadc..fc04961 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3019,3 +3019,544 @@ span.cm-number { .ui-timepicker-div dl dt{ height: 25px; } .ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } .ui-timepicker-div td { font-size: 90%; } + +/* Designer */ +.input_tab { + background-color: #A6C7E1; + color: #000000; +} + +#canvas { + background-color: #FFFFFF; + color: #000000; +} + +canvas.pmd { + display: inline-block; + overflow: hidden; + text-align: left; +} + +canvas.pmd * { + behavior: url(#default#VML); +} + +.pmd_tab { + background-color: #FFFFFF; + color: #000000; + border-collapse: collapse; + border: 1px solid #AAAAAA; + font-family: Tahoma, sans-serif; + font-size: 10px; + z-index: 1; + -moz-user-select: none; +} + +.tab_zag { + background-image: url(images/Header.png); + background-repeat: repeat-x; + text-align: center; + cursor: move; + padding: 1px; + font-weight: bold; +} + +.tab_zag_2 { + background-image: url(images/Header_Linked.png); + background-repeat: repeat-x; + text-align: center; + cursor: move; + padding: 1px; + font-weight: bold; +} + +.tab_field { + background: #FFFFFF; + color: #000000; + cursor: default; +} + +.tab_field_2 { + background-color: #CCFFCC; + color: #000000; + background-repeat: repeat-x; + cursor: default; +} + +.tab_field_3 { + background-color: #FFE6E6; /*#DDEEFF*/ + color: #000000; + cursor: default; +} + +#pmd_hint { + white-space: nowrap; + position: absolute; + background-color: #99FF99; + color: #000000; + left: 200px; + top: 50px; + z-index: 3; + border: #00CC66 solid 1px; + visibility: hidden; +} + +.scroll_tab { + overflow: auto; + width: 100%; + height: 500px; +} + +.pmd_Tabs { + cursor: default; + font-family: Tahoma, sans-serif; + font-size: 10px; + color: #0055bb; + white-space: nowrap; + text-decoration: none; + text-indent: 3px; + font-weight: bold; + margin-left: 2px; + text-align: left; + background-color: #FFFFFF; + background-image: url(images/left_panel_butt.png); + border: #CCCCCC solid 1px; +} + +.pmd_Tabs2 { + cursor: default; + font-family: Tahoma, sans-serif; + font-size: 10px; + color: #0055bb; + background: #FFEE99; + text-indent: 3px; + font-weight: bold; + white-space: nowrap; + text-decoration: none; + border: #9999FF solid 1px; + text-align: left; +} + +.owner { + font-family: Tahoma, sans-serif; + font-size: 9px; + font-weight: normal; +/* background-color: #ffffff;*/ + color: #888888; +} + +.option_tab { + padding-left: 2px; + padding-right: 2px; + width: 5px; +} + +.select_all { + vertical-align: top; + padding-left: 2px; + padding-right: 2px; + cursor: default; + width: 1px; + color: #000000; + background-image: url(images/Header.png); + background-repeat: repeat-x; +} + +.small_tab { + vertical-align: top; + background-color: #0064ea; + color: #FFFFFF; + background-image: url(images/small_tab.png); + cursor: default; + text-align: center; + font-weight: bold; + padding-left: 2px; + padding-right: 2px; + width: 1px; + text-decoration: none; +} + +.small_tab2 { + vertical-align: top; + color: #FFFFFF; + background-color: #FF9966; + cursor: default; + padding-left: 2px; + padding-right: 2px; + text-align: center; + font-weight: bold; + width: 1px; + text-decoration: none; +} + +.small_tab_pref { + background-image: url(images/Header.png); + background-repeat: repeat-x; + text-align: center; + width: 1px; +} + +.small_tab_pref2 { + vertical-align: top; + color: #FFFFFF; + background-color: #FF9966; + cursor: default; + text-align: center; + font-weight: bold; + width: 1px; + text-decoration: none; +} + +.butt { + border: #4477aa solid 1px; + font-size: 11px; + font-weight: bold; + height: 19px; + width: 70px; + background-color: #FFFFFF; + color: #000000; + vertical-align: baseline; +} + +.L_butt2_1 { + font-size: 12px; + padding: 1px; + text-decoration: none; + background-color: #ffffff; + color: #000000; + vertical-align: middle; + cursor: default; +} + +.L_butt2_2 { + font-size: 12px; + padding: 0; + border: #0099CC solid 1px; + background: #FFEE99; + text-decoration: none; + color: #000000; + cursor: default; +} + +/* ---------------------------------------------------------------------------*/ +.bor { + width: 10px; + height: 10px; +} + +.frams1 { + background: url(images/1.png) no-repeat right bottom; +} + +.frams2 { + background: url(images/2.png) no-repeat left bottom; +} + +.frams3 { + background: url(images/3.png) no-repeat left top; +} + +.frams4 { + background: url(images/4.png) no-repeat right top; +} + +.frams5 { + background: url(images/5.png) repeat-x center bottom; +} + +.frams6 { + background: url(images/6.png) repeat-y left; +} + +.frams7 { + background: url(images/7.png) repeat-x top; +} + +.frams8 { + background: url(images/8.png) repeat-y right; +} + +#osn_tab { + background-color: #FFFFFF; + color: #000000; + border: #A9A9A9 solid 1px; +} + +.header { + background-color: #EAEEF0; + color: #000000; + text-align: center; + font-weight: bold; + margin: 0; + padding: 0; + background-image: url(images/top_panel.png); + background-position: top; + background-repeat: repeat-x; + border-right: #999999 solid 1px; + border-left: #999999 solid 1px; + height: 28px; +} + +.header a { + display: block; + float: left; + margin: 3px 1px 4px 1px; + height: 20px; + border: 1px dotted #ffffff; +} + +.header .M_bord { + display: block; + float: left; + margin: 4px; + height: 20px; + width: 2px; +} + +.header a.first { + margin-right: 1em; +} + +.header a.last { + margin-left: 1em; +} + +a.M_butt_Selected_down_IE, +a.M_butt_Selected_down { + border: 1px solid #C0C0BB; + background-color: #99FF99; + color: #000000; +} + +a.M_butt_Selected_down_IE:hover, +a.M_butt_Selected_down:hover, +a.M_butt:hover { + border: 1px solid #0099CC; + background-color: #FFEE99; + color: #000000; +} + +#layer_menu { + clear: both; + float: left; + z-index: 1000; + background-color: #EAEEF0; + border: #999999 solid 1px; +} + +#layer_action { + position: absolute; + left: 638px; + top: 52px; + z-index: 1000; + background-color: #CCFF99; + padding: 3px; + border: #009933 solid 1px; + white-space: nowrap; + font-weight: bold; +} + +#layer_upd_relation { + position: absolute; + left: 637px; + top: 224px; + z-index: 1000; +} + +#layer_new_relation { + position: absolute; + left: 636px; + top: 85px; + z-index: 1000; + width: 153px; +} + +#pmd_optionse { + position: absolute; + left: 636px; + top: 85px; + z-index: 1000; + width: 153px; +} + +#layer_menu_sizer { + background-image: url(../../images/resize.png); + cursor: nw-resize; + width: 16px; + height: 16px; +} + +.panel { +position: fixed; +top: 50px; +right: 0; +display: none; +background: #FFF; +border:1px solid #F5F5F5; +width: 350 px; +height: auto; +padding: 30px 170px 30px 30px; +color:#FFF; +z-index:99; +} + +a.trigger{ +position: fixed; +text-decoration: none; +top: 60px; right: 0; +font-size: 16px; +font-family: verdana, helvetica, arial, sans-serif; +color:#fff; +padding: 10px 40px 10px 15px; +font-weight: 700; +background:#333333 url(images/plus.png) 85% 55% no-repeat; +border:1px solid #444444; +display: block; +} + +a.trigger:hover{ +position: fixed; +text-decoration: none; +top: 60px; right: 0; +font-size: 16px; +font-family: verdana, helvetica, arial, sans-serif; +color:#080808; +padding: 10px 40px 10px 15px; +font-weight: 700; +background:#fff696 url(images/plus.png) 85% 55% no-repeat; +border:1px solid #999; +display: block; +} + +a.active.trigger { +background:#222222 url(images/minus.png) 85% 55% no-repeat; +z-index:999; +} + +a.active.trigger:hover { +background:#fff696 url(images/minus.png) 85% 55% no-repeat; +z-index:999; +} + +h2.tiger{ + background-repeat: repeat-x; + padding: 1px; + font-weight: bold; + font-size:14px; + padding: 50 20 50 20px; + margin: 0 0 5px 0; + width: 250px; + float: left; + color : #333; + text-align: center; +} + +h2.tiger a { + background-image: url(images/Header.png); + text-align: center; + text-decoration: none; + color : #333; + display: block; +} + +h2.tiger a:hover { + color: #000; + background-image: url(images/Header_Linked.png); +} + +h2.active { + background-image: url(images/Header.png); + background-repeat: repeat-x; + padding: 1px; + background-position: left bottom; +} + +.toggle_container { + margin: 0 0 5px; + padding: 0; + border-top: 1px solid #d6d6d6; + background: #FFF ; + width: 250px; + overflow: hidden; + font-size: 1.2em; + clear: both; +} + +.toggle_container .block { + background-color: #DBE4E8; + padding:40 15 40 15px; /*--Padding of Container--*/ + border:1px solid #999; + color:#000; +} + +.history_table { + text-align: center; + background-color: #9999CC; +} + +.history_table2 { + text-align: center; + background-color: #DBE4E8; +} + +#filter { + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: #CCA; + z-index:10; + opacity:0.5; + filter: alpha(opacity=50); +} + +#box { + display: none; + position: absolute; + top: 20%; + left: 30%; + width: 500px; + height: 220px; + padding: 48px; + margin:0; + border: 1px solid black; + background-color: white; + z-index:101; + overflow: visible; +} + +#boxtitle { + position:absolute; + float:center; + top:0; + left:0; + width:593px; + height:20px; + padding:0; + padding-top:4px; + left-padding:8px; + margin:0; + border-bottom:4px solid #3CF; + background-color: #D0DCE0; //#09c; + color:black; + font-weight:bold; + padding-left: 2px; + font-family:"Times New Roman", Times, serif; + font-size:16px; + text-align:left; +} + +#tblfooter { + background-color: D3DCE3; + float: right; + padding-top:10px; + color: black; + font-weight: normal; +} + +input.btn { + color:#333; + background-color: #D0DCE0; +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15880-gcd69e5b
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via cd69e5bdf2081561e5d8891d72820d16a4d99266 (commit) via a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 (commit) from 7b54504cc0981821619ffd3f0759766448e6b879 (commit) - Log ----------------------------------------------------------------- commit cd69e5bdf2081561e5d8891d72820d16a4d99266 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:25:47 2011 +0200 Include missing database tabs commit a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:21:55 2011 +0200 Move library to libraries ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 3 ++- pmd_common.php => libraries/pmd_common.php | 0 pmd_display_field.php | 2 +- pmd_general.php | 2 +- pmd_help.php | 2 +- pmd_pdf.php | 2 +- pmd_relation_new.php | 2 +- pmd_relation_upd.php | 2 +- pmd_save_pos.php | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) rename pmd_common.php => libraries/pmd_common.php (100%) diff --git a/db_datadict.php b/db_datadict.php index fca38b7..89b2bc5 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; if (! isset($selected_tbl)) { - require_once './libraries/header.inc.php'; + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; } diff --git a/pmd_common.php b/libraries/pmd_common.php similarity index 100% rename from pmd_common.php rename to libraries/pmd_common.php diff --git a/pmd_display_field.php b/pmd_display_field.php index 0e51cd7..9f82912 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -7,7 +7,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $table = $T; diff --git a/pmd_general.php b/pmd_general.php index be504ac..d270cbd 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -7,7 +7,7 @@ /** * */ -require_once "./pmd_common.php"; +require_once './libraries/pmd_common.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); diff --git a/pmd_help.php b/pmd_help.php index f653b14..f81df43 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -8,7 +8,7 @@ /** * */ -require_once 'pmd_common.php'; +require_once './libraries/pmd_common.php'; ?> <html> <head> diff --git a/pmd_pdf.php b/pmd_pdf.php index adf5fac..2afe131 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -5,7 +5,7 @@ * @package phpMyAdmin-Designer */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; /** * If called directly from the designer, first save the positions diff --git a/pmd_relation_new.php b/pmd_relation_new.php index a104cc1..fbd6246 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 58c9135..7151cf7 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); extract($_GET, EXTR_SKIP); $die_save_pos = 0; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index c487ddb..1a071af 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15878-g7b54504
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 7b54504cc0981821619ffd3f0759766448e6b879 (commit) from 679814416f4842f8e0e189c054772edf2d20ddef (commit) - Log ----------------------------------------------------------------- commit 7b54504cc0981821619ffd3f0759766448e6b879 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:16:59 2011 +0200 Fix handling of tables with something what gets urlencoded ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a1b7acb..685b817 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1416,7 +1416,7 @@ if (isset($_REQUEST['flush_privileges'])) { /** * defines some standard links */ -$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1424,7 +1424,7 @@ $link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" href="serve . PMA_getIcon('b_usredit.png', __('Edit Privileges')) . '</a>'; -$link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] +$link_revoke = '<a href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1433,7 +1433,7 @@ $link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . PMA_getIcon('b_usrdrop.png', __('Revoke')) . '</a>'; -$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . $GLOBALS['url_query'] +$link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%') . '&username=%s' . '&hostname=%s' . '&initial=%s' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15877-g6798144
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 679814416f4842f8e0e189c054772edf2d20ddef (commit) from 282e730985a24e5b03b5b8195ef93ac98aee7274 (commit) - Log ----------------------------------------------------------------- commit 679814416f4842f8e0e189c054772edf2d20ddef Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:11:31 2011 +0200 Format ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 78e4f06..a1b7acb 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2353,7 +2353,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n" . ' </td>' . "\n" . ' <td>' . "\n"; - $user_form .= sprintf($link_edit, urlencode($current_user), + $user_form .= sprintf( + $link_edit, + urlencode($current_user), urlencode($current_host), urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']), ''); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15876-g282e730
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 282e730985a24e5b03b5b8195ef93ac98aee7274 (commit) via da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit) via 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b (commit) from 54f96664a486164d23a7bc48efb2a504190c812e (commit) - Log ----------------------------------------------------------------- commit 282e730985a24e5b03b5b8195ef93ac98aee7274 Merge: 54f9666 da6e51d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:08:14 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 10cd8a9..fca38b7 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -203,7 +203,7 @@ foreach($tables as $table) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) @@ -225,9 +225,9 @@ foreach($tables as $table) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-69-gda6e51d
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, QA_3_4 has been updated via da6e51d00780dd941f4b496c69ae15d0d09bd3a3 (commit) via 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b (commit) from 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7..b910c76 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -227,7 +227,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . $field_name . '</u>'; + echo '<u>' . htmlspecialchars($field_name) . '</u>'; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15873-g54f9666
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 54f96664a486164d23a7bc48efb2a504190c812e (commit) via 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) from 889ea0afb047b255e81ebb1fe54f5bb825a804ef (commit) - Log ----------------------------------------------------------------- commit 54f96664a486164d23a7bc48efb2a504190c812e Merge: 889ea0a 414363d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:06:13 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e74524d..10cd8a9 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -225,9 +225,9 @@ foreach($tables as $table) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . htmlspecialchars($field_name) . '</u>'; + echo '<u>' . $field_name . '</u>'; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-67-g414363d
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, QA_3_4 has been updated via 414363d38d788c1c126d0aafc4eda69c0a8157c8 (commit) from 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462..938ebf7 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { <td nowrap="nowrap"> <?php if (isset($pk_array[$row['Field']])) { - echo '<u>' . htmlspecialchars($field_name) . '</u>'; + echo '<u>' . $field_name . '</u>'; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15871-g889ea0a
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 889ea0afb047b255e81ebb1fe54f5bb825a804ef (commit) from 270960ee35349a40315b4abe5512ebaea1967580 (commit) - Log ----------------------------------------------------------------- commit 889ea0afb047b255e81ebb1fe54f5bb825a804ef Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:05:15 2011 +0200 Fix getting tables ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e9a8c55..e74524d 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -58,8 +58,7 @@ PMA_DBI_select_db($db); $tables = PMA_DBI_get_tables($db); $count = 0; -foreach($tables as $row) { - $table = $row[0]; +foreach($tables as $table) { $comments = PMA_getComments($db, $table); echo '<div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0