- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-147-g3d0499c
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 3d0499c185bdb33cb619600d97b62989c693d5b9 (commit) via 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 (commit) from 4bcbd156e45320e6483d8c4673d81b05a54c8b3b (commit) - Log ----------------------------------------------------------------- commit 3d0499c185bdb33cb619600d97b62989c693d5b9 Merge: 4bcbd156e45320e6483d8c4673d81b05a54c8b3b 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:50:40 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 libraries/transformations/generator.sh mode change 100644 => 100755 libraries/transformations/template_generator.sh mode change 100644 => 100755 libraries/transformations/template_generator_mimetype.sh diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh old mode 100644 new mode 100755 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-17-g6cd25a9
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated via 6cd25a93f6cb8bb9fd98ee2399930ea5e70fdc88 (commit) from 655f72e47459abd2220b96962b334e299be9889f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 libraries/transformations/generator.sh mode change 100644 => 100755 libraries/transformations/template_generator.sh mode change 100644 => 100755 libraries/transformations/template_generator_mimetype.sh diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh old mode 100644 new mode 100755 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-145-g4bcbd15
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 4bcbd156e45320e6483d8c4673d81b05a54c8b3b (commit) via 655f72e47459abd2220b96962b334e299be9889f (commit) from a4ac8d6becbe8676771def662a900d47216823c7 (commit) - Log ----------------------------------------------------------------- commit 4bcbd156e45320e6483d8c4673d81b05a54c8b3b Merge: a4ac8d6becbe8676771def662a900d47216823c7 655f72e47459abd2220b96962b334e299be9889f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:47:32 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-16-g655f72e
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated via 655f72e47459abd2220b96962b334e299be9889f (commit) from 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100755 new mode 100644 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-143-ga4ac8d6
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via a4ac8d6becbe8676771def662a900d47216823c7 (commit) via 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) from 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c (commit) - Log ----------------------------------------------------------------- commit a4ac8d6becbe8676771def662a900d47216823c7 Merge: 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:45:57 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index 02069f9..d9e485c 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -51,6 +51,8 @@ check() { if [ $PERCENT -lt $THRESHOLD ] ; then echo "Removing $lang, only $PERCENT%" rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo + rmdir locale/$lang/LC_MESSAGES + rmdir locale/$lang fi } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-15-g072bc8d
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated via 072bc8de79f1cf58cded1c4f1b4d3b97590e0a79 (commit) from 5687ac290e64ad82c9dc709a8d0850b7e8a99198 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index 02069f9..d9e485c 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -51,6 +51,8 @@ check() { if [ $PERCENT -lt $THRESHOLD ] ; then echo "Removing $lang, only $PERCENT%" rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo + rmdir locale/$lang/LC_MESSAGES + rmdir locale/$lang fi } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-141-g8f49a1a
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c (commit) from 21766b684be69f185b85c61d6da07af02d5d71b2 (commit) - Log ----------------------------------------------------------------- commit 8f49a1a642b2248ebd4d3cfd0f57cf14a20cd72c Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:18:52 2011 +0200 Adjust STABLE/TESTING marking for new major release (in case there will ever be bugfix for 3.3). ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index cd91e99..0589c28 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -241,17 +241,15 @@ if [ $# -gt 0 ] ; then git tag -a -m "Released $version" $tagname $branch if echo $version | grep -q '^2\.11\.' ; then echo '* 2.11 branch, no STABLE/TESTING update' + elif echo $version | grep -q '^3\.3\.' ; then + echo '* 3.3 branch, no STABLE/TESTING update' else if echo $version | grep '[a-z_-]' ; then mark_as_release $branch TESTING else # We update both branches here # As it does not make sense to have older testing than stable - if echo $version | grep -q '^3\.3\.' ; then - echo '* 3.3 branch, no TESTING update' - else - mark_as_release $branch TESTING - fi + mark_as_release $branch TESTING mark_as_release $branch STABLE fi git checkout master hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-140-g21766b6
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 21766b684be69f185b85c61d6da07af02d5d71b2 (commit) via 5687ac290e64ad82c9dc709a8d0850b7e8a99198 (commit) via 88ff8be6afcb833153372afd3a56fe65f303681a (commit) from 21f8f5d072fb7bdc30751ab904c7e8d29cdc9a78 (commit) - Log ----------------------------------------------------------------- commit 21766b684be69f185b85c61d6da07af02d5d71b2 Merge: 88ff8be6afcb833153372afd3a56fe65f303681a 5687ac290e64ad82c9dc709a8d0850b7e8a99198 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:00:30 2011 +0200 Merge branch 'QA_3_4' commit 88ff8be6afcb833153372afd3a56fe65f303681a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 11 14:00:10 2011 +0200 Add missing operator ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a46b720..5000f4c 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -244,9 +244,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { 6 => '<>', 7 => '>=', 8 => '>>', - 9 => '||' + 9 => '||', + 10 => '==', ); - $allpunct_list_pair_size = 10; //count($allpunct_list_pair); + $allpunct_list_pair_size = 11; //count($allpunct_list_pair); $quote_list = '\'"`'; $arraysize = 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0-14-g5687ac2
by Michal Čihař 11 May '11

11 May '11

The branch, QA_3_4 has been updated via 5687ac290e64ad82c9dc709a8d0850b7e8a99198 (commit) from 332f3da9026e70d460e22f12ca77ce0911fa5ee0 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index cbad1d6..2171560 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -244,9 +244,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { 6 => '<>', 7 => '>=', 8 => '>>', - 9 => '||' + 9 => '||', + 10 => '==', ); - $allpunct_list_pair_size = 10; //count($allpunct_list_pair); + $allpunct_list_pair_size = 11; //count($allpunct_list_pair); $quote_list = '\'"`'; $arraysize = 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-137-g21f8f5d
by Michal Čihař 11 May '11

11 May '11

The branch, master has been updated via 21f8f5d072fb7bdc30751ab904c7e8d29cdc9a78 (commit) from 9210f44a612511a92790c92ed4204e7098fc3488 (commit) - Log ----------------------------------------------------------------- commit 21f8f5d072fb7bdc30751ab904c7e8d29cdc9a78 Author: bumbu <bumbu(a)mail.ru> Date: Fri Apr 22 03:31:17 2011 +0300 + delete button into tracking table + function change tracking data in Tracker.class.php ----------------------------------------------------------------------- Summary of changes: libraries/Tracker.class.php | 45 ++++++++++++++++++++++++++++++ tbl_tracking.php | 63 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 3 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index 4f5c52f..7592c2c 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -465,6 +465,51 @@ class PMA_Tracker } /** + * Changes tracking data of a table. + * + * @static + * + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $type type of data(DDL || DML) + * @param string || array $new_data the new tracking data + * + * @return bool result of change + */ + static public function changeTrackingData($dbname, $tablename, $version, $type, $new_data) + { + if ($type == 'DDL') + $save_to = 'schema_sql'; + elseif ($type == 'DML') + $save_to = 'data_sql'; + else + return false; + + $date = date('Y-m-d H:i:s'); + + $new_data_processed = ''; + if (is_array($new_data)) { + foreach ($new_data as $data) { + $new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddslashes($data['statement']) . "\n"; + } + } else { + $new_data_processed = $new_data; + } + + $sql_query = + " UPDATE " . self::$pma_table . + " SET `" . $save_to . "` = '" . $new_data_processed . "' " . + " WHERE `db_name` = '" . PMA_sqlAddslashes($dbname) . "' " . + " AND `table_name` = '" . PMA_sqlAddslashes($tablename) . "' " . + " AND `version` = '" . PMA_sqlAddslashes($version) . "' "; + + $result = PMA_query_as_controluser($sql_query); + + return $result; + } + + /** * Activates tracking of a table. * * @static diff --git a/tbl_tracking.php b/tbl_tracking.php index 757456b..9c3aae1 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -210,8 +210,7 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'execution' } // Export as SQL dump -if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') -{ +if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') { $new_query = "# " . __('You can execute the dump by creating and using a temporary database. Please ensure that you have the privileges to do so.') . "\n" . "# " . __('Comment out these two lines if you do not need them.') . "\n" . "\n" . @@ -368,6 +367,43 @@ if (isset($_REQUEST['snapshot'])) { /* * Tracking report */ +if (isset($_REQUEST['report']) && (isset($_REQUEST['delete_ddlog']) || isset($_REQUEST['delete_dmlog']))) { + + if(isset($_REQUEST['delete_ddlog'])){ + + // Delete ddlog row data + $delete_id = $_REQUEST['delete_ddlog']; + + // Only in case of valable id + if($delete_id == (int)$delete_id){ + unset($data['ddlog'][$delete_id]); + + if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DDL', $data['ddlog'])) + $msg = PMA_Message::success(__('Tracking data definition succesfully deleted')); + else + $msg = PMA_Message::rawError(__('Query error')); + $msg->display(); + } + } + + if(isset($_REQUEST['delete_dmlog'])){ + + // Delete dmlog row data + $delete_id = $_REQUEST['delete_dmlog']; + + // Only in case of valable id + if($delete_id == (int)$delete_id){ + unset($data['dmlog'][$delete_id]); + + if (PMA_Tracker::changeTrackingData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version'], 'DML', $data['dmlog'])) + $msg = PMA_Message::success(__('Tracking data manipulation succesfully deleted')); + else + $msg = PMA_Message::rawError(__('Query error')); + $msg->display(); + } + } +} + if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { ?> <h3><?php echo __('Tracking report');?> [<a href="tbl_tracking.php?<?php echo $url_query;?>"><?php echo __('Close');?></a>]</h3> @@ -390,12 +426,25 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { printf(__('Show %s with dates from %s to %s by user %s %s'), $str1, $str2, $str3, $str4, $str5); + // Prepare delete link content here + $drop_image_or_text = ''; + if (true == $GLOBALS['cfg']['PropertiesIconic']) { + $drop_image_or_text .= '<img class="icon" width="16" height="16" src="' . $pmaThemeImage . 'b_drop.png" alt="' . __('Delete tracking data row from report') . '" title="' . __('Delete tracking data row from report') . '" />'; + } + if ('both' === $GLOBALS['cfg']['PropertiesIconic'] || false === $GLOBALS['cfg']['PropertiesIconic']) { + $drop_image_or_text .= __('Delete'); + } /* * First, list tracked data definition statements */ $i = 1; - if ($selection_schema || $selection_both ) { + if (count($data['ddlog']) == 0 && count($data['dmlog']) == 0) { + $msg = PMA_Message::notice(__('No data')); + $msg->display(); + } + + if ($selection_schema || $selection_both && count($data['ddlog']) > 0) { ?> <table id="ddl_versions" class="data" width="100%"> <thead> @@ -404,10 +453,12 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <th width="100"><?php echo __('Date');?></th> <th width="60"><?php echo __('Username');?></th> <th><?php echo __('Data definition statement');?></th> + <th><?php echo __('Delete');?></th> </tr> </thead> <tbody> <?php + $style = 'odd'; foreach ($data['ddlog'] as $entry) { if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -425,6 +476,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <td><small><?php echo $entry['date'];?></small></td> <td><small><?php echo $entry['username']; ?></small></td> <td><?php echo $statement; ?></td> + <td nowrap="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&report=true&version=<?php echo $version['version'];?>&delete_ddlog=<?php echo $i-1; ?>"><?php echo $drop_image_or_text; ?></a></td> </tr> <?php if ($style == 'even') { @@ -442,6 +494,9 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } //endif + // Memorize data definition amount + $ddlog_count = $i; + /* * Secondly, list tracked data manipulation statements */ @@ -455,6 +510,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <th width="100"><?php echo __('Date');?></th> <th width="60"><?php echo __('Username');?></th> <th><?php echo __('Data manipulation statement');?></th> + <th><?php echo __('Delete');?></th> </tr> </thead> <tbody> @@ -476,6 +532,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <td><small><?php echo $entry['date']; ?></small></td> <td><small><?php echo $entry['username']; ?></small></td> <td><?php echo $statement; ?></td> + <td nowrap="nowrap"><a href="tbl_tracking.php?<?php echo $url_query;?>&report=true&version=<?php echo $version['version'];?>&delete_dmlog=<?php echo $i-$ddlog_count; ?>"><?php echo $drop_image_or_text; ?></a></td> </tr> <?php if ($style == 'even') { hooks/post-receive -- phpMyAdmin

1 0