nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #771794

Browse Source
This commit is contained in:
Alexander M. Turek
2003-07-16 08:29:07 +00:00
parent 43306e3aa1
commit 0a7f4edda1
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-07-16 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/functions.js: Bug #771794 (CHAR length check although field name
is empty).
2003-07-15 Marc Delisle <lem9@users.sourceforge.net> 2003-07-15 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties.inc.php3: bug 771523: wrong type displayed for * tbl_properties.inc.php3: bug 771523: wrong type displayed for
a LONGTEXT with character set latin7 a LONGTEXT with character set latin7

22
libraries/functions.js
View File

@@ -71,7 +71,7 @@ function confirmQuery(theForm1, sqlQuery1)
// for this kind of verification // for this kind of verification
// For now, I just added a ^ to check for the statement at // For now, I just added a ^ to check for the statement at
// beginning of expression // beginning of expression
//var do_confirm_re_0 = new RegExp('DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE)\\s', 'i'); //var do_confirm_re_0 = new RegExp('DROP\\s+(IF EXISTS\\s+)?(TABLE|DATABASE)\\s', 'i');
//var do_confirm_re_1 = new RegExp('ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i'); //var do_confirm_re_1 = new RegExp('ALTER\\s+TABLE\\s+((`[^`]+`)|([A-Za-z0-9_$]+))\\s+DROP\\s', 'i');
//var do_confirm_re_2 = new RegExp('DELETE\\s+FROM\\s', 'i'); //var do_confirm_re_2 = new RegExp('DELETE\\s+FROM\\s', 'i');
@@ -253,9 +253,10 @@ function checkTableEditForm(theForm, fieldsCnt)
var id = "field_" + i + "_2"; var id = "field_" + i + "_2";
var elm = getElement(id); var elm = getElement(id);
if (elm.value == 'VARCHAR' || elm.value == 'CHAR') { if (elm.value == 'VARCHAR' || elm.value == 'CHAR') {
elm2 = getElement("field_" + i + "_3") elm2 = getElement("field_" + i + "_3");
val = parseInt(elm2.value); val = parseInt(elm2.value);
if (isNaN(val)) { elm3 = getElement("field_" + i + "_1");
if (isNaN(val) && elm3.value != "") {
elm2.select(); elm2.select();
alert(errorMsg1); alert(errorMsg1);
elm2.focus(); elm2.focus();
@@ -263,8 +264,9 @@ function checkTableEditForm(theForm, fieldsCnt)
} }
} }
} }
return true;
} // enf of the 'checkTableEditForm()' function } // enf of the 'checkTableEditForm()' function
/** /**
* Ensures the choice between 'transmit', 'zipped', 'gzipped' and 'bzipped' * Ensures the choice between 'transmit', 'zipped', 'gzipped' and 'bzipped'
@@ -510,7 +512,7 @@ function setVerticalPointer(theRow, theRowNum, theAction, theDefaultColor1, theD
// 4. Defines the new color // 4. Defines the new color
// 4.1 Current color is the default one // 4.1 Current color is the default one
if (currentColor == '' if (currentColor == ''
|| currentColor.toLowerCase() == theDefaultColor1.toLowerCase() || currentColor.toLowerCase() == theDefaultColor1.toLowerCase()
|| currentColor.toLowerCase() == theDefaultColor2.toLowerCase()) { || currentColor.toLowerCase() == theDefaultColor2.toLowerCase()) {
if (theAction == 'over' && thePointerColor != '') { if (theAction == 'over' && thePointerColor != '') {
newColor = thePointerColor; newColor = thePointerColor;
@@ -616,7 +618,7 @@ function setSelectOptions(the_form, the_select, do_check)
/** /**
* Allows moving around inputs/select by Ctrl+arrows * Allows moving around inputs/select by Ctrl+arrows
* *
* @param object event data * @param object event data
*/ */
function onKeyDownArrowsHandler(e) { function onKeyDownArrowsHandler(e) {
e = e||window.event; e = e||window.event;
@@ -630,7 +632,7 @@ function onKeyDownArrowsHandler(e) {
if (pos[0] != "field" || typeof pos[2] == "undefined") return; if (pos[0] != "field" || typeof pos[2] == "undefined") return;
var x = pos[2], y=pos[1]; var x = pos[2], y=pos[1];
// skip non existent fields // skip non existent fields
for (i=0; i<10; i++) for (i=0; i<10; i++)
{ {
@@ -646,7 +648,7 @@ function onKeyDownArrowsHandler(e) {
var nO = document.getElementById(id); var nO = document.getElementById(id);
if (nO) break; if (nO) break;
} }
if (!nO) return; if (!nO) return;
nO.focus(); nO.focus();
if (nO.tagName != 'SELECT') { if (nO.tagName != 'SELECT') {
@@ -673,7 +675,7 @@ function insertValueQuery() {
chaineAj += ", "; chaineAj += ", ";
chaineAj += myListBox.options[i].value; chaineAj += myListBox.options[i].value;
} }
} }
//IE support //IE support
if (document.selection) { if (document.selection) {
@@ -687,7 +689,7 @@ function insertValueQuery() {
var startPos = document.sqlform.sql_query.selectionStart; var startPos = document.sqlform.sql_query.selectionStart;
var endPos = document.sqlform.sql_query.selectionEnd; var endPos = document.sqlform.sql_query.selectionEnd;
var chaineSql = document.sqlform.sql_query.value; var chaineSql = document.sqlform.sql_query.value;
myQuery.value = chaineSql.substring(0, startPos) + chaineAj + chaineSql.substring(endPos, chaineSql.length); myQuery.value = chaineSql.substring(0, startPos) + chaineAj + chaineSql.substring(endPos, chaineSql.length);
} else { } else {
myQuery.value += chaineAj; myQuery.value += chaineAj;