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

Resolved conflicts

Browse Source
This commit is contained in:
Chanaka Indrajith 2012-07-11 21:31:34 +05:30
commit aaa8d22d78
10 changed files with 563 additions and 471 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/DbSearch.class.php
View File

@ -93,19 +93,6 @@ class PMA_DbSearch
$this->_setSearchParams();
}
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

511
libraries/DisplayResults.class.php
View File

File diff suppressed because it is too large Load Diff

14
libraries/Menu.class.php
View File

@ -40,20 +40,6 @@ class PMA_Menu
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

14
libraries/Table.class.php
View File

@ -68,20 +68,6 @@ class PMA_Table
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

14
libraries/TableSearch.class.php
View File

@ -83,20 +83,6 @@ class PMA_TableSearch
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

136
libraries/insert_edit.lib.php
View File

@ -54,12 +54,11 @@ function PMA_getFormParametersForInsertForm($db, $table, $where_clauses,
*/
function PMA_getStuffForEditMode($where_clause, $table, $db)
{
$found_unique_key = false;
if (isset($where_clause)) {
$where_clause_array = PMA_getWhereClauseArray($where_clause);
list($whereClauses, $resultArray, $rowsArray, $found_unique_key)
= PMA_analyzeWhereClauses(
$where_clause_array, $table, $db, $found_unique_key
$where_clause_array, $table, $db, false
);
return array(
false, $whereClauses,
@ -68,7 +67,7 @@ function PMA_getStuffForEditMode($where_clause, $table, $db)
);
} else {
list($results, $row) = PMA_loadFirstRowInEditMode($table, $db);
return array(true, null, $results, $row, null, $found_unique_key);
return array(true, null, $results, $row, null, false);
}
}
@ -108,12 +107,12 @@ function PMA_analyzeWhereClauses(
$where_clauses = array();
foreach ($where_clause_array as $key_id => $where_clause) {
$local_query = 'SELECT * FROM '
$local_query = 'SELECT * FROM '
. PMA_CommonFunctions::getInstance()->backquote($db) . '.'
. PMA_CommonFunctions::getInstance()->backquote($table)
. ' WHERE ' . $where_clause . ';';
$result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]);
$result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]);
$where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause);
$found_unique_key = PMA_showEmptyResultMessageOrSetUniqueCondition(
@ -481,14 +480,14 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
|| strstr($column['True_Type'], 'set')
|| in_array($column['pma_type'], $no_support_types)
) {
$html_output .= ' <td class="center">--</td>' . "\n";
$html_output .= '<td class="center">--</td>' . "\n";
} else {
$html_output .= '<td>' . "\n";
$html_output .= '<select name="funcs' . $column_name_appendix . '"' .
$unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_function)
. '" id="field_' . $idindex . '_1">';
$html_output .= '<select name="funcs' . $column_name_appendix . '"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
. ' id="field_' . $idindex . '_1">';
$html_output .= PMA_CommonFunctions::getInstance()
->getFunctionsForField($column, $insert_mode) . "\n";
@ -737,14 +736,18 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
list($db, $table) = $paramTableDbArray;
$html_output = '';
$html_output .= $backup_field . "\n";
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="foreign" />';
$html_output .= '<input type="text" name="fields' . $column_name_appendix . '"'
. 'class="textfield" ' . $unnullify_trigger
$html_output .= '<input type="text" name="fields' . $column_name_appendix . '" '
. 'class="textfield" '
. $unnullify_trigger . ' '
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '" '
. 'id="field_' . ($idindex) . '_3" '
. 'value="' . htmlspecialchars($data) . '" />'
. '<a class="hide foreign_values_anchor" target="_blank" '
. 'value="' . htmlspecialchars($data) . '" />';
$html_output .= '<a class="hide foreign_values_anchor" target="_blank" '
. 'onclick="window.open(this.href,\'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false;" '
. 'href="browse_foreigners.php?'
. PMA_generate_common_url($db, $table) . '&amp;field='
@ -773,18 +776,21 @@ function PMA_dispRowForeignData($backup_field, $column_name_appendix,
) {
$html_output = '';
$html_output .= $backup_field . "\n";
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="foreign" />'
. '<select name="fields' . $column_name_appendix . '"'
. $unnullify_trigger
. 'class="textfield"' . ($tabindex + $tabindex_for_value). '"'
. 'id="field_' . $idindex . '_3"'
. PMA_foreignDropdown(
$foreignData['disp_row'], $foreignData['foreign_field'],
$foreignData['foreign_display'], $data,
$GLOBALS['cfg']['ForeignKeyMaxLimit']
)
. '</select>';
$html_output .= '<input type="hidden"'
. ' name="fields_type' . $column_name_appendix . '"'
. ' value="foreign" />';
$html_output .= '<select name="fields' . $column_name_appendix . '"'
. ' ' . $unnullify_trigger
. ' class="textfield"'
. ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
. ' id="field_' . $idindex . '_3">';
$html_output .= PMA_foreignDropdown(
$foreignData['disp_row'], $foreignData['foreign_field'],
$foreignData['foreign_display'], $data,
$GLOBALS['cfg']['ForeignKeyMaxLimit']
);
$html_output .= '</select>';
return $html_output;
}
@ -820,18 +826,18 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
} elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
&& strstr($column['pma_type'], 'longtext')
) {
$textAreaRows = $GLOBALS['cfg']['TextareaRows']*2;
$textareaCols = $GLOBALS['cfg']['TextareaCols']*2;
$textAreaRows = $GLOBALS['cfg']['TextareaRows'] * 2;
$textareaCols = $GLOBALS['cfg']['TextareaCols'] * 2;
}
$html_output = $backup_field . "\n"
. '<textarea name="fields' . $column_name_appendix . '"'
. 'class="' . $the_class . '"'
. 'rows="' . $textAreaRows . '"'
. 'cols="' . $textareaCols . '"'
. 'dir="' . $text_dir . '"'
. 'id="field_' . ($idindex) . '_3"'
. $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '">'
. ' class="' . $the_class . '"'
. ' rows="' . $textAreaRows . '"'
. ' cols="' . $textareaCols . '"'
. ' dir="' . $text_dir . '"'
. ' id="field_' . ($idindex) . '_3"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '">'
. $special_chars_encoded
. '</textarea>';
@ -903,9 +909,9 @@ function PMA_getColumnEnumValues($column, $extracted_columnspec)
// Removes automatic MySQL escape format
$val = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $val));
$column['values'][] = array(
'plain' => $val,
'html' => htmlspecialchars($val),
);
'plain' => $val,
'html' => htmlspecialchars($val),
);
}
return $column['values'];
}
@ -929,14 +935,13 @@ function PMA_getDropDownDependingOnLength(
$tabindex, $tabindex_for_value, $idindex, $data, $column_enum_values
) {
$html_output = '<select name="fields' . $column_name_appendix . '"'
. $unnullify_trigger
. 'class="textfield"'
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. 'id="field_' . ($idindex) . '_3">'
. '<option value="">&nbsp;</option>' . "\n";
. ' ' . $unnullify_trigger
. ' class="textfield"'
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. ' id="field_' . ($idindex) . '_3">';
$html_output .= '<option value="">&nbsp;</option>' . "\n";
foreach ($column_enum_values as $enum_value) {
$html_output .= ' ';
$html_output .= '<option value="' . $enum_value['html'] . '"';
if ($data == $enum_value['plain']
|| ($data == ''
@ -978,7 +983,7 @@ function PMA_getRadioButtonDependingOnLength(
. ' class="textfield"'
. ' value="' . $enum_value['html'] . '"'
. ' id="field_' . ($idindex) . '_3_' . $j . '"'
. $unnullify_trigger;
. ' ' . $unnullify_trigger;
if ($data == $enum_value['plain']
|| ($data == ''
&& (! isset($_REQUEST['where_clause']) || $column['Null'] != 'YES')
@ -1025,13 +1030,13 @@ function PMA_getPmaTypeSet(
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="set" />';
$html_output .= '<select name="fields' . $column_name_appendix . '[]' . '"'
. 'class="textfield"'
. 'size="' . $select_size . '"'
. 'multiple="multiple"' . $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. 'id="field_' . ($idindex) . '_3">';
. ' class="textfield"'
. ' size="' . $select_size . '"'
. ' multiple="multiple"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. ' id="field_' . ($idindex) . '_3">';
foreach ($column_set_values as $column_set_value) {
$html_output .= ' ';
$html_output .= '<option value="' . $column_set_value['html'] . '"';
if (isset($vset[$column_set_value['plain']])) {
$html_output .= ' selected="selected"';
@ -1128,10 +1133,10 @@ function PMA_getBinaryAndBlobColumn(
if ($is_upload && $column['is_blob']) {
$html_output .= '<br />'
. '<input type="file" name="fields_upload'
. $vkey . '[' . $column['Field_md5']
. ']" class="textfield" id="field_' . $idindex . '_3" size="10" '
. $unnullify_trigger . '/>&nbsp;';
. '<input type="file"'
. ' name="fields_upload' . $vkey . '[' . $column['Field_md5'] . ']"'
. ' class="textfield" id="field_' . $idindex . '_3" size="10"'
. ' ' . $unnullify_trigger . '/>&nbsp;';
list($html_out, $biggest_max_file_size) = PMA_getMaxUploadSize(
$column, $biggest_max_file_size
);
@ -1171,10 +1176,10 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
$the_class .= ' datetimefield';
}
return '<input type="text" name="fields' . $column_name_appendix . '"'
. 'value="' . $special_chars . '" size="' . $fieldsize . '"'
. 'class="' . $the_class . '"' . $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value). '"'
. 'id="field_' . ($idindex) . '_3" />';
. ' value="' . $special_chars . '" size="' . $fieldsize . '"'
. ' class="' . $the_class . '" ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
. ' id="field_' . ($idindex) . '_3" />';
}
/**
@ -1226,7 +1231,8 @@ function PMA_getMaxUploadSize($column, $biggest_max_file_size)
'tinyblob' => '256',
'blob' => '65536',
'mediumblob' => '16777216',
'longblob' => '4294967296'); // yeah, really
'longblob' => '4294967296' // yeah, really
);
$this_field_max_size = $max_upload_size; // from PHP max
if ($this_field_max_size > $max_field_sizes[$column['pma_type']]) {
@ -1391,13 +1397,13 @@ function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url
if (isset($_REQUEST['where_clause'])) {
foreach ($where_clause_array as $key_id => $where_clause) {
$html_output .= '<input type="hidden" name="where_clause['
. $key_id . ']" value="'
. htmlspecialchars(trim($where_clause)) . '" />'. "\n";
$html_output .= '<input type="hidden"'
. ' name="where_clause[' . $key_id . ']"'
. ' value="' . htmlspecialchars(trim($where_clause)) . '" />'. "\n";
}
}
$tmp = '<select name="insert_rows" id="insert_rows">' . "\n";
$option_values = array(1,2,5,10,15,20,30,40);
$option_values = array(1, 2, 5, 10, 15, 20, 30, 40);
foreach ($option_values as $value) {
$tmp .= '<option value="' . $value . '"';

40
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -37,19 +37,6 @@ class PMA_Schema_PDF extends PMA_PDF
private $_ff = PMA_PDF_FONT;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*
@ -406,19 +393,6 @@ class Table_Stats
private $_ff = PMA_PDF_FONT;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*
@ -886,6 +860,20 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
private $leftMargin = 10;
private $rightMargin = 10;
private $_tablewidth;
private $_common_functions;
/**
* Get CommmonFunctions
*
* @return CommonFunctions object
*/
public function getCommonFunctions()
{
if (is_null($this->_common_functions)) {
$this->_common_functions = PMA_CommonFunctions::getInstance();
}
return $this->_common_functions;
}
/**
* The "PMA_Pdf_Relation_Schema" constructor

14
libraries/schema/User_Schema.class.php
View File

@ -25,20 +25,6 @@ class PMA_User_Schema
public $action;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

211
main.php
View File

@ -91,7 +91,7 @@ if ($server > 0
/**
* Displays the mysql server related links
*/
if ($server > 0 && !PMA_DRIZZLE) {
if ($server > 0 && ! PMA_DRIZZLE) {
include_once 'libraries/check_user_privileges.lib.php';
// Logout for advanced authentication
@ -120,10 +120,22 @@ if ($server > 0
. ' <label for="select_collation_connection">' . "\n"
. ' ' . __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. $common_functions->showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n"
. $common_functions->showMySQLDocu(
'MySQL_Database_Administration',
'Charset-connection'
)
. ': ' . "\n"
. ' </label>' . "\n"
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
. PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION,
'collation_connection',
'select_collation_connection',
$collation_connection,
true,
4,
true
)
. ' </form>' . "\n"
. ' </li>' . "\n";
} // end of if ($server > 0 && !PMA_DRIZZLE)
@ -176,13 +188,22 @@ echo '<div id="main_pane_right">';
if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
echo '<div class="group">';
echo '<h2>' . __('Database server') . '</h2>';
echo '<ul>' . "\n";
PMA_printListItem(__('Server') . ': ' . $server_info, 'li_server_info');
PMA_printListItem(__('Software') . ': ' . $common_functions->getServerType(), 'li_server_type');
PMA_printListItem(__('Software version') . ': ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT, 'li_server_version');
PMA_printListItem(
__('Server') . ': ' . $server_info,
'li_server_info'
);
PMA_printListItem(
__('Software') . ': ' . $common_functions->getServerType(),
'li_server_type'
);
PMA_printListItem(
__('Software version') . ': ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT,
'li_server_version'
);
PMA_printListItem(
__('Protocol version') . ': ' . PMA_DBI_get_proto_info(),
'li_mysql_proto'
@ -221,16 +242,25 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
__('Database client version') . ': ' . $client_version_str,
'li_mysql_client_version'
);
$php_ext_string = __('PHP extension') . ': '
. $GLOBALS['cfg']['Server']['extension'] . ' '
. $common_functions->showPHPDocu(
'book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'
);
PMA_printListItem(
__('PHP extension') . ': ' . $GLOBALS['cfg']['Server']['extension']. ' '
. $common_functions->showPHPDocu('book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'),
$php_ext_string,
'li_used_php_extension'
);
}
}
if ($cfg['ShowPhpInfo']) {
PMA_printListItem(__('Show PHP information'), 'li_phpinfo', 'phpinfo.php?' . $common_url_query);
PMA_printListItem(
__('Show PHP information'),
'li_phpinfo',
'phpinfo.php?' . $common_url_query
);
}
echo ' </ul>';
echo ' </div>';
@ -242,18 +272,64 @@ echo '<ul>';
$class = null;
// We rely on CSP to allow access to http://www.phpmyadmin.net, but IE lacks
// support here and does not allow request to http once using https.
if ($GLOBALS['cfg']['VersionCheck'] && (! $GLOBALS['PMA_Config']->get('is_https') || PMA_USR_BROWSER_AGENT != 'IE')) {
if ($GLOBALS['cfg']['VersionCheck']
&& (! $GLOBALS['PMA_Config']->get('is_https') || PMA_USR_BROWSER_AGENT != 'IE')
) {
$class = 'jsversioncheck';
}
PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class);
PMA_printListItem(__('Documentation'), 'li_pma_docs', 'Documentation.html', null, '_blank');
PMA_printListItem(__('Wiki'), 'li_pma_wiki', PMA_linkURL('http://wiki.phpmyadmin.net/'), null, '_blank');
PMA_printListItem(
__('Version information') . ': ' . PMA_VERSION,
'li_pma_version',
null,
null,
null,
null,
$class
);
PMA_printListItem(
__('Documentation'),
'li_pma_docs',
'Documentation.html',
null,
'_blank'
);
PMA_printListItem(
__('Wiki'),
'li_pma_wiki',
PMA_linkURL('http://wiki.phpmyadmin.net/'),
null,
'_blank'
);
// does not work if no target specified, don't know why
PMA_printListItem(__('Official Homepage'), 'li_pma_homepage', PMA_linkURL('http://www.phpMyAdmin.net/'), null, '_blank');
PMA_printListItem(__('Contribute'), 'li_pma_contribute', PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'), null, '_blank');
PMA_printListItem(__('Get support'), 'li_pma_support', PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'), null, '_blank');
PMA_printListItem(__('List of changes'), 'li_pma_changes', PMA_linkURL('changelog.php'), null, '_blank');
PMA_printListItem(
__('Official Homepage'),
'li_pma_homepage',
PMA_linkURL('http://www.phpMyAdmin.net/'),
null,
'_blank'
);
PMA_printListItem(
__('Contribute'),
'li_pma_contribute',
PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'),
null,
'_blank'
);
PMA_printListItem(
__('Get support'),
'li_pma_support',
PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'),
null,
'_blank'
);
PMA_printListItem(
__('List of changes'),
'li_pma_changes',
PMA_linkURL('changelog.php'),
null,
'_blank'
);
?>
</ul>
</div>
@ -278,7 +354,10 @@ if ($server != 0
&& $cfg['Server']['user'] == 'root'
&& $cfg['Server']['password'] == ''
) {
trigger_error(__('Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole by setting a password for user \'root\'.'), E_USER_WARNING);
trigger_error(
__('Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole by setting a password for user \'root\'.'),
E_USER_WARNING
);
}
/**
@ -286,7 +365,10 @@ if ($server != 0
* break it, see bug 1063821.
*/
if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
trigger_error(__('You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause some data to be corrupted!'), E_USER_WARNING);
trigger_error(
__('You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause some data to be corrupted!'),
E_USER_WARNING
);
}
/**
@ -294,7 +376,10 @@ if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
* to tell user something might be broken without it, see bug #1063149.
*/
if (! @extension_loaded('mbstring')) {
trigger_error(__('The mbstring PHP extension was not found and you seem to be using a multibyte charset. Without the mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'), E_USER_WARNING);
trigger_error(
__('The mbstring PHP extension was not found and you seem to be using a multibyte charset. Without the mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'),
E_USER_WARNING
);
}
/**
@ -302,14 +387,22 @@ if (! @extension_loaded('mbstring')) {
*/
$gc_time = (int)@ini_get('session.gc_maxlifetime');
if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
trigger_error(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
trigger_error(
__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'),
E_USER_WARNING
);
}
/**
* Check whether LoginCookieValidity is limited by LoginCookieStore.
*/
if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']) {
trigger_error(__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
if ($GLOBALS['cfg']['LoginCookieStore'] != 0
&& $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']
) {
trigger_error(
__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'),
E_USER_WARNING
);
}
/**
@ -318,7 +411,10 @@ if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStor
if (! empty($_SESSION['auto_blowfish_secret'])
&& empty($GLOBALS['cfg']['blowfish_secret'])
) {
trigger_error(__('The configuration file now needs a secret passphrase (blowfish_secret).'), E_USER_WARNING);
trigger_error(
__('The configuration file now needs a secret passphrase (blowfish_secret).'),
E_USER_WARNING
);
}
/**
@ -326,14 +422,22 @@ if (! empty($_SESSION['auto_blowfish_secret'])
* production environment.
*/
if (file_exists('config')) {
trigger_error(__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'), E_USER_WARNING);
trigger_error(
__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'),
E_USER_WARNING
);
}
if ($server > 0) {
$cfgRelation = PMA_getRelationsParam();
if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
if (! $cfgRelation['allworks']
&& $cfg['PmaNoRelation_DisableWarning'] == false
) {
$msg = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
$msg->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$msg->addParam(
'<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">',
false
);
$msg->addParam('</a>', false);
/* Show error if user has configured something, notice elsewhere */
if (!empty($cfg['Servers'][$server]['pmadb'])) {
@ -346,14 +450,18 @@ if ($server > 0) {
/**
* Warning about different MySQL library and server version
* (a difference on the third digit does not count).
* If someday there is a constant that we can check about mysqlnd, we can use it instead
* of strpos().
* If someday there is a constant that we can check about mysqlnd,
* we can use it instead of strpos().
* If no default server is set, PMA_DBI_get_client_info() is not defined yet.
* Drizzle can speak MySQL protocol, so don't warn about version mismatch for Drizzle servers.
* Drizzle can speak MySQL protocol, so don't warn about version mismatch for
* Drizzle servers.
*/
if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
$_client_info = PMA_DBI_get_client_info();
if ($server > 0 && strpos($_client_info, 'mysqlnd') === false && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)) {
if ($server > 0
&& strpos($_client_info, 'mysqlnd') === false
&& substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)
) {
trigger_error(
PMA_sanitize(
sprintf(
@ -391,7 +499,9 @@ if ($cfg['SuhosinDisableWarning'] == false
/**
* Warning about mcrypt.
*/
if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning']) {
if (! function_exists('mcrypt_encrypt')
&& ! $GLOBALS['cfg']['McryptDisableWarning']
) {
PMA_warnMissingExtension('mcrypt');
}
@ -407,25 +517,34 @@ if (file_exists('libraries/language_stats.inc.php')) {
* handling incomplete translations here and focus on english
* speaking users.
*/
if (isset($GLOBALS['language_stats'][$lang]) && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']) {
trigger_error('You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate" target="_blank">contributing</a>.', E_USER_NOTICE);
if (isset($GLOBALS['language_stats'][$lang])
&& $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']
) {
trigger_error(
'You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate" target="_blank">contributing</a>.',
E_USER_NOTICE
);
}
}
/**
* prints list item for main page
*
* @param string $name displayed text
* @param string $id id, used for css styles
* @param string $url make item as link with $url as target
* @param string $mysql_help_page display a link to MySQL's manual
* @param string $target special target for $url
* @param string $a_id id for the anchor, used for jQuery to hook in functions
* @param string $class class for the li element
* @param string $a_class class for the anchor element
* @param string $name displayed text
* @param string $id id, used for css styles
* @param string $url make item as link with $url as target
* @param string $mysql_help_page display a link to MySQL's manual
* @param string $target special target for $url
* @param string $a_id id for the anchor,
* used for jQuery to hook in functions
* @param string $class class for the li element
* @param string $a_class class for the anchor element
*
* @return void
*/
function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null)
{
function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null,
$target = null, $a_id = null, $class = null, $a_class = null
) {
echo '<li id="' . $id . '"';
if (null !== $class) {
echo ' class="' . $class . '"';
@ -434,7 +553,7 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
if (null !== $url) {
echo '<a href="' . $url . '"';
if (null !== $target) {
echo ' target="' . $target . '"';
echo ' target="' . $target . '"';
}
if (null != $a_id) {
echo ' id="' . $a_id .'"';

67
po/pt_BR.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-07-10 05:08+0200\n"
"PO-Revision-Date: 2012-07-11 04:43+0200\n"
"Last-Translator: Anderson Diego Kulpa Fachini <anderson.dkfachini@gmail.com>\n"
"Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
"Language: pt_BR\n"
@ -3660,7 +3660,7 @@ msgstr "Você deveria atualizar para %s %s ou posterior."
#: libraries/common.inc.php:1076
msgid "GLOBALS overwrite attempt"
msgstr ""
msgstr "Tentativa de sobrescrever GLOBALS"
#: libraries/common.inc.php:1083
msgid "possible exploit"
@ -6771,6 +6771,9 @@ msgid ""
"This is the amount of memory allocated to the index cache. Default value is "
"32MB. The memory allocated here is used only for caching index pages."
msgstr ""
"Esta é a quantidade de memória alocada para o cache de índice. O valor "
"padrão é 32MB. A memória alocada aqui é usada apenas para cache de páginas "
"index."
#: libraries/engines/pbxt.lib.php:33
msgid "Record cache size"
@ -6808,6 +6811,8 @@ msgid ""
"The size of a transaction log before rollover, and a new log is created. The "
"default value is 16MB."
msgstr ""
"Tamanho do log de transação antes da mudança e o novo log criado. O valor "
"padrão é 16MB."
#: libraries/engines/pbxt.lib.php:48
msgid "Transaction buffer size"
@ -6818,20 +6823,24 @@ msgid ""
"The size of the global transaction log buffer (the engine allocates 2 "
"buffers of this size). The default is 1MB."
msgstr ""
"O tamanho do buffer do log global de transações (a engine aloca 2 buffers "
"deste tamanho). O padrão é 1MB."
#: libraries/engines/pbxt.lib.php:53
msgid "Checkpoint frequency"
msgstr ""
msgstr "Frequência de ponto de verificação"
#: libraries/engines/pbxt.lib.php:54
msgid ""
"The amount of data written to the transaction log before a checkpoint is "
"performed. The default value is 24MB."
msgstr ""
"A quantidade dados escritos no log de transação antes que um ponto de "
"checagem é realizado. O valor padrão é 24MB."
#: libraries/engines/pbxt.lib.php:58
msgid "Data log threshold"
msgstr ""
msgstr "Início do log de dados"
#: libraries/engines/pbxt.lib.php:59
msgid ""
@ -6840,16 +6849,22 @@ msgid ""
"value of this variable can be increased to increase the total amount of data "
"that can be stored in the database."
msgstr ""
"Tamanho máximo do log de dados. O valor padrão é 64MB. PBXT pode criar no "
"máximo 32000 logs da dados, que são usados por todas as tabelas. Então o "
"valor desta variável pode ser incrementado para aumentar a quantidade total "
"dos dados que podem ser armazenados no banco de dados."
#: libraries/engines/pbxt.lib.php:63
msgid "Garbage threshold"
msgstr ""
msgstr "Início do lixo"
#: libraries/engines/pbxt.lib.php:64
msgid ""
"The percentage of garbage in a data log file before it is compacted. This is "
"a value between 1 and 99. The default is 50."
msgstr ""
"O percentual de lixo em um arquivo de dados de log antes de compactá-lo. "
"Este valor está entre 1 e 99. O padrão é 50."
#: libraries/engines/pbxt.lib.php:68
msgid "Log buffer size"
@ -6864,23 +6879,23 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:73
msgid "Data file grow size"
msgstr ""
msgstr "Tamanho que um arquivo de dados pode atingir"
#: libraries/engines/pbxt.lib.php:74
msgid "The grow size of the handle data (.xtd) files."
msgstr ""
msgstr "Tamanho que um arquivo de controle de dados (.xtd) pode atingir."
#: libraries/engines/pbxt.lib.php:78
msgid "Row file grow size"
msgstr ""
msgstr "Tamanho que a linha de um arquivo pode atingir"
#: libraries/engines/pbxt.lib.php:79
msgid "The grow size of the row pointer (.xtr) files."
msgstr ""
msgstr "Tamanho que um ponteiro de linha (.xtr) pode atingir."
#: libraries/engines/pbxt.lib.php:83
msgid "Log file count"
msgstr ""
msgstr "Soma de arquivos de log"
#: libraries/engines/pbxt.lib.php:84
msgid ""
@ -6896,6 +6911,8 @@ msgid ""
"Documentation and further information about PBXT can be found on the "
"%sPrimeBase XT Home Page%s."
msgstr ""
"Documentação e mais informações sobre PBXT podem ser encontradas na %"
"sPrimeBase XT Home Page%s."
#: libraries/engines/pbxt.lib.php:135
msgid "Related Links"
@ -6903,7 +6920,7 @@ msgstr "Links relacionados"
#: libraries/engines/pbxt.lib.php:137
msgid "The PrimeBase XT Blog by Paul McCullagh"
msgstr ""
msgstr "O PrimeBase XT Blog por Paul McCullagh"
#: libraries/gis_visualization.lib.php:135
msgid "No data found for GIS visualization."
@ -7555,7 +7572,7 @@ msgstr "Versão do PHP"
#: libraries/plugins/export/ExportMediawiki.class.php:39
#: libraries/plugins/import/ImportMediawiki.class.php:52
msgid "MediaWiki Table"
msgstr ""
msgstr "Tabela MediaWiki"
#: libraries/plugins/export/ExportMediawiki.class.php:77
#, fuzzy
@ -7582,13 +7599,15 @@ msgstr "Título do Relatório:"
#: libraries/plugins/export/ExportPhparray.class.php:39
msgid "PHP array"
msgstr ""
msgstr "Array PHP"
#: libraries/plugins/export/ExportSql.class.php:152
msgid ""
"Display comments <i>(includes info such as export timestamp, PHP version, "
"and server version)</i>"
msgstr ""
"Mostrar comentários <i>(incluindo informação como data e hora de exportação, "
"versão do PHP e versão do servidor)</i>"
#: libraries/plugins/export/ExportSql.class.php:160
msgid "Additional custom header comment (\\n splits lines):"
@ -7604,6 +7623,8 @@ msgstr ""
msgid ""
"Database system or older MySQL server to maximize output compatibility with:"
msgstr ""
"Sistema de banco de dados ou servidor de MySQL antigo para maximizar saída "
"de compatível com:"
#: libraries/plugins/export/ExportSql.class.php:242
#: libraries/plugins/export/ExportSql.class.php:310
@ -7621,6 +7642,8 @@ msgid ""
"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Envolver nomes de tabela e colunas com crase <i>(Proteger nomes de colunas e "
"tabelas formados com caracteres especiais ou palavras chaves)</i>"
#: libraries/plugins/export/ExportSql.class.php:381
#: libraries/plugins/export/ExportSql.class.php:1610
@ -7629,23 +7652,23 @@ msgstr ""
#: libraries/plugins/export/ExportSql.class.php:388
msgid "Instead of <code>INSERT</code> statements, use:"
msgstr ""
msgstr "Em vez de declarar <code>INSERT</code>, use:"
#: libraries/plugins/export/ExportSql.class.php:396
msgid "<code>INSERT DELAYED</code> statements"
msgstr ""
msgstr "declarações <code>INSERT DELAYED</code>"
#: libraries/plugins/export/ExportSql.class.php:406
msgid "<code>INSERT IGNORE</code> statements"
msgstr ""
msgstr "declarações <code>INSERT IGNORE</code>"
#: libraries/plugins/export/ExportSql.class.php:421
msgid "Function to use when dumping data:"
msgstr ""
msgstr "Função usada quando despejar dados:"
#: libraries/plugins/export/ExportSql.class.php:434
msgid "Syntax to use when inserting data:"
msgstr ""
msgstr "Sintaxe para usar quando inserir dados:"
#: libraries/plugins/export/ExportSql.class.php:442
msgid ""
@ -7653,6 +7676,9 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
"(1,2,3)</code>"
msgstr ""
"incluir nomes de columas em cada declaração <code>INSERT</code><br /> &nbsp; "
"&nbsp; &nbsp; Exemplo: <code>INSERT INTO tbl_name (col_A,col_B,col_C) "
"VALUES (1,2,3)</code>"
#: libraries/plugins/export/ExportSql.class.php:447
msgid ""
@ -7660,12 +7686,17 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
msgstr ""
"inserir múltiplas linhas em cada declaração <code>INSERT</code><br /> &nbsp; "
"&nbsp; &nbsp; Exemplo: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:452
msgid ""
"both of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
msgstr ""
"acima referidos<br /> &nbsp; &nbsp; &nbsp; Exemplo: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:457
msgid ""