April 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1656-g3abfe58
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 3abfe58dc7a311d29c6214b00afd6edaccc782e8 (commit) from 7f5be87f3c82a6b120e5819c4c7d6b093b530d54 (commit) - Log ----------------------------------------------------------------- commit 3abfe58dc7a311d29c6214b00afd6edaccc782e8 Author: Virsacer <virsacer(a)users.sourceforge.net> Date: Tue Apr 20 10:25:46 2010 +0200 Ignore non-default Themes ----------------------------------------------------------------------- Summary of changes: themes/.gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) create mode 100644 themes/.gitignore diff --git a/themes/.gitignore b/themes/.gitignore new file mode 100644 index 0000000..306f1c3 --- /dev/null +++ b/themes/.gitignore @@ -0,0 +1,3 @@ +*/ +!darkblue_orange/ +!original/ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1655-g7f5be87
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 7f5be87f3c82a6b120e5819c4c7d6b093b530d54 (commit) via 769aec95effaa407fc62778a23549b902fd586d9 (commit) from 1cafc3a509eca28246982ae29a0ba764bd73def6 (commit) - Log ----------------------------------------------------------------- commit 7f5be87f3c82a6b120e5819c4c7d6b093b530d54 Merge: 1cafc3a509eca28246982ae29a0ba764bd73def6 769aec95effaa407fc62778a23549b902fd586d9 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 10:22:26 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ tbl_operations.php | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35d8773..0c03b96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,8 @@ $Id$ thanks to Martynas Mickevičius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. +- bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria, thanks to Madhura Jayaratne. 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_operations.php b/tbl_operations.php index 7054bbc..87ccce9 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); + if ($is_maria) { + $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; + $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; + } } if (! empty($_REQUEST['tbl_collation']) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-20-g769aec9
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, QA_3_3 has been updated via 769aec95effaa407fc62778a23549b902fd586d9 (commit) from 69dd779f407a41d9b6ea5b8c7418cfac322368cb (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ tbl_operations.php | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac9f998..4010dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Martynas Mickevičius - BlinK_ - bug #2983060, patch #2987900 [interface] Fix initial state of tables in designer, thanks to Sutharshan Balachandren. +- bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria, thanks to Madhura Jayaratne. 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_operations.php b/tbl_operations.php index a0e9514..e859b3c 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); + if ($is_maria) { + $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; + $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; + } } if (! empty($_REQUEST['tbl_collation']) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1653-g1cafc3a
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 1cafc3a509eca28246982ae29a0ba764bd73def6 (commit) via 378094ac307835b22aafd45c5af1ea1dc763dfd4 (commit) from 81ffe74473b3a50fe9ee7d13144917ca09bcf028 (commit) - Log ----------------------------------------------------------------- commit 1cafc3a509eca28246982ae29a0ba764bd73def6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 10:10:15 2010 +0200 Remove old calendar code. commit 378094ac307835b22aafd45c5af1ea1dc763dfd4 Author: Muhammad Adnan <hiddenpearls(a)gmail.com> Date: Tue Apr 20 10:08:41 2010 +0200 [interface] Use jQuery calendar dialog. rfe #2983207, patch #2988715 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 + calendar.php | 32 ---- js/jquery/timepicker.js | 416 +++++++++++++++++++++++++++++++++++++++++++++++ js/tbl_change.js | 279 ------------------------------- tbl_change.php | 29 ++-- tbl_select.php | 22 ++- 6 files changed, 452 insertions(+), 328 deletions(-) delete mode 100644 calendar.php create mode 100644 js/jquery/timepicker.js diff --git a/ChangeLog b/ChangeLog index 69d3472..35d8773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,8 @@ $Id$ synchronisation. + rfe #2988633 [relation] Improve ON DELETE/ON UPDATE drop-downs + rfe #2988629 [relation] Improve labels in relation view ++ rfe #2983207, patch #2988715 [interface] Use jQuery calendar dialog, thanks + to Muhammad Adnan. 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/calendar.php b/calendar.php deleted file mode 100644 index 58cdf42..0000000 --- a/calendar.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * - * @version $Id$ - * @package phpMyAdmin - */ - -/** - * - */ -require_once './libraries/common.inc.php'; -require_once './libraries/header_http.inc.php'; -$page_title = $strCalendar; -require './libraries/header_meta_style.inc.php'; -$GLOBALS['js_include'][] = 'common.js'; -$GLOBALS['js_include'][] = 'tbl_change.js'; -require './libraries/header_scripts.inc.php'; -?> -<script type="text/javascript"> -//<![CDATA[ -var month_names = new Array("<?php echo implode('","', $month); ?>"); -var day_names = new Array("<?php echo implode('","', $day_of_week); ?>"); -var submit_text = "<?php echo $strGo . ' (' . $strTime . ')'; ?>"; -//]]> -</script> -</head> -<body onload="initCalendar();"> -<div id="calendar_data"></div> -<div id="clock_data"></div> -</body> -</html> diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js new file mode 100644 index 0000000..84879c4 --- /dev/null +++ b/js/jquery/timepicker.js @@ -0,0 +1,416 @@ +/*! + * jQuery UI Timepicker 0.2.1 + * + * Copyright (c) 2009 Martin Milesich (http://milesich.com/) + * + * Some parts are + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * + * $Id: timepicker.js 28 2009-08-11 20:31:23Z majlo $ + * + * Depends: + * ui.core.js + * ui.datepicker.js + * ui.slider.js + */ +(function($) { + +/** + * Extending default values + */ +$.extend($.datepicker._defaults, { + 'dateFormat': 'yy-mm-dd', + 'changeMonth': true, + 'changeYear': true, + 'stepMinutes': 1, // Number of minutes to step up/down + 'stepHours': 1, // Number of hours to step up/down + 'time24h': false, // True if 24h time + 'showTime': false, // Show timepicker with datepicker + 'altTimeField': '' // Selector for an alternate field to store time into +}); + +/** + * _hideDatepicker must be called with null + */ +$.datepicker._connectDatepickerOverride = $.datepicker._connectDatepicker; +$.datepicker._connectDatepicker = function(target, inst) { + $.datepicker._connectDatepickerOverride(target, inst); + + // showButtonPanel is required with timepicker + if (this._get(inst, 'showTime')) { + inst.settings['showButtonPanel'] = true; + } + + var showOn = this._get(inst, 'showOn'); + + if (showOn == 'button' || showOn == 'both') { + // Unbind all click events + inst.trigger.unbind('click'); + + // Bind new click event + inst.trigger.click(function() { + if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target) + $.datepicker._hideDatepicker(null); // This override is all about the "null" + else + $.datepicker._showDatepicker(target); + return false; + }); + } +}; + +/** + * Datepicker does not have an onShow event so I need to create it. + * What I actually doing here is copying original _showDatepicker + * method to _showDatepickerOverload method. + */ +$.datepicker._showDatepickerOverride = $.datepicker._showDatepicker; +$.datepicker._showDatepicker = function (input) { + // Call the original method which will show the datepicker + $.datepicker._showDatepickerOverride(input); + + input = input.target || input; + + // find from button/image trigger + if (input.nodeName.toLowerCase() != 'input') input = $('input', input.parentNode)[0]; + + // Do not show timepicker if datepicker is disabled + if ($.datepicker._isDisabledDatepicker(input)) return; + + // Get instance to datepicker + var inst = $.datepicker._getInst(input); + + var showTime = $.datepicker._get(inst, 'showTime'); + + // If showTime = True show the timepicker + if (showTime) $.timepicker.show(input); +}; + +/** + * Same as above. Here I need to extend the _checkExternalClick method + * because I don't want to close the datepicker when the sliders get focus. + */ +$.datepicker._checkExternalClickOverride = $.datepicker._checkExternalClick; +$.datepicker._checkExternalClick = function (event) { + if (!$.datepicker._curInst) return; + var $target = $(event.target); + + if (($target.parents('#' + $.timepicker._mainDivId).length == 0)) { + $.datepicker._checkExternalClickOverride(event); + } +}; + +/** + * Datepicker has onHide event but I just want to make it simple for you + * so I hide the timepicker when datepicker hides. + */ +$.datepicker._hideDatepickerOverride = $.datepicker._hideDatepicker; +$.datepicker._hideDatepicker = function(input, duration) { + // Some lines from the original method + var inst = this._curInst; + + if (!inst || (input && inst != $.data(input, PROP_NAME))) return; + + // Get the value of showTime property + var showTime = this._get(inst, 'showTime'); + + if (input === undefined && showTime) { + if (inst.input) { + inst.input.val(this._formatDate(inst)); + inst.input.trigger('change'); // fire the change event + } + + this._updateAlternate(inst); + + if (showTime) $.timepicker.update(this._formatDate(inst)); + } + + // Hide datepicker + $.datepicker._hideDatepickerOverride(input, duration); + + // Hide the timepicker if enabled + if (showTime) { + $.timepicker.hide(); + } +}; + +/** + * This is a complete replacement of the _selectDate method. + * If showed with timepicker do not close when date is selected. + */ +$.datepicker._selectDate = function(id, dateStr) { + var target = $(id); + var inst = this._getInst(target[0]); + var showTime = this._get(inst, 'showTime'); + dateStr = (dateStr != null ? dateStr : this._formatDate(inst)); + if (!showTime) { + if (inst.input) + inst.input.val(dateStr); + this._updateAlternate(inst); + } + var onSelect = this._get(inst, 'onSelect'); + if (onSelect) + onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]); // trigger custom callback + else if (inst.input && !showTime) + inst.input.trigger('change'); // fire the change event + if (inst.inline) + this._updateDatepicker(inst); + else if (!inst.stayOpen) { + if (showTime) { + this._updateDatepicker(inst); + } else { + this._hideDatepicker(null, this._get(inst, 'duration')); + this._lastInput = inst.input[0]; + if (typeof(inst.input[0]) != 'object') + inst.input[0].focus(); // restore focus + this._lastInput = null; + } + } +}; + +/** + * We need to resize the timepicker when the datepicker has been changed. + */ +$.datepicker._updateDatepickerOverride = $.datepicker._updateDatepicker; +$.datepicker._updateDatepicker = function(inst) { + $.datepicker._updateDatepickerOverride(inst); + $.timepicker.resize(); +}; + +function Timepicker() {} + +Timepicker.prototype = { + init: function() + { + this._mainDivId = 'ui-timepicker-div'; + this._inputId = null; + this._orgValue = null; + this._orgHour = null; + this._orgMinute = null; + this._colonPos = -1; + this._visible = false; + this.tpDiv = $('<div id="' + this._mainDivId + '" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible" style="width: 100px; display: none; position: absolute;"></div>'); + this._generateHtml(); + }, + + show: function (input) + { + // Get instance to datepicker + var inst = $.datepicker._getInst(input); + + this._time24h = $.datepicker._get(inst, 'time24h'); + this._altTimeField = $.datepicker._get(inst, 'altTimeField'); + + var stepMinutes = parseInt($.datepicker._get(inst, 'stepMinutes'), 10) || 1; + var stepHours = parseInt($.datepicker._get(inst, 'stepHours'), 10) || 1; + + if (60 % stepMinutes != 0) { stepMinutes = 1; } + if (24 % stepHours != 0) { stepHours = 1; } + + $('#hourSlider').slider('option', 'max', 24 - stepHours); + $('#hourSlider').slider('option', 'step', stepHours); + + $('#minuteSlider').slider('option', 'max', 60 - stepMinutes); + $('#minuteSlider').slider('option', 'step', stepMinutes); + + this._inputId = input.id; + + if (!this._visible) { + this._parseTime(); + this._orgValue = $('#' + this._inputId).val(); + } + + this.resize(); + + $('#' + this._mainDivId).show(); + + this._visible = true; + + var dpDiv = $('#' + $.datepicker._mainDivId); + var dpDivPos = dpDiv.position(); + + var viewWidth = (window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) + $(document).scrollLeft(); + var tpRight = this.tpDiv.offset().left + this.tpDiv.outerWidth(); + + if (tpRight > viewWidth) { + dpDiv.css('left', dpDivPos.left - (tpRight - viewWidth) - 5); + this.tpDiv.css('left', dpDiv.offset().left + dpDiv.outerWidth() + 'px'); + } + }, + + update: function (fd) + { + var curTime = $('#' + this._mainDivId + ' span.fragHours').text() + + ':' + + $('#' + this._mainDivId + ' span.fragMinutes').text(); + + if (!this._time24h) { + curTime += ' ' + $('#' + this._mainDivId + ' span.fragAmpm').text(); + } + + var curDate = $('#' + this._inputId).val(); + + $('#' + this._inputId).val(fd + ' ' + curTime); + + if (this._altTimeField) { + $(this._altTimeField).each(function() { $(this).val(curTime); }); + } + }, + + hide: function () + { + this._visible = false; + $('#' + this._mainDivId).hide(); + }, + + resize: function () + { + var dpDiv = $('#' + $.datepicker._mainDivId); + var dpDivPos = dpDiv.position(); + + var hdrHeight = $('#' + $.datepicker._mainDivId + ' > div.ui-datepicker-header:first-child').height(); + + $('#' + this._mainDivId + ' > div.ui-datepicker-header:first-child').css('height', hdrHeight); + + this.tpDiv.css({ + 'height': dpDiv.height(), + 'top' : dpDivPos.top, + 'left' : dpDivPos.left + dpDiv.outerWidth() + 'px' + }); + + $('#hourSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight)); + $('#minuteSlider').css('height', this.tpDiv.height() - (3.5 * hdrHeight)); + }, + + _generateHtml: function () + { + var html = ''; + + html += '<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix ui-corner-all">'; + html += '<div class="ui-datepicker-title" style="margin:0">'; + html += '<span class="fragHours">08</span><span class="delim">:</span><span class="fragMinutes">45</span> <span class="fragAmpm"></span></div></div><table>'; + html += '<tr><th>Hour</th><th>Minute</th></tr>'; + html += '<tr><td align="center"><div id="hourSlider" class="slider"></div></td><td align="center"><div id="minuteSlider" class="slider"></div></td></tr>'; + html += '</table>'; + + this.tpDiv.empty().append(html); + $('body').append(this.tpDiv); + + var self = this; + + $('#hourSlider').slider({ + orientation: "vertical", + range: 'min', + min: 0, + max: 23, + step: 1, + slide: function(event, ui) { + self._writeTime('hour', ui.value); + }, + stop: function(event, ui) { + $('#' + self._inputId).focus(); + } + }); + + $('#minuteSlider').slider({ + orientation: "vertical", + range: 'min', + min: 0, + max: 59, + step: 1, + slide: function(event, ui) { + self._writeTime('minute', ui.value); + }, + stop: function(event, ui) { + $('#' + self._inputId).focus(); + } + }); + + $('#hourSlider > a').css('padding', 0); + $('#minuteSlider > a').css('padding', 0); + }, + + _writeTime: function (type, value) + { + if (type == 'hour') { + if (!this._time24h) { + if (value < 12) { + $('#' + this._mainDivId + ' span.fragAmpm').text('am'); + } else { + $('#' + this._mainDivId + ' span.fragAmpm').text('pm'); + value -= 12; + } + + if (value == 0) value = 12; + } else { + $('#' + this._mainDivId + ' span.fragAmpm').text(''); + } + + if (value < 10) value = '0' + value; + $('#' + this._mainDivId + ' span.fragHours').text(value); + } + + if (type == 'minute') { + if (value < 10) value = '0' + value; + $('#' + this._mainDivId + ' span.fragMinutes').text(value); + } + }, + + _parseTime: function () + { + var dt = $('#' + this._inputId).val(); + + this._colonPos = dt.search(':'); + + var m = 0, h = 0, a = ''; + + if (this._colonPos != -1) { + h = parseInt(dt.substr(this._colonPos - 2, 2), 10); + m = parseInt(dt.substr(this._colonPos + 1, 2), 10); + a = jQuery.trim(dt.substr(this._colonPos + 3, 3)); + } + + a = a.toLowerCase(); + + if (a != 'am' && a != 'pm') { + a = ''; + } + + if (h < 0) h = 0; + if (m < 0) m = 0; + + if (h > 23) h = 23; + if (m > 59) m = 59; + + if (a == 'pm' && h < 12) h += 12; + if (a == 'am' && h == 12) h = 0; + + this._setTime('hour', h); + this._setTime('minute', m); + + this._orgHour = h; + this._orgMinute = m; + }, + + _setTime: function (type, value) + { + if (isNaN(value)) value = 0; + if (value < 0) value = 0; + if (value > 23 && type == 'hour') value = 23; + if (value > 59 && type == 'minute') value = 59; + + if (type == 'hour') { + $('#hourSlider').slider('value', value); + } + + if (type == 'minute') { + $('#minuteSlider').slider('value', value); + } + + this._writeTime(type, value); + } +}; + +$.timepicker = new Timepicker(); +$('document').ready(function () {$.timepicker.init();}); + +})(jQuery); diff --git a/js/tbl_change.js b/js/tbl_change.js index 9539591..a5ee5c1 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -247,282 +247,3 @@ function unNullify(urlField, multi_edit) return true; } // end of the 'unNullify()' function - -var day; -var month; -var year; -var hour; -var minute; -var second; -var clock_set = 0; - -/** - * Opens calendar window. - * - * @param string calendar.php parameters - * @param string form name - * @param string id of field name - * @param string edit type - date/timestamp - * @param string id of the corresponding checkbox for NULL - */ -function openCalendar(params, form, field, type, fieldNull) { - window.open("./calendar.php?" + params, "calendar", "width=400,height=200,status=yes"); - dateField = eval("document." + form + "." + field); - dateType = type; - if (fieldNull != '') { - dateFieldNull = eval("document." + form + "." + fieldNull); - } -} - -/** - * Formats number to two digits. - * - * @param int number to format. - * @param string type of number - */ -function formatNum2(i, valtype) { - f = (i < 10 ? '0' : '') + i; - if (valtype && valtype != '') { - switch(valtype) { - case 'month': - f = (f > 12 ? 12 : f); - break; - - case 'day': - f = (f > 31 ? 31 : f); - break; - - case 'hour': - f = (f > 24 ? 24 : f); - break; - - default: - case 'second': - case 'minute': - f = (f > 59 ? 59 : f); - break; - } - } - - return f; -} - -/** - * Formats number to two digits. - * - * @param int number to format. - * @param int default value - * @param string type of number - */ -function formatNum2d(i, default_v, valtype) { - i = parseInt(i, 10); - if (isNaN(i)) return default_v; - return formatNum2(i, valtype) -} - -/** - * Formats number to four digits. - * - * @param int number to format. - */ -function formatNum4(i) { - i = parseInt(i, 10) - return (i < 1000 ? i < 100 ? i < 10 ? '000' : '00' : '0' : '') + i; -} - -/** - * Initializes calendar window. - */ -function initCalendar() { - if (!year && !month && !day) { - /* Called for first time */ - if (window.opener.dateField.value) { - value = window.opener.dateField.value; - if (window.opener.dateType == 'datetime' || window.opener.dateType == 'date') { - if (window.opener.dateType == 'datetime') { - parts = value.split(' '); - value = parts[0]; - - if (parts[1]) { - time = parts[1].split(':'); - hour = parseInt(time[0],10); - minute = parseInt(time[1],10); - second = parseInt(time[2],10); - } - } - date = value.split("-"); - day = parseInt(date[2],10); - month = parseInt(date[1],10) - 1; - year = parseInt(date[0],10); - } else { - year = parseInt(value.substr(0,4),10); - month = parseInt(value.substr(4,2),10) - 1; - day = parseInt(value.substr(6,2),10); - hour = parseInt(value.substr(8,2),10); - minute = parseInt(value.substr(10,2),10); - second = parseInt(value.substr(12,2),10); - } - } - if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) { - dt = new Date(); - year = dt.getFullYear(); - month = dt.getMonth(); - day = dt.getDate(); - } - if (isNaN(hour) || isNaN(minute) || isNaN(second)) { - dt = new Date(); - hour = dt.getHours(); - minute = dt.getMinutes(); - second = dt.getSeconds(); - } - } else { - /* Moving in calendar */ - if (month > 11) { - month = 0; - year++; - } - if (month < 0) { - month = 11; - year--; - } - } - - if (document.getElementById) { - cnt = document.getElementById("calendar_data"); - } else if (document.all) { - cnt = document.all["calendar_data"]; - } - - cnt.innerHTML = ""; - - str = "" - - //heading table - str += '<table class="calendar"><tr><th width="50%">'; - str += '<form method="NONE" onsubmit="return 0">'; - str += '<a href="javascript:month--; initCalendar();">«</a> '; - str += '<select id="select_month" name="monthsel" onchange="month = parseInt(document.getElementById(\'select_month\').value); initCalendar();">'; - for (i =0; i < 12; i++) { - if (i == month) selected = ' selected="selected"'; - else selected = ''; - str += '<option value="' + i + '" ' + selected + '>' + month_names[i] + '</option>'; - } - str += '</select>'; - str += ' <a href="javascript:month++; initCalendar();">»</a>'; - str += '</form>'; - str += '</th><th width="50%">'; - str += '<form method="NONE" onsubmit="return 0">'; - str += '<a href="javascript:year--; initCalendar();">«</a> '; - str += '<select id="select_year" name="yearsel" onchange="year = parseInt(document.getElementById(\'select_year\').value); initCalendar();">'; - for (i = year - 25; i < year + 25; i++) { - if (i == year) selected = ' selected="selected"'; - else selected = ''; - str += '<option value="' + i + '" ' + selected + '>' + i + '</option>'; - } - str += '</select>'; - str += ' <a href="javascript:year++; initCalendar();">»</a>'; - str += '</form>'; - str += '</th></tr></table>'; - - str += '<table class="calendar"><tr>'; - for (i = 0; i < 7; i++) { - str += "<th>" + day_names[i] + "</th>"; - } - str += "</tr>"; - - var firstDay = new Date(year, month, 1).getDay(); - var lastDay = new Date(year, month + 1, 0).getDate(); - - str += "<tr>"; - - dayInWeek = 0; - for (i = 0; i < firstDay; i++) { - str += "<td> </td>"; - dayInWeek++; - } - for (i = 1; i <= lastDay; i++) { - if (dayInWeek == 7) { - str += "</tr><tr>"; - dayInWeek = 0; - } - - dispmonth = 1 + month; - - if (window.opener.dateType == 'datetime' || window.opener.dateType == 'date') { - actVal = "" + formatNum4(year) + "-" + formatNum2(dispmonth, 'month') + "-" + formatNum2(i, 'day'); - } else { - actVal = "" + formatNum4(year) + formatNum2(dispmonth, 'month') + formatNum2(i, 'day'); - } - if (i == day) { - style = ' class="selected"'; - current_date = actVal; - } else { - style = ''; - } - str += "<td" + style + "><a href=\"javascript:returnDate('" + actVal + "');\">" + i + "</a></td>" - dayInWeek++; - } - for (i = dayInWeek; i < 7; i++) { - str += "<td> </td>"; - } - - str += "</tr></table>"; - - cnt.innerHTML = str; - - // Should we handle time also? - if (window.opener.dateType != 'date' && !clock_set) { - - if (document.getElementById) { - cnt = document.getElementById("clock_data"); - } else if (document.all) { - cnt = document.all["clock_data"]; - } - - str = ''; - init_hour = hour; - init_minute = minute; - init_second = second; - str += '<fieldset>'; - str += '<form method="NONE" class="clock" onsubmit="returnDate(\'' + current_date + '\')">'; - str += '<input id="hour" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_hour, \'hour\'); init_hour = this.value;" value="' + formatNum2(hour, 'hour') + '" />:'; - str += '<input id="minute" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_minute, \'minute\'); init_minute = this.value;" value="' + formatNum2(minute, 'minute') + '" />:'; - str += '<input id="second" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_second, \'second\'); init_second = this.value;" value="' + formatNum2(second, 'second') + '" />'; - str += '  '; - str += '<input type="submit" value="' + submit_text + '"/>'; - str += '</form>'; - str += '</fieldset>'; - - cnt.innerHTML = str; - clock_set = 1; - } - -} - -/** - * Returns date from calendar. - * - * @param string date text - */ -function returnDate(d) { - txt = d; - if (window.opener.dateType != 'date') { - // need to get time - h = parseInt(document.getElementById('hour').value,10); - m = parseInt(document.getElementById('minute').value,10); - s = parseInt(document.getElementById('second').value,10); - if (window.opener.dateType == 'datetime') { - txt += ' ' + formatNum2(h, 'hour') + ':' + formatNum2(m, 'minute') + ':' + formatNum2(s, 'second'); - } else { - // timestamp - txt += formatNum2(h, 'hour') + formatNum2(m, 'minute') + formatNum2(s, 'second'); - } - } - - window.opener.dateField.value = txt; - window.opener.dateField.className=''; - if (typeof(window.opener.dateFieldNull) != 'undefined') { - window.opener.dateFieldNull.checked = false; - } - window.close(); -} diff --git a/tbl_change.php b/tbl_change.php index 84e5f69..31110c1 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -114,7 +114,8 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) { * used in ./libraries/header.inc.php to load JavaScript library file */ $GLOBALS['js_include'][] = 'tbl_change.js'; - +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'jquery/timepicker.js'; /** * HTTP and HTML headers */ @@ -1056,7 +1057,7 @@ foreach ($rows as $row_id => $vrow) { <input type="text" name="fields<?php echo $field_name_appendix; ?>" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" class="textfield" <?php echo $unnullify_trigger; ?> - tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" + tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" /> <?php if ($field['Extra'] == 'auto_increment') { @@ -1083,15 +1084,21 @@ foreach ($rows as $row_id => $vrow) { // the _3 suffix points to the date field // the _2 suffix points to the corresponding NULL checkbox ?> - <script type="text/javascript"> - //<![CDATA[ - document.write('<a title="<?php echo $strCalendar;?>"'); - document.write(' href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (substr($field['pma_type'], 0, 9) == 'timestamp') ? 'datetime' : substr($field['pma_type'], 0, 9); ?>\', \'field_<?php echo ($idindex); ?>_2\')">'); - document.write('<img class="calendar"'); - document.write(' src="<?php echo $pmaThemeImage; ?>b_calendar.png"'); - document.write(' alt="<?php echo $strCalendar; ?>"/></a>'); - //]]> - </script> +<script type="text/javascript"> +//<![CDATA[ +$(function() { + $('#field_<?php echo ($idindex); ?>_3').datepicker({ + duration: '', + time24h: true, + stepMinutes: 1, + stepHours: 1, + <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?> + altTimeField: '', + constrainInput: false + }); +}); +//]]> +</script> <?php } } diff --git a/tbl_select.php b/tbl_select.php index 879c0e6..440bd3e 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -20,7 +20,7 @@ require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; - +$GLOBALS['js_include'][] = 'jquery/timepicker.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { $titles['Browse'] = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage @@ -231,11 +231,21 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { $type = $fields_type[$i]; if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') { ?> - <script type="text/javascript"> - //<![CDATA[ - document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($i); ?>\', \'<?php echo (substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\', \'\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>'); - //]]> - </script> +<script type="text/javascript"> +//<![CDATA[ +$(function() { + $('#field_<?php echo $i; ?>').datepicker({ + duration: '', + time24h: true, + stepMinutes: 1, + stepHours: 1, + <?php echo ($type == 'date' ? "showTime: false,":"showTime: true,"); ?> + altTimeField: '', + constrainInput: false + }); +}); +//]]> +</script> <?php } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1651-g81ffe74
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 81ffe74473b3a50fe9ee7d13144917ca09bcf028 (commit) from 8f36b52facc4bdb8c98881f4b840b2d1794f1143 (commit) - Log ----------------------------------------------------------------- commit 81ffe74473b3a50fe9ee7d13144917ca09bcf028 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 09:05:47 2010 +0200 Fix html. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9dc2dbd..e70d5d2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1884,7 +1884,7 @@ $cfg['TrustedProxies'] = each row on a vertical lineup. </dd> - <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] </span>string</dt> + <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt> <dd> The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using 'css' the rotation of the header for horizontalflipped is done via hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1650-g8f36b52
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 8f36b52facc4bdb8c98881f4b840b2d1794f1143 (commit) from 9bb35300ebdcf242abcb23e55ad7164ab799d88f (commit) - Log ----------------------------------------------------------------- commit 8f36b52facc4bdb8c98881f4b840b2d1794f1143 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 08:34:27 2010 +0200 Minor fixes in docs. ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index c6ee94f..9dc2dbd 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3259,7 +3259,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p> port-forwarding to another host, MySQL is not resolving the localhost as expected.<br /> Erik Wasser explains: The solution is: if your host is "localhost" - MySQL (the commandline tool 'mysql' as well) always tries to use the socket + MySQL (the command line tool <code>mysql</code> as well) always tries to use the socket connection for speeding up things. And that doesn't work in this configuration with port forwarding.<br /> If you enter "127.0.0.1" as hostname, everything is right and MySQL uses the @@ -3385,7 +3385,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension <a href="#faq3_4">3.4 I am unable to import dumps I created with the mysqldump tool bundled with the MySQL server distribution.</a></h4> -<p> The problem is that older versions of mysqldump created invalid comments like this:</p> +<p> The problem is that older versions of <code>mysqldump</code> created invalid comments like this:</p> <pre> -- MySQL dump 8.22 @@ -4526,7 +4526,7 @@ now synchronize your databases placed on the same server or some remote server. <pre> Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2009 Marc Delisle <marc_at_infomarc.info> +Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1649-g9bb3530
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 9bb35300ebdcf242abcb23e55ad7164ab799d88f (commit) from 980a3bb86c3a2025189b64b96372fd7eac0cf0ca (commit) - Log ----------------------------------------------------------------- commit 9bb35300ebdcf242abcb23e55ad7164ab799d88f Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 08:19:55 2010 +0200 Port can not be string. ----------------------------------------------------------------------- Summary of changes: libraries/dbi/mysqli.dbi.lib.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce6..fe83655 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -60,7 +60,7 @@ if (! defined('MYSQLI_TYPE_BIT')) { * @param string $user mysql user name * @param string $password mysql user password * @param boolean $is_controluser - * @param array $server host/port/socket + * @param array $server host/port/socket * @param boolean $auxiliary_connection (when true, don't go back to login if connection fails) * @return mixed false on error or a mysqli object on success */ @@ -68,7 +68,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu { if ($server) { $server_port = (empty($server['port'])) - ? '' + ? false : (int)$server['port']; $server_socket = (empty($server['socket'])) ? '' @@ -107,7 +107,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { $client_flags |= MYSQLI_CLIENT_SSL; } - + if (!$server) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); @@ -126,7 +126,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } // we could be calling PMA_DBI_connect() to connect to another // server, for example in the Synchronize feature, so do not - // go back to main login if it fails + // go back to main login if it fails if (! $auxiliary_connection) { PMA_log_user($user, 'mysql-denied'); PMA_auth_fails(); @@ -231,7 +231,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) } if ($r != FALSE && PMA_Tracker::isActive() == TRUE ) { - PMA_Tracker::handleQuery($query); + PMA_Tracker::handleQuery($query); } return $r; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1648-g980a3bb
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 980a3bb86c3a2025189b64b96372fd7eac0cf0ca (commit) from ccd8997f961056e66f91393b1d9ad45beb6d4eec (commit) - Log ----------------------------------------------------------------- commit 980a3bb86c3a2025189b64b96372fd7eac0cf0ca Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 08:13:27 2010 +0200 Use proper server selector. We need to use the one who fired event, not the first one in document. ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 1b9138c..b360d15 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -4,8 +4,8 @@ * */ $(document).ready(function() { - $('.server_selector').change(function() { - var server = $('.server_selector').val(); + $('.server_selector').change(function(evt) { + var server = $(evt.target).val(); if (server == 'cur') { $(this).closest('tbody').children('.current-server').css('display', ''); $(this).closest('tbody').children('.remote-server').css('display', 'none'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1647-gccd8997
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via ccd8997f961056e66f91393b1d9ad45beb6d4eec (commit) from 354d5d26c9a4795c6ee5d3e0acbdafaf0d305e8a (commit) - Log ----------------------------------------------------------------- commit ccd8997f961056e66f91393b1d9ad45beb6d4eec Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 08:11:29 2010 +0200 Remove testing code. ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/js/server_synchronize.js b/js/server_synchronize.js index d9a965f..1b9138c 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -16,7 +16,6 @@ $(document).ready(function() { $(this).closest('tbody').children('.current-server').css('display', 'none'); $(this).closest('tbody').children('.remote-server').css('display', ''); var parts = server.split('||||'); - $('#src_host').val(parts[0]); $(this).closest('tbody').find('.server-host').val(parts[0]); $(this).closest('tbody').find('.server-port').val(parts[1]); $(this).closest('tbody').find('.server-socket').val(parts[2]); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1646-g354d5d2
by Michal Čihař 20 Apr '10

20 Apr '10

The branch, master has been updated via 354d5d26c9a4795c6ee5d3e0acbdafaf0d305e8a (commit) from 9bc7ffd3bcc6b9f5614be6e1aff7f76998a600e1 (commit) - Log ----------------------------------------------------------------- commit 354d5d26c9a4795c6ee5d3e0acbdafaf0d305e8a Author: Michal Čihař <michal(a)cihar.com> Date: Tue Apr 20 08:04:02 2010 +0200 Fix handling of preselected servers from config. ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index 365a431..440103d 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -83,17 +83,17 @@ if ((isset($_REQUEST['submit_connect']))) { ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}, $auxiliary_connection = true); } // end foreach ($cons as $con) - if ((! $src_connection && $src_type == 'rmt') || (! $trg_connection && $trg_type == 'rmt')) { + if ((! $src_connection && $src_type != 'cur') || (! $trg_connection && $trg_type != 'cur')) { /** * Displays the connection error string if * connections are not established */ echo '<div class="error">'; - if(! $src_connection && $src_type == 'rmt') { + if(! $src_connection && $src_type != 'cur') { echo $GLOBALS['strCouldNotConnectSource'] . '<br />'; } - if(! $trg_connection && $trg_type == 'rmt'){ + if(! $trg_connection && $trg_type != 'cur'){ echo $GLOBALS['strCouldNotConnectTarget']; } echo '</div>'; @@ -515,7 +515,7 @@ if (isset($_REQUEST['Table_ids'])) { * Creating link object for source and target databases */ foreach ($cons as $con) { - if (${"{$con}_type"} == "rmt") { + if (${"{$con}_type"} != "cur") { ${"{$con}_link"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"}); } else { ${"{$con}_link"} = null; @@ -993,7 +993,7 @@ if (isset($_REQUEST['synchronize_db'])) { /** * connecting the source and target servers */ - if ('rmt' == $_SESSION['src_type']) { + if ('cur' != $_SESSION['src_type']) { $src_link = PMA_DBI_connect($src_username, $src_password, $is_controluser = false, $_SESSION['src_server']); } else { $src_link = $GLOBALS['userlink']; @@ -1001,7 +1001,7 @@ if (isset($_REQUEST['synchronize_db'])) { // (does not work if user defined current server as a remote one) $GLOBALS['db'] = $_SESSION['src_db']; } - if ('rmt' == $_SESSION['trg_type']) { + if ('cur' != $_SESSION['trg_type']) { $trg_link = PMA_DBI_connect($trg_username, $trg_password, $is_controluser = false, $_SESSION['trg_server']); } else { $trg_link = $GLOBALS['userlink']; hooks/post-receive -- phpMyAdmin

1 0