April 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1380-g12b5d8d
by Michal Čihař 09 Apr '10

09 Apr '10

The branch, master has been updated via 12b5d8d20b08c25115e9e6b7c68865a8b191fdc5 (commit) via 5603e1a68373b88fa46911d2e38c0a7e7def017e (commit) from 1fc253e19e6952437fe980a932cf62e5200988e5 (commit) - Log ----------------------------------------------------------------- commit 12b5d8d20b08c25115e9e6b7c68865a8b191fdc5 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 9 11:13:20 2010 +0200 Convert end of lines. commit 5603e1a68373b88fa46911d2e38c0a7e7def017e Author: Crack <piotrprz(a)gmail.com> Date: Thu Apr 8 19:30:20 2010 +0200 Setup script: migrate MooTools code to jQuery ----------------------------------------------------------------------- Summary of changes: js/jquery/jquery.json-2.2.min.js | 31 + setup/index.php | 5 +- setup/lib/FormDisplay.class.php | 4 +- setup/scripts.js | 1446 +++++++++++++++++++------------------- setup/styles.css | 768 ++++++++++---------- 5 files changed, 1154 insertions(+), 1100 deletions(-) create mode 100644 js/jquery/jquery.json-2.2.min.js diff --git a/js/jquery/jquery.json-2.2.min.js b/js/jquery/jquery.json-2.2.min.js new file mode 100644 index 0000000..bad4a0a --- /dev/null +++ b/js/jquery/jquery.json-2.2.min.js @@ -0,0 +1,31 @@ + +(function($){$.toJSON=function(o) +{if(typeof(JSON)=='object'&&JSON.stringify) +return JSON.stringify(o);var type=typeof(o);if(o===null) +return"null";if(type=="undefined") +return undefined;if(type=="number"||type=="boolean") +return o+"";if(type=="string") +return $.quoteString(o);if(type=='object') +{if(typeof o.toJSON=="function") +return $.toJSON(o.toJSON());if(o.constructor===Date) +{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+ +hours+':'+minutes+':'+seconds+'.'+milli+'Z"';} +if(o.constructor===Array) +{var ret=[];for(var i=0;i<o.length;i++) +ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";} +var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number") +name='"'+k+'"';else if(type=="string") +name=$.quoteString(k);else +continue;if(typeof o[k]=="function") +continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);} +return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src) +{if(typeof(JSON)=='object'&&JSON.parse) +return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src) +{if(typeof(JSON)=='object'&&JSON.parse) +return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)) +return eval("("+src+")");else +throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string) +{if(string.match(_escapeable)) +{return'"'+string.replace(_escapeable,function(a) +{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';} +return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery); \ No newline at end of file diff --git a/setup/index.php b/setup/index.php index 44174b7..a0f5b3a 100644 --- a/setup/index.php +++ b/setup/index.php @@ -34,8 +34,9 @@ require './libraries/header_http.inc.php'; <link href="../favicon.ico" rel="icon" type="image/x-icon" /> <link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="styles.css" rel="stylesheet" type="text/css" /> -<script type="text/javascript" src="../js/mootools.js"></script> -<script type="text/javascript" src="../js/mootools-more.js"></script> +<script type="text/javascript" src="../js/jquery/jquery-1.4.2-min.js"></script> +<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.min.js"></script> +<script type="text/javascript" src="../js/jquery/jquery.json-2.2.min.js"></script> <script type="text/javascript" src="scripts.js"></script> </head> <body> diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php index e3c8b0a..f1ee1c3 100644 --- a/setup/lib/FormDisplay.class.php +++ b/setup/lib/FormDisplay.class.php @@ -227,10 +227,10 @@ class FormDisplay : filter_input($GLOBALS["str$str"]); // null if not set $js_lang[] = "'$str': '" . PMA_jsFormat($lang, false) . '\''; } - $js[] = '$extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})'; + $js[] = '$.extend(PMA_messages, {' . implode(",\n\t", $js_lang) . '})'; } - $js[] = '$extend(defaultValues, {' . implode(",\n\t", $js_default) . '})'; + $js[] = '$.extend(defaultValues, {' . implode(",\n\t", $js_default) . '})'; display_js($js); } diff --git a/setup/scripts.js b/setup/scripts.js index 16b0568..7298e63 100644 --- a/setup/scripts.js +++ b/setup/scripts.js @@ -1,717 +1,729 @@ -/** - * functions used in setup script - * - * @version $Id$ - */ - -// show this window in top frame -if (top != self) { - window.top.location.href = location; -} - -// default values for fields -var defaultValues = {}; - -// language strings -var PMA_messages = {}; - -/** - * Returns field type - * - * @param Element field - */ -function getFieldType(field) { - if (field.tagName == 'INPUT') { - return field.getProperty('type'); - } else if (field.tagName == 'SELECT') { - return 'select'; - } else if (field.tagName == 'TEXTAREA') { - return 'text'; - } - return ''; -} - -/** - * Sets field value - * - * value must be of type: - * o undefined (omitted) - restore default value (form default, not PMA default) - * o String - if type is 'text' - * o boolean - if type is 'checkbox' - * o Array of values - if type is 'select' - * - * @param Element field - * @param String field_type see getFieldType - * @param mixed value - */ -function setFieldValue(field, field_type, value) { - switch (field_type) { - case 'text': - field.value = $defined(value) ? value : field.defaultValue; - break; - case 'checkbox': - field.checked = $defined(value) ? value : field.defaultChecked; - break; - case 'select': - var i, imax = field.options.length; - if (!$defined(value)) { - for (i = 0; i < imax; i++) { - field.options[i].selected = field.options[i].defaultSelected; - } - } else { - for (i = 0; i < imax; i++) { - field.options[i].selected = (value.indexOf(field.options[i].value) != -1); - } - } - break; - } - markField(field); -} - -/** - * Gets field value - * - * Will return one of: - * o String - if type is 'text' - * o boolean - if type is 'checkbox' - * o Array of values - if type is 'select' - * - * @param Element field - * @param String field_type see getFieldType - * @return mixed - */ -function getFieldValue(field, field_type) { - switch (field_type) { - case 'text': - return field.value; - case 'checkbox': - return field.checked; - case 'select': - var i, imax = field.options.length, items = []; - for (i = 0; i < imax; i++) { - if (field.options[i].selected) { - items.push(field.options[i].value); - } - } - return items; - } -} - -/** - * Returns values for all fields in fieldsets - */ -function getAllValues() { - var elements = $$('fieldset input, fieldset select, fieldset textarea'); - var values = {} - var type, value; - for (var i = 0; i < elements.length; i++) { - type = getFieldType(elements[i]); - value = getFieldValue(elements[i], type); - if (typeof value != 'undefined') { - // we only have single selects, fatten array - if (type == 'select') { - value = value[0]; - } - values[elements[i].name] = value; - } - } - return values; -} - -/** - * Checks whether field has its default value - * - * @param Element field - * @param String type - * @return boolean - */ -function checkFieldDefault(field, type) { - if (!$defined(defaultValues[field.id])) { - return true; - } - var isDefault = true - var currentValue = getFieldValue(field, type); - if (type != 'select') { - isDefault = currentValue == defaultValues[field.id]; - } else { - // compare arrays, will work for our representation of select values - if (currentValue.length != defaultValues[field.id].length) { - isDefault = false; - } - else { - for (var i = 0; i < currentValue.length; i++) { - if (currentValue[i] != defaultValues[field.id][i]) { - isDefault = false; - break; - } - } - } - } - return isDefault; -} - -/** - * Returns element's id prefix - * @param Element element - */ -function getIdPrefix(element) { - return element.id.replace(/[^-]+$/, ''); -} - -// ------------------------------------------------------------------ -// Messages -// - -// stores hidden message ids -var hiddenMessages = []; - -window.addEvent('domready', function() { - var hidden = hiddenMessages.length; - for (var i = 0; i < hidden; i++) { - $(hiddenMessages[i]).style.display = 'none'; - } - if (hidden > 0) { - var link = $('show_hidden_messages'); - link.addEvent('click', function(e) { - e.stop(); - for (var i = 0; i < hidden; i++) { - $(hiddenMessages[i]).style.display = ''; - } - this.dispose(); - }); - link.set('html', link.get('html').replace('#MSG_COUNT', hidden)); - link.style.display = ''; - } -}); - -// -// END: Messages -// ------------------------------------------------------------------ - -// ------------------------------------------------------------------ -// Form validation and field operations -// - -// form validator assignments -var validate = {}; - -// form validator list -var validators = { - /** - * Validates positive number - * - * @param boolean isKeyUp - */ - validate_positive_number: function (isKeyUp) { - var result = this.value.test('^[0-9]*$') && this.value != '0'; - return result ? true : PMA_messages['error_nan_p']; - }, - /** - * Validates non-negative number - * - * @param boolean isKeyUp - */ - validate_non_negative_number: function (isKeyUp) { - var result = this.value.test('^[0-9]*$'); - return result ? true : PMA_messages['error_nan_nneg']; - }, - /** - * Validates port number - * - * @param boolean isKeyUp - */ - validate_port_number: function(isKeyUp) { - var result = this.value.test('^[0-9]*$') && this.value != '0'; - if (!result || this.value > 65536) { - result = PMA_messages['error_incorrect_port']; - } - return result; - }, - // field validators - _field: { - /** - * hide_db field - * - * @param boolean isKeyUp - */ - hide_db: function(isKeyUp) { - if (!isKeyUp && this.value != '') { - var data = {}; - data[this.id] = this.value; - ajaxValidate(this, 'Servers/1/hide_db', data); - } - return true; - }, - /** - * TrustedProxies field - * - * @param boolean isKeyUp - */ - TrustedProxies: function(isKeyUp) { - if (!isKeyUp && this.value != '') { - var data = {}; - data[this.id] = this.value; - ajaxValidate(this, 'TrustedProxies', data); - } - return true; - }, - }, - // fieldset validators - _fieldset: { - /** - * Validates Server fieldset - * - * @param boolean isKeyUp - */ - Server: function(isKeyUp) { - if (!isKeyUp) { - ajaxValidate(this, 'Server', getAllValues()); - } - return true; - }, - /** - * Validates Server_login_options fieldset - * - * @param boolean isKeyUp - */ - Server_login_options: function(isKeyUp) { - return validators._fieldset.Server.bind(this)(isKeyUp); - }, - /** - * Validates Server_pmadb fieldset - * - * @param boolean isKeyUp - */ - Server_pmadb: function(isKeyUp) { - if (isKeyUp) { - return true; - } - - var prefix = getIdPrefix(this.getElement('input')); - var pmadb_active = $(prefix + 'pmadb').value != ''; - if (pmadb_active) { - ajaxValidate(this, 'Server_pmadb', getAllValues()); - } - - return true; - } - } -} - -/** - * Calls server-side validation procedures - * - * @param Element parent input field in <fieldset> or <fieldset> - * @param String id validator id - * @param Object values values hash (element_id: value) - */ -function ajaxValidate(parent, id, values) { - // ensure that parent is a fieldset - if (parent.tagName != 'FIELDSET') { - parent = parent.getParent('fieldset'); - if (!parent) { - return false; - } - } - // ensure that we have a Request object - if (typeof parent.request == 'undefined') { - parent.validate = { - request: new Request.JSON({ - url: 'validate.php', - autoCancel: true, - onSuccess: function(response) { - if (response == null) { - return; - } - var error = {}; - if ($type(response) != 'object') { - error[parent.id] = [response]; - } else if (typeof response['error'] != 'undefined') { - error[parent.id] = [response['error']]; - } else { - $each(response, function(value, key) { - error[key] = $type(value) == 'array' ? value : [value]; - }); - } - displayErrors(error); - }}), - token: parent.getParent('form').token.value - }; - } - - parent.validate.request.send({ - data: { - token: parent.validate.token, - id: id, - values: JSON.encode(values)} - }); - - return true; -} - -/** - * Registers validator for given field - * - * @param String id field id - * @param String type validator (key in validators object) - * @param boolean onKeyUp whether fire on key up - * @param mixed params validation function parameters - */ -function validateField(id, type, onKeyUp, params) { - if (typeof validators[type] == 'undefined') { - return; - } - if (typeof validate[id] == 'undefined') { - validate[id] = []; - } - validate[id].push([type, params, onKeyUp]); -} - -/** - * Returns valdiation functions associated with form field - * - * @param String field_id form field id - * @param boolean onKeyUpOnly see validateField - * @return Array array of [function, paramseters to be passed to function] - */ -function getFieldValidators(field_id, onKeyUpOnly) { - // look for field bound validator - var name = field_id.match(/[^-]+$/)[0]; - if (typeof validators._field[name] != 'undefined') { - return [[validators._field[name], null]]; - } - - // look for registered validators - var functions = []; - if (typeof validate[field_id] != 'undefined') { - // validate[field_id]: array of [type, params, onKeyUp] - for (var i = 0, imax = validate[field_id].length; i < imax; i++) { - if (onKeyUpOnly && !validate[field_id][i][2]) { - continue; - } - functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]); - } - } - - return functions; -} - -/** - * Displays errors for given form fields - * - * WARNING: created DOM elements must be identical with the ones made by - * display_input() in FormDisplay.tpl.php! - * - * @param Object error list (key: field id, value: error array) - */ -function displayErrors(errors) { - $each(errors, function(errors, field_id) { - var field = $(field_id); - var isFieldset = field.tagName == 'FIELDSET'; - var errorCnt = isFieldset - ? field.getElement('dl.errors') - : field.getNext('.inline_errors'); - - // remove empty errors (used to clear error list) - errors = errors.filter(function(item) { - return item != ''; - }); - - if (errors.length) { - // if error container doesn't exist, create it - if (errorCnt === null) { - if (isFieldset) { - errorCnt = new Element('dl', { - 'class': 'errors' - }); - errorCnt.inject(field.getElement('table'), 'before'); - } else { - errorCnt = new Element('dl', { - 'class': 'inline_errors' - }); - errorCnt.inject(field.getParent('td'), 'bottom'); - } - } - - var html = ''; - for (var i = 0, imax = errors.length; i < imax; i++) { - html += '<dd>' + errors[i] + '</dd>'; - } - errorCnt.set('html', html); - } else if (errorCnt !== null) { - // remove useless error container - errorCnt.dispose(); - } - }); -} - -/** - * Validates fieldset and puts errors in 'errors' object - * - * @param Element field - * @param boolean isKeyUp - * @param Object errors - */ -function validate_fieldset(fieldset, isKeyUp, errors) { - if (fieldset && typeof validators._fieldset[fieldset.id] != 'undefined') { - var fieldset_errors = validators._fieldset[fieldset.id].bind(fieldset)(isKeyUp); - $each(fieldset_errors, function(field_errors, field_id) { - if (typeof errors[field_id] == 'undefined') { - errors[field_id] = []; - } - errors[field_id][$type(field_errors) == 'array' ? 'extend' : 'push'](field_errors); - }); - } -} - -/** - * Validates form field and puts errors in 'errors' object - * - * @param Element field - * @param boolean isKeyUp - * @param Object errors - */ -function validate_field(field, isKeyUp, errors) { - errors[field.id] = []; - var functions = getFieldValidators(field.id, isKeyUp); - for (var i = 0; i < functions.length; i++) { - var result = functions[i][0].bind(field)(isKeyUp, functions[i][1]); - if (result !== true) { - errors[field.id][$type(result) == 'array' ? 'extend' : 'push'](result); - } - } -} - -/** - * Validates form field and parent fieldset - * - * @param Element field - * @param boolean isKeyUp - */ -function validate_field_and_fieldset(field, isKeyUp) { - var errors = {}; - validate_field(field, isKeyUp, errors); - validate_fieldset(field.getParent('fieldset'), isKeyUp, errors); - displayErrors(errors); -} - -/** - * Marks field depending on its value (system default or custom) - * - * @param Element field - */ -function markField(field) { - var type = getFieldType(field); - var isDefault = checkFieldDefault(field, type); - - // checkboxes uses parent <span> for marking - var fieldMarker = (type == 'checkbox') ? field.getParent() : field; - setRestoreDefaultBtn(field, !isDefault); - fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom'); -} - -/** - * Enables or disables the "restore default value" button - * - * @param Element field - * @param bool display - */ -function setRestoreDefaultBtn(field, display) { - var td = field.getParent('td'); - if (!td) return; - var el = td.getElement('.restore-default'); - if (!el) return; - el.style.display = (display ? '' : 'none'); -} - -window.addEvent('domready', function() { - var elements = $$('input[id], select[id], textarea[id]'); - var elements_count = elements.length; - - // register validators and mark custom values - for (var i = 0; i < elements_count; i++) { - var el = elements[i]; - markField(el); - el.addEvent('change', function(e) { - validate_field_and_fieldset(this, false); - markField(this); - }); - // text fields can be validated after each change - if (el.tagName == 'INPUT' && el.type == 'text') { - el.addEvent('keyup', function(e) { - validate_field_and_fieldset(this, true); - markField(el); - }); - } - // disable textarea spellcheck - if (el.tagName == 'TEXTAREA') { - el.setProperty('spellcheck', false) - } - } - - // check whether we've refreshed a page and browser remembered modified - // form values - var check_page_refresh = $('check_page_refresh'); - if (!check_page_refresh || check_page_refresh.value == '1') { - // run all field validators - var errors = {}; - for (var i = 0; i < elements_count; i++) { - validate_field(elements[i], false, errors); - } - // run all fieldset validators - $$('fieldset').each(function(el){ - validate_fieldset(el, false, errors); - }); - - displayErrors(errors); - } else if (check_page_refresh) { - check_page_refresh.value = '1'; - } -}); - -// -// END: Form validation and field operations -// ------------------------------------------------------------------ - -// ------------------------------------------------------------------ -// Tabbed forms -// - -/** - * Sets active tab - * - * @param Element tab_link - */ -function setTab(tab_link) { - var tabs_menu = tab_link.getParent('.tabs'); - - var links = tabs_menu.getElements('a'); - var contents; - for (var i = 0, imax = links.length; i < imax; i++) { - contents = $(links[i].getProperty('href').substr(1)); - if (links[i] == tab_link) { - links[i].addClass('active'); - contents.style.display = 'block'; - } else { - links[i].removeClass('active'); - contents.style.display = 'none'; - } - } - location.hash = 'tab_' + tab_link.getProperty('href').substr(1); -} - -window.addEvent('domready', function() { - var tabs = $$('.tabs'); - var url_tab = location.hash.match(/^#tab_.+/) - ? $$('a[href$="' + location.hash.substr(5) + '"]') : null; - if (url_tab) { - url_tab = url_tab[0]; - } - // add tabs events and activate one tab (the first one or indicated by location hash) - for (var i = 0, imax = tabs.length; i < imax; i++) { - var links = tabs[i].getElements('a'); - var selected_tab = links[0]; - for (var j = 0, jmax = links.length; j < jmax; j++) { - links[j].addEvent('click', function(e) { - e.stop(); - setTab(this); - }); - if (links[j] == url_tab) { - selected_tab = links[j]; - } - } - setTab(selected_tab); - } - // tab links handling, check each 200ms - // (works with history in FF, further browser support here would be an overkill) - var prev_hash = location.hash; - (function() { - if (location.hash != prev_hash) { - prev_hash = location.hash; - var url_tab = location.hash.match(/^#tab_.+/) - ? $$('a[href$="' + location.hash.substr(5) + '"]') : null; - if (url_tab) { - setTab(url_tab[0]); - } - } - }).periodical(200); -}); - -// -// END: Tabbed forms -// ------------------------------------------------------------------ - -// ------------------------------------------------------------------ -// Form reset buttons -// - -window.addEvent('domready', function() { - var buttons = $$('input[type=button]'); - for (var i = 0, imax = buttons.length; i < imax; i++) { - buttons[i].addEvent('click', function(e) { - var fields = this.getParent('fieldset').getElements('input, select, textarea'); - for (var i = 0, imax = fields.length; i < imax; i++) { - setFieldValue(fields[i], getFieldType(fields[i])); - } - }); - } -}); - -// -// END: Form reset buttons -// ------------------------------------------------------------------ - -// ------------------------------------------------------------------ -// "Restore default" and "set value" buttons -// - -/** - * Restores field's default value - * - * @param String field_id - */ -function restoreField(field_id) { - var field = $(field_id); - if (!field || !$defined(defaultValues[field_id])) { - return; - } - setFieldValue(field, getFieldType(field), defaultValues[field_id]); -} - -window.addEvent('domready', function() { - var buttons = $$('.restore-default, .set-value'); - var fixIE = Browser.Engine.name == 'trident' && Browser.Engine.version == 4; - for (var i = 0, imax = buttons.length; i < imax; i++) { - buttons[i].set('opacity', 0.25); - if (!buttons[i].hasClass('restore-default')) { - // restore-default is handled by markField - buttons[i].style.display = ''; - } - buttons[i].addEvents({ - mouseenter: function(e) {this.set('opacity', 1);}, - mouseleave: function(e) {this.set('opacity', 0.25);}, - click: function(e) { - e.stop(); - var href = this.getProperty('href').substr(1); - var field_id; - if (this.hasClass('restore-default')) { - field_id = href; - restoreField(field_id); - } else { - field_id = href.match(/^[^=]+/)[0]; - var value = href.match(/=(.+)$/)[1]; - setFieldValue($(field_id), 'text', value); - } - $(field_id).fireEvent('change'); - } - }); - // fix IE showing <img> alt text instead of link title - if (fixIE) { - buttons[i].getChildren('img')[0].alt = buttons[i].title; - } - } -}); - -// -// END: "Restore default" and "set value" buttons -// ------------------------------------------------------------------ +/** + * functions used in setup script + * + * @version $Id$ + */ + +// show this window in top frame +if (top != self) { + window.top.location.href = location; +} + +// default values for fields +var defaultValues = {}; + +// language strings +var PMA_messages = {}; + +/** + * Returns field type + * + * @param Element field + */ +function getFieldType(field) { + field = $(field); + var tagName = field.attr('tagName'); + if (tagName == 'INPUT') { + return field.attr('type'); + } else if (tagName == 'SELECT') { + return 'select'; + } else if (tagName == 'TEXTAREA') { + return 'text'; + } + return ''; +} + +/** + * Sets field value + * + * value must be of type: + * o undefined (omitted) - restore default value (form default, not PMA default) + * o String - if field_type is 'text' + * o boolean - if field_type is 'checkbox' + * o Array of values - if field_type is 'select' + * + * @param Element field + * @param String field_type see getFieldType + * @param mixed value + */ +function setFieldValue(field, field_type, value) { + field = $(field); + switch (field_type) { + case 'text': + field.attr('value', (value != undefined ? value : field.attr('defaultValue'))); + break; + case 'checkbox': + field.attr('checked', (value != undefined ? value : field.attr('defaultChecked'))); + break; + case 'select': + var options = field.attr('options'); + var i, imax = options.length; + if (value == undefined) { + for (i = 0; i < imax; i++) { + options[i].selected = options[i].defaultSelected; + } + } else { + for (i = 0; i < imax; i++) { + options[i].selected = (value.indexOf(options[i].value) != -1); + } + } + break; + } + markField(field); +} + +/** + * Gets field value + * + * Will return one of: + * o String - if type is 'text' + * o boolean - if type is 'checkbox' + * o Array of values - if type is 'select' + * + * @param Element field + * @param String field_type see getFieldType + * @return mixed + */ +function getFieldValue(field, field_type) { + field = $(field); + switch (field_type) { + case 'text': + return field.attr('value'); + case 'checkbox': + return field.attr('checked'); + case 'select': + var options = field.attr('options'); + var i, imax = options.length, items = []; + for (i = 0; i < imax; i++) { + if (options[i].selected) { + items.push(options[i].value); + } + } + return items; + } +} + +/** + * Returns values for all fields in fieldsets + */ +function getAllValues() { + var elements = $('fieldset input, fieldset select, fieldset textarea'); + var values = {}; + var type, value; + for (var i = 0; i < elements.length; i++) { + type = getFieldType(elements[i]); + value = getFieldValue(elements[i], type); + if (typeof value != 'undefined') { + // we only have single selects, fatten array + if (type == 'select') { + value = value[0]; + } + values[elements[i].name] = value; + } + } + return values; +} + +/** + * Checks whether field has its default value + * + * @param Element field + * @param String type + * @return boolean + */ +function checkFieldDefault(field, type) { + field = $(field); + var field_id = field.attr('id'); + if (typeof defaultValues[field_id] == 'undefined') { + return true; + } + var isDefault = true; + var currentValue = getFieldValue(field, type); + if (type != 'select') { + isDefault = currentValue == defaultValues[field_id]; + } else { + // compare arrays, will work for our representation of select values + if (currentValue.length != defaultValues[field_id].length) { + isDefault = false; + } + else { + for (var i = 0; i < currentValue.length; i++) { + if (currentValue[i] != defaultValues[field_id][i]) { + isDefault = false; + break; + } + } + } + } + return isDefault; +} + +/** + * Returns element's id prefix + * @param Element element + */ +function getIdPrefix(element) { + return $(element).attr('id').replace(/[^-]+$/, ''); +} + +// ------------------------------------------------------------------ +// Messages +// + +// stores hidden message ids +var hiddenMessages = []; + +$(function() { + var hidden = hiddenMessages.length; + for (var i = 0; i < hidden; i++) { + $('#'+hiddenMessages[i]).css('display', 'none'); + } + if (hidden > 0) { + var link = $('#show_hidden_messages'); + link.click(function(e) { + e.preventDefault(); + for (var i = 0; i < hidden; i++) { + $('#'+hiddenMessages[i]).show(500); + } + $(this).remove(); + }); + link.html(link.html().replace('#MSG_COUNT', hidden)); + link.css('display', ''); + } +}); + +// +// END: Messages +// ------------------------------------------------------------------ + +// ------------------------------------------------------------------ +// Form validation and field operations +// + +// form validator assignments +var validate = {}; + +// form validator list +var validators = { + // regexp: numeric value + _regexp_numeric: new RegExp('^[0-9]*$'), + /** + * Validates positive number + * + * @param boolean isKeyUp + */ + validate_positive_number: function (isKeyUp) { + var result = this.value != '0' && validators._regexp_numeric.test(this.value); + return result ? true : PMA_messages['error_nan_p']; + }, + /** + * Validates non-negative number + * + * @param boolean isKeyUp + */ + validate_non_negative_number: function (isKeyUp) { + var result = validators._regexp_numeric.test(this.value); + return result ? true : PMA_messages['error_nan_nneg']; + }, + /** + * Validates port number + * + * @param boolean isKeyUp + */ + validate_port_number: function(isKeyUp) { + var result = validators._regexp_numeric.test(this.value) && this.value != '0'; + if (!result || this.value > 65536) { + result = PMA_messages['error_incorrect_port']; + } + return result; + }, + // field validators + _field: { + /** + * hide_db field + * + * @param boolean isKeyUp + */ + hide_db: function(isKeyUp) { + if (!isKeyUp && this.value != '') { + var data = {}; + data[this.id] = this.value; + ajaxValidate(this, 'Servers/1/hide_db', data); + } + return true; + }, + /** + * TrustedProxies field + * + * @param boolean isKeyUp + */ + TrustedProxies: function(isKeyUp) { + if (!isKeyUp && this.value != '') { + var data = {}; + data[this.id] = this.value; + ajaxValidate(this, 'TrustedProxies', data); + } + return true; + } + }, + // fieldset validators + _fieldset: { + /** + * Validates Server fieldset + * + * @param boolean isKeyUp + */ + Server: function(isKeyUp) { + if (!isKeyUp) { + ajaxValidate(this, 'Server', getAllValues()); + } + return true; + }, + /** + * Validates Server_login_options fieldset + * + * @param boolean isKeyUp + */ + Server_login_options: function(isKeyUp) { + return validators._fieldset.Server.apply(this, [isKeyUp]); + }, + /** + * Validates Server_pmadb fieldset + * + * @param boolean isKeyUp + */ + Server_pmadb: function(isKeyUp) { + if (isKeyUp) { + return true; + } + + var prefix = getIdPrefix($(this).find('input')); + var pmadb_active = $('#' + prefix + 'pmadb').val() != ''; + if (pmadb_active) { + ajaxValidate(this, 'Server_pmadb', getAllValues()); + } + + return true; + } + } +}; + +/** + * Calls server-side validation procedures + * + * @param Element parent input field in <fieldset> or <fieldset> + * @param String id validator id + * @param Object values values hash (element_id: value) + */ +function ajaxValidate(parent, id, values) { + parent = $(parent); + // ensure that parent is a fieldset + if (parent.attr('tagName') != 'FIELDSET') { + parent = parent.closest('fieldset'); + if (parent.length == 0) { + return false; + } + } + + if (parent.data('ajax') != null) { + parent.data('ajax').abort(); + } + + parent.data('ajax', $.ajax({ + url: 'validate.php', + cache: false, + type: 'POST', + data: { + token: parent.closest('form').find('input[name=token]').val(), + id: id, + values: $.toJSON(values) + }, + success: function(response) { + if (response == null) { + return; + } + + var error = {}; + if (typeof response != 'object') { + error[parent.id] = [response]; + } else if (typeof response['error'] != 'undefined') { + error[parent.id] = [response['error']]; + } else { + for (key in response) { + var value = response[key]; + error[key] = jQuery.isArray(value) ? value : [value]; + } + } + displayErrors(error); + }, + complete: function() { + parent.removeData('ajax'); + } + })); + + return true; +} + +/** + * Registers validator for given field + * + * @param String id field id + * @param String type validator (key in validators object) + * @param boolean onKeyUp whether fire on key up + * @param mixed params validation function parameters + */ +function validateField(id, type, onKeyUp, params) { + if (typeof validators[type] == 'undefined') { + return; + } + if (typeof validate[id] == 'undefined') { + validate[id] = []; + } + validate[id].push([type, params, onKeyUp]); +} + +/** + * Returns valdiation functions associated with form field + * + * @param String field_id form field id + * @param boolean onKeyUpOnly see validateField + * @return Array array of [function, paramseters to be passed to function] + */ +function getFieldValidators(field_id, onKeyUpOnly) { + // look for field bound validator + var name = field_id.match(/[^-]+$/)[0]; + if (typeof validators._field[name] != 'undefined') { + return [[validators._field[name], null]]; + } + + // look for registered validators + var functions = []; + if (typeof validate[field_id] != 'undefined') { + // validate[field_id]: array of [type, params, onKeyUp] + for (var i = 0, imax = validate[field_id].length; i < imax; i++) { + if (onKeyUpOnly && !validate[field_id][i][2]) { + continue; + } + functions.push([validators[validate[field_id][i][0]], validate[field_id][i][1]]); + } + } + + return functions; +} + +/** + * Displays errors for given form fields + * + * WARNING: created DOM elements must be identical with the ones made by + * display_input() in FormDisplay.tpl.php! + * + * @param Object error list (key: field id, value: error array) + */ +function displayErrors(error_list) { + for (field_id in error_list) { + var errors = error_list[field_id]; + var field = $('#'+field_id); + var isFieldset = field.attr('tagName') == 'FIELDSET'; + var errorCnt = isFieldset + ? field.find('dl.errors') + : field.siblings('.inline_errors'); + + // remove empty errors (used to clear error list) + errors = $.grep(errors, function(item) { + return item != ''; + }); + + if (errors.length) { + // if error container doesn't exist, create it + if (errorCnt.length == 0) { + if (isFieldset) { + errorCnt = $('<dl class="errors" />'); + field.find('table').before(errorCnt); + } else { + errorCnt = $('<dl class="inline_errors" />'); + field.closest('td').append(errorCnt); + } + } + + var html = ''; + for (var i = 0, imax = errors.length; i < imax; i++) { + html += '<dd>' + errors[i] + '</dd>'; + } + errorCnt.html(html); + } else if (errorCnt !== null) { + // remove useless error container + errorCnt.remove(); + } + } +} + +/** + * Validates fieldset and puts errors in 'errors' object + * + * @param Element field + * @param boolean isKeyUp + * @param Object errors + */ +function validate_fieldset(fieldset, isKeyUp, errors) { + fieldset = $(fieldset); + if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') { + var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]); + for (field_id in fieldset_errors) { + if (typeof errors[field_id] == 'undefined') { + errors[field_id] = []; + } + if (typeof fieldset_errors[field_id] == 'string') { + fieldset_errors[field_id] = [fieldset_errors[field_id]]; + } + $.merge(errors[field_id], fieldset_errors[field_id]); + } + } +} + +/** + * Validates form field and puts errors in 'errors' object + * + * @param Element field + * @param boolean isKeyUp + * @param Object errors + */ +function validate_field(field, isKeyUp, errors) { + field = $(field); + var field_id = field.attr('id'); + errors[field_id] = []; + var functions = getFieldValidators(field_id, isKeyUp); + for (var i = 0; i < functions.length; i++) { + var result = functions[i][0].apply(field[0], [isKeyUp, functions[i][1]]); + if (result !== true) { + if (typeof result == 'string') { + result = [result]; + } + $.merge(errors[field_id], result); + } + } +} + +/** + * Validates form field and parent fieldset + * + * @param Element field + * @param boolean isKeyUp + */ +function validate_field_and_fieldset(field, isKeyUp) { + field = $(field); + var errors = {}; + validate_field(field, isKeyUp, errors); + validate_fieldset(field.closest('fieldset'), isKeyUp, errors); + displayErrors(errors); +} + +/** + * Marks field depending on its value (system default or custom) + * + * @param Element field + */ +function markField(field) { + field = $(field); + var type = getFieldType(field); + var isDefault = checkFieldDefault(field, type); + + // checkboxes uses parent <span> for marking + var fieldMarker = (type == 'checkbox') ? field.parent() : field; + setRestoreDefaultBtn(field, !isDefault); + fieldMarker[isDefault ? 'removeClass' : 'addClass']('custom'); +} + +/** + * Enables or disables the "restore default value" button + * + * @param Element field + * @param bool display + */ +function setRestoreDefaultBtn(field, display) { + var el = $(field).closest('td').find('.restore-default'); + el.css('display', (el.css('display') ? '' : 'none')); +} + +$(function() { + // register validators and mark custom values + var elements = $('input[id], select[id], textarea[id]'); + $('input[id], select[id], textarea[id]').each(function(){ + markField(this); + var el = $(this); + el.bind('change', function() { + validate_field_and_fieldset(this, false); + markField(this); + }); + var tagName = el.attr('tagName'); + // text fields can be validated after each change + if (tagName == 'INPUT' && el.attr('type') == 'text') { + el.keyup(function() { + validate_field_and_fieldset(el, true); + markField(el); + }); + } + // disable textarea spellcheck + if (tagName == 'TEXTAREA') { + el.attr('spellcheck', false); + } + }); + + // check whether we've refreshed a page and browser remembered modified + // form values + var check_page_refresh = $('#check_page_refresh'); + if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { + // run all field validators + var errors = {}; + for (var i = 0; i < elements.length; i++) { + validate_field(elements[i], false, errors); + } + // run all fieldset validators + $('fieldset').each(function(){ + validate_fieldset(this, false, errors); + }); + + displayErrors(errors); + } else if (check_page_refresh) { + check_page_refresh.val('1'); + } +}); + +// +// END: Form validation and field operations +// ------------------------------------------------------------------ + +// ------------------------------------------------------------------ +// Tabbed forms +// + +/** + * Sets active tab + * + * @param Element tab_link + */ +function setTab(tab_link) { + var tabs_menu = $(tab_link).closest('.tabs'); + + var links = tabs_menu.find('a'); + var contents, link; + for (var i = 0, imax = links.length; i < imax; i++) { + link = $(links[i]); + contents = $(link.attr('href')); + if (links[i] == tab_link) { + link.addClass('active'); + contents.css('display', 'block'); + } else { + link.removeClass('active'); + contents.css('display', 'none'); + } + } + location.hash = 'tab_' + $(tab_link).attr('href').substr(1); +} + +$(function() { + var tabs = $('.tabs'); + var url_tab = location.hash.match(/^#tab_.+/) + ? $('a[href$="' + location.hash.substr(5) + '"]') : null; + if (url_tab) { + url_tab = url_tab[0]; + } + // add tabs events and activate one tab (the first one or indicated by location hash) + for (var i = 0, imax = tabs.length; i < imax; i++) { + var links = $(tabs[i]).find('a'); + var selected_tab = links[0]; + for (var j = 0, jmax = links.length; j < jmax; j++) { + $(links[j]).click(function(e) { + e.preventDefault(); + setTab(this); + }); + if (links[j] == url_tab) { + selected_tab = links[j]; + } + } + setTab(selected_tab); + } + // tab links handling, check each 200ms + // (works with history in FF, further browser support here would be an overkill) + var prev_hash = location.hash; + setInterval(function() { + if (location.hash != prev_hash) { + prev_hash = location.hash; + var url_tab = location.hash.match(/^#tab_.+/) + ? $('a[href$="' + location.hash.substr(5) + '"]') : null; + if (url_tab) { + setTab(url_tab[0]); + } + } + }, 200); +}); + +// +// END: Tabbed forms +// ------------------------------------------------------------------ + +// ------------------------------------------------------------------ +// Form reset buttons +// + +$(function() { + $('input[type=button]').click(function(e) { + var fields = $(this).closest('fieldset').find('input, select, textarea'); + for (var i = 0, imax = fields.length; i < imax; i++) { + setFieldValue(fields[i], getFieldType(fields[i])); + } + }); +}); + +// +// END: Form reset buttons +// ------------------------------------------------------------------ + +// ------------------------------------------------------------------ +// "Restore default" and "set value" buttons +// + +/** + * Restores field's default value + * + * @param String field_id + */ +function restoreField(field_id) { + var field = $('#'+field_id); + if (field.length == 0 || defaultValues[field_id] == undefined) { + return; + } + setFieldValue(field, getFieldType(field), defaultValues[field_id]); +} + +$(function() { + $('.restore-default, .set-value').each(function() { + var link = $(this); + link.css('opacity', 0.25); + if (!link.hasClass('restore-default')) { + // restore-default is handled by markField + link.css('display', ''); + } + link.bind({ + mouseenter: function() {$(this).css('opacity', 1);}, + mouseleave: function() {$(this).css('opacity', 0.25);}, + click: function(e) { + e.preventDefault(); + var href = $(this).attr('href').substr(1); + var field_id; + if ($(this).hasClass('restore-default')) { + field_id = href; + restoreField(field_id); + } else { + field_id = href.match(/^[^=]+/)[0]; + var value = href.match(/=(.+)$/)[1]; + setFieldValue($('#'+field_id), 'text', value); + } + $('#'+field_id).trigger('change'); + } + }); + }); +}); + +// +// END: "Restore default" and "set value" buttons +// ------------------------------------------------------------------ diff --git a/setup/styles.css b/setup/styles.css index 0b89143..d5a399d 100644 --- a/setup/styles.css +++ b/setup/styles.css @@ -1,379 +1,389 @@ -/* global styles */ - -body { - padding-bottom: 1em; -} - -img { - border: 0; -} - -a { - color: #004C96; -} - -a:hover, a:active { - color: #000; -} - -h1 { - font-size: 1.5em; - font-family: Verdana, Arial, Helvetica, sans-serif; -} - -/* language selection box */ - -#select_lang { - position: absolute; - right: 1em; - top: 1em; -} - -/* menu */ - -#menu { - float: left; - width: 200px; -} - -#menu ul { - margin: 1em 1em 1em 0.5em; - padding: 0 0.5em; - list-style: none; -} - -#menu li a { - padding: 3px; - font-weight: bold; - display: block; - color: #669; - text-decoration: none; - zoom: 1; /* IE fix */ -} - -#menu li a:hover, #menu li a:active { - color: #C00; -} - -/* page contents and footer layout */ - -#page { - margin-left: 200px; -} - -#footer { - margin-top: 1em; -} - -#footer a { - margin-right: 0.5em; - text-decoration: none; - font-size: small; -} - -/* phpMyAdmin logo colors */ - -.blue { - color: #7584B3; -} - -.orange { - color: #FFAD17; -} - -.red { - color: #C00; -} - -/* main page messages */ - -div.notice, div.warning, div.error { - margin: 0.5em 0; - padding: 10px 10px 10px 36px; - border: 1px solid #000; - background: #FFD url(../themes/original/img/b_tipp.png) no-repeat 10px 0.8em; -} - -div.notice h4, div.warning h4, div.error h4 { - font-weight: bold; - font-size: large; - margin: 0 0 0.2em 0; - border-bottom: 1px solid #000; -} - -div.notice { - border-color: #FFD700; - background-color: #FFD; - background-image: url(../themes/original/img/s_notice.png); -} - -div.notice h4 { - border-color: #FFD700; -} - -div.warning { - border-color: #C00; - background-color: #FFC; - background-image: url(../themes/original/img/s_warn.png); -} - -div.warning h4 { - color: #C00; - border-color: #C00; -} - -div.error { - border-color: #D00; - background-color: #FFC; - background-image: url(../themes/original/img/s_error.png); -} - -div.error h4 { - color: #D00; - border-color: #D00; -} - -/* form tabs */ - -ul.tabs { - margin: 0; - padding: 0 0 7px 0; - list-style: none; - font-weight: bold; -} - -ul.tabs li { - float: left; -} - -ul.tabs li a { - display: block; - margin: 2px 2px 0; - padding: 2px 8px; - background: #DEE1FF; - white-space: nowrap; - text-decoration: none; - border: 1px #9AA4FF solid; - border-bottom: none; -} - -ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a.active { - margin: 0; - padding: 2px 10px 4px; - background: #F7FBFF; -} - -ul.tabs li a:hover, ul.tabs li a:active { - color: #C00; -} - -.tabs_contents { - border-top: 2px #66B solid; -} - -.tabs_contents fieldset { - margin-top: 0; - border-top: none; -} - -.tabs_contents legend { - display: none; -} - -/* "restore default value" and "set value: foo" buttons */ - -.restore-default img, .set-value img { - margin-bottom: -3px; -} - -/* forms */ - -fieldset { - padding: 0; - margin-top: 1em; - border: 2px #DEE1FF solid; - background: #DEE1FF; -} - -.form { - border: 2px #DEE1FF solid; -} - -fieldset legend { - margin-left: 1em; - padding: 2px 8px; - font-weight: bold; - background: #F7FBFF; - border: 1px #9AA4FF solid; -} - -fieldset p { - margin: 0; - padding: 0.5em; - background: #DEE1FF; -} - -fieldset .errors { /* form error list */ - margin: 0 -2px 1em -2px; - padding: 0.5em 1.5em; - background: #FBEAD9; - border: 1px #C83838 solid; - border-width: 1px 0; - list-style: none; - font-family: sans-serif; - font-size: small; -} - -fieldset .inline_errors { /* field error list */ - margin: 0.3em 0.3em 0.3em 0; - padding: 0; - list-style: none; - color: #9A0000; -} - -fieldset table { - background: #FFF; -} - -fieldset th { - width: 40%; - min-width: 350px; - padding: 0.3em 0.3em 0.3em 0.5em; - text-align: left; - vertical-align: top; -} - -fieldset th small { - display: block; -} - -fieldset .doc { - margin-left: 1em; -} - -fieldset td { - padding-top: 0.3em; - vertical-align: top; -} - -fieldset th small { - font-weight: normal; - font-family: sans-serif; - font-size: x-small; - color: #666; -} - -fieldset th, fieldset td { - border-top: 1px #555 dotted; -} - -fieldset .lastrow, .form .lastrow { - background: #F7FBFF; - padding: 0.5em; - text-align: center; -} - -.form .lastrow { - border-top: 1px #555 dotted; -} - -fieldset .lastrow input, .form .lastrow input { - font-weight: bold; -} - -/* simple form, without header and legend */ - -fieldset.simple { - border-top-color: #DEE1FF; -} - -fieldset.simple legend { - display: none; -} - -fieldset.simple th, fieldset.simple td { - border-top: none; - border-bottom: 1px #555 dotted; -} - -fieldset.simple .lastrow { - border: 0; -} - -/* form elements */ - -span.checkbox { - padding: 2px; -} - -.custom { /* customized field */ - background: #FFC; -} - -span.checkbox.custom { - padding: 1px; - border: 1px #EDEC90 solid; - background: #FFC; -} - -input[type="text"], select, textarea { - border: 1px #A7A6AA solid; -} - -input[type="text"]:focus, select:focus, textarea:focus { - border: 1px #6676FF solid; - background: #F7FBFF; -} - -.green { /* default form button */ - color: #080; -} - -table.datatable { - margin: 0.5em 0 1em; -} - -table.datatable th { - padding: 0 1em 0 0.5em; - border-bottom: 2px #66F solid; - text-align: left; -} - -table.datatable td { - padding: 1px 0.5em; - border-bottom: 1px #DEE1FF solid; -} - -/* textarea with config file's contents */ - -#textconfig { - width: 100%; - border: 0; -} - -/* error list */ - -dd { - margin-left: 0.5em; -} - -dd:before { - content: "\25B8 "; -} - -/* links on failed validation page, when saving a form */ - -a.btn { - padding: 1px 5px; - text-decoration: none; - background: #E2E8FF; - border: 1px #A6C8FF solid; - border-top-color: #AFD0FF; - border-left-color: #AFD0FF; - font-weight: bold; -} - -a.btn:hover, a.btn:active { - background: #E6F5FF; - color: #004C96; -} +/* global styles */ + +body { + padding-bottom: 1em; +} + +img { + border: 0; +} + +a { + color: #004C96; +} + +a:hover, a:active { + color: #000; +} + +h1 { + font-size: 1.5em; + font-family: Verdana, Arial, Helvetica, sans-serif; +} + +/* language selection box */ + +#select_lang { + position: absolute; + right: 1em; + top: 1em; +} + +/* menu */ + +#menu { + float: left; + width: 200px; +} + +#menu ul { + margin: 1em 1em 1em 0.5em; + padding: 0 0.5em; + list-style: none; +} + +#menu li a { + padding: 3px; + font-weight: bold; + display: block; + color: #669; + text-decoration: none; + zoom: 1; /* IE fix */ +} + +#menu li a:hover, #menu li a:active { + color: #C00; +} + +/* page contents and footer layout */ + +#page { + margin-left: 200px; +} + +#footer { + margin-top: 1em; +} + +#footer a { + margin-right: 0.5em; + text-decoration: none; + font-size: small; +} + +/* phpMyAdmin logo colors */ + +.blue { + color: #7584B3; +} + +.orange { + color: #FFAD17; +} + +.red { + color: #C00; +} + +/* main page messages */ + +div.notice, div.warning, div.error { + margin: 0.5em 0; + padding: 10px 10px 10px 36px; + border: 1px solid #000; + background: #FFD url(../themes/original/img/b_tipp.png) no-repeat 10px 0.8em; +} + +div.notice h4, div.warning h4, div.error h4 { + font-weight: bold; + font-size: large; + margin: 0 0 0.2em 0; + border-bottom: 1px solid #000; +} + +div.notice { + border-color: #FFD700; + background-color: #FFD; + background-image: url(../themes/original/img/s_notice.png); +} + +div.notice h4 { + border-color: #FFD700; +} + +div.notice[id^=version_check] { + border-color: #002DFF; + background-color: #EEF; +} + +div.notice[id^=version_check] h4 { + border-color: #002DFF; +} + +div.warning { + border-color: #C00; + background-color: #FFC; + background-image: url(../themes/original/img/s_warn.png); +} + +div.warning h4 { + color: #C00; + border-color: #C00; +} + +div.error { + border-color: #D00; + background-color: #FFC; + background-image: url(../themes/original/img/s_error.png); +} + +div.error h4 { + color: #D00; + border-color: #D00; +} + +/* form tabs */ + +ul.tabs { + margin: 0; + padding: 0 0 7px 0; + list-style: none; + font-weight: bold; +} + +ul.tabs li { + float: left; +} + +ul.tabs li a { + display: block; + margin: 2px 2px 0; + padding: 2px 8px; + background: #DEE1FF; + white-space: nowrap; + text-decoration: none; + border: 1px #9AA4FF solid; + border-bottom: none; +} + +ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a.active { + margin: 0; + padding: 2px 10px 4px; + background: #F7FBFF; +} + +ul.tabs li a:hover, ul.tabs li a:active { + color: #C00; +} + +.tabs_contents { + border-top: 2px #66B solid; +} + +.tabs_contents fieldset { + margin-top: 0; + border-top: none; +} + +.tabs_contents legend { + display: none; +} + +/* "restore default value" and "set value: foo" buttons */ + +.restore-default img, .set-value img { + margin-bottom: -3px; +} + +/* forms */ + +fieldset { + padding: 0; + margin-top: 1em; + border: 2px #DEE1FF solid; + background: #DEE1FF; +} + +.form { + border: 2px #DEE1FF solid; +} + +fieldset legend { + margin-left: 1em; + padding: 2px 8px; + font-weight: bold; + background: #F7FBFF; + border: 1px #9AA4FF solid; +} + +fieldset p { + margin: 0; + padding: 0.5em; + background: #DEE1FF; +} + +fieldset .errors { /* form error list */ + margin: 0 -2px 1em -2px; + padding: 0.5em 1.5em; + background: #FBEAD9; + border: 1px #C83838 solid; + border-width: 1px 0; + list-style: none; + font-family: sans-serif; + font-size: small; +} + +fieldset .inline_errors { /* field error list */ + margin: 0.3em 0.3em 0.3em 0; + padding: 0; + list-style: none; + color: #9A0000; + font-size: small; +} + +fieldset table { + background: #FFF; +} + +fieldset th { + width: 40%; + min-width: 350px; + padding: 0.3em 0.3em 0.3em 0.5em; + text-align: left; + vertical-align: top; +} + +fieldset th small { + display: block; +} + +fieldset .doc { + margin-left: 1em; +} + +fieldset td { + padding-top: 0.3em; + vertical-align: top; +} + +fieldset th small { + font-weight: normal; + font-family: sans-serif; + font-size: x-small; + color: #666; +} + +fieldset th, fieldset td { + border-top: 1px #555 dotted; +} + +fieldset .lastrow, .form .lastrow { + background: #F7FBFF; + padding: 0.5em; + text-align: center; +} + +.form .lastrow { + border-top: 1px #555 dotted; +} + +fieldset .lastrow input, .form .lastrow input { + font-weight: bold; +} + +/* simple form, without header and legend */ + +fieldset.simple { + border-top-color: #DEE1FF; +} + +fieldset.simple legend { + display: none; +} + +fieldset.simple th, fieldset.simple td { + border-top: none; + border-bottom: 1px #555 dotted; +} + +fieldset.simple .lastrow { + border: 0; +} + +/* form elements */ + +span.checkbox { + padding: 2px; +} + +.custom { /* customized field */ + background: #FFC; +} + +span.checkbox.custom { + padding: 1px; + border: 1px #EDEC90 solid; + background: #FFC; +} + +input[type="text"], select, textarea { + border: 1px #A7A6AA solid; +} + +input[type="text"]:focus, select:focus, textarea:focus { + border: 1px #6676FF solid; + background: #F7FBFF; +} + +.green { /* default form button */ + color: #080; +} + +table.datatable { + margin: 0.5em 0 1em; +} + +table.datatable th { + padding: 0 1em 0 0.5em; + border-bottom: 2px #66F solid; + text-align: left; +} + +table.datatable td { + padding: 1px 0.5em; + border-bottom: 1px #DEE1FF solid; +} + +/* textarea with config file's contents */ + +#textconfig { + width: 100%; + border: 0; +} + +/* error list */ + +dd { + margin-left: 0.5em; +} + +dd:before { + content: "\25B8 "; +} + +/* links on failed validation page, when saving a form */ + +a.btn { + padding: 1px 5px; + text-decoration: none; + background: #E2E8FF; + border: 1px #A6C8FF solid; + border-top-color: #AFD0FF; + border-left-color: #AFD0FF; + font-weight: bold; +} + +a.btn:hover, a.btn:active { + background: #E6F5FF; + color: #004C96; +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1378-g1fc253e
by Marc Delisle 08 Apr '10

08 Apr '10

The branch, master has been updated via 1fc253e19e6952437fe980a932cf62e5200988e5 (commit) via b3c041bb997b939f96c58a330f9ea9168aef738b (commit) from 5c032d4110cd618413f88a513443932bce4fa18e (commit) - Log ----------------------------------------------------------------- commit 1fc253e19e6952437fe980a932cf62e5200988e5 Merge: 5c032d4110cd618413f88a513443932bce4fa18e b3c041bb997b939f96c58a330f9ea9168aef738b Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 8 10:32:51 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/server_synchronize.lib.php | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5589941..b30051d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,8 @@ $Id$ 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. +- patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done, thanks to Ankit Gupta - ankitgupta3 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8978cc6..79948b9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { $display = false; // todo: maybe display some of the queries if they are not too numerous - $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; + $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; @@ -683,12 +683,14 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= ","; } } - $insert_query .= ');'; - if ($display == true) { - PMA_displayQuery($insert_query); - } - PMA_DBI_try_query($insert_query, $trg_link, 0); + $insert_query .= '),'; + } + $insert_query = substr($insert_query, 0, -1); + $insert_query .= ';'; + if ($display == true) { + PMA_displayQuery($insert_query); } + PMA_DBI_try_query($insert_query, $trg_link, 0); } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-16-gb3c041b
by Marc Delisle 08 Apr '10

08 Apr '10

The branch, QA_3_3 has been updated via b3c041bb997b939f96c58a330f9ea9168aef738b (commit) from a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) - Log ----------------------------------------------------------------- commit b3c041bb997b939f96c58a330f9ea9168aef738b Author: Ankit Gupta <ankitgupta3(a)users.sourceforge.net> Date: Thu Apr 8 10:32:13 2010 -0400 patch #2983492 When asking to synchronize Structure and Data, only Structure is done ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/server_synchronize.lib.php | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52370e5..718ac6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. +- patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done, thanks to Ankit Gupta - ankitgupta3 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8978cc6..79948b9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { $display = false; // todo: maybe display some of the queries if they are not too numerous - $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; + $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; @@ -683,12 +683,14 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= ","; } } - $insert_query .= ');'; - if ($display == true) { - PMA_displayQuery($insert_query); - } - PMA_DBI_try_query($insert_query, $trg_link, 0); + $insert_query .= '),'; + } + $insert_query = substr($insert_query, 0, -1); + $insert_query .= ';'; + if ($display == true) { + PMA_displayQuery($insert_query); } + PMA_DBI_try_query($insert_query, $trg_link, 0); } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2de185415f65d2c8415c1da93a7950da76b17841
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, master has been updated via 2de185415f65d2c8415c1da93a7950da76b17841 (commit) from 4a99e62d7a25e1b7e26c4ed9055868a266c19d04 (commit) - Log ----------------------------------------------------------------- commit 2de185415f65d2c8415c1da93a7950da76b17841 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 8 15:21:12 2010 +0200 Regenerate. ----------------------------------------------------------------------- Summary of changes: output/en_GB/Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index 7ef2695..f9cafe0 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -4591,7 +4591,7 @@ placed on the same server or some remote server. <p>For more details see <a href="./documentation-gsoc/Synchronization_User_Manual.htm">How to -synchronize</a> +synchronise</a> </p> hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 4a99e62d7a25e1b7e26c4ed9055868a266c19d04
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, master has been updated via 4a99e62d7a25e1b7e26c4ed9055868a266c19d04 (commit) via 3fcf65032193dcbe573b48507914725493ed7fed (commit) from e0a0e62420d0dbbe0717b59e1ac99615c07ced9c (commit) - Log ----------------------------------------------------------------- commit 4a99e62d7a25e1b7e26c4ed9055868a266c19d04 Merge: 3fcf65032193dcbe573b48507914725493ed7fed e0a0e62420d0dbbe0717b59e1ac99615c07ced9c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 15:17:33 2010 +0200 Merge branch 'origin/master' Conflicts: po/en_GB.po commit 3fcf65032193dcbe573b48507914725493ed7fed Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 15:12:11 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 186 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 110 insertions(+), 76 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index b489753..8a53d65 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -395,11 +395,9 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:142 -#, fuzzy msgid "" "communicate in <a href=\"./translators.html\">58 different languages</a>" -msgstr "" -"communicate in <a href=\"./translators.html\">57 different languages</a>" +msgstr "communicate in <a href=\"./translators.html\">58 different languages</a>" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:144 @@ -2016,12 +2014,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:773 -#, fuzzy msgid "" "<span id=\"cfg_Servers_auth_http_realm\">$cfg['Servers'][$i]" "['auth_http_realm']</span> string" msgstr "" -"<span id=\"cfg_Servers_user\">$cfg['Servers'][$i]['user']</span> string" +"<span id=\"cfg_Servers_auth_http_realm\">$cfg['Servers'][$i]['auth_http_realm'" +"]</span> string" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:776 @@ -2035,6 +2033,15 @@ msgid "" "\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> " "will be used." msgstr "" +"When using auth_type = '<abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr>', this field allows to define a custom <abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr> Basic Auth Realm which will " +"be displayed to the user. If not explicitly specified in your configuration, " +"a string combined of \"phpMyAdmin \" and either <a " +"href=\"#cfg_Servers_verbose\" " +"class=\"configrule\">$cfg['Servers'][$i]['verbose']</a> or <a " +"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> " +"will be used." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:783 @@ -2772,13 +2779,12 @@ msgstr "put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt>" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1082 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]" "['tracking_version_auto_create']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_auto_create\">$cfg['Servers'][$i]" -"['tracking_version_auto_create']</span> boolean" +"<span id=\"cfg_Servers_tracking_version_auto_create\">$cfg['Servers'][$i]['tra" +"cking_version_auto_create']</span> boolean" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1085 @@ -2849,63 +2855,57 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1113 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]" "['tracking_add_drop_view']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_view\">$cfg['Servers'][$i]" -"['tracking_version_drop_view']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_view\">$cfg['Servers'][$i]['tracking_" +"add_drop_view']</span> boolean" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1116 -#, fuzzy msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view. Default value is true." msgstr "" -"Whether a DROP VIEW IF EXISTS statement will added as first line to the log " -"when creating a view. Default value is true." +"Whether a DROP VIEW IF EXISTS statement will be added as first line to the " +"log when creating a view. Default value is true." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1122 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]" "['tracking_add_drop_table']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_table\">$cfg['Servers'][$i]" -"['tracking_version_drop_table']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_table\">$cfg['Servers'][$i]['tracking" +"_add_drop_table']</span> boolean" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1125 -#, fuzzy msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table. Default value is true." msgstr "" -"Whether a DROP TABLE IF EXISTS statement will added as first line to the log " -"when creating a table. Default value is true." +"Whether a DROP TABLE IF EXISTS statement will be added as first line to the " +"log when creating a table. Default value is true." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1130 -#, fuzzy msgid "" "<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]" "['tracking_add_drop_database']</span> boolean" msgstr "" -"<span id=\"cfg_Servers_tracking_drop_database\">$cfg['Servers'][$i]" -"['tracking_version_drop_database']</span> boolean" +"<span id=\"cfg_Servers_tracking_add_drop_database\">$cfg['Servers'][$i]['track" +"ing_add_drop_database']</span> boolean" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1133 -#, fuzzy msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database. Default value is true." msgstr "" -"Whether a DROP DATABASE IF EXISTS statement will added as first line to the " -"log when creating a database. Default value is true." +"Whether a DROP DATABASE IF EXISTS statement will be added as first line to " +"the log when creating a database. Default value is true." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1139 @@ -4248,21 +4248,18 @@ msgstr "" "from the interface." #. type: Content of: <html><body><div><dl><dt> -#: ../phpmyadmin/Documentation.html:1559 -#, fuzzy +#: ../phpmyadmin/Documentation.html:1553 msgid "$cfg['ShowFieldTypesInDataEditView'] boolean" -msgstr "$cfg['ShowStats'] boolean" +msgstr "$cfg['ShowFieldTypesInDataEditView'] boolean" #. type: Content of: <html><body><div><dl><dd> -#: ../phpmyadmin/Documentation.html:1560 -#, fuzzy +#: ../phpmyadmin/Documentation.html:1554 msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode. The user can toggle this setting from the interface." msgstr "" -"Defines whether or not MySQL functions fields should be initially displayed " -"in edit/insert mode. Since version 2.10, the user can toggle this setting " -"from the interface." +"Defines whether or not type fields should be initially displayed in " +"edit/insert mode. The user can toggle this setting from the interface." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1565 @@ -4577,6 +4574,8 @@ msgid "" "The corresponding language file needs to be in locale/<i>code</i>/" "LC_MESSAGES/phpmyadmin.mo." msgstr "" +"The corresponding language file needs to be in " +"locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1665 @@ -4605,7 +4604,7 @@ msgstr "$cfg['Lang'] string" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1672 msgid "Force language to use." -msgstr "" +msgstr "Force language to use." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1677 @@ -8324,6 +8323,8 @@ msgid "" "Since release 3.0 only PHP 5.2 and newer. For older PHP versions 2.9 branch " "is still maintained." msgstr "" +"Since release 3.0 only PHP 5.2 and newer. For older PHP versions 2.9 branch " +"is still maintained." #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3006 @@ -8540,6 +8541,9 @@ msgid "" "problems with some operations, for example editing a table with many columns " "and no primary key or with textual primary key." msgstr "" +"Yes but the default configuration values of Suhosin are known to cause " +"problems with some operations, for example editing a table with many columns " +"and no primary key or with textual primary key." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3090 @@ -8553,6 +8557,14 @@ msgid "" "error logs which limit did cause dropping of variable, so you can diagnose " "the problem and adjust matching configuration variable." msgstr "" +"Suhosin configuration might lead to malfunction in some cases and it can not " +"be fully avoided as phpMyAdmin is kind of application which needs to " +"transfer big amounts of fields in single HTTP request, what is something " +"what Suhosin tries to prevent. Generally all <code>suhosin.request.*</code>, " +"<code>suhosin.post.*</code> and <code>suhosin.get.*</code> directives can " +"have negative effect on phpMyAdmin usability. You can always find in your " +"error logs which limit did cause dropping of variable, so you can diagnose " +"the problem and adjust matching configuration variable." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3101 @@ -8560,6 +8572,8 @@ msgid "" "The default values for most Suhosin configuration options will work in most " "scenarios, however you might want to adjust at least following parameters:" msgstr "" +"The default values for most Suhosin configuration options will work in most " +"scenarios, however you might want to adjust at least following parameters:" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3106 @@ -8568,6 +8582,8 @@ msgid "" "request.max_vars\">suhosin.request.max_vars</a> should be increased (eg. " "2048)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_vars\">suhosin.request.max_vars</a> should be increased (eg. 2048)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3107 @@ -8575,6 +8591,8 @@ msgid "" "<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin." "post.max_vars\">suhosin.post.max_vars</a> should be increased (eg. 2048)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_vars\">suhosin.post.max_vars</a> should be increased (eg. 2048)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3108 @@ -8583,6 +8601,9 @@ msgid "" "request.max_array_index_length\">suhosin.request.max_array_index_length</a> " "should be increased (eg. 256)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_array_index_length\">suhosin.request.max_array_index_length</a> " +"should be increased (eg. 256)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3109 @@ -8591,6 +8612,9 @@ msgid "" "post.max_array_index_length\">suhosin.post.max_array_index_length</a> should " "be increased (eg. 256)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_array_index_length\">suhosin.post.max_array_index_length</a> should be " +"increased (eg. 256)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3110 @@ -8599,6 +8623,9 @@ msgid "" "request.max_totalname_length\">suhosin.request.max_totalname_length</a> " "should be increased (eg. 8192)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.requ" +"est.max_totalname_length\">suhosin.request.max_totalname_length</a> should be " +"increased (eg. 8192)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3111 @@ -8607,6 +8634,9 @@ msgid "" "post.max_totalname_length\">suhosin.post.max_totalname_length</a> should be " "increased (eg. 8192)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.post" +".max_totalname_length\">suhosin.post.max_totalname_length</a> should be " +"increased (eg. 8192)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3112 @@ -8615,6 +8645,9 @@ msgid "" "bailout_on_error\">suhosin.sql.bailout_on_error</a> needs to be disabled " "(the default)" msgstr "" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.sql." +"bailout_on_error\">suhosin.sql.bailout_on_error</a> needs to be disabled (the " +"default)" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:3113 @@ -8623,6 +8656,9 @@ msgid "" "html#logging_configuration\">suhosin.log.*</a> should not include SQL, " "otherwise you get big slowdown" msgstr "" +"<a href=\"http://www.hardened-" +"php.net/suhosin/configuration.html#logging_configuration\">suhosin.log.*</a> " +"should not include SQL, otherwise you get big slowdown" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3117 @@ -8630,6 +8666,9 @@ msgid "" "You can also disable the warning using the <a href=" "\"#cfg_SuhosinDisableWarning\"> <tt>SuhosinDisableWarning</tt> directive</a>." msgstr "" +"You can also disable the warning using the <a " +"href=\"#cfg_SuhosinDisableWarning\"> <tt>SuhosinDisableWarning</tt> " +"directive</a>." #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:3122 @@ -11892,20 +11931,18 @@ msgid "The following method is preferred for new developers:" msgstr "The following method is preferred for new developers:" #. type: Content of: <html><body><div><ol><li> -#: ../phpmyadmin/Documentation.html:4396 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4378 msgid "fetch the current git repository over anonymous git:" -msgstr "fetch the current SVN tree over anonymous SVN:" +msgstr "fetch the current git repository over anonymous git:" #. type: Content of: <html><body><div><ol><li> -#: ../phpmyadmin/Documentation.html:4397 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4379 msgid "" "<tt>git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/" "phpmyadmin</tt>" msgstr "" -"<tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/" -"phpMyAdmin</tt>" +"<tt>git clone " +"git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:4400 @@ -11913,20 +11950,19 @@ msgid "add your stuff" msgstr "add your stuff" #. type: Content of: <html><body><div><ol><li> -#: ../phpmyadmin/Documentation.html:4401 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4383 msgid "generate patch with your changes: <tt>git diff > xxx.diff</tt>" -msgstr "generate patch with your changes: <tt>svn diff</tt>" +msgstr "generate patch with your changes: <tt>git diff > xxx.diff</tt>" #. type: Content of: <html><body><div><ol><li> -#: ../phpmyadmin/Documentation.html:4404 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4386 msgid "" "submit your patch via the <a href=\"https://sourceforge.net/tracker/?" "group_id=23067&atid=377410\">patch tracker of the phpMyAdmin project</a>." msgstr "" -"put the patch inside the <a href=\"https://sourceforge.net/tracker/?" -"group_id=23067&atid=377410\">patch tracker of the phpMyAdmin project</a>." +"submit your patch via the <a " +"href=\"https://sourceforge.net/tracker/?group_id=23067&atid=377410\">patch " +"tracker of the phpMyAdmin project</a>." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4410 @@ -11934,15 +11970,16 @@ msgid "" "More details on git are available on <a href=\"http://wiki.phpmyadmin.net/" "pma/Devel:Git\">our wiki</a>." msgstr "" +"More details on git are available on <a " +"href=\"http://wiki.phpmyadmin.net/pma/Devel:Git\">our wiki</a>." #. type: Content of: <html><body><div><p> -#: ../phpmyadmin/Documentation.html:4412 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4394 msgid "" "Write access to the repository is granted only to experienced developers who " "have already contributed something useful to phpMyAdmin." msgstr "" -"Write access to the SVN tree is granted only to experienced developers who " +"Write access to the repository is granted only to experienced developers who " "have already contributed something useful to phpMyAdmin." #. type: Content of: <html><body><div><p> @@ -12079,14 +12116,13 @@ msgstr "" "placed on the same server or some remote server." #. type: Content of: <html><body><div><p> -#: ../phpmyadmin/Documentation.html:4465 -#, fuzzy +#: ../phpmyadmin/Documentation.html:4447 msgid "" "For more details see <a href=\"./documentation-gsoc/" "Synchronization_User_Manual.htm\">How to synchronize</a>" msgstr "" -"For more details see <a href=\"./documentation-gsoc/Synchronization_User%" -"20Manual.htm\">How to synchronise</a>" +"For more details see <a href=\"./documentation-" +"gsoc/Synchronization_User_Manual.htm\">How to synchronise</a>" #. type: Content of: <html><body><div><h2> #: ../phpmyadmin/Documentation.html:4469 @@ -13954,9 +13990,8 @@ msgstr "Chinese Simplified (GB)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:154 -#, fuzzy msgid "Shanyan Baishui (rimyxp(a)users.sourceforge.net)" -msgstr "Orzu Samarqandiy (orzu(a)users.sourceforge.net)" +msgstr "Shanyan Baishui (rimyxp(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:159 @@ -14018,12 +14053,12 @@ msgstr "" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:195 msgid "English (United Kingdom)" -msgstr "" +msgstr "English (United Kingdom)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:197 msgid "Robert Readman (robert_readman(a)hotmail.com)" -msgstr "" +msgstr "Robert Readman (robert_readman(a)hotmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:202 @@ -14288,13 +14323,12 @@ msgstr "Albert Fazlí (amichauer(a)gmx.de)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:426 msgid "Telugu" -msgstr "" +msgstr "Telugu" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:428 -#, fuzzy msgid "veeven (veeven(a)gmail.com)" -msgstr "Sven-Erik Andersen (sven.erik.andersen(a)gmail.com)" +msgstr "veeven (veeven(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:433 @@ -14334,37 +14368,33 @@ msgstr "Abdurashid Muhitdinov (cool_zero(a)list.ru" #. type: Content of: <html><body><h1> #: output/en_GB/index-full-template.html:7 #: output/en_GB/index-full-template.html:10 -#, fuzzy msgid "phpMyAdmin English (United Kingdom) Documentation" -msgstr "phpMyAdmin 3.4.0-dev - Documentation" +msgstr "phpMyAdmin English (United Kingdom) Documentation" #. type: Content of: <html><body><p> #: output/en_GB/index-full-template.html:11 msgid "Documents translated to English (United Kingdom):" -msgstr "" +msgstr "Documents translated to English (United Kingdom):" #. type: Content of: <html><body><ul><li> #: output/en_GB/index-full-template.html:13 -#, fuzzy msgid "<a href=\"INSTALL\">INSTALL</a>" -msgstr "<a href=\"LICENSE\">License</a>" +msgstr "<a href=\"INSTALL\">INSTALL</a>" #. type: Content of: <html><body><ul><li> #: output/en_GB/index-full-template.html:14 msgid "<a href=\"TODO\">TODO</a>" -msgstr "" +msgstr "<a href=\"TODO\">TODO</a>" #. type: Content of: <html><body><ul><li> #: output/en_GB/index-full-template.html:15 -#, fuzzy msgid "<a href=\"README\">README</a>" -msgstr "<a href=\"LICENSE\">License</a>" +msgstr "<a href=\"README\">README</a>" #. type: Content of: <html><body><ul><li> #: output/en_GB/index-full-template.html:16 -#, fuzzy msgid "<a href=\"Documentation.html\">Main documentation</a>" -msgstr "<a href=\"Documentation.html#intro\">Introduction</a>" +msgstr "<a href=\"Documentation.html\">Main documentation</a>" #. type: Content of: <p> #: addendum/head.html:2 @@ -14374,6 +14404,10 @@ msgid "" "our <a href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</" "a>." msgstr "" +"This is translated version of a <a " +"href=\"http://www.phpmyadmin.net/documentation/\">phpMyAdmin " +"documentation</a>. You can contribute to it on our <a " +"href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>." #. type: Plain text #: addendum/comment.html:2 @@ -14383,17 +14417,17 @@ msgstr "<!--" #. type: Plain text #: addendum/comment.html:4 msgid "This file is generated using po4a, do not edit!" -msgstr "" +msgstr "This file is generated using po4a, do not edit!" #. type: Plain text #: addendum/comment.html:6 msgid "You can edit po files to change the translation." -msgstr "" +msgstr "You can edit po files to change the translation." #. type: Plain text #: addendum/comment.html:8 msgid "Or you can edit them online at https://l10n.cihar.com/projects/pmadoc/." -msgstr "" +msgstr "Or you can edit them online at https://l10n.cihar.com/projects/pmadoc/." #. type: Plain text #: addendum/comment.html:9 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1376-g5c032d4
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, master has been updated via 5c032d4110cd618413f88a513443932bce4fa18e (commit) via 3aa8e025cb29285148dc45e03e8cd8b1ab09b89b (commit) via 8222253192faa0c8fe63d4eb47699d97a974ebb7 (commit) via bc71de609830a33469dd327db1d4408a0e619c9b (commit) via c98d8fb52ef2379196f3ff91ff9a95e407c92f95 (commit) via 1e3549fc83e5c431225bc78b88a56854895c24a9 (commit) via c9823db143bbe08e1267661f2e79712f20ad8a8d (commit) via 6cc17647f0bb704b605a049ccb37e3ed95572cf5 (commit) via 1207812164e8d8cecc6bc5294b2e9e3cce788853 (commit) via 1c201362da9bb748f483149bee2cbf2eaf969c12 (commit) via ca659b86069d9317236e360e28bcf61d5c6fddd9 (commit) via ee6f8f80e118fe4a9179e4e64c5c8a771bb4e7ba (commit) via 93227883e66d8a7fe7d42fda270cced801016350 (commit) via ee554717cc3f15297762edb17caa95895a454895 (commit) via cc86df8e295502573bcce43b7a976a60668faad2 (commit) via f20bf63cd39a4a187bfb516492d127e17cee5fc9 (commit) via 5541b1415b95fee7020008bb733c60b6bb855b7c (commit) via 07f4b9e039eebe390c5eeb8e2bb8f6ca8e7615cc (commit) via c6ead622575cf1c8e22297736868090ee17f2d0b (commit) via 2b5319abe86a6742d9695c9330afc71c34d9a743 (commit) via ed3724cc7a660b1db1d394d4e72b517ea5053f86 (commit) via c72fe83d5634c9e2f7c23007c80976a46c7c5d9c (commit) from 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 (commit) - Log ----------------------------------------------------------------- commit 5c032d4110cd618413f88a513443932bce4fa18e Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 15:12:07 2010 +0200 Translation update done using Pootle. commit 3aa8e025cb29285148dc45e03e8cd8b1ab09b89b Merge: 8222253192faa0c8fe63d4eb47699d97a974ebb7 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 14:40:27 2010 +0200 Merge remote branch 'origin/master' commit 8222253192faa0c8fe63d4eb47699d97a974ebb7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:06:28 2010 +0200 Translation update done using Pootle. commit bc71de609830a33469dd327db1d4408a0e619c9b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:05:15 2010 +0200 Translation update done using Pootle. commit c98d8fb52ef2379196f3ff91ff9a95e407c92f95 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:05:01 2010 +0200 Translation update done using Pootle. commit 1e3549fc83e5c431225bc78b88a56854895c24a9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:04:55 2010 +0200 Translation update done using Pootle. commit c9823db143bbe08e1267661f2e79712f20ad8a8d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:04:35 2010 +0200 Translation update done using Pootle. commit 6cc17647f0bb704b605a049ccb37e3ed95572cf5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:04:17 2010 +0200 Translation update done using Pootle. commit 1207812164e8d8cecc6bc5294b2e9e3cce788853 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:03:36 2010 +0200 Translation update done using Pootle. commit 1c201362da9bb748f483149bee2cbf2eaf969c12 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:02:43 2010 +0200 Translation update done using Pootle. commit ca659b86069d9317236e360e28bcf61d5c6fddd9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:02:15 2010 +0200 Translation update done using Pootle. commit ee6f8f80e118fe4a9179e4e64c5c8a771bb4e7ba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 13:00:05 2010 +0200 Translation update done using Pootle. commit 93227883e66d8a7fe7d42fda270cced801016350 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:59:59 2010 +0200 Translation update done using Pootle. commit ee554717cc3f15297762edb17caa95895a454895 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:59:30 2010 +0200 Translation update done using Pootle. commit cc86df8e295502573bcce43b7a976a60668faad2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:57:22 2010 +0200 Translation update done using Pootle. commit f20bf63cd39a4a187bfb516492d127e17cee5fc9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:56:58 2010 +0200 Translation update done using Pootle. commit 5541b1415b95fee7020008bb733c60b6bb855b7c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:56:20 2010 +0200 Translation update done using Pootle. commit 07f4b9e039eebe390c5eeb8e2bb8f6ca8e7615cc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:56:10 2010 +0200 Translation update done using Pootle. commit c6ead622575cf1c8e22297736868090ee17f2d0b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:54:02 2010 +0200 Translation update done using Pootle. commit 2b5319abe86a6742d9695c9330afc71c34d9a743 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:53:45 2010 +0200 Translation update done using Pootle. commit ed3724cc7a660b1db1d394d4e72b517ea5053f86 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:53:18 2010 +0200 Translation update done using Pootle. commit c72fe83d5634c9e2f7c23007c80976a46c7c5d9c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Apr 8 12:52:46 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 52 +++++++++++++++++---------------------------- po/zh_CN.po | 67 ++++++++++++++++++++++------------------------------------- 2 files changed, 45 insertions(+), 74 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 8838ebd..ae4689b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -57,13 +57,12 @@ msgstr "en" #: libraries/common.lib.php:1276 msgid "Inline edit of this query" -msgstr "" +msgstr "Inline edit of this query" #: libraries/common.lib.php:1278 -#, fuzzy #| msgid "Engines" msgid "Inline" -msgstr "Engines" +msgstr "Inline" #: libraries/Message.class.php:282 #, php-format @@ -6518,11 +6517,11 @@ msgstr "PMA database" #: setup/lib/messages.inc.php:133 msgid "Tracking of changes made in database. Requires configured PMA database." -msgstr "" +msgstr "Tracking of changes made in database. Requires configured PMA database." #: setup/lib/messages.inc.php:134 msgid "Changes tracking" -msgstr "" +msgstr "Changes tracking" #: setup/lib/messages.inc.php:135 msgid "Customization" @@ -7231,7 +7230,6 @@ msgid "SQL query history table" msgstr "SQL query history table" #: setup/lib/messages.inc.php:279 -#, fuzzy #| msgid "" #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history" #| "[/kbd]" @@ -7239,14 +7237,13 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" -"Leave blank for no SQL query history support, suggested: [kbd]pma_history[/" -"kbd]" +"Leave blank for no SQL query tracking support, suggested: " +"[kbd]pma_tracking[/kbd]" #: setup/lib/messages.inc.php:280 -#, fuzzy #| msgid "SQL query history table" msgid "SQL query tracking table" -msgstr "SQL query history table" +msgstr "SQL query tracking table" #: setup/lib/messages.inc.php:281 msgid "Hostname where MySQL server is running" @@ -7353,7 +7350,6 @@ msgid "Signon URL" msgstr "Signon URL" #: setup/lib/messages.inc.php:303 -#, fuzzy #| msgid "" #| "Whether the tracking mechanism creates versions for tables and views " #| "automatically. Default value is false." @@ -7362,68 +7358,60 @@ msgid "" "automatically." msgstr "" "Whether the tracking mechanism creates versions for tables and views " -"automatically. Default value is false." +"automatically." #: setup/lib/messages.inc.php:304 -#, fuzzy #| msgid "Automatic recovery mode" msgid "Automatically create versions" -msgstr "Automatic recovery mode" +msgstr "Automatically create versions" #: setup/lib/messages.inc.php:305 -#, fuzzy #| msgid "" #| "Defines the list of statements the auto-creation uses for new versions. " #| "Default value is" msgid "Defines the list of statements the auto-creation uses for new versions." -msgstr "" -"Defines the list of statements the auto-creation uses for new versions. " -"Default value is" +msgstr "Defines the list of statements the auto-creation uses for new versions." #: setup/lib/messages.inc.php:306 -#, fuzzy #| msgid "Statements" msgid "Statements to track" -msgstr "Statements" +msgstr "Statements to track" #: setup/lib/messages.inc.php:307 -#, fuzzy msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" -"Whether a DROP VIEW IF EXISTS statement will added as first line to the log " -"when creating a view. Default value is true." +"Whether a DROP VIEW IF EXISTS statement will be added as first line to the " +"log when creating a view." #: setup/lib/messages.inc.php:308 msgid "Add DROP VIEW" -msgstr "" +msgstr "Add DROP VIEW" #: setup/lib/messages.inc.php:309 -#, fuzzy msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" -"Whether a DROP TABLE IF EXISTS statement will added as first line to the log " -"when creating a table. Default value is true." +"Whether a DROP TABLE IF EXISTS statement will be added as first line to the " +"log when creating a table." #: setup/lib/messages.inc.php:310 msgid "Add DROP TABLE" -msgstr "" +msgstr "Add DROP TABLE" #: setup/lib/messages.inc.php:311 -#, fuzzy msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" -"Whether a DROP DATABASE IF EXISTS statement will added as first line to the " -"log when creating a database. Default value is true." +"Whether a DROP DATABASE IF EXISTS statement will be added as first line to " +"the log when creating a database." #: setup/lib/messages.inc.php:312 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Add DROP DATABASE" #: setup/lib/messages.inc.php:313 msgid "You should use SSL connections if your web server supports it" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4d7f459..db69e9a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-02 13:41+0200\n" -"PO-Revision-Date: 2010-03-19 03:34+0200\n" +"PO-Revision-Date: 2010-04-08 13:06+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -44,7 +44,7 @@ msgstr "" #: libraries/common.lib.php:411 msgctxt "$mysql_5_1_doc_lang" msgid "en" -msgstr "en" +msgstr "zh" #. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:415 @@ -54,34 +54,33 @@ msgstr "zh" #: libraries/common.lib.php:1276 msgid "Inline edit of this query" -msgstr "" +msgstr "在本页面编辑此查询" #: libraries/common.lib.php:1278 -#, fuzzy #| msgid "Engines" msgid "Inline" -msgstr "引擎" +msgstr "内联" #: libraries/Message.class.php:282 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) affected." msgid "%1$d row affected." msgid_plural "%1$d rows affected." msgstr[0] "影响了 %1$d 行。" #: libraries/Message.class.php:301 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) deleted." msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "已删除 %1$d 行。" +msgstr[0] "删除了 %1$d 行。" #: libraries/Message.class.php:320 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) inserted." msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "已插入 %1$d 行。" +msgstr[0] "插入了 %1$d 行。" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 @@ -6302,7 +6301,7 @@ msgstr "PMA 数据库" #: setup/lib/messages.inc.php:133 msgid "Tracking of changes made in database. Requires configured PMA database." -msgstr "" +msgstr "追踪数据库的修改。需要设置 PMA 数据库。" #: setup/lib/messages.inc.php:134 msgid "Changes tracking" @@ -6988,20 +6987,18 @@ msgid "SQL query history table" msgstr "SQL 查询历史表" #: setup/lib/messages.inc.php:279 -#, fuzzy #| msgid "" #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history" #| "[/kbd]" msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" -msgstr "不使用 SQL 查询历史功能请留空，默认：[kbd]pma_history[/kbd]" +msgstr "不使用 SQL 查询追踪功能请留空，默认：[kbd]pma_tracking[/kbd]" #: setup/lib/messages.inc.php:280 -#, fuzzy #| msgid "SQL query history table" msgid "SQL query tracking table" -msgstr "SQL 查询历史表" +msgstr "SQL 查询追踪表" #: setup/lib/messages.inc.php:281 msgid "Hostname where MySQL server is running" @@ -7106,72 +7103,60 @@ msgid "Signon URL" msgstr "登录地址" #: setup/lib/messages.inc.php:303 -#, fuzzy #| msgid "" #| "Whether the tracking mechanism creates versions for tables and views " #| "automatically. Default value is false." msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." -msgstr "设置追踪系统是否自动为数据表和视图创建版本。默认为 false 。" +msgstr "设置追踪系统是否自动为数据表和视图创建版本。" #: setup/lib/messages.inc.php:304 -#, fuzzy #| msgid "Automatic recovery mode" msgid "Automatically create versions" -msgstr "自动恢复模式" +msgstr "自动创建版本" #: setup/lib/messages.inc.php:305 -#, fuzzy #| msgid "" #| "Defines the list of statements the auto-creation uses for new versions. " #| "Default value is" msgid "Defines the list of statements the auto-creation uses for new versions." -msgstr "定义自动创建新版的命令列表。默认值为" +msgstr "定义自动创建新版的命令列表。" #: setup/lib/messages.inc.php:306 -#, fuzzy #| msgid "Statements" msgid "Statements to track" -msgstr "说明" +msgstr "要追踪的命令" #: setup/lib/messages.inc.php:307 -#, fuzzy msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." -msgstr "" -"设置当记录视图创建时，是否在前面加上 DROP VIEW IF EXISTS 命令。默认为 true 。" +msgstr "设置当记录视图创建时，是否在前面加上 DROP VIEW IF EXISTS 命令。" #: setup/lib/messages.inc.php:308 msgid "Add DROP VIEW" -msgstr "" +msgstr "添加 DROP VIEW" #: setup/lib/messages.inc.php:309 -#, fuzzy msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." -msgstr "" -"设置当记录数据表创建时，是否在前面加上 DROP TABLE IF EXISTS 命令。默认为 " -"true 。" +msgstr "设置当记录数据表创建时，是否在前面加上 DROP TABLE IF EXISTS 命令。" #: setup/lib/messages.inc.php:310 msgid "Add DROP TABLE" -msgstr "" +msgstr "添加 DROP TABLE" #: setup/lib/messages.inc.php:311 -#, fuzzy msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." -msgstr "" -"设置当记录数据库创建时，是否在前面加上 DROP DATABASE IF EXISTS 命令。默认为 " -"true 。" +msgstr "设置当记录数据库创建时，是否在前面加上 DROP DATABASE IF EXISTS 命令。" #: setup/lib/messages.inc.php:312 msgid "Add DROP DATABASE" -msgstr "" +msgstr "添加 DROP DATABASE" #: setup/lib/messages.inc.php:313 msgid "You should use SSL connections if your web server supports it" @@ -7435,16 +7420,14 @@ msgid "" msgstr "有新的 phpMyAdmin 可用，请考虑升级。最新的版本是 %s，于 %s 发布。" #: setup/lib/messages.inc.php:372 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The " #| "latest stable version is %s, released on %s." msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." -msgstr "" -"你现在使用的是开发版，请通过 [kbd]svn update[/kbd] 检查更新 :-)[br]最新正式版" -"为 %s，于 %s 发布。" +msgstr "你现在使用的是开发版，请通过 [kbd]git pull[/kbd] 检查更新 :-)[br]最新正式版为 %s，于 %s 发布。" #: setup/lib/messages.inc.php:373 msgid "No newer stable version is available" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1354-g1b1bef3
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, master has been updated via 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 (commit) via 6e056ffe05a2895e9f34da4062accc7ead4a82f3 (commit) via d4d375a63b03abc1b7b5166cc213d1527d732a09 (commit) via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit) via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit) from f73996ba01806c6162f2d3a998f9eca9983378ed (commit) - Log ----------------------------------------------------------------- commit 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 12:41:01 2010 +0200 Update FAQ 7.2 to gettext. commit 6e056ffe05a2895e9f34da4062accc7ead4a82f3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 12:35:39 2010 +0200 Update devel section to mention Gettext. commit d4d375a63b03abc1b7b5166cc213d1527d732a09 Merge: f73996ba01806c6162f2d3a998f9eca9983378ed a99858b16a40bcfceec01667eb2814a1acf45f6d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 8 12:33:42 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: Documentation.html | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/Documentation.html b/Documentation.html index 467a599..5e07feb 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1393,6 +1393,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd> + <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dd>Whether to display errors from PHP or not.</dd> + + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dd>Whether to gather errors from PHP or not.</dd> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can @@ -1906,20 +1912,20 @@ $cfg['TrustedProxies'] = name of the field. The comment is shown as a tool-tip for that field. </dd> - <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> + <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> <dd>Whether to display an edit link to change a query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> + <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> + <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> + <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> <dd>Whether to display a link to validate a query in any SQL Query box. See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd> - <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> + <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> <dd>Whether to display a link to refresh a query in any SQL Query box.</dd> <dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt> @@ -4354,20 +4360,32 @@ chmod o+rwx tmp <a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?</a></h4> -<p> Always use the current SVN version of your language file. - For a new language, start from <i>english-utf-8.inc.php</i>. If you - don't know how to get the SVN version, please ask one of the developers. - <br /> +<p> Always use latest Git versoin of po file to translate. You can optionally + translate online at our <a href="http://l10n.cihar.com/">translation + server</a> where you can also get latest po files and merge them + with your translations. For creating new translation simply use + <code>po/phpmyadmin.pot</code> and generate + <code>po/LANG_CODE.po</code> for your language (you can use + <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> + to do this) or ask on mailing list to add the translation to the web + interface. +</p> +<p> Please note that we try not to use HTML entities like &eacute; in the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. However there are some entities that need to be there, for quotes - ,non-breakable spaces, ampersands, less than, greater than.<br /> + ,non-breakable spaces, ampersands, less than, greater than. +</p> +<p> You can then put your translations, as a zip file to avoid losing special - characters, on the sourceforge.net translation tracker.<br /> + characters, on the sourceforge.net translation tracker. +</p> +<p> It would be a good idea to subscribe to the phpmyadmin-translators mailing - list, because this is where we ask for translations of new messages.</p> + list, because this is where we ask for translations of new messages. +</p> <h4 id="faq7_3"> <a href="#faq7_3">7.3 I would like to help out with the development of @@ -4474,11 +4492,18 @@ now synchronize your databases placed on the same server or some remote server. <abbr title="PHP Extension and Application Repository">PEAR</abbr> coding standards</a> on the other hand. Please pay attention to this.</li> + <li>Please enable showing PHP errors and warnings by the + <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> + configuration directive.</li> <li>Please try to keep up the file-naming conventions. Table-related stuff goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related tools to <i>server_*.php</i> and so on.</li> - <li>Please don't put message strings in your code, instead add the string - (at least) to <i>english-utf-8.inc.php</i> and print() it out.</li> + <li>Please use gettext wrappers around all messages + (<code>__('Some text')</code> or <code>_ngettext()</code> function). + To translate them, you need to call <code>scripts/update-po</code> + script. To use translated messages, call + <code>scripts/generate-mo</code>, which generates binary files read by + Gettext.</li> <li>If you want to be really helpful, write an entry for the ChangeLog.</li> <li id="developersdbg"> The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2RC1-15-ga99858b
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, QA_3_3 has been updated via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit) via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit) from c9d7a662101b57abe754393ab6424b05ab0e685f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 070b3e1..8848f90 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd> + <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dd>Whether to display errors from PHP or not.</dd> + + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dd>Whether to gather errors from PHP or not.</dd> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can @@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] = name of the field. The comment is shown as a tool-tip for that field. </dd> - <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> + <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> <dd>Whether to display an edit link to change a query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> + <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> + <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> + <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> <dd>Whether to display a link to validate a query in any SQL Query box. See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd> - <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> + <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> <dd>Whether to display a link to refresh a query in any SQL Query box.</dd> <dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt> @@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server. <abbr title="PHP Extension and Application Repository">PEAR</abbr> coding standards</a> on the other hand. Please pay attention to this.</li> + <li>Please enable showing PHP errors and warnings by the + <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> + configuration directive.</li> <li>Please try to keep up the file-naming conventions. Table-related stuff goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related tools to <i>server_*.php</i> and so on.</li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_2, updated. RELEASE_3_3_2RC1-6-gb68b7d1
by Michal Čihař 08 Apr '10

08 Apr '10

The branch, MAINT_3_3_2 has been updated via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit) via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit) from 7e40035275d28fa38fef7f7628bdda3a44d83de5 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Documentation.html | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index abe01c4..81e12b0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd> + <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dd>Whether to display errors from PHP or not.</dd> + + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dd>Whether to gather errors from PHP or not.</dd> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can @@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] = name of the field. The comment is shown as a tool-tip for that field. </dd> - <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> + <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> <dd>Whether to display an edit link to change a query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> + <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> + <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd> - <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> + <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> <dd>Whether to display a link to validate a query in any SQL Query box. See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd> - <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> + <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> <dd>Whether to display a link to refresh a query in any SQL Query box.</dd> <dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt> @@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server. <abbr title="PHP Extension and Application Repository">PEAR</abbr> coding standards</a> on the other hand. Please pay attention to this.</li> + <li>Please enable showing PHP errors and warnings by the + <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> + configuration directive.</li> <li>Please try to keep up the file-naming conventions. Table-related stuff goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related tools to <i>server_*.php</i> and so on.</li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1347-gf73996b
by Marc Delisle 07 Apr '10

07 Apr '10

The branch, master has been updated via f73996ba01806c6162f2d3a998f9eca9983378ed (commit) from 8a1e59972566f9ee60bb5c0a1a96fe96898154f5 (commit) - Log ----------------------------------------------------------------- commit f73996ba01806c6162f2d3a998f9eca9983378ed Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Apr 7 17:34:33 2010 -0400 no longer needed as Mootools is no longer used in the Structure page shown after adding a field ----------------------------------------------------------------------- Summary of changes: tbl_addfield.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tbl_addfield.php b/tbl_addfield.php index c5d6ce9..572992e 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -13,7 +13,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; $GLOBALS['js_include'][] = 'functions.js'; -$GLOBALS['js_include'][] = 'mootools.js'; require_once './libraries/header.inc.php'; // Check parameters hooks/post-receive -- phpMyAdmin

1 0