add warning if table name empty

This commit is contained in:
Steve Alberty
2001-07-31 09:30:11 +00:00
parent 047acbf862
commit a026e490ca
2 changed files with 130 additions and 113 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-07-31 Steve Alberty <alberty@neptunlabs.de>
* tbl_create.php3: add warning if table name empty
2001-07-30 Marc Delisle <lem9@users.sourceforge.net> 2001-07-30 Marc Delisle <lem9@users.sourceforge.net>
* merge Loic's version to cvs * merge Loic's version to cvs
* spanish.inc.php3 updates, thanks to * spanish.inc.php3 updates, thanks to

View File

@@ -16,132 +16,146 @@ mysql_select_db($db);
/** /**
* The form used to define the structure of the table has been submitted * A new name has been submitted -> do the work
*/ */
if (isset($submit)) { if (isset($num_fields)) $num_fields=intval($num_fields);
if (!isset($query)) { if (isset($table) && trim($table) != '' && !empty($num_fields)) {
$query = '';
}
// Builds the fields creation statements /**
for ($i = 0; $i < count($field_name); $i++) { * The form used to define the structure of the table has been submitted
if (empty($field_name[$i])) { */
continue; if (isset($submit)) {
if (!isset($query)) {
$query = '';
} }
$query .= backquote($field_name[$i]) . ' ' . $field_type[$i];
if ($field_length[$i] != '') { // Builds the fields creation statements
if (get_magic_quotes_gpc()) { for ($i = 0; $i < count($field_name); $i++) {
$query .= '(' . stripslashes($field_length[$i]) . ')'; if (empty($field_name[$i])) {
} else { continue;
$query .= '(' . $field_length[$i] . ')'; }
} $query .= backquote($field_name[$i]) . ' ' . $field_type[$i];
} if ($field_length[$i] != '') {
if ($field_attribute[$i] != '') { if (get_magic_quotes_gpc()) {
$query .= ' ' . $field_attribute[$i]; $query .= '(' . stripslashes($field_length[$i]) . ')';
} else {
$query .= '(' . $field_length[$i] . ')';
}
}
if ($field_attribute[$i] != '') {
$query .= ' ' . $field_attribute[$i];
}
if ($field_default[$i] != '') {
if (get_magic_quotes_gpc()) {
$query .= ' DEFAULT \'' . sql_addslashes(stripslashes($field_default[$i])) . '\'';
} else {
$query .= ' DEFAULT \'' . sql_addslashes($field_default[$i]) . '\'';
}
}
if ($field_null[$i] != '') {
$query .= ' ' . $field_null[$i];
}
if ($field_extra[$i] != '') {
$query .= ' ' . $field_extra[$i] . ', ';
} else {
$query .= ', ';
}
} // end for
$query = ereg_replace(', $', '', $query);
// Builds the primary keys statements
if (!isset($primary)) {
$primary = '';
} }
if ($field_default[$i] != '') { if (!isset($field_primary)) {
if (get_magic_quotes_gpc()) { $field_primary = array();
$query .= ' DEFAULT \'' . sql_addslashes(stripslashes($field_default[$i])) . '\'';
} else {
$query .= ' DEFAULT \'' . sql_addslashes($field_default[$i]) . '\'';
}
} }
if ($field_null[$i] != '') { for ($i = 0; $i < count($field_primary); $i++) {
$query .= ' ' . $field_null[$i]; $j = $field_primary[$i];
if (!empty($field_name[$j])) {
$primary .= backquote($field_name[$j]) . ', ';
}
} // end for
$primary = ereg_replace(', $', '', $primary);
if (!empty($primary)) {
$primary = ', PRIMARY KEY (' . $primary . ')';
} }
if ($field_extra[$i] != '') {
$query .= ' ' . $field_extra[$i] . ', '; // Builds the indexes statements
} else { if (!isset($index)) {
$query .= ', '; $index = '';
} }
} // end for if (!isset($field_index)) {
$query = ereg_replace(', $', '', $query); $field_index = array();
// Builds the primary keys statements
if (!isset($primary)) {
$primary = '';
}
if (!isset($field_primary)) {
$field_primary = array();
}
for ($i = 0; $i < count($field_primary); $i++) {
$j = $field_primary[$i];
if (!empty($field_name[$j])) {
$primary .= backquote($field_name[$j]) . ', ';
} }
} // end for for ($i = 0;$i < count($field_index); $i++) {
$primary = ereg_replace(', $', '', $primary); $j = $field_index[$i];
if (!empty($primary)) { if (!empty($field_name[$j])) {
$primary = ', PRIMARY KEY (' . $primary . ')'; $index .= backquote($field_name[$j]) . ', ';
} }
} // end for
// Builds the indexes statements $index = ereg_replace(', $', '', $index);
if (!isset($index)) { if (!empty($index)) {
$index = ''; $index = ', INDEX (' . $index . ')';
}
if (!isset($field_index)) {
$field_index = array();
}
for ($i = 0;$i < count($field_index); $i++) {
$j = $field_index[$i];
if (!empty($field_name[$j])) {
$index .= backquote($field_name[$j]) . ', ';
} }
} // end for
$index = ereg_replace(', $', '', $index); // Builds the uniques statements
if (!empty($index)) { if (!isset($unique)) {
$index = ', INDEX (' . $index . ')'; $unique = '';
}
// Builds the uniques statements
if (!isset($unique)) {
$unique = '';
}
if (!isset($field_unique)) {
$field_unique = array();
}
for ($i = 0; $i < count($field_unique); $i++) {
$j = $field_unique[$i];
if (!empty($field_name[$j])) {
$unique .= backquote($field_name[$j]) . ', ';
} }
} // end for if (!isset($field_unique)) {
$unique = ereg_replace(', $', '', $unique); $field_unique = array();
if (!empty($unique)) { }
$unique = ', UNIQUE (' . $unique . ')'; for ($i = 0; $i < count($field_unique); $i++) {
$j = $field_unique[$i];
if (!empty($field_name[$j])) {
$unique .= backquote($field_name[$j]) . ', ';
}
} // end for
$unique = ereg_replace(', $', '', $unique);
if (!empty($unique)) {
$unique = ', UNIQUE (' . $unique . ')';
}
$query_keys = $primary . $index . $unique;
$query_keys = ereg_replace(', $', '', $query_keys);
// Builds the 'create table' statement
$sql_query = 'CREATE TABLE ' . backquote($table) . ' ('
. $query . ' '
. $query_keys . ')';
// Adds table type (2 May 2001 - Robbat2)
if (!empty($tbl_type) && ($tbl_type != 'Default')) {
$sql_query .= ' TYPE = ' . $tbl_type;
}
if (MYSQL_MAJOR_VERSION == 3.23 && !empty($comment)) {
$sql_query .= ' comment = \'' . sql_addslashes($comment) . '\'';
}
// Executes the query
$result = mysql_query($sql_query) or mysql_die();
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenCreated;
include('./tbl_properties.php3');
exit();
} // end do create table
/**
* Displays the form used to define the structure of the table
*/
else {
$action = 'tbl_create.php3';
include('./tbl_properties.inc.php3');
// Diplays the footer
echo "\n";
include('./footer.inc.php3');
} }
$query_keys = $primary . $index . $unique;
$query_keys = ereg_replace(', $', '', $query_keys);
// Builds the 'create table' statement
$sql_query = 'CREATE TABLE ' . backquote($table) . ' ('
. $query . ' '
. $query_keys . ')';
// Adds table type (2 May 2001 - Robbat2)
if (!empty($tbl_type) && ($tbl_type != 'Default')) {
$sql_query .= ' TYPE = ' . $tbl_type;
}
if (MYSQL_MAJOR_VERSION == 3.23 && !empty($comment)) {
$sql_query .= ' comment = \'' . sql_addslashes($comment) . '\'';
}
// Executes the query
$result = mysql_query($sql_query) or mysql_die();
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenCreated;
include('./tbl_properties.php3');
exit();
} // end do create table
/** /**
* Displays the form used to define the structure of the table * No new name for the table!
*/ */
else {
$action = 'tbl_create.php3';
include('./tbl_properties.inc.php3');
// Diplays the footer
echo "\n";
include('./footer.inc.php3');
} }
else {
if (!isset($table) || trim($table) == '') mysql_die($strTableEmpty);
else if (empty($num_fields) || !is_int($num_fields)) mysql_die($strFieldsEmpty);
}
?> ?>