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

improve variables, remove unneccesary code

Browse Source
This commit is contained in:
Marc Delisle
2003-08-21 10:59:45 +00:00
parent e09365c2d5
commit e82304e565
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-08-21 Marc Delisle <lem9@users.sourceforge.net>
* tbl_relation.php3: improve variables, remove some code
2003-08-20 Alexander M. Turek <rabus@users.sourceforge.net> 2003-08-20 Alexander M. Turek <rabus@users.sourceforge.net>
* server_privileges.php3: Fixed some typos. * server_privileges.php3: Fixed some typos.

35
tbl_relation.php3
View File

@@ -32,33 +32,33 @@ if ($cfgRelation['displaywork']) {
if ($cfgRelation['relwork'] if ($cfgRelation['relwork']
&& isset($submit_rel) && $submit_rel == 'true') { && isset($submit_rel) && $submit_rel == 'true') {
while (list($key, $value) = each($destination)) { while (list($master_field, $foreign_string) = each($destination)) {
if ($value != 'nix') { if ($foreign_string != 'nix') {
$for = explode('.', $value); list($foreign_db, $foreign_table, $foreign_field) = explode('.', $foreign_string);
if (!isset($existrel[$key])) { if (!isset($existrel[$master_field])) {
$upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['relation']) $upd_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['relation'])
. '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)'
. ' values(' . ' values('
. '\'' . PMA_sqlAddslashes($db) . '\', ' . '\'' . PMA_sqlAddslashes($db) . '\', '
. '\'' . PMA_sqlAddslashes($table) . '\', ' . '\'' . PMA_sqlAddslashes($table) . '\', '
. '\'' . PMA_sqlAddslashes($key) . '\', ' . '\'' . PMA_sqlAddslashes($master_field) . '\', '
. '\'' . PMA_sqlAddslashes($for[0]) . '\', ' . '\'' . PMA_sqlAddslashes($foreign_db) . '\', '
. '\'' . PMA_sqlAddslashes($for[1]) . '\',' . '\'' . PMA_sqlAddslashes($foreign_table) . '\','
. '\'' . PMA_sqlAddslashes($for[2]) . '\')'; . '\'' . PMA_sqlAddslashes($foreign_field) . '\')';
} else if ($existrel[$key] != $value) { } else if ($existrel[$master_field] != $foreign_string) {
$upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) . ' SET' $upd_query = 'UPDATE ' . PMA_backquote($cfgRelation['relation']) . ' SET'
. ' foreign_db = \'' . PMA_sqlAddslashes($for[0]) . '\', ' . ' foreign_db = \'' . PMA_sqlAddslashes($foreign_db) . '\', '
. ' foreign_table = \'' . PMA_sqlAddslashes($for[1]) . '\', ' . ' foreign_table = \'' . PMA_sqlAddslashes($foreign_table) . '\', '
. ' foreign_field = \'' . PMA_sqlAddslashes($for[2]) . '\' ' . ' foreign_field = \'' . PMA_sqlAddslashes($foreign_field) . '\' '
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($key) . '\''; . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\'';
} // end if... else.... } // end if... else....
} else if (isset($existrel[$key])) { } else if (isset($existrel[$master_field])) {
$upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['relation']) $upd_query = 'DELETE FROM ' . PMA_backquote($cfgRelation['relation'])
. ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\''
. ' AND master_field = \'' . PMA_sqlAddslashes($key) . '\''; . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\'';
} // end if... else.... } // end if... else....
if (isset($upd_query)) { if (isset($upd_query)) {
$upd_rs = PMA_query_as_cu($upd_query); $upd_rs = PMA_query_as_cu($upd_query);
@@ -160,9 +160,7 @@ if ($cfgRelation['relwork']) {
while ($curr_field = PMA_mysql_fetch_array($fi_rs)) { while ($curr_field = PMA_mysql_fetch_array($fi_rs)) {
$field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name']; $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
$field_v = $curr_field['Table'] . '->' . $curr_field['Column_name']; $field_v = $curr_field['Table'] . '->' . $curr_field['Column_name'];
if (isset($field_full) && isset($field_v)) {
$selectboxall[$field_full] = $field_v; $selectboxall[$field_full] = $field_v;
}
} // end while } // end while
} // end if (mysql_num_rows) } // end if (mysql_num_rows)
} }
@@ -198,7 +196,6 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
<tr> <tr>
<th><?php echo $save_row[$i]['Field']; ?></th> <th><?php echo $save_row[$i]['Field']; ?></th>
<td> <td>
<input type="hidden" name="src_field" value="<?php echo $save_row[$i]['Field']; ?>" />
<select name="destination[<?php echo htmlspecialchars($save_row[$i]['Field']); ?>]"> <select name="destination[<?php echo htmlspecialchars($save_row[$i]['Field']); ?>]">
<?php <?php
echo "\n"; echo "\n";
@@ -250,7 +247,7 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
<?php <?php
if ($cfgRelation['displaywork']) { if ($cfgRelation['displaywork']) {
// Get "display_filed" infos // Get "display_field" infos
$disp = PMA_getDisplayField($db, $table); $disp = PMA_getDisplayField($db, $table);
echo "\n"; echo "\n";