- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5796-g60b2d5a
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 60b2d5a3a4459dfbd454b0f26ecf6c9056e13118 (commit) via ef500cd23fd863e62bf810537776b45a4ed76c34 (commit) via 59428bb433dcd7a2df1b5500788dfabfd31641ed (commit) via 828d008838565b1980c67e82ff48eb087a0bcb9a (commit) from 0305c10f91768606b68dd184e3c61bc6d36591db (commit) - Log ----------------------------------------------------------------- commit 60b2d5a3a4459dfbd454b0f26ecf6c9056e13118 Merge: 59428bb433dcd7a2df1b5500788dfabfd31641ed ef500cd23fd863e62bf810537776b45a4ed76c34 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 14:39:46 2010 +0200 Merge branch 'QA_3_3' Conflicts: Documentation.html README libraries/Config.class.php translators.html commit 59428bb433dcd7a2df1b5500788dfabfd31641ed Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 14:36:44 2010 +0200 Whitespace cleanup. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 2 +- libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45b5aa4..7c075c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ $Id$ navigation. 3.3.6.0 (not yet released) +- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2611401..5bea0db 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2825,7 +2825,7 @@ function PMA_getTitleForTarget($target) { $mapping = array( // Values for $cfg['DefaultTabTable'] - 'tbl_structure.php' => __('Structure'), + 'tbl_structure.php' => __('Structure'), 'tbl_sql.php' => __('SQL'), 'tbl_select.php' =>__('Search'), 'tbl_change.php' =>__('Insert'), diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 3a5a449..0fb46c2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -490,8 +490,8 @@ function PMA_DBI_get_fields_meta($result) { // Build an associative array for a type look up $typeAr = array(); - $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-35-gef500cd
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, QA_3_3 has been updated via ef500cd23fd863e62bf810537776b45a4ed76c34 (commit) from 828d008838565b1980c67e82ff48eb087a0bcb9a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f1afa7..5323907 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.6.0 (not yet released) +- bug #3031705 [core] Do not use CONCAT for DECIMAL fields. 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce6..fd35eb4 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -493,8 +493,8 @@ function PMA_DBI_get_fields_meta($result) { // Build an associative array for a type look up $typeAr = array(); - $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; - $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; + $typeAr[MYSQLI_TYPE_DECIMAL] = 'decimal'; + $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'decimal'; $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5792-g0305c10
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 0305c10f91768606b68dd184e3c61bc6d36591db (commit) via 4330ee3fd431f488263cb9a86fdb1f72fd4f9b8a (commit) via 29ccdfc1ff9a44206d9705161f2f7c6ce41a7ea4 (commit) from 318dc4b650cc487fbcf6c1b444f4b05b4a0de1c5 (commit) - Log ----------------------------------------------------------------- commit 0305c10f91768606b68dd184e3c61bc6d36591db Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 14:19:46 2010 +0200 rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. commit 4330ee3fd431f488263cb9a86fdb1f72fd4f9b8a Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 14:15:00 2010 +0200 Whitespace cleanup. commit 29ccdfc1ff9a44206d9705161f2f7c6ce41a7ea4 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 14:14:44 2010 +0200 Focus SQL query area after dom is ready. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 + js/functions.js | 185 +++++++++++++++++++------------------- libraries/sql_query_form.lib.php | 22 ++--- 3 files changed, 103 insertions(+), 106 deletions(-) diff --git a/ChangeLog b/ChangeLog index f19f496..45b5aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,8 @@ $Id$ (fixed for Privileges and Change password) - [core] RecodingEngine now accepts none as valid option. + [core] Dropped AllowAnywhereRecoding configuration variable. +- rfe #3016457 [interface] Define tab order in SQL form to allow easier tab + navigation. 3.3.6.0 (not yet released) diff --git a/js/functions.js b/js/functions.js index f03b9e3..e5d8363 100644 --- a/js/functions.js +++ b/js/functions.js @@ -194,7 +194,7 @@ function confirmQuery(theForm1, sqlQuery1) * Displays a confirmation box before disabling the BLOB repository for a given database. * This function is called while clicking links * - * @param object the database + * @param object the database * * @return boolean whether to disable the repository or not */ @@ -282,10 +282,10 @@ function checkSqlQuery(theForm) // Global variable row_class is set to even var row_class = 'even'; -/** +/** * Generates a row dynamically in the differences table displaying -* the complete statistics of difference in table like number of -* rows to be updated, number of rows to be inserted, number of +* the complete statistics of difference in table like number of +* rows to be updated, number of rows to be inserted, number of * columns to be added, number of columns to be removed, etc. * * @param index index of matching table @@ -294,17 +294,17 @@ var row_class = 'even'; * @param remove_size number of columns to be removed * @param insert_index number of indexes to be inserted * @param remove_index number of indexes to be removed -* @param img_obj image object +* @param img_obj image object * @param table_name name of the table */ function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name) -{ +{ // The path of the image is split to facilitate comparison - var relative_path = (img_obj.src).split("themes/"); - + var relative_path = (img_obj.src).split("themes/"); + // The image source is changed when the showDetails function is called. - if (relative_path[1] == 'original/img/new_data_hovered.jpg') { + if (relative_path[1] == 'original/img/new_data_hovered.jpg') { img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; img_obj.alt = PMA_messages['strClickToUnselect']; //only for IE browser } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { @@ -313,76 +313,76 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; img_obj.alt = PMA_messages['strClickToSelect']; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { + } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { img_obj.src = "./themes/original/img/new_data_hovered.jpg"; img_obj.alt = PMA_messages['strClickToSelect']; - } - - var div = document.getElementById("list"); - var table = div.getElementsByTagName("table")[0]; + } + + var div = document.getElementById("list"); + var table = div.getElementsByTagName("table")[0]; var table_body = table.getElementsByTagName("tbody")[0]; - + //Global variable row_class is being used if (row_class == 'even') { row_class = 'odd'; } else { - row_class = 'even'; + row_class = 'even'; } - // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. - if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { - - var newRow = document.createElement("tr"); + // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. + if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { + + var newRow = document.createElement("tr"); newRow.setAttribute("class", row_class); - newRow.className = row_class; - // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array + newRow.className = row_class; + // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array newRow.setAttribute("id" , i); - + var table_name_cell = document.createElement("td"); table_name_cell.align = "center"; table_name_cell.innerHTML = table_name ; - + newRow.appendChild(table_name_cell); - + var create_table = document.createElement("td"); create_table.align = "center"; - + var add_cols = document.createElement("td"); add_cols.align = "center"; - + var remove_cols = document.createElement("td"); remove_cols.align = "center"; - + var alter_cols = document.createElement("td"); alter_cols.align = "center"; - + var add_index = document.createElement("td"); add_index.align = "center"; - + var delete_index = document.createElement("td"); delete_index.align = "center"; - + var update_rows = document.createElement("td"); update_rows.align = "center"; - + var insert_rows = document.createElement("td"); insert_rows.align = "center"; - + var tick_image = document.createElement("img"); - tick_image.src = "./themes/original/img/s_success.png"; + tick_image.src = "./themes/original/img/s_success.png"; if (update_size == '' && insert_size == '' && remove_size == '') { /** - This is the case when the table needs to be created in target database. + This is the case when the table needs to be created in target database. */ create_table.appendChild(tick_image); add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; alter_cols.innerHTML = "--"; delete_index.innerHTML = "--"; add_index.innerHTML = "--"; update_rows.innerHTML = "--"; insert_rows.innerHTML = "--"; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); @@ -391,43 +391,43 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); - + } else if (update_size == '' && remove_size == '') { /** - This is the case when data difference is displayed in the - table which is present in source but absent from target database + This is the case when data difference is displayed in the + table which is present in source but absent from target database */ create_table.innerHTML = "--"; add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; alter_cols.innerHTML = "--"; add_index.innerHTML = "--"; delete_index.innerHTML = "--"; update_rows.innerHTML = "--"; insert_rows.innerHTML = insert_size; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); + newRow.appendChild(delete_index); newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); - + } else if (remove_size == '') { /** - This is the case when data difference between matching_tables is displayed. + This is the case when data difference between matching_tables is displayed. */ create_table.innerHTML = "--"; add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; alter_cols.innerHTML = "--"; add_index.innerHTML = "--"; delete_index.innerHTML = "--"; update_rows.innerHTML = update_size; insert_rows.innerHTML = insert_size; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); @@ -436,41 +436,41 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); - + } else { /** This is the case when structure difference between matching_tables id displayed */ create_table.innerHTML = "--"; add_cols.innerHTML = insert_size; - remove_cols.innerHTML = remove_size; + remove_cols.innerHTML = remove_size; alter_cols.innerHTML = update_size; delete_index.innerHTML = remove_index; add_index.innerHTML = insert_index; update_rows.innerHTML = "--"; insert_rows.innerHTML = "--"; - + newRow.appendChild(create_table); newRow.appendChild(add_cols); newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); + newRow.appendChild(alter_cols); newRow.appendChild(delete_index); newRow.appendChild(add_index); newRow.appendChild(update_rows); newRow.appendChild(insert_rows); } table_body.appendChild(newRow); - + } else if ((relative_path[1] != 'original/img/new_struct_hovered.jpg') && (relative_path[1] != 'original/img/new_data_hovered.jpg')) { //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now. var table_rows = table_body.getElementsByTagName("tr"); var j; var index = 0; - for (j=0; j < table_rows.length; j++) - { - if (table_rows[j].id == i) { + for (j=0; j < table_rows.length; j++) + { + if (table_rows[j].id == i) { index = j; - table_rows[j].parentNode.removeChild(table_rows[j]); + table_rows[j].parentNode.removeChild(table_rows[j]); } } //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained. @@ -481,11 +481,11 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem table_rows[index].setAttribute("class","odd"); // for Mozilla firefox table_rows[index].className = "odd"; // for IE browser } else { - table_rows[index].setAttribute("class","even"); // for Mozilla firefox - table_rows[index].className = "even"; // for IE browser + table_rows[index].setAttribute("class","even"); // for Mozilla firefox + table_rows[index].className = "even"; // for IE browser } - } - } + } + } } /** @@ -494,35 +494,35 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem * @param img_obj the image object whose source needs to be changed * */ - + function change_Image(img_obj) { - var relative_path = (img_obj.src).split("themes/"); - - if (relative_path[1] == 'original/img/new_data.jpg') { - img_obj.src = "./themes/original/img/new_data_hovered.jpg"; + var relative_path = (img_obj.src).split("themes/"); + + if (relative_path[1] == 'original/img/new_data.jpg') { + img_obj.src = "./themes/original/img/new_data_hovered.jpg"; } else if (relative_path[1] == 'original/img/new_struct.jpg') { img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { img_obj.src = "./themes/original/img/new_struct.jpg"; - } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected.jpg') { - img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; - } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; - } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data_selected.jpg"; + } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') { + img_obj.src = "./themes/original/img/new_data.jpg"; + } else if (relative_path[1] == 'original/img/new_data_selected.jpg') { + img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; + } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') { + img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; + } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { + img_obj.src = "./themes/original/img/new_struct_selected.jpg"; + } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { + img_obj.src = "./themes/original/img/new_data_selected.jpg"; } } /** - * Generates the URL containing the list of selected table ids for synchronization and - * a variable checked for confirmation of deleting previous rows from target tables + * Generates the URL containing the list of selected table ids for synchronization and + * a variable checked for confirmation of deleting previous rows from target tables * - * @param token the token generated for each PMA form + * @param token the token generated for each PMA form * */ @@ -536,15 +536,15 @@ function ApplySelectedChanges(token) var x = table_rows.length; var i; /** - Append the token at the beginning of the query string followed by - Table_ids that shows that "Apply Selected Changes" button is pressed + Append the token at the beginning of the query string followed by + Table_ids that shows that "Apply Selected Changes" button is pressed */ var append_string = "?token="+token+"&Table_ids="+1; for(i=0; i<x; i++){ - append_string += "&"; - append_string += i+"="+table_rows[i].id; + append_string += "&"; + append_string += i+"="+table_rows[i].id; } - + // Getting the value of checkbox delete_rows var checkbox = document.getElementById("delete_rows"); if (checkbox.checked){ @@ -552,13 +552,13 @@ function ApplySelectedChanges(token) } else { append_string += "&checked=false"; } - //Appending the token and list of table ids in the URL + //Appending the token and list of table ids in the URL location.href += token; location.href += append_string; } -/** -* Displays error message if any text field +/** +* Displays error message if any text field * is left empty other than port field. * * @param string the form name @@ -567,7 +567,7 @@ function ApplySelectedChanges(token) * @return boolean whether the form field is empty or not */ function validateConnection(form_name, form_obj) -{ +{ var check = true; var src_hostfilled = true; var trg_hostfilled = true; @@ -602,7 +602,7 @@ function validateConnection(form_name, form_obj) } return check; } - + /** * Check if a form's element is empty * should be @@ -1637,8 +1637,8 @@ function pdfPaperSize(format, axis) { /** * for playing media from the BLOB repository * - * @param var - * @param var url_params main purpose is to pass the token + * @param var + * @param var url_params main purpose is to pass the token * @param var bs_ref BLOB repository reference * @param var m_type type of BLOB repository media * @param var w_width width of popup window @@ -1690,12 +1690,12 @@ function requestMIMETypeChange(db, table, reference, current_mime_type) */ function changeMIMEType(db, table, reference, mime_type) { - // specify url and parameters for jQuery POST + // specify url and parameters for jQuery POST var mime_chg_url = 'bs_change_mime_type.php'; var params = { bs_db: db, bs_table: table, bs_reference: reference, bs_new_mime_type: mime_type }; // jQuery POST - jQuery.post(mime_chg_url, params); + jQuery.post(mime_chg_url, params); } /** @@ -1725,5 +1725,6 @@ $(document).ready(function(){ insertQuery(evt.target.id); return false; }); + $('#sqlquery').focus(); }); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index a29f227..68574cb 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -290,7 +290,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter echo '<legend>' . $legend . '</legend>' . "\n"; echo '<div id="queryfieldscontainer">' . "\n"; echo '<div id="' . $sqlquerycontainer_id . '">' . "\n" - .'<textarea name="sql_query" id="sqlquery"' + .'<textarea tabindex="100" name="sql_query" id="sqlquery"' .' cols="' . $GLOBALS['cfg']['TextareaCols'] . '"' .' rows="' . $height . '"' .' dir="' . $GLOBALS['text_dir'] . '"' @@ -305,12 +305,6 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter } echo '</div>' . "\n"; - echo '<script type="text/javascript">' . "\n" - .'//<![CDATA[' . "\n" - .'document.getElementById("sqlquery").focus();' . "\n" - .'//]]>' . "\n" - .'</script>' . "\n"; - if (count($fields_list)) { echo '<div id="tablefieldscontainer">' . "\n" .'<label>' . __('Columns') . '</label>' . "\n" @@ -349,16 +343,16 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter <div class="formelement"> <label for="bkm_label"> <?php echo __('Bookmark this SQL query'); ?>:</label> - <input type="text" name="bkm_label" id="bkm_label" value="" /> + <input type="text" name="bkm_label" id="bkm_label" tabindex="110" value="" /> </div> <div class="formelement"> - <input type="checkbox" name="bkm_all_users" id="id_bkm_all_users" + <input type="checkbox" name="bkm_all_users" tabindex="111" id="id_bkm_all_users" value="true" /> <label for="id_bkm_all_users"> <?php echo __('Let every user access this bookmark'); ?></label> </div> <div class="formelement"> - <input type="checkbox" name="bkm_replace" id="id_bkm_replace" + <input type="checkbox" name="bkm_replace" tabindex="112" id="id_bkm_replace" value="true" /> <label for="id_bkm_replace"> <?php echo __('Replace existing bookmark of same name'); ?></label> @@ -377,7 +371,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter ?> <script type="text/javascript"> //<![CDATA[ - document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> '); + document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" tabindex="120" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> '); //]]> </script> <?php @@ -386,17 +380,17 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter echo '<div class="formelement">' . "\n"; echo '<label for="id_sql_delimiter">[ ' . __('Delimiter') .'</label>' . "\n"; - echo '<input type="text" name="sql_delimiter" size="3" ' + echo '<input type="text" name="sql_delimiter" tabindex="131" size="3" ' .'value="' . $delimiter . '" ' .'id="id_sql_delimiter" /> ]' . "\n"; echo '<input type="checkbox" name="show_query" value="1" ' - .'id="checkbox_show_query" checked="checked" />' . "\n" + .'id="checkbox_show_query" tabindex="132" checked="checked" />' . "\n" .'<label for="checkbox_show_query">' . __(' Show this query here again ') .'</label>' . "\n"; echo '</div>' . "\n"; - echo '<input type="submit" name="SQL" value="' . __('Go') . '" />' + echo '<input type="submit" name="SQL" tabindex="200" value="' . __('Go') . '" />' ."\n"; echo '<div class="clearfloat"></div>' . "\n"; echo '</fieldset>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5789-g318dc4b
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 318dc4b650cc487fbcf6c1b444f4b05b4a0de1c5 (commit) from 95c0b5125d1be0177d9a30f8b7414804662e6064 (commit) - Log ----------------------------------------------------------------- commit 318dc4b650cc487fbcf6c1b444f4b05b4a0de1c5 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 13:59:17 2010 +0200 Drop @version tag from docblocks. ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 1 - bs_change_mime_type.php | 1 - bs_disp_as_mime_type.php | 1 - bs_play_media.php | 1 - changelog.php | 1 - chk_rel.php | 1 - db_create.php | 1 - db_datadict.php | 1 - db_export.php | 1 - db_import.php | 1 - db_operations.php | 1 - db_printview.php | 1 - db_qbe.php | 1 - db_search.php | 1 - db_sql.php | 1 - db_structure.php | 1 - db_tracking.php | 1 - error.php | 1 - export.php | 1 - import.php | 1 - import_status.php | 1 - index.php | 1 - libraries/Config.class.php | 1 - libraries/Error.class.php | 1 - libraries/Error_Handler.class.php | 1 - libraries/File.class.php | 1 - libraries/Index.class.php | 1 - libraries/List.class.php | 1 - libraries/List_Database.class.php | 1 - libraries/Message.class.php | 1 - libraries/Partition.class.php | 1 - libraries/StorageEngine.class.php | 1 - libraries/Table.class.php | 1 - libraries/Theme.class.php | 1 - libraries/Theme_Manager.class.php | 1 - libraries/Tracker.class.php | 1 - libraries/auth/config.auth.lib.php | 1 - libraries/auth/cookie.auth.lib.php | 1 - libraries/auth/http.auth.lib.php | 1 - libraries/auth/signon.auth.lib.php | 1 - libraries/blowfish.php | 1 - libraries/bookmark.lib.php | 1 - libraries/charset_conversion.lib.php | 1 - libraries/check_user_privileges.lib.php | 1 - libraries/cleanup.lib.php | 1 - libraries/common.inc.php | 1 - libraries/common.lib.php | 1 - libraries/config.default.php | 1 - libraries/core.lib.php | 1 - libraries/database_interface.lib.php | 1 - libraries/db_common.inc.php | 1 - libraries/db_events.inc.php | 1 - libraries/db_info.inc.php | 1 - libraries/db_links.inc.php | 1 - libraries/db_routines.inc.php | 1 - libraries/db_structure.lib.php | 1 - libraries/db_table_exists.lib.php | 1 - libraries/dbg/setup.php | 1 - libraries/dbi/mysql.dbi.lib.php | 1 - libraries/dbi/mysqli.dbi.lib.php | 1 - libraries/display_change_password.lib.php | 1 - libraries/display_create_database.lib.php | 1 - libraries/display_create_table.lib.php | 1 - libraries/display_export.lib.php | 1 - libraries/display_import_ajax.lib.php | 1 - libraries/display_select_lang.lib.php | 1 - libraries/display_tbl.lib.php | 1 - libraries/display_tbl_links.lib.php | 1 - libraries/engines/bdb.lib.php | 1 - libraries/engines/berkeleydb.lib.php | 1 - libraries/engines/binlog.lib.php | 1 - libraries/engines/innobase.lib.php | 1 - libraries/engines/innodb.lib.php | 1 - libraries/engines/memory.lib.php | 1 - libraries/engines/merge.lib.php | 1 - libraries/engines/mrg_myisam.lib.php | 1 - libraries/engines/myisam.lib.php | 1 - libraries/engines/ndbcluster.lib.php | 1 - libraries/engines/pbxt.lib.php | 1 - libraries/export/codegen.php | 1 - libraries/export/csv.php | 1 - libraries/export/excel.php | 1 - libraries/export/htmlword.php | 1 - libraries/export/latex.php | 1 - libraries/export/ods.php | 1 - libraries/export/odt.php | 1 - libraries/export/pdf.php | 1 - libraries/export/sql.php | 1 - libraries/export/xls.php | 1 - libraries/export/xlsx.php | 1 - libraries/export/xml.php | 1 - libraries/export/yaml.php | 1 - libraries/file_listing.php | 1 - libraries/footer.inc.php | 1 - libraries/grab_globals.lib.php | 1 - libraries/header.inc.php | 1 - libraries/header_http.inc.php | 1 - libraries/header_meta_style.inc.php | 1 - libraries/header_printview.inc.php | 1 - libraries/header_scripts.inc.php | 1 - libraries/iconv_wrapper.lib.php | 1 - libraries/import.lib.php | 1 - libraries/import/csv.php | 1 - libraries/import/docsql.php | 1 - libraries/import/ldi.php | 1 - libraries/import/sql.php | 1 - libraries/import/upload/apc.php | 1 - libraries/import/upload/noplugin.php | 1 - libraries/import/upload/uploadprogress.php | 1 - libraries/import/xls.php | 1 - libraries/import/xlsx.php | 1 - libraries/information_schema_relations.lib.php | 1 - libraries/ip_allow_deny.lib.php | 1 - libraries/js_escape.lib.php | 1 - libraries/kanji-encoding.lib.php | 1 - libraries/logging.lib.php | 1 - libraries/mime.lib.php | 1 - libraries/mult_submits.inc.php | 1 - libraries/mysql_charsets.lib.php | 1 - libraries/navigation_header.inc.php | 1 - libraries/ob.lib.php | 1 - libraries/opendocument.lib.php | 1 - libraries/parse_analyze.lib.php | 1 - libraries/plugin_interface.lib.php | 1 - libraries/relation.lib.php | 1 - libraries/relation_cleanup.lib.php | 1 - libraries/replication.inc.php | 1 - libraries/replication_gui.lib.php | 1 - libraries/sanitizing.lib.php | 1 - libraries/select_lang.lib.php | 1 - libraries/select_server.lib.php | 1 - libraries/server_common.inc.php | 1 - libraries/server_links.inc.php | 1 - libraries/session.inc.php | 1 - libraries/sql_query_form.lib.php | 1 - libraries/sqlparser.data.php | 1 - libraries/sqlparser.lib.php | 1 - libraries/sqlvalidator.lib.php | 1 - libraries/string.lib.php | 1 - libraries/string_mb.lib.php | 1 - libraries/string_native.lib.php | 1 - libraries/string_type_ctype.lib.php | 1 - libraries/string_type_native.lib.php | 1 - libraries/tbl_common.php | 1 - libraries/tbl_info.inc.php | 1 - libraries/tbl_links.inc.php | 1 - libraries/tbl_properties.inc.php | 1 - libraries/tbl_replace_fields.inc.php | 1 - libraries/tbl_triggers.lib.php | 1 - libraries/transformations.lib.php | 1 - .../application_octetstream__download.inc.php | 1 - .../application_octetstream__hex.inc.php | 1 - libraries/transformations/global.inc.php | 1 - .../transformations/image_jpeg__inline.inc.php | 1 - libraries/transformations/image_jpeg__link.inc.php | 1 - .../transformations/image_png__inline.inc.php | 1 - .../transformations/text_plain__dateformat.inc.php | 1 - .../transformations/text_plain__external.inc.php | 1 - .../transformations/text_plain__formatted.inc.php | 1 - .../transformations/text_plain__imagelink.inc.php | 1 - libraries/transformations/text_plain__link.inc.php | 1 - .../transformations/text_plain__longToIpv4.inc.php | 1 - libraries/transformations/text_plain__sql.inc.php | 1 - .../transformations/text_plain__substr.inc.php | 1 - libraries/url_generating.lib.php | 1 - libraries/vendor_config.php | 1 - libraries/zip.lib.php | 1 - license.php | 1 - main.php | 1 - navigation.php | 1 - pdf_pages.php | 1 - pdf_schema.php | 1 - phpinfo.php | 1 - phpmyadmin.css.php | 1 - pmd_common.php | 1 - pmd_display_field.php | 1 - pmd_general.php | 1 - pmd_help.php | 1 - pmd_pdf.php | 1 - pmd_relation_new.php | 1 - pmd_relation_upd.php | 1 - pmd_save_pos.php | 1 - querywindow.php | 1 - scripts/decode_bug.php | 1 - scripts/signon.php | 1 - server_binlog.php | 1 - server_collations.php | 1 - server_databases.php | 1 - server_engines.php | 1 - server_export.php | 1 - server_import.php | 1 - server_privileges.php | 1 - server_processlist.php | 1 - server_replication.php | 1 - server_sql.php | 1 - server_status.php | 1 - server_synchronize.php | 1 - server_variables.php | 1 - show_config_errors.php | 1 - sql.php | 1 - tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_change.php | 1 - tbl_create.php | 1 - tbl_export.php | 1 - tbl_get_field.php | 1 - tbl_import.php | 1 - tbl_indexes.php | 1 - tbl_move_copy.php | 1 - tbl_operations.php | 1 - tbl_printview.php | 1 - tbl_relation.php | 1 - tbl_replace.php | 1 - tbl_row_action.php | 1 - tbl_select.php | 1 - tbl_sql.php | 1 - tbl_structure.php | 1 - tbl_tracking.php | 1 - test/AllSeleniumTests.php | 1 - test/AllTests.php | 1 - test/Environment_test.php | 1 - test/FailTest.php | 1 - test/PMA_Message_test.php | 1 - test/PMA_STR_sub_test.php | 1 - test/PMA_blowfish_test.php | 1 - test/PMA_escapeJsString_test.php | 1 - test/PMA_escapeMySqlWildcards_test.php | 1 - test/PMA_foreignKeySupported_test.php | 1 - test/PMA_generateCommonUrl_test.php | 1 - test/PMA_get_real_size_test.php | 1 - test/PMA_headerLocation_test.php | 1 - test/PMA_ifSetOr_test.php | 1 - test/PMA_isValid_test.php | 1 - test/PMA_pow_test.php | 1 - test/PMA_sanitize_test.php | 1 - test/PMA_transformation_getOptions_test.php | 1 - test/PmaSeleniumLoginTest.php | 1 - test/PmaSeleniumPrivilegesTest.php | 1 - test/PmaSeleniumTestCase.php | 1 - test/PmaSeleniumXssTest.php | 1 - test/theme.php | 1 - test/wui.php | 1 - themes.php | 1 - themes/darkblue_orange/css/theme_right.css.php | 1 - themes/darkblue_orange/info.inc.php | 1 - themes/darkblue_orange/layout.inc.php | 1 - themes/original/css/theme_left.css.php | 1 - themes/original/css/theme_print.css.php | 1 - themes/original/css/theme_right.css.php | 1 - themes/original/info.inc.php | 1 - themes/original/layout.inc.php | 1 - transformation_overview.php | 1 - transformation_wrapper.php | 1 - user_password.php | 1 - view_create.php | 1 - view_operations.php | 1 - 256 files changed, 0 insertions(+), 256 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 714d867..0f39cb4 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -3,7 +3,6 @@ /** * display selection for relational field values * - * @version $Id$ * @package phpMyAdmin */ diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php index b8fea6b..8ad8d1a 100644 --- a/bs_change_mime_type.php +++ b/bs_change_mime_type.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version 1.0 * @package BLOBStreaming */ diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php index a83dfa6..9b26a59 100644 --- a/bs_disp_as_mime_type.php +++ b/bs_disp_as_mime_type.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version 1.0 * @package BLOBStreaming */ diff --git a/bs_play_media.php b/bs_play_media.php index 94ed25a..ad3c9af 100644 --- a/bs_play_media.php +++ b/bs_play_media.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version 1.0 * @package BLOBStreaming */ diff --git a/changelog.php b/changelog.php index dcdbecf..9ab2e39 100644 --- a/changelog.php +++ b/changelog.php @@ -3,7 +3,6 @@ /** * Simple script to set correct charset for changelog * - * @version $Id$ * @package phpMyAdmin */ diff --git a/chk_rel.php b/chk_rel.php index f95d45b..38ca5c1 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_create.php b/db_create.php index b55e04f..9b1959a 100644 --- a/db_create.php +++ b/db_create.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_datadict.php b/db_datadict.php index 7af533c..6a9c04c 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_export.php b/db_export.php index 718a489..dce374a 100644 --- a/db_export.php +++ b/db_export.php @@ -3,7 +3,6 @@ /** * dumps a database * - * @version $Id$ * @uses libraries/db_common.inc.php * @uses libraries/db_info.inc.php * @uses libraries/display_export.lib.php diff --git a/db_import.php b/db_import.php index bdcd5d6..73ba817 100644 --- a/db_import.php +++ b/db_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_operations.php b/db_operations.php index 40ec652..e4e6992 100644 --- a/db_operations.php +++ b/db_operations.php @@ -9,7 +9,6 @@ * - adding tables * - viewing PDF schemas * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_printview.php b/db_printview.php index a6d66f7..15801a9 100644 --- a/db_printview.php +++ b/db_printview.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_qbe.php b/db_qbe.php index 0b661c9..7a08f07 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -3,7 +3,6 @@ /** * query by example the whole database * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_search.php b/db_search.php index 03e146f..6fd947d 100644 --- a/db_search.php +++ b/db_search.php @@ -46,7 +46,6 @@ * @uses array_intersect() * @uses sprintf() * @uses in_array() - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_sql.php b/db_sql.php index 2ac198b..27194b0 100644 --- a/db_sql.php +++ b/db_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_structure.php b/db_structure.php index e99cfa3..9a6ee24 100644 --- a/db_structure.php +++ b/db_structure.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/db_tracking.php b/db_tracking.php index 68faafe..f18b9b8 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin */ diff --git a/error.php b/error.php index 674d08e..040da49 100644 --- a/error.php +++ b/error.php @@ -3,7 +3,6 @@ /** * phpMyAdmin fatal error display page * - * @version $Id$ * @package phpMyAdmin */ diff --git a/export.php b/export.php index 9c1be55..43c37ce 100644 --- a/export.php +++ b/export.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @todo too much die here, or? - * @version $Id$ * @package phpMyAdmin */ diff --git a/import.php b/import.php index 85616a9..b123064 100644 --- a/import.php +++ b/import.php @@ -4,7 +4,6 @@ * Core script for import, this is just the glue around all other stuff * * @uses PMA_Bookmark_getList() - * @version $Id$ * @package phpMyAdmin */ diff --git a/import_status.php b/import_status.php index 4125ead..d739009 100644 --- a/import_status.php +++ b/import_status.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/index.php b/index.php index 0b4a982..1aec410 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,6 @@ /** * forms frameset * - * @version $Id$ * @uses __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.') * @uses $GLOBALS['cfg']['QueryHistoryDB'] * @uses $GLOBALS['cfg']['Server']['user'] diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 28994c2..5a31629 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -3,7 +3,6 @@ /** * * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 849287e..b063995 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Error * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index fab7a39..0b90898 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Error_Handler * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/File.class.php b/libraries/File.class.php index 9dfe568..2f0fecd 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -3,7 +3,6 @@ /** * file upload functions * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 66a2114..61d1211 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -3,7 +3,6 @@ /** * holds the database index class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/List.class.php b/libraries/List.class.php index 029b6fc..65ac7fc 100644 --- a/libraries/List.class.php +++ b/libraries/List.class.php @@ -3,7 +3,6 @@ /** * hold the PMA_List base class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 397a6db..f793ed4 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -3,7 +3,6 @@ /** * holds the PMA_List_Database class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Message.class.php b/libraries/Message.class.php index ffddb87..68d32bc 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -3,7 +3,6 @@ /** * Holds class PMA_Message * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index cd69633..c2b14a4 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -3,7 +3,6 @@ /** * Library for extracting information about the partitions * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index 711f709..d0f6974 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -3,7 +3,6 @@ /** * Library for extracting information about the available storage engines * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Table.class.php b/libraries/Table.class.php index ef522f9..7839107 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index cf8f0a5..c74ec7b 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -3,7 +3,6 @@ /** * hold PMA_Theme class * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 9adb7c5..c5298f3 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index e909e76..82deb43 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 71e9a62..e16d189 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run config authentication (ie no authentication). * * @package phpMyAdmin-Auth-Config - * @version $Id$ */ diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index d524e1c..833703c 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run cookie based authentication. * * @package phpMyAdmin-Auth-Cookie - * @version $Id$ */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 7ccea39..b3d305a 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -5,7 +5,6 @@ * NOTE: Requires PHP loaded as a Apache module. * * @package phpMyAdmin-Auth-HTTP - * @version $Id$ */ diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 2f828bd..4215408 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -4,7 +4,6 @@ * Set of functions used to run single signon authentication. * * @package phpMyAdmin-Auth-Signon - * @version $Id$ */ diff --git a/libraries/blowfish.php b/libraries/blowfish.php index 1dc3dcd..ae85f43 100644 --- a/libraries/blowfish.php +++ b/libraries/blowfish.php @@ -11,7 +11,6 @@ * See the enclosed file COPYING for license information (LGPL). If you * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * - * @version $Id$ * @since Horde 2.2 * @package horde.cipher */ diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 73a9665..fa6b4bf 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the bookmark feature * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 0b03c7e..9acd184 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -3,7 +3,6 @@ /** * Charset conversion functions. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 398101b..6dbc251 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -3,7 +3,6 @@ /** * Get user's global privileges and some db-specific privileges * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php index 2bd1ef8..b77fd31 100644 --- a/libraries/cleanup.lib.php +++ b/libraries/cleanup.lib.php @@ -3,7 +3,6 @@ /** * Functions for cleanup of user input. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 8ad8a2c..abbd663 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -28,7 +28,6 @@ * - db connection * - authentication work * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6591715..2611401 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3,7 +3,6 @@ /** * Misc functions used all over the scripts. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/config.default.php b/libraries/config.default.php index e16216c..bb4e805 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -16,7 +16,6 @@ * * All directives are explained in Documentation.html * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/core.lib.php b/libraries/core.lib.php index acc9814..a4746e2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -5,7 +5,6 @@ * This script is distinct from libraries/common.inc.php because this * script is called from /test. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index de65d12..2f24e4f 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -3,7 +3,6 @@ /** * Common Option Constants For DBI Functions * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 5d16995..b9a4a97 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 33c5d17..a72c7eb 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 20dff36..2d5652b 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -31,7 +31,6 @@ * @uses strnatcasecmp() * @uses count() * @uses addslashes() - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 1010eac..a86bcf5 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 5235ab5..8af2197 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -12,7 +12,6 @@ * our current sql.php. * Of course the interface would need a way to pass calling parameters. * Also, support DEFINER (like we do in export). - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 2b6f420..c938ce0 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index d1ae16a..1110dc5 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -4,7 +4,6 @@ * Ensure the database and the table exist (else move to the "parent" script) * and display headers * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php index 07732df..5f36185 100644 --- a/libraries/dbg/setup.php +++ b/libraries/dbg/setup.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-DBG */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 360f1db..c9442ed 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -4,7 +4,6 @@ * Interface to the classic MySQL extension * * @package phpMyAdmin-DBI-MySQL - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 80779d8..3a5a449 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -4,7 +4,6 @@ * Interface to the improved MySQL extension (MySQLi) * * @package phpMyAdmin-DBI-MySQLi - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 1e88a4a..43a61f6 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -3,7 +3,6 @@ /** * Displays form for password change * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index 1f0f1f5..f348f3c 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -3,7 +3,6 @@ /** * Displays form for creating database (if user has privileges for that) * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 8f1b740..57a5606 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -22,7 +22,6 @@ * warnings about the lack of privileges for CREATE TABLE. Tested * on MySQL 5.0.18. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 895f30c..ae099e0 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index c05cd4d..1a3f9db 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index b11df0d..493939b 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -3,7 +3,6 @@ /** * Code for displaying language selection * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 5238d93..682ff4c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -3,7 +3,6 @@ /** * library for displaying table with results from all sort of select queries * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index 40a3fd1..442d53f 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -7,7 +7,6 @@ * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox * - also changes made in js/functions.js * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php index b9d4446..2325d15 100644 --- a/libraries/engines/bdb.lib.php +++ b/libraries/engines/bdb.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php index ec8e689..48b2ae8 100644 --- a/libraries/engines/berkeleydb.lib.php +++ b/libraries/engines/berkeleydb.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php index ef433f6..07eff48 100644 --- a/libraries/engines/binlog.lib.php +++ b/libraries/engines/binlog.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php index 8e55768..e1262b9 100644 --- a/libraries/engines/innobase.lib.php +++ b/libraries/engines/innobase.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index d71d5a0..be76a40 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php index a1c3042..636a8df 100644 --- a/libraries/engines/memory.lib.php +++ b/libraries/engines/memory.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php index ebaf97a..9c9ef1e 100644 --- a/libraries/engines/merge.lib.php +++ b/libraries/engines/merge.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php index 4ec36d1..fd25178 100644 --- a/libraries/engines/mrg_myisam.lib.php +++ b/libraries/engines/mrg_myisam.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php index 73a4b0f..f6ca061 100644 --- a/libraries/engines/myisam.lib.php +++ b/libraries/engines/myisam.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php index 3dfa54a..2979385 100644 --- a/libraries/engines/ndbcluster.lib.php +++ b/libraries/engines/ndbcluster.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php index 125ef4f..842f8ff 100644 --- a/libraries/engines/pbxt.lib.php +++ b/libraries/engines/pbxt.lib.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Engines */ diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 506240c..e089893 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -4,7 +4,6 @@ * Set of functions used to build NHibernate dumps of tables * * @package phpMyAdmin-Export-Codegen - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 8e1973f..b4d0810 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Export-CSV - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 768fa3d..9e01fed 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -4,7 +4,6 @@ * Set of functions used to build CSV dumps of tables * * @package phpMyAdmin-Export-CSV - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 5f36dc9..ffaf5f2 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -4,7 +4,6 @@ * Set of functions used to build CSV dumps of tables * * @package phpMyAdmin-Export-HTMLWord - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index cba335a..ccf87e9 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -4,7 +4,6 @@ * Set of functions used to build dumps of tables * * @package phpMyAdmin-Export-Latex - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 78fd6f2..0cd3cdc 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -4,7 +4,6 @@ * Set of functions used to build OpenDocument Spreadsheet dumps of tables * * @package phpMyAdmin-Export-ODS - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 157fc43..408c54e 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -4,7 +4,6 @@ * Set of functions used to build OpenDocument Text dumps of tables * * @package phpMyAdmin-Export-ODT - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index c4111e2..5bd4617 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -4,7 +4,6 @@ * Produce a PDF report (export) from a query * * @package phpMyAdmin-Export-PDF - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/sql.php b/libraries/export/sql.php index d5c6c84..e0a69b8 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -4,7 +4,6 @@ * Set of functions used to build SQL dumps of tables * * @package phpMyAdmin-Export-SQL - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xls.php b/libraries/export/xls.php index d238903..cc29138 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -4,7 +4,6 @@ * * * @package phpMyAdmin-Export-XLS - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index b59c78c..f3cc849 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -4,7 +4,6 @@ * * * @package phpMyAdmin-Export-XLSX - * @version $Id$ */ if (! defined('PHPMYADMIN')) { exit; diff --git a/libraries/export/xml.php b/libraries/export/xml.php index be005bf..470aaeb 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -4,7 +4,6 @@ * Set of functions used to build XML dumps of tables * * @todo - * @version $Id$ * @package phpMyAdmin-Export-XML */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index 7091272..c444998 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -3,7 +3,6 @@ /** * Set of functions used to build YAML dumps of tables * - * @version $Id$ * @package phpMyAdmin-Export-YAML */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/file_listing.php b/libraries/file_listing.php index ff9e1a8..1ca9711 100644 --- a/libraries/file_listing.php +++ b/libraries/file_listing.php @@ -4,7 +4,6 @@ * Functions for listing directories * * @todo rename to file_listing.lib.php - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 2a3cb28..b117779 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -41,7 +41,6 @@ * @uses PMA_generate_common_url() * @uses basename() * @uses file_exists() - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php index a582e82..cddaca2 100644 --- a/libraries/grab_globals.lib.php +++ b/libraries/grab_globals.lib.php @@ -6,7 +6,6 @@ * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and * $HTTP_AUTHORIZATION. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 8273d50..9182f15 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 46f8017..6086f38 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 02c0aa1..55e7991 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index bd575d4..4a30f2b 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index cb366b5..3463309 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php index 6fadfeb..2efd615 100644 --- a/libraries/iconv_wrapper.lib.php +++ b/libraries/iconv_wrapper.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 85d6870..8ef38f6 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -3,7 +3,6 @@ /** * Library that provides common import functions that are used by import plugins * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 170fb96..d444950 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -4,7 +4,6 @@ * CSV import plugin for phpMyAdmin * * @todo add an option for handling NULL values - * @version $Id$ * @package phpMyAdmin-Import */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index fa458ac..7f93f9b 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -3,7 +3,6 @@ /** * DocSQL import plugin for phpMyAdmin * - * @version $Id$ * @package phpMyAdmin-Import */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 2c8702a..adf42c1 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -3,7 +3,6 @@ /** * CSV import plugin for phpMyAdmin * - * @version $Id$ * @package phpMyAdmin-Import */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 0241d71..e6e7725 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -3,7 +3,6 @@ /** * SQL import plugin for phpMyAdmin * - * @version $Id$ * @package phpMyAdmin-Import */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php index 6b50aeb..79d435b 100644 --- a/libraries/import/upload/apc.php +++ b/libraries/import/upload/apc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php index b3baf70..6cce9ad 100644 --- a/libraries/import/upload/noplugin.php +++ b/libraries/import/upload/noplugin.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php index ce4c476..cc7eb27 100644 --- a/libraries/import/upload/uploadprogress.php +++ b/libraries/import/upload/uploadprogress.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * -* @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/import/xls.php b/libraries/import/xls.php index ca4778f..e6ac76f 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -4,7 +4,6 @@ * Microsoft Office Excel 97-2003 XLS import plugin for phpMyAdmin * * @todo Pretty much everything - * @version $Id$ * @package phpMyAdmin-Import */ diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 80d79e5..00cadde 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -4,7 +4,6 @@ * Microsoft Office Excel 2007 XLSX import plugin for phpMyAdmin * * @todo Pretty much everything - * @version $Id$ * @package phpMyAdmin-Import */ diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php index 670cd31..5c7d0e1 100644 --- a/libraries/information_schema_relations.lib.php +++ b/libraries/information_schema_relations.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 6403528..69cab18 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -4,7 +4,6 @@ * This library is used with the server IP allow/deny host authentication * feature * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 8bec9c0..5ddb604 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -5,7 +5,6 @@ * * @package phpMyAdmin * - * @version $Id$ */ /** diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index e1590a3..74e7698 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -9,7 +9,6 @@ * * 2002/2/22 - by Yukihiro Kawada <kawada(a)den.fujifilm.co.jp> * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index a52098f..8764247 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -5,7 +5,6 @@ * * This includes web server specific code to log some information. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php index 6ee5249..b8d035a 100644 --- a/libraries/mime.lib.php +++ b/libraries/mime.lib.php @@ -3,7 +3,6 @@ /** * MIME detection code. * - * @version $Id$ * @package phpMyAdmin * @todo Maybe we could try to use fileinfo module if loaded */ diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index c508941..0b3413b 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 1782a3e..303c637 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 969d86a..d6cb383 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -3,7 +3,6 @@ /** * displays the pma logo, links and db and server selection in left frame * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 2290324..780ee02 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -9,7 +9,6 @@ * Check for all the needed functions for output buffering * Make some wrappers for the top and bottoms of our files. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php index b81d759..810d97f 100644 --- a/libraries/opendocument.lib.php +++ b/libraries/opendocument.lib.php @@ -3,7 +3,6 @@ /** * Simple interface for creating OASIS OpenDocument files. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 75dd00b..345c096 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index b78d32f..da52b83 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -3,7 +3,6 @@ /** * Generic plugin interface. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 6aefe89..36f02b0 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the relation and pdf feature * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 6c2c789..313e0b2 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used for cleaning up phpMyAdmin tables * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 7b8ca0a..3669a4e 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index a975bee..d64e5f4 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 2b54bf1..c9b79a7 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -3,7 +3,6 @@ /** * This is in a separate script because it's called from a number of scripts * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index f4c0c1b..f750d81 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -3,7 +3,6 @@ /** * phpMyAdmin Language Loading File * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index f873a5e..602b63c 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -3,7 +3,6 @@ /** * Code for displaying server selection * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 89e468b..56ab261 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -7,7 +7,6 @@ * @uses PMA_DBI_fetch_result() * @uses PMA_DBI_QUERY_STORE * @uses $userlink - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1608de3..c5d384f 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 8f5bec9..551668d 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -3,7 +3,6 @@ /** * session handling * - * @version $Id$ * @todo add failover or warn if sessions are not configured properly * @todo add an option to use mm-module for session handler * @see http://www.php.net/session diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 30f02f6..a29f227 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -3,7 +3,6 @@ /** * functions for displaying the sql query form * - * @version $Id$ * @usedby server_sql.php * @usedby db_sql.php * @usedby tbl_sql.php diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index b68d193..8af6458 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -19,7 +19,6 @@ * It's easier to use only uppercase for proper sorting. In case of * doubt, use the DEBUG code after this function's definition. * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index bb103aa..5509db1 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -24,7 +24,6 @@ * page for it to work, I recommend '<link rel="stylesheet" type="text/css" * href="syntax.css.php" />' at the moment.) * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php index 52dd994..2e965f8 100644 --- a/libraries/sqlvalidator.lib.php +++ b/libraries/sqlvalidator.lib.php @@ -27,7 +27,6 @@ * * Also set a username and password if you have a private one * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/string.lib.php b/libraries/string.lib.php index d87dbf7..e17a935 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @uses extension_loaded() * @uses substr() * @uses function_exists() diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php index eac8a94..69b5a0d 100644 --- a/libraries/string_mb.lib.php +++ b/libraries/string_mb.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-String-MB */ diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php index 8a5b8cc..e70bf0b 100644 --- a/libraries/string_native.lib.php +++ b/libraries/string_native.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-String-Native */ diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php index 4e7a106..b211dd5 100644 --- a/libraries/string_type_ctype.lib.php +++ b/libraries/string_type_ctype.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-StringType-CType */ diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php index 337c23d..a2c7f0e 100644 --- a/libraries/string_type_native.lib.php +++ b/libraries/string_type_native.lib.php @@ -12,7 +12,6 @@ * * The SQL Parser code relies heavily on these functions. * - * @version $Id$ * @package phpMyAdmin-StringType-Native */ diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php index 0ef16c2..41d8152 100644 --- a/libraries/tbl_common.php +++ b/libraries/tbl_common.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index c1adea4..e97c2fb 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -6,7 +6,6 @@ * @todo should be handled by class Table * @todo this should be recoded as functions, to avoid messing with global variables * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index e9b4cb9..1f695a5 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 0d00d17..4b10f51 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -4,7 +4,6 @@ * Display form for changing/adding table fields/columns * * included by tbl_addfield.php, -_alter.php, -_create.php - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 08bbdb7..824d5bc 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -17,7 +17,6 @@ * * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES * - * @version $Id$ * * @uses $_REQUEST * @uses defined() diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php index d397b3c..da2ee1d 100644 --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index c3249f1..7148003 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -3,7 +3,6 @@ /** * Set of functions used with the relation and pdf feature * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index 4fbc24d..28b199a 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_application_octetstream__download_info() { diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php index 7122354..f5050ce 100644 --- a/libraries/transformations/application_octetstream__hex.inc.php +++ b/libraries/transformations/application_octetstream__hex.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_application_octetstream__hex_info() { diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index 1e662ee..974f24f 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -19,7 +19,6 @@ * * Please provide a comment for your function, what it does and what parameters are available. * - * @version $Id$ * @package phpMyAdmin-Transformation */ diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php index 682e4a0..d4312aa 100644 --- a/libraries/transformations/image_jpeg__inline.inc.php +++ b/libraries/transformations/image_jpeg__inline.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_jpeg__inline_info() { diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php index 5223e50..0d0b9a3 100644 --- a/libraries/transformations/image_jpeg__link.inc.php +++ b/libraries/transformations/image_jpeg__link.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_jpeg__link_info() { diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php index f631aa4..3655171 100644 --- a/libraries/transformations/image_png__inline.inc.php +++ b/libraries/transformations/image_png__inline.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_image_png__inline_info() { diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index cf3c2b0..42a19a9 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__dateformat_info() { diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index 8c35a4e..2ed3cdd 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__external_info() { diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index add22e1..f251f29 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__formatted_info() { diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index cb62067..b22c945 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__imagelink_info() { diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index 579deda..bec7661 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__link_info() { diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php index bcfc12a..a6d31aa 100644 --- a/libraries/transformations/text_plain__longToIpv4.inc.php +++ b/libraries/transformations/text_plain__longToIpv4.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__longToIpv4_info() { diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php index 5d5bfb1..afc2888 100644 --- a/libraries/transformations/text_plain__sql.inc.php +++ b/libraries/transformations/text_plain__sql.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_t ransformation_text_plain__sql_info() { diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php index 9982dcb..67d4536 100644 --- a/libraries/transformations/text_plain__substr.inc.php +++ b/libraries/transformations/text_plain__substr.inc.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * @package phpMyAdmin-Transformation - * @version $Id$ */ function PMA_transformation_text_plain__substr_info() { diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index ef5c7fa..069e4b4 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -3,7 +3,6 @@ /** * URL/hidden inputs generating. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 35b6dea..5cea609 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -7,7 +7,6 @@ * For changing this file you should know what you are doing. For this reason * options here are not part of normal configuration. * - * @version $Id$ * @package phpMyAdmin */ diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index f616c7d..c6ac6e5 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/license.php b/license.php index 0294611..b4b394f 100644 --- a/license.php +++ b/license.php @@ -6,7 +6,6 @@ * Note: please do not fold this script into a general script * that would read any file using a GET parameter, it would open a hole * - * @version $Id$ * @package phpMyAdmin */ diff --git a/main.php b/main.php index 360e988..ba6faa1 100644 --- a/main.php +++ b/main.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/navigation.php b/navigation.php index 909bc00..06581cc 100644 --- a/navigation.php +++ b/navigation.php @@ -3,7 +3,6 @@ /** * the navigation frame - displays server, db and table selection tree * - * @version $Id$ * @package phpMyAdmin * @uses $GLOBALS['pma']->databases * @uses $GLOBALS['server'] diff --git a/pdf_pages.php b/pdf_pages.php index 2e907b8..a26420f 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/pdf_schema.php b/pdf_schema.php index 43bffae..0979792 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/phpinfo.php b/phpinfo.php index 043db95..777521b 100644 --- a/phpinfo.php +++ b/phpinfo.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpinfo() wrapper to allow displaying only when configured to do so. - * @version $Id$ * @package phpMyAdmin */ diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php index ebf48bb..2275c97 100644 --- a/phpmyadmin.css.php +++ b/phpmyadmin.css.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/pmd_common.php b/pmd_common.php index bb376fa..bf23514 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_display_field.php b/pmd_display_field.php index fc4f540..acfa162 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_general.php b/pmd_general.php index 89988dd..f87d62b 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -1,7 +1,6 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_help.php b/pmd_help.php index e538a48..2f5e006 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_pdf.php b/pmd_pdf.php index 3c921f5..069f6f1 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 5dc8754..307304a 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index eb4e17b..a4ee7f9 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 63e19e5..7f6179a 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin-Designer */ diff --git a/querywindow.php b/querywindow.php index 0d15de5..dd2e39b 100644 --- a/querywindow.php +++ b/querywindow.php @@ -37,7 +37,6 @@ * @uses strlen() * @uses preg_replace() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index 48ea0ca..2f55dcf 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -8,7 +8,6 @@ * * Copyright 2002 Robin Johnson <robbat2(a)users.sourceforge.net> * - * @version $Id$ * @package phpMyAdmin-debug */ diff --git a/scripts/signon.php b/scripts/signon.php index a289fce..d2aac58 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -7,7 +7,6 @@ * not intended to be perfect code and look, only shows how you can * integrate this functionality in your application. * - * @version $Id$ * @package phpMyAdmin * @subpackage Example */ diff --git a/server_binlog.php b/server_binlog.php index c8dd614..71afc08 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -35,7 +35,6 @@ * @uses array_key_exists() * @uses implode() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_collations.php b/server_collations.php index 0abeaab..b6482cd 100644 --- a/server_collations.php +++ b/server_collations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_databases.php b/server_databases.php index 9a05c70..0c7d598 100644 --- a/server_databases.php +++ b/server_databases.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_engines.php b/server_engines.php index 6fa73ec..f9664ca 100644 --- a/server_engines.php +++ b/server_engines.php @@ -3,7 +3,6 @@ /** * display list of server enignes and additonal information about them * - * @version $Id$ * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/ * @package phpMyAdmin */ diff --git a/server_export.php b/server_export.php index e728465..9d78ce7 100644 --- a/server_export.php +++ b/server_export.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_import.php b/server_import.php index d0ec687..e7a9118 100644 --- a/server_import.php +++ b/server_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_privileges.php b/server_privileges.php index ea4b8c8..a909ef5 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_processlist.php b/server_processlist.php index a777060..58f4813 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_replication.php b/server_replication.php index dae375a..1dbd42e 100644 --- a/server_replication.php +++ b/server_replication.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_sql.php b/server_sql.php index 54141b1..1b8027c 100644 --- a/server_sql.php +++ b/server_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_status.php b/server_status.php index 5ebd835..30edca2 100644 --- a/server_status.php +++ b/server_status.php @@ -4,7 +4,6 @@ * displays status variables with descriptions and some hints an optmizing * + reset status variables * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_synchronize.php b/server_synchronize.php index c5d8077..1272dda 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -3,7 +3,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/server_variables.php b/server_variables.php index 0248b8a..db156a2 100644 --- a/server_variables.php +++ b/server_variables.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/show_config_errors.php b/show_config_errors.php index 8b1cd18..9024fec 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -3,7 +3,6 @@ /** * Simple wrapper just to enable error reporting and include config * - * @version $Id$ * @package phpMyAdmin */ diff --git a/sql.php b/sql.php index 288f150..c2b1031 100644 --- a/sql.php +++ b/sql.php @@ -3,7 +3,6 @@ /** * @todo we must handle the case if sql.php is called directly with a query * that returns 0 rows - to prevent cyclic redirects or includes - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_addfield.php b/tbl_addfield.php index 500a3da..b61327f 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_alter.php b/tbl_alter.php index 92c9fed..7f81c41 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -6,7 +6,6 @@ * linked from table_structure, uses libraries/tbl_properties.inc.php to display * form and handles this form data * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_change.php b/tbl_change.php index 61ccadc..f873490 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -5,7 +5,6 @@ * * register_globals_save (mark this file save for disabling register globals) * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_create.php b/tbl_create.php index 02c637d..8856788 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -31,7 +31,6 @@ * @uses strlen() * @uses sprintf() * @uses htmlspecialchars() - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_export.php b/tbl_export.php index 086dd39..eeaf248 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_get_field.php b/tbl_get_field.php index ac12357..a58eb51 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Provides download to a given field defined in parameters. - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_import.php b/tbl_import.php index a0500fd..ead8ff0 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_indexes.php b/tbl_indexes.php index 470cd04..172191a 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -3,7 +3,6 @@ /** * Displays index edit/creation form and handles it * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_move_copy.php b/tbl_move_copy.php index f4c8d47..fa8a11e 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_operations.php b/tbl_operations.php index 4e0738a..fa89491 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_printview.php b/tbl_printview.php index 7f7a8c8..1b625f9 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_relation.php b/tbl_relation.php index 5ca5ed5..ab58511 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -10,7 +10,6 @@ * @todo check foreign fields to be from same type and size, all other makes no sense * @todo add an link to create an index required for constraints, or an option to do automatically * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_replace.php b/tbl_replace.php index b508342..d3271ac 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -5,7 +5,6 @@ * * usally called as form action from tbl_change.php to insert or update table rows * - * @version $Id$ * * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by * it needs the original query and the row number and than replace the LIMIT clause diff --git a/tbl_row_action.php b/tbl_row_action.php index bfe2e43..356ad57 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -3,7 +3,6 @@ /** * handle row specifc actions like edit, delete, export * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_select.php b/tbl_select.php index 99936f3..d9e8a46 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -7,7 +7,6 @@ * and include sql.php to execute it * * @todo display search form again if no results from previous search - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_sql.php b/tbl_sql.php index 5565d92..a9366c8 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_structure.php b/tbl_structure.php index 8f1f26d..b0263a3 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -3,7 +3,6 @@ /** * Displays table structure infos like fields/columns, indexes, size, rows * and allows manipulation of indexes and columns/fields - * @version $Id$ * @package phpMyAdmin */ diff --git a/tbl_tracking.php b/tbl_tracking.php index 3e761f8..698076a 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php index 50b27c9..5d9baed 100644 --- a/test/AllSeleniumTests.php +++ b/test/AllSeleniumTests.php @@ -3,7 +3,6 @@ /** * runs all defined Selenium tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/AllTests.php b/test/AllTests.php index 079a947..b77f3ec 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -3,7 +3,6 @@ /** * runs all defined tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/Environment_test.php b/test/Environment_test.php index 7bc16e7..f61956f 100644 --- a/test/Environment_test.php +++ b/test/Environment_test.php @@ -3,7 +3,6 @@ /** * tests for environment like OS, PHP, modules, ... * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/FailTest.php b/test/FailTest.php index 0cecf69..f430bb4 100644 --- a/test/FailTest.php +++ b/test/FailTest.php @@ -3,7 +3,6 @@ /** * tests for PMA_get_real_size() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php index 009dc23..e3a4492 100644 --- a/test/PMA_Message_test.php +++ b/test/PMA_Message_test.php @@ -3,7 +3,6 @@ /** * Test for PMA_Message class * - * @version $Id$ */ /** diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php index 957f2cb..7900b92 100644 --- a/test/PMA_STR_sub_test.php +++ b/test/PMA_STR_sub_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php index 307d966..234339a 100644 --- a/test/PMA_blowfish_test.php +++ b/test/PMA_blowfish_test.php @@ -4,7 +4,6 @@ * Test for blowfish encryption. * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php index 6b54cea..4efd633 100644 --- a/test/PMA_escapeJsString_test.php +++ b/test/PMA_escapeJsString_test.php @@ -4,7 +4,6 @@ * Test for javascript escaping. * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php index 75dd4e8..ccdf15b 100644 --- a/test/PMA_escapeMySqlWildcards_test.php +++ b/test/PMA_escapeMySqlWildcards_test.php @@ -4,7 +4,6 @@ * Test for MySQL Wildcards escaping/unescaping * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_foreignKeySupported_test.php b/test/PMA_foreignKeySupported_test.php index 6d3e1ab..f00afca 100644 --- a/test/PMA_foreignKeySupported_test.php +++ b/test/PMA_foreignKeySupported_test.php @@ -4,7 +4,6 @@ * Test for supporting foreign key * * @package phpMyAdmin-test - * @version $Id$ */ /** diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php index 8f62a82..22e948b 100644 --- a/test/PMA_generateCommonUrl_test.php +++ b/test/PMA_generateCommonUrl_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_generate_common_url() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php index baad230..14d2a61 100644 --- a/test/PMA_get_real_size_test.php +++ b/test/PMA_get_real_size_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_get_real_size() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php index 7626906..f37e061 100644 --- a/test/PMA_headerLocation_test.php +++ b/test/PMA_headerLocation_test.php @@ -3,7 +3,6 @@ /** * Test for PMA_sendHeaderLocation * - * @version $Id$ */ /** diff --git a/test/PMA_ifSetOr_test.php b/test/PMA_ifSetOr_test.php index 4e9dce1..fbeb80e 100644 --- a/test/PMA_ifSetOr_test.php +++ b/test/PMA_ifSetOr_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_ifSetOr() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php index fd561ff..ffd41a2 100644 --- a/test/PMA_isValid_test.php +++ b/test/PMA_isValid_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php index e9b9441..cb62e52 100644 --- a/test/PMA_pow_test.php +++ b/test/PMA_pow_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_pow() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php index 396daa6..1400c7e 100644 --- a/test/PMA_sanitize_test.php +++ b/test/PMA_sanitize_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_sanitize() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php index b47812d..126a620 100644 --- a/test/PMA_transformation_getOptions_test.php +++ b/test/PMA_transformation_getOptions_test.php @@ -3,7 +3,6 @@ /** * tests for PMA_sanitize() * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumLoginTest.php b/test/PmaSeleniumLoginTest.php index dad0f5f..9c1be97 100644 --- a/test/PmaSeleniumLoginTest.php +++ b/test/PmaSeleniumLoginTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for login related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumPrivilegesTest.php b/test/PmaSeleniumPrivilegesTest.php index 149f3ed..64ff25d 100644 --- a/test/PmaSeleniumPrivilegesTest.php +++ b/test/PmaSeleniumPrivilegesTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for privilege related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumTestCase.php b/test/PmaSeleniumTestCase.php index e2468b6..ac70594 100644 --- a/test/PmaSeleniumTestCase.php +++ b/test/PmaSeleniumTestCase.php @@ -3,7 +3,6 @@ /** * Selenium parent class for TestCases * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/PmaSeleniumXssTest.php b/test/PmaSeleniumXssTest.php index 0870aa4..5099506 100644 --- a/test/PmaSeleniumXssTest.php +++ b/test/PmaSeleniumXssTest.php @@ -3,7 +3,6 @@ /** * Selenium TestCase for XSS related tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/test/theme.php b/test/theme.php index cbd9981..098feed 100644 --- a/test/theme.php +++ b/test/theme.php @@ -5,7 +5,6 @@ * * @uses libraries/common.inc.php global fnctions * @package phpMyAdmin-test - * @version $Id$ */ chdir('..'); diff --git a/test/wui.php b/test/wui.php index d1f6f6c..c3b459d 100644 --- a/test/wui.php +++ b/test/wui.php @@ -3,7 +3,6 @@ /** * runs all defined tests * - * @version $Id$ * @package phpMyAdmin-test */ diff --git a/themes.php b/themes.php index e686371..a996030 100644 --- a/themes.php +++ b/themes.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index c4b8cda..cf54378 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -3,7 +3,6 @@ /** * main css file from theme Darkblue Orange * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php index 57cc456..62f981b 100644 --- a/themes/darkblue_orange/info.inc.php +++ b/themes/darkblue_orange/info.inc.php @@ -3,7 +3,6 @@ /** * Theme information * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 50ed7bf..e7282e1 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -4,7 +4,6 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Darkblue_orange */ diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index e161f59..0fcaf21 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -3,7 +3,6 @@ /** * navigation css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php index b39f5cf..49a0d23 100644 --- a/themes/original/css/theme_print.css.php +++ b/themes/original/css/theme_print.css.php @@ -3,7 +3,6 @@ /** * print css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index b3c5101..4cd48ea 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -3,7 +3,6 @@ /** * main css file from theme Original * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 0608898..5f7beba 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -3,7 +3,6 @@ /** * Theme information * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 909320a..604982a 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -4,7 +4,6 @@ * configures general layout * for detailed layout configuration please refer to the css files * - * @version $Id$ * @package phpMyAdmin-theme * @subpackage Original */ diff --git a/transformation_overview.php b/transformation_overview.php index 12ca395..acf2ca4 100644 --- a/transformation_overview.php +++ b/transformation_overview.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/transformation_wrapper.php b/transformation_wrapper.php index a231d49..3dd9c31 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ diff --git a/user_password.php b/user_password.php index 91cfde0..6cb795a 100644 --- a/user_password.php +++ b/user_password.php @@ -25,7 +25,6 @@ * @uses PMA_blowfish_encrypt() * @uses PMA_showMessage() * @uses define() - * @version $Id$ * @package phpMyAdmin */ diff --git a/view_create.php b/view_create.php index 6797919..a1de4cc 100644 --- a/view_create.php +++ b/view_create.php @@ -5,7 +5,6 @@ * * @todo js error when view name is empty (strFormEmpty) * @todo (also validate if js is disabled, after form submission?) - * @version $Id$ * @package phpMyAdmin */ diff --git a/view_operations.php b/view_operations.php index b707ca5..08c26d6 100644 --- a/view_operations.php +++ b/view_operations.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5788-g95c0b51
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 95c0b5125d1be0177d9a30f8b7414804662e6064 (commit) from 79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa (commit) - Log ----------------------------------------------------------------- commit 95c0b5125d1be0177d9a30f8b7414804662e6064 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 13:57:25 2010 +0200 This function is not used anywhere. ----------------------------------------------------------------------- Summary of changes: libraries/charset_conversion.lib.php | 45 ---------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 15f4a11..0b03c7e 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -84,49 +84,4 @@ function PMA_convert_string($src_charset, $dest_charset, $what) { } } // end of the "PMA_convert_string()" function - -/** - * Converts encoding of file according to parameters with detected - * conversion function. The old file will be unlinked and new created and - * its file name is returned. - * - * @param string source charset - * @param string target charset - * @param string file to convert - * - * @return string new temporay file - * - * @access public - * - */ -function PMA_convert_file($src_charset, $dest_charset, $file) { - switch ($GLOBALS['PMA_recoding_engine']) { - case PMA_CHARSET_RECODE: - case PMA_CHARSET_ICONV: - $tmpfname = tempnam('', 'PMA_convert_file'); - $fin = fopen($file, 'r'); - $fout = fopen($tmpfname, 'w'); - if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_RECODE) { - recode_file($src_charset . '..' . $dest_charset, $fin, $fout); - } else { - while (!feof($fin)) { - $line = fgets($fin, 4096); - if ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV) { - $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); - } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) { - $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); - } - fputs($fout, $dist); - } // end while - } - fclose($fin); - fclose($fout); - unlink($file); - - return $tmpfname; - default: - return $file; - } -} // end of the "PMA_convert_file()" function - ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5787-g79a23fc
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa (commit) from ee99ed3d39277b521c0f3b0aadfeecd5a548c647 (commit) - Log ----------------------------------------------------------------- commit 79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:20:06 2010 +0200 Forgotten occurence. ----------------------------------------------------------------------- Summary of changes: libraries/charset_conversion.lib.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 5166a36..15f4a11 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -103,7 +103,6 @@ function PMA_convert_file($src_charset, $dest_charset, $file) { switch ($GLOBALS['PMA_recoding_engine']) { case PMA_CHARSET_RECODE: case PMA_CHARSET_ICONV: - case PMA_CHARSET_LIBICONV: $tmpfname = tempnam('', 'PMA_convert_file'); $fin = fopen($file, 'r'); $fout = fopen($tmpfname, 'w'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5786-gee99ed3
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via ee99ed3d39277b521c0f3b0aadfeecd5a548c647 (commit) from 163aca52b4a8e7c1ad92212ca357ef92c5556828 (commit) - Log ----------------------------------------------------------------- commit ee99ed3d39277b521c0f3b0aadfeecd5a548c647 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:19:35 2010 +0200 libiconv is gone as of PHP 4.0.5, no need to support that ----------------------------------------------------------------------- Summary of changes: libraries/charset_conversion.lib.php | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index adf0d49..5166a36 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -12,9 +12,8 @@ if (! defined('PHPMYADMIN')) { define('PMA_CHARSET_NONE', 0); define('PMA_CHARSET_ICONV', 1); -define('PMA_CHARSET_LIBICONV', 2); -define('PMA_CHARSET_RECODE', 3); -define('PMA_CHARSET_ICONV_AIX', 4); +define('PMA_CHARSET_RECODE', 2); +define('PMA_CHARSET_ICONV_AIX', 3); // Finally detect which function we will use: if ($cfg['RecodingEngine'] == 'iconv') { @@ -24,8 +23,6 @@ if ($cfg['RecodingEngine'] == 'iconv') { } else { $PMA_recoding_engine = PMA_CHARSET_ICONV; } - } elseif (@function_exists('libiconv')) { - $PMA_recoding_engine = PMA_CHARSET_LIBICONV; } else { $PMA_recoding_engine = PMA_CHARSET_NONE; PMA_warnMissingExtension('iconv'); @@ -44,8 +41,6 @@ if ($cfg['RecodingEngine'] == 'iconv') { } else { $PMA_recoding_engine = PMA_CHARSET_ICONV; } - } elseif (@function_exists('libiconv')) { - $PMA_recoding_engine = PMA_CHARSET_LIBICONV; } elseif (@function_exists('recode_string')) { $PMA_recoding_engine = PMA_CHARSET_RECODE; } else { @@ -84,8 +79,6 @@ function PMA_convert_string($src_charset, $dest_charset, $what) { return iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what); case PMA_CHARSET_ICONV_AIX: return PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what); - case PMA_CHARSET_LIBICONV: - return libiconv($src_charset, $dest_charset, $what); default: return $what; } @@ -123,8 +116,6 @@ function PMA_convert_file($src_charset, $dest_charset, $file) { $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) { $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); - } else { - $dist = libiconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); } fputs($fout, $dist); } // end while hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5785-g163aca5
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 163aca52b4a8e7c1ad92212ca357ef92c5556828 (commit) from c4f1e7a951da45fe08a63fff163a99148bbb696f (commit) - Log ----------------------------------------------------------------- commit 163aca52b4a8e7c1ad92212ca357ef92c5556828 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:17:45 2010 +0200 Update Czech translation. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/cs.po b/po/cs.po index eac087a..f3314fb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ 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-07-20 12:14+0200\n" -"PO-Revision-Date: 2010-07-20 11:10+0200\n" +"PO-Revision-Date: 2010-07-20 12:17+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -502,13 +502,13 @@ msgid "Search results for \"<i>%s</i>\" %s:" msgstr "Výsledky vyhledávání pro „<i>%s</i>“ %s:" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" -msgstr[0] "%s odpovídající(ch) záznam(ů) v tabulce <i>%s</i>" -msgstr[1] "%s odpovídající(ch) záznam(ů) v tabulce <i>%s</i>" -msgstr[2] "%s odpovídající(ch) záznam(ů) v tabulce <i>%s</i>" +msgstr[0] "%s odpovídající záznam v tabulce <i>%s</i>" +msgstr[1] "%s odpovídající záznamy v tabulce <i>%s</i>" +msgstr[2] "%s odpovídajících záznamů v tabulce <i>%s</i>" #: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 @@ -527,13 +527,13 @@ msgid "Delete" msgstr "Odstranit" #: db_search.php:285 -#, fuzzy, php-format +#, php-format #| msgid "<b>Total:</b> <i>%s</i> match(es)" msgid "<b>Total:</b> <i>%s</i> match" msgid_plural "<b>Total:</b> <i>%s</i> matches" -msgstr[0] "<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ů)" -msgstr[1] "<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ů)" -msgstr[2] "<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ů)" +msgstr[0] "<b>Celkem:</b> <i>%s</i> odpovídající záznam" +msgstr[1] "<b>Celkem:</b> <i>%s</i> odpovídající záznamy" +msgstr[2] "<b>Celkem:</b> <i>%s</i> odpovídajících záznamů" #: db_search.php:299 msgid "Search in database" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5783-gbe6e0eb
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via be6e0eb8f35ca6dc8aae1762e1a0279c9afdc681 (commit) via f152dbcf849d653892f352e4eed9c30d0b957576 (commit) from 75593e3603b87ced82cfdf34a5cf03ea129db7e0 (commit) - Log ----------------------------------------------------------------- commit be6e0eb8f35ca6dc8aae1762e1a0279c9afdc681 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:13:29 2010 +0200 Standard warnings for missing extensions. commit f152dbcf849d653892f352e4eed9c30d0b957576 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:10:41 2010 +0200 The configuration directive is handled by generic config loading. ----------------------------------------------------------------------- Summary of changes: libraries/charset_conversion.lib.php | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 9bdfd5b..adf0d49 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -16,10 +16,6 @@ define('PMA_CHARSET_LIBICONV', 2); define('PMA_CHARSET_RECODE', 3); define('PMA_CHARSET_ICONV_AIX', 4); -if (!isset($cfg['IconvExtraParams'])) { - $cfg['IconvExtraParams'] = ''; -} - // Finally detect which function we will use: if ($cfg['RecodingEngine'] == 'iconv') { if (@function_exists('iconv')) { @@ -32,24 +28,14 @@ if ($cfg['RecodingEngine'] == 'iconv') { $PMA_recoding_engine = PMA_CHARSET_LIBICONV; } else { $PMA_recoding_engine = PMA_CHARSET_NONE; - - if (!isset($GLOBALS['is_header_sent'])) { - include './libraries/header.inc.php'; - } - echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.'); - require_once './libraries/footer.inc.php'; - exit(); + PMA_warnMissingExtension('iconv'); } } elseif ($cfg['RecodingEngine'] == 'recode') { if (@function_exists('recode_string')) { $PMA_recoding_engine = PMA_CHARSET_RECODE; } else { $PMA_recoding_engine = PMA_CHARSET_NONE; - - require_once './libraries/header.inc.php'; - echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.'); - require_once './libraries/footer.inc.php'; - exit; + PMA_warnMissingExtension('recode'); } } elseif ($cfg['RecodingEngine'] == 'auto') { if (@function_exists('iconv')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5781-g75593e3
by Michal Čihař 20 Jul '10

20 Jul '10

The branch, master has been updated via 75593e3603b87ced82cfdf34a5cf03ea129db7e0 (commit) via 42532065ab19a92b0c4513c7916a27353b3c1122 (commit) from 11e53fb1418f57529ef2fdd88bff7f7b41600ffe (commit) - Log ----------------------------------------------------------------- commit 75593e3603b87ced82cfdf34a5cf03ea129db7e0 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:09:22 2010 +0200 Do not die if RecodingEngine is auto and no engine is found. commit 42532065ab19a92b0c4513c7916a27353b3c1122 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 20 12:08:43 2010 +0200 No section for loading extensions. The dl has been deprecated long time and the code for it removed as well so we can simplify loading much. ----------------------------------------------------------------------- Summary of changes: libraries/charset_conversion.lib.php | 45 ++++------------------------------ 1 files changed, 5 insertions(+), 40 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 6254e67..9bdfd5b 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -10,38 +10,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * Failure on loading recode/iconv extensions. - */ -function PMA_failRecoding() { - PMA_fatalError(__('Couldn\'t load the iconv or recode extension needed for charset conversion. Either configure PHP to enable these extensions or disable charset conversion in phpMyAdmin.')); -} - -/** - * Loads the recode or iconv extensions if any of it is not loaded yet - */ -if ($cfg['RecodingEngine'] == 'recode') { - if (!@extension_loaded('recode')) { - PMA_failRecoding(); - } - $PMA_recoding_engine = 'recode'; -} elseif ($cfg['RecodingEngine'] == 'iconv') { - if (!@extension_loaded('iconv')) { - PMA_failRecoding(); - } - $PMA_recoding_engine = 'iconv'; -} elseif ($cfg['RecodingEngine'] == 'auto') { - if (@extension_loaded('iconv')) { - $PMA_recoding_engine = 'iconv'; - } elseif (@extension_loaded('recode')) { - $PMA_recoding_engine = 'recode'; - } else { - $PMA_recoding_engine = 'none'; - } -} else { - $PMA_recoding_engine = 'none'; -} - define('PMA_CHARSET_NONE', 0); define('PMA_CHARSET_ICONV', 1); define('PMA_CHARSET_LIBICONV', 2); @@ -53,7 +21,7 @@ if (!isset($cfg['IconvExtraParams'])) { } // Finally detect which function we will use: -if ($PMA_recoding_engine == 'iconv') { +if ($cfg['RecodingEngine'] == 'iconv') { if (@function_exists('iconv')) { if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX; @@ -72,7 +40,7 @@ if ($PMA_recoding_engine == 'iconv') { require_once './libraries/footer.inc.php'; exit(); } -} elseif ($PMA_recoding_engine == 'recode') { +} elseif ($cfg['RecodingEngine'] == 'recode') { if (@function_exists('recode_string')) { $PMA_recoding_engine = PMA_CHARSET_RECODE; } else { @@ -83,7 +51,7 @@ if ($PMA_recoding_engine == 'iconv') { require_once './libraries/footer.inc.php'; exit; } -} else { +} elseif ($cfg['RecodingEngine'] == 'auto') { if (@function_exists('iconv')) { if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { $PMA_recoding_engine = PMA_CHARSET_ICONV_AIX; @@ -96,12 +64,9 @@ if ($PMA_recoding_engine == 'iconv') { $PMA_recoding_engine = PMA_CHARSET_RECODE; } else { $PMA_recoding_engine = PMA_CHARSET_NONE; - - require_once './libraries/header.inc.php'; - echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.'); - require_once './libraries/footer.inc.php'; - exit; } +} else { + $PMA_recoding_engine = PMA_CHARSET_NONE; } /* Load AIX iconv wrapper if needed */ hooks/post-receive -- phpMyAdmin

1 0