Merge Origin: Conflicts in js/functions.js
This commit is contained in:
23
ChangeLog
23
ChangeLog
@@ -83,7 +83,21 @@ $Id$
|
||||
+ [core] Include Content Security Policy HTTP headers.
|
||||
- bug #3004216 [CSS] Field attributes use inline CSS
|
||||
- patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
|
||||
- [core] Update library PHPExcel to version 1.7.3c
|
||||
- patch #3025161 [core] Prevent sending of unnecessary cookies,
|
||||
thanks to Piotr Przybylski - crackpl
|
||||
- bug [password] Generate password only available if JS is enabled
|
||||
(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.
|
||||
+ [code] Centralized format string expansion, @VARIABLES@ are recommended way
|
||||
now.
|
||||
+ [validator] SQL validator works also with SOAP PHP extension.
|
||||
- [interface] Better formatting for SQL validator results.
|
||||
|
||||
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
|
||||
@@ -93,6 +107,13 @@ $Id$
|
||||
- bug [replication] Do not offer information_schema in the list of databases
|
||||
- bug [js] Avoid loading twice a js file
|
||||
- bug #3024344 [setup] Setup forces numeric MemoryLimit
|
||||
- bug #3025975 [auth] Odd LoginCookieValidity default value
|
||||
- bug #3026400 [PHP] ereg functions are deprecated
|
||||
- bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master)
|
||||
- bug #3023507 [core] No result set display from stored procedure SELECT
|
||||
- bug [export] CSV for MS Excel (Windows) should have semi-colon as separator
|
||||
- [core] Update library PHPExcel to version 1.7.3c
|
||||
- bug #2994885, bug #3029168 [import] Convert Excel column name correctly
|
||||
|
||||
3.3.4.0 (2010-06-28)
|
||||
- bug #2996161 [import] properly escape import value
|
||||
|
@@ -340,7 +340,8 @@ rm -rf config # remove not needed directory
|
||||
<abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
|
||||
|
||||
<p> If you already had this infrastructure and upgraded to MySQL 4.1.2
|
||||
or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>.</p>
|
||||
or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>
|
||||
and then create new tables by importing <i>./scripts/create_tables.sql</i>.</p>
|
||||
|
||||
<p> You can use your phpMyAdmin to create the tables for you. Please be aware
|
||||
that you may need special (administrator) privileges to create the database
|
||||
@@ -396,7 +397,7 @@ rm -rf config # remove not needed directory
|
||||
In cookie mode, the password is stored, encrypted with the blowfish
|
||||
algorithm, in a temporary cookie.</li>
|
||||
|
||||
<li id="pmausr">Note: starting with phpMyAdmin 2.6.1, this section is only applicable if
|
||||
<li id="pmausr">Note: this section is only applicable if
|
||||
your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
|
||||
|
||||
For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
|
||||
@@ -715,7 +716,7 @@ since this link provides funding for phpMyAdmin.
|
||||
<dd>This special account is used for 2 distinct purposes: to make possible
|
||||
all relational features (see
|
||||
<a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
|
||||
and, for a MySQL server previous to 4.1.2 or running with
|
||||
and, for a MySQL server running with
|
||||
<tt>--skip-show-database</tt>, to enable a multi-user installation
|
||||
(<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
|
||||
authentication mode).<br /><br />
|
||||
@@ -1361,8 +1362,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
|
||||
<dd>Define how long is login cookie valid. Please note that php
|
||||
configuration option <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a>
|
||||
might limit session validity and if session is lost, login cookie is
|
||||
also invalidated. So it is good idea to set <code>session.gc_maxlifetime</code>
|
||||
at least as high is $cfg['LoginCookieValidity'] is set.</dd>
|
||||
also invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code>
|
||||
not lower than the value of $cfg['LoginCookieValidity'].</dd>
|
||||
|
||||
<dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt>
|
||||
<dd>Define how long is login cookie should be stored in browser. Default 0
|
||||
@@ -1683,27 +1684,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
|
||||
expression. For example if you want only Czech and English, you should
|
||||
set filter to <code>'^(cs|en)'</code>.</dd>
|
||||
|
||||
<dt id="cfg_DefaultCharset">$cfg['DefaultCharset'] string</dt>
|
||||
<dd>Default character set to use for recoding of MySQL queries. This must be
|
||||
enabled and it's described by
|
||||
<a href="#cfg_AllowAnywhereRecoding" class="configrule">$cfg['AllowAnywhereRecoding']</a>
|
||||
option.<br />
|
||||
You can give here any character set which is in
|
||||
<a href="#cfg_AvailableCharsets" class="configrule">$cfg['AvailableCharsets']</a>
|
||||
array and this is just default choice, user can select any of them.</dd>
|
||||
|
||||
<dt id="cfg_AllowAnywhereRecoding">$cfg['AllowAnywhereRecoding'] boolean</dt>
|
||||
<dd>Allow character set recoding of MySQL queries. You need recode or iconv
|
||||
support (compiled in or module) in PHP to allow MySQL queries recoding
|
||||
and used language file must have it enabled (by default only these
|
||||
which are in Unicode, just to avoid losing some characters).<br /><br />
|
||||
|
||||
Setting this to <tt>TRUE</tt> also activates a pull-down menu
|
||||
in the Export and Import pages, to choose the character set when
|
||||
exporting a file. The default value in this menu comes from
|
||||
<tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
|
||||
</dd>
|
||||
|
||||
<dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] string</dt>
|
||||
<dd>You can select here which functions will be used for character set
|
||||
conversion. Possible values are:
|
||||
@@ -1711,8 +1691,15 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
|
||||
iconv, then recode)</li>
|
||||
<li>iconv - use iconv or libiconv functions</li>
|
||||
<li>recode - use recode_string function</li>
|
||||
<li>none - disable encoding conversion</li>
|
||||
</ul>
|
||||
Default is auto.</dd>
|
||||
<dd>
|
||||
Enabled charset conversion activates a pull-down menu
|
||||
in the Export and Import pages, to choose the character set when
|
||||
exporting a file. The default value in this menu comes from
|
||||
<tt>$cfg['Export']['charset']</tt> and <tt>$cfg['Import']['charset']</tt>.
|
||||
</dd>
|
||||
|
||||
<dt id="cfg_IconvExtraParams">$cfg['IconvExtraParams'] string</dt>
|
||||
<dd>Specify some parameters for iconv used in charset conversion. See
|
||||
@@ -1867,7 +1854,7 @@ $cfg['TrustedProxies'] =
|
||||
editing.</dd>
|
||||
|
||||
<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
|
||||
<dd>Maximum number of characters showen in any non-numeric column on browse view.
|
||||
<dd>Maximum number of characters shown in any non-numeric field on browse view.
|
||||
Can be turned off by a toggle button on the browse page.</dd>
|
||||
|
||||
<dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean
|
||||
@@ -2163,24 +2150,8 @@ setfacl -d -m "g:www-data:rwx" tmp
|
||||
<dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
|
||||
<dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
|
||||
<dt id="cfg_TitleDefault">$cfg['TitleDefault'] string</dt>
|
||||
<dd>Allows you to specify window's title bar. Following magic string can
|
||||
be used to get special values:
|
||||
<dl>
|
||||
<dt><code>@HTTP_HOST@</code></dt>
|
||||
<dd>HTTP host that runs phpMyAdmin</dd>
|
||||
<dt><code>@SERVER@</code></dt>
|
||||
<dd>MySQL server name</dd>
|
||||
<dt><code>@VERBOSE@</code></dt>
|
||||
<dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
|
||||
<dt><code>@VSERVER@</code></dt>
|
||||
<dd>Verbose MySQL server name if set, otherwise normal</dd>
|
||||
<dt><code>@DATABASE@</code></dt>
|
||||
<dd>Currently opened database</dd>
|
||||
<dt><code>@TABLE@</code></dt>
|
||||
<dd>Currently opened table</dd>
|
||||
<dt><code>@PHPMYADMIN@</code></dt>
|
||||
<dd>phpMyAdmin with version</dd>
|
||||
</dl>
|
||||
<dd>Allows you to specify window's title bar. You can use
|
||||
<a href="#faq6_27">format string expansion</a>.
|
||||
</dd>
|
||||
|
||||
<dt id="cfg_ErrorIconic">$cfg['ErrorIconic'] boolean</dt>
|
||||
@@ -4137,25 +4108,34 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
|
||||
<a href="#faqsqlvalidator">6.14 How do I set up the
|
||||
<abbr title="structured query language">SQL</abbr> Validator?</a></h4>
|
||||
|
||||
<p> To use it, you need a very recent version of PHP, 4.3.0 recommended, with
|
||||
<p>
|
||||
To use SQL Validator, you need PHP with
|
||||
<abbr title="Extensible Markup Language">XML</abbr>,
|
||||
<abbr title="Perl Compatible Regular Expressions">PCRE</abbr> and
|
||||
<abbr title="PHP Extension and Application Repository">PEAR</abbr> support.
|
||||
On your system command line, run <tt>"pear install Net_Socket Net_URL
|
||||
HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary
|
||||
<abbr title="PHP Extension and Application Repository">PEAR</abbr> modules
|
||||
for usage.<br />
|
||||
On a more recent pear version, I had problems with the state of Net_DIME
|
||||
being beta, so this single command
|
||||
<tt>"pear -d preferred_state=beta install -a SOAP"</tt> installed all the
|
||||
needed modules.<br />
|
||||
In addition you need a <abbr title="Simple Object Access
|
||||
Protocol">SOAP</abbr> support, either as a PHP extension or as a PEAR SOAP
|
||||
module.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
To install <abbr title="PHP Extension and Application
|
||||
Repository">PEAR</abbr> <abbr title="Simple Object Access
|
||||
Protocol">SOAP</abbr> module, run <tt>"pear install Net_Socket Net_URL
|
||||
HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary <abbr
|
||||
title="PHP Extension and Application Repository">PEAR</abbr> modules for
|
||||
usage.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you use the Validator, you should be aware that any
|
||||
<abbr title="structured query language">SQL</abbr> statement you
|
||||
submit will be stored anonymously (database/table/column names,
|
||||
strings, numbers replaced with generic values). The Mimer
|
||||
<abbr title="structured query language">SQL</abbr>
|
||||
Validator itself, is © 2001 Upright Database Technology.
|
||||
We utilize it as free SOAP service.</p>
|
||||
We utilize it as free SOAP service.
|
||||
</p>
|
||||
|
||||
<h4 id="faq6_15">
|
||||
<a href="#faq6_15">6.15 I want to add a BLOB column and put an index on
|
||||
@@ -4343,6 +4323,33 @@ chmod o+rwx tmp
|
||||
<p> Click the first row of the range, hold the shift key and click the last row of the range. This works everywhere you see rows, for example in Browse mode or on the Structure page.</p>
|
||||
|
||||
|
||||
<h4 id="faq6_27">
|
||||
<a href="#faq6_27">6.27 What format strings can I use?</a></h4>
|
||||
|
||||
<p>
|
||||
In all places where phpMyAdmin accepts format strings, you can use
|
||||
<code>@VARIABLE@</code> expansion and
|
||||
<a href="http://php.net/strftime">strftime</a> format strings. The
|
||||
expanded variables depend on a context (eg. if you don't have chosen
|
||||
table, you can not get table name), but following variables can be used:
|
||||
</p>
|
||||
<dl>
|
||||
<dt><code>@HTTP_HOST@</code></dt>
|
||||
<dd>HTTP host that runs phpMyAdmin</dd>
|
||||
<dt><code>@SERVER@</code></dt>
|
||||
<dd>MySQL server name</dd>
|
||||
<dt><code>@VERBOSE@</code></dt>
|
||||
<dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
|
||||
<dt><code>@VSERVER@</code></dt>
|
||||
<dd>Verbose MySQL server name if set, otherwise normal</dd>
|
||||
<dt><code>@DATABASE@</code></dt>
|
||||
<dd>Currently opened database</dd>
|
||||
<dt><code>@TABLE@</code></dt>
|
||||
<dd>Currently opened table</dd>
|
||||
<dt><code>@PHPMYADMIN@</code></dt>
|
||||
<dd>phpMyAdmin with version</dd>
|
||||
</dl>
|
||||
|
||||
<h3 id="faqproject">phpMyAdmin project</h3>
|
||||
|
||||
<h4 id="faq7_1">
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* display selection for relational field values
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version 1.0
|
||||
* @package BLOBStreaming
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Simple script to set correct charset for changelog
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -9,7 +9,6 @@
|
||||
* - adding tables
|
||||
* - viewing PDF schemas
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* query by example the whole database
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -7,23 +7,6 @@
|
||||
* @todo display executed query, optional?
|
||||
* @uses $cfg['UseDbSearch']
|
||||
* @uses $GLOBALS['db']
|
||||
* @uses __('Access denied')
|
||||
* @uses __('at least one of the words')
|
||||
* @uses __('all words')
|
||||
* @uses __('the exact phrase')
|
||||
* @uses __('as regular expression')
|
||||
* @uses __('Search results for "<i>%s</i>" %s:')
|
||||
* @uses __('%s match(es) inside table <i>%s</i>')
|
||||
* @uses __('Browse')
|
||||
* @uses __('Delete')
|
||||
* @uses __('<b>Total:</b> <i>%s</i> match(es)')
|
||||
* @uses __('Search in database')
|
||||
* @uses __('Word(s) or value(s) to search for (wildcard: "%"):')
|
||||
* @uses __('Find:')
|
||||
* @uses __('Words are separated by a space character (" ").')
|
||||
* @uses __('Inside table(s):')
|
||||
* @uses __('Unselect All')
|
||||
* @uses __('Select All')
|
||||
* @uses PMA_DBI_get_tables()
|
||||
* @uses PMA_sqlAddslashes()
|
||||
* @uses PMA_getSearchSqls()
|
||||
@@ -46,7 +29,6 @@
|
||||
* @uses array_intersect()
|
||||
* @uses sprintf()
|
||||
* @uses in_array()
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -257,7 +239,7 @@ if (isset($_REQUEST['submit_search'])) {
|
||||
$sql_query .= $newsearchsqls['select_count'];
|
||||
|
||||
echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
|
||||
.'<td>' . sprintf(__('%s match(es) inside table <i>%s</i>'), $res_cnt,
|
||||
.'<td>' . sprintf(_ngettext('%s match inside table <i>%s</i>', '%s matches inside table <i>%s</i>', $res_cnt), $res_cnt,
|
||||
htmlspecialchars($each_table)) . "</td>\n";
|
||||
|
||||
if ($res_cnt > 0) {
|
||||
@@ -282,7 +264,7 @@ if (isset($_REQUEST['submit_search'])) {
|
||||
echo '</table>' . "\n";
|
||||
|
||||
if (count($tables_selected) > 1) {
|
||||
echo '<p>' . sprintf(__('<b>Total:</b> <i>%s</i> match(es)'),
|
||||
echo '<p>' . sprintf(_ngettext('<b>Total:</b> <i>%s</i> match', '<b>Total:</b> <i>%s</i> matches', $num_search_result_total),
|
||||
$num_search_result_total) . '</p>' . "\n";
|
||||
}
|
||||
} // end 1.
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -360,24 +359,24 @@ foreach ($tables as $keyname => $each_table) {
|
||||
) {
|
||||
$do = true;
|
||||
}
|
||||
foreach ($server_slave_Wild_Do_Table as $table) {
|
||||
if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename)))
|
||||
foreach ($server_slave_Wild_Do_Table as $db_table) {
|
||||
$table_part = PMA_extract_db_or_table($db_table, 'table');
|
||||
if (($db == PMA_extract_db_or_table($db_table, 'db')) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) {
|
||||
$do = true;
|
||||
}
|
||||
}
|
||||
////////////////////////////////////////////////////////////////////
|
||||
if ((strlen(array_search($truename, $server_slave_Ignore_Table)) > 0) || (strlen(array_search($db, $server_slave_Ignore_DB)) > 0)) {
|
||||
$ignored = true;
|
||||
}
|
||||
foreach ($server_slave_Wild_Ignore_Table as $table) {
|
||||
if (($db == PMA_replication_strout($table)) && (ereg("^".substr(PMA_replication_strout($table, true), 0, strlen(PMA_replication_strout($table, true))-1), $truename)))
|
||||
foreach ($server_slave_Wild_Ignore_Table as $db_table) {
|
||||
$table_part = PMA_extract_db_or_table($db_table, 'table');
|
||||
if (($db == PMA_extract_db_or_table($db_table)) && (preg_match("@^" . substr($table_part, 0, strlen($table_part) - 1) . "@", $truename))) {
|
||||
$ignored = true;
|
||||
}
|
||||
}/* elseif ($server_master_status) {
|
||||
if ((strlen(array_search($db, $server_master_Do_DB))>0) || count($server_master_Do_DB)==1)
|
||||
$do = true;
|
||||
elseif ((strlen(array_search($db, $server_master_Ignore_DB))>0) || count($server_master_Ignore_DB)==1)
|
||||
$ignored = true;
|
||||
}*/
|
||||
}
|
||||
unset($table_part);
|
||||
}
|
||||
?>
|
||||
<tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
|
||||
<td align="center">
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* phpMyAdmin fatal error display page
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
11
export.php
11
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
|
||||
*/
|
||||
|
||||
@@ -207,7 +206,7 @@ if ($what == 'sql') {
|
||||
$output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xls';
|
||||
|
||||
// Do we need to convert charset?
|
||||
$output_charset_conversion = $asfile && $cfg['AllowAnywhereRecoding']
|
||||
$output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE
|
||||
&& isset($charset_of_file) && $charset_of_file != $charset
|
||||
&& $type != 'xls';
|
||||
|
||||
@@ -248,25 +247,19 @@ if ($asfile) {
|
||||
if (isset($remember_template)) {
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_server_filename_template', $filename_template);
|
||||
}
|
||||
$filename = str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template));
|
||||
} elseif ($export_type == 'database') {
|
||||
if (isset($remember_template)) {
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_db_filename_template', $filename_template);
|
||||
}
|
||||
$filename = str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)));
|
||||
} else {
|
||||
if (isset($remember_template)) {
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_table_filename_template', $filename_template);
|
||||
}
|
||||
$filename = str_replace('__TABLE__', $table, str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template))));
|
||||
}
|
||||
$filename = PMA_expandUserString($filename_template);
|
||||
|
||||
// convert filename to iso-8859-1, it is safer
|
||||
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )) {
|
||||
$filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
|
||||
} else {
|
||||
$filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);
|
||||
}
|
||||
|
||||
// Grab basic dump extension and mime type
|
||||
$filename .= '.' . $export_list[$type]['extension'];
|
||||
|
@@ -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
|
||||
*/
|
||||
|
||||
@@ -343,7 +342,7 @@ if ($import_file != 'none' && !$error) {
|
||||
//$_SESSION['Import_message'] = $message->getDisplay();
|
||||
|
||||
// Convert the file's charset if necessary
|
||||
if ($cfg['AllowAnywhereRecoding'] && isset($charset_of_file)) {
|
||||
if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) {
|
||||
if ($charset_of_file != $charset) {
|
||||
$charset_conversion = TRUE;
|
||||
}
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,8 +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']
|
||||
* @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe
|
||||
@@ -63,7 +61,7 @@ unset($cfgRelation);
|
||||
/**
|
||||
* pass variables to child pages
|
||||
*/
|
||||
$drops = array('lang', 'server', 'convcharset', 'collation_connection',
|
||||
$drops = array('lang', 'server', 'collation_connection',
|
||||
'db', 'table');
|
||||
|
||||
foreach ($drops as $each_drop) {
|
||||
|
@@ -1733,22 +1733,26 @@ $(document).ready(function(){
|
||||
});
|
||||
|
||||
$("#export_type").change(function(){
|
||||
|
||||
if($("#export_type").val()!='pdf')
|
||||
{
|
||||
if($("#export_type").val()!='pdf'){
|
||||
$("#show_grid_opt").attr("disabled","disabled");
|
||||
$("#orientation_opt").attr("disabled","disabled");
|
||||
$("#with_doc").attr("disabled","disabled");
|
||||
$(this).css("background-color","yellow");
|
||||
|
||||
}
|
||||
if($("#export_type").val()=='pdf')
|
||||
{
|
||||
if($("#export_type").val()=='pdf'){
|
||||
$("#show_grid_opt").removeAttr("disabled");
|
||||
$("#orientation_opt").removeAttr("disabled");
|
||||
$("#with_doc").removeAttr("disabled","disabled");
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
$('#sqlquery').focus();
|
||||
if ($('#input_username')) {
|
||||
if ($('#input_username').val() == '') {
|
||||
$('#input_username').focus();
|
||||
} else {
|
||||
$('#input_password').focus();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
@@ -62,6 +62,10 @@ $js_messages['strSelectForeignKey'] = __('Select Foreign Key');
|
||||
$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');
|
||||
$js_messages['strChangeDisplay'] = __('Choose column to display');
|
||||
|
||||
/* password generation */
|
||||
$js_messages['strGeneratePassword'] = __('Generate password');
|
||||
$js_messages['strGenerate'] = __('Generate');
|
||||
|
||||
echo "var PMA_messages = new Array();\n";
|
||||
foreach ($js_messages as $name => $js_message) {
|
||||
PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);
|
||||
|
10
js/password_generation.js
Normal file
10
js/password_generation.js
Normal file
@@ -0,0 +1,10 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* for libraries/display_change_password.lib.php
|
||||
*
|
||||
*/
|
||||
|
||||
$(document).ready(function() {
|
||||
$('#tr_element_before_generate_password').parent().append('<tr><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
|
||||
$('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
|
||||
});
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -994,7 +993,6 @@ class PMA_Config
|
||||
* @uses $GLOBALS['PMA_Config']
|
||||
* @uses PMA_Config::get()
|
||||
* @uses PMA_Config::_getFontsizeOptions()
|
||||
* @uses __('Font size')
|
||||
* @static
|
||||
* @param string $current_size currently slected font size with unit
|
||||
* @return string html selectbox
|
||||
@@ -1031,7 +1029,6 @@ class PMA_Config
|
||||
*
|
||||
* @uses PMA_generate_common_hidden_inputs()
|
||||
* @uses PMA_Config::_getFontsizeSelection()
|
||||
* @uses __('Go')
|
||||
* @static
|
||||
* @param string $current_size currently slected font size with unit
|
||||
* @return string html selectbox
|
||||
@@ -1086,11 +1083,14 @@ class PMA_Config
|
||||
if ($validity == null) {
|
||||
$validity = 2592000;
|
||||
}
|
||||
if (strlen($value) && null !== $default && $value === $default
|
||||
&& isset($_COOKIE[$cookie])) {
|
||||
// remove cookie, default value is used
|
||||
if (strlen($value) && null !== $default && $value === $default) {
|
||||
// default value is used
|
||||
if (isset($_COOKIE[$cookie])) {
|
||||
// remove cookie
|
||||
return $this->removeCookie($cookie);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! strlen($value) && isset($_COOKIE[$cookie])) {
|
||||
// remove cookie, value is empty
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Holds class PMA_Error
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Holds class PMA_Error_Handler
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* file upload functions
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -259,13 +258,6 @@ class PMA_File
|
||||
* @uses PMA_File::setRecentBLOBReference()
|
||||
* @uses curl_setopt_array()
|
||||
* @uses PMA_File::$_error_message
|
||||
* @uses __('The uploaded file exceeds the upload_max_filesize directive in php.ini.')
|
||||
* @uses __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.')
|
||||
* @uses __('The uploaded file was only partially uploaded.')
|
||||
* @uses __('Missing a temporary folder.')
|
||||
* @uses __('Failed to write file to disk.')
|
||||
* @uses __('File upload stopped by extension.')
|
||||
* @uses __('Unknown error in file upload.')
|
||||
* @uses $_FILES
|
||||
* @param string $key a numeric key used to identify the different rows
|
||||
* @param string $primary_key
|
||||
@@ -832,7 +824,6 @@ class PMA_File
|
||||
/**
|
||||
*
|
||||
* @access public
|
||||
* @uses __('File could not be read')
|
||||
* @uses PMA_File::setName()
|
||||
* @uses PMA_securePath()
|
||||
* @uses PMA_userDir()
|
||||
@@ -881,7 +872,6 @@ class PMA_File
|
||||
* @todo move check of $cfg['TempDir'] into PMA_Config?
|
||||
* @access public
|
||||
* @uses $cfg['TempDir']
|
||||
* @uses __('Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]')
|
||||
* @uses PMA_File::isReadable()
|
||||
* @uses PMA_File::getName()
|
||||
* @uses PMA_File::setName()
|
||||
@@ -937,7 +927,6 @@ class PMA_File
|
||||
*
|
||||
* @todo move file read part into readChunk() or getChunk()
|
||||
* @todo add support for compression plugins
|
||||
* @uses __('File could not be read')
|
||||
* @uses PMA_File::$_compression to set it
|
||||
* @uses PMA_File::getName()
|
||||
* @uses fopen()
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* holds the database index class
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -539,7 +538,6 @@ class PMA_Index
|
||||
/**
|
||||
* Function to check over array of indexes and look for common problems
|
||||
*
|
||||
* @uses __('The indexes %1 and %2 seem to be equal and one of them could possibly be removed.')
|
||||
* @uses is_string()
|
||||
* @uses is_array()
|
||||
* @uses count()
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* hold the PMA_List base class
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* holds the PMA_List_Database class
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Holds class PMA_Message
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Library for extracting information about the partitions
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Library for extracting information about the available storage engines
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -155,7 +154,6 @@ class PMA_StorageEngine
|
||||
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
|
||||
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
|
||||
* @uses PMA_StorageEngine::getVariablesStatus()
|
||||
* @uses __('There is no detailed status information available for this storage engine.')
|
||||
* @uses PMA_showHint()
|
||||
* @uses PMA_formatByteDown()
|
||||
* @uses PMA_formatNumber()
|
||||
@@ -335,11 +333,6 @@ class PMA_StorageEngine
|
||||
/**
|
||||
* public String getSupportInformationMessage()
|
||||
*
|
||||
* @uses __('%s is the default storage engine on this MySQL server.')
|
||||
* @uses __('%s is available on this MySQL server.')
|
||||
* @uses __('%s has been disabled for this MySQL server.')
|
||||
* @uses __('This MySQL server does not support the %s storage engine.')
|
||||
* @uses __('This MySQL server does not support the %s storage engine.')
|
||||
* @uses PMA_ENGINE_SUPPORT_DEFAULT
|
||||
* @uses PMA_ENGINE_SUPPORT_YES
|
||||
* @uses PMA_ENGINE_SUPPORT_DISABLED
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* hold PMA_Theme class
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -145,7 +144,6 @@ class PMA_Theme {
|
||||
* @uses PMA_Theme::setImgPath()
|
||||
* @uses PMA_Theme::getName()
|
||||
* @uses $GLOBALS['cfg']['ThemePath']
|
||||
* @uses __('No valid image path for theme %s found!')
|
||||
* @uses is_dir()
|
||||
* @uses sprintf()
|
||||
*/
|
||||
@@ -357,8 +355,6 @@ class PMA_Theme {
|
||||
* @uses PMA_Theme::getVersion()
|
||||
* @uses PMA_Theme::getId()
|
||||
* @uses PMA_Theme::getPath()
|
||||
* @uses __('No preview available.')
|
||||
* @uses __('take it')
|
||||
* @uses PMA_generate_common_url()
|
||||
* @uses addslashes()
|
||||
* @uses file_exists()
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to run config authentication (ie no authentication).
|
||||
*
|
||||
* @package phpMyAdmin-Auth-Config
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to run cookie based authentication.
|
||||
*
|
||||
* @package phpMyAdmin-Auth-Cookie
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -115,17 +114,6 @@ function PMA_get_blowfish_secret() {
|
||||
* @uses $GLOBALS['target']
|
||||
* @uses $GLOBALS['db']
|
||||
* @uses $GLOBALS['table']
|
||||
* @uses __('Welcome to %s')
|
||||
* @uses __('The configuration file now needs a secret passphrase (blowfish_secret).')
|
||||
* @uses __('Error')
|
||||
* @uses __('Log in')
|
||||
* @uses __('Server:')
|
||||
* @uses __('Username:')
|
||||
* @uses __('Password:')
|
||||
* @uses __('Server Choice')
|
||||
* @uses __('Go')
|
||||
* @uses __('Cookies must be enabled past this point.')
|
||||
* @uses __('phpMyAdmin documentation')
|
||||
* @uses $GLOBALS['pmaThemeImage']
|
||||
* @uses $cfg['Servers']
|
||||
* @uses $cfg['LoginCookieRecall']
|
||||
@@ -184,14 +172,14 @@ function PMA_auth()
|
||||
?>
|
||||
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
|
||||
<script src="./js/update-location.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
// show login form in top frame
|
||||
if (top != self) {
|
||||
window.top.location.href=location;
|
||||
<?php
|
||||
if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
|
||||
?>
|
||||
<script src="./js/cross_framing_protection.js" type="text/javascript"></script>
|
||||
<?php
|
||||
}
|
||||
//]]>
|
||||
</script>
|
||||
?>
|
||||
<script src="./js/functions.js" type="text/javascript"></script>
|
||||
</head>
|
||||
|
||||
<body class="loginform">
|
||||
@@ -324,22 +312,6 @@ if (top != self) {
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
// <![CDATA[
|
||||
function PMA_focusInput()
|
||||
{
|
||||
var input_username = document.getElementById('input_username');
|
||||
var input_password = document.getElementById('input_password');
|
||||
if (input_username.value == '') {
|
||||
input_username.focus();
|
||||
} else {
|
||||
input_password.focus();
|
||||
}
|
||||
}
|
||||
|
||||
window.setTimeout('PMA_focusInput()', 500);
|
||||
// ]]>
|
||||
</script>
|
||||
<?php
|
||||
if (file_exists(CUSTOM_FOOTER_FILE)) {
|
||||
require CUSTOM_FOOTER_FILE;
|
||||
@@ -644,9 +616,6 @@ function PMA_auth_set_user()
|
||||
*
|
||||
* @uses $GLOBALS['server']
|
||||
* @uses $GLOBALS['allowDeny_forbidden']
|
||||
* @uses __('Access denied')
|
||||
* @uses __('No activity within %s seconds; please log in again')
|
||||
* @uses __('Cannot log in to the MySQL server')
|
||||
* @uses $GLOBALS['no_activity']
|
||||
* @uses $cfg['LoginCookieValidity']
|
||||
* @uses $GLOBALS['PMA_Config']->removeCookie()
|
||||
|
@@ -5,7 +5,6 @@
|
||||
* NOTE: Requires PHP loaded as a Apache module.
|
||||
*
|
||||
* @package phpMyAdmin-Auth-HTTP
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to run single signon authentication.
|
||||
*
|
||||
* @package phpMyAdmin-Auth-Signon
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
|
||||
|
@@ -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
|
||||
*/
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Set of functions used with the bookmark feature
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,113 +3,47 @@
|
||||
/**
|
||||
* Charset conversion functions.
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
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 (isset($cfg['AllowAnywhereRecoding'])
|
||||
&& $cfg['AllowAnywhereRecoding']) {
|
||||
|
||||
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';
|
||||
} else {
|
||||
if (@extension_loaded('iconv')) {
|
||||
$PMA_recoding_engine = 'iconv';
|
||||
} elseif (@extension_loaded('recode')) {
|
||||
$PMA_recoding_engine = 'recode';
|
||||
} else {
|
||||
PMA_failRecoding();
|
||||
}
|
||||
}
|
||||
} // end load recode/iconv extension
|
||||
|
||||
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);
|
||||
|
||||
if (!isset($cfg['IconvExtraParams'])) {
|
||||
$cfg['IconvExtraParams'] = '';
|
||||
}
|
||||
define('PMA_CHARSET_RECODE', 2);
|
||||
define('PMA_CHARSET_ICONV_AIX', 3);
|
||||
|
||||
// Finally detect which function we will use:
|
||||
if (isset($cfg['AllowAnywhereRecoding'])
|
||||
&& $cfg['AllowAnywhereRecoding']) {
|
||||
|
||||
if (!isset($PMA_recoding_engine)) {
|
||||
$PMA_recoding_engine = $cfg['RecodingEngine'];
|
||||
}
|
||||
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;
|
||||
} else {
|
||||
$PMA_recoding_engine = PMA_CHARSET_ICONV;
|
||||
}
|
||||
} elseif (@function_exists('libiconv')) {
|
||||
$PMA_recoding_engine = PMA_CHARSET_LIBICONV;
|
||||
} else {
|
||||
$PMA_recoding_engine = PMA_CHARSET_NONE;
|
||||
|
||||
if (!isset($GLOBALS['is_header_sent'])) {
|
||||
include './libraries/header.inc.php';
|
||||
PMA_warnMissingExtension('iconv');
|
||||
}
|
||||
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();
|
||||
}
|
||||
} elseif ($PMA_recoding_engine == 'recode') {
|
||||
} 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');
|
||||
}
|
||||
} 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;
|
||||
} 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 {
|
||||
$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;
|
||||
@@ -120,43 +54,6 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
|
||||
require_once './libraries/iconv_wrapper.lib.php';
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts encoding of text according to current settings.
|
||||
*
|
||||
* @param string what to convert
|
||||
*
|
||||
* @return string converted text
|
||||
*
|
||||
* @global array the configuration array
|
||||
* @global boolean whether recoding is allowed or not
|
||||
* @global string the current charset
|
||||
* @global array the charset to convert to
|
||||
*
|
||||
* @access public
|
||||
*
|
||||
*/
|
||||
function PMA_convert_charset($what) {
|
||||
global $cfg, $charset, $convcharset;
|
||||
|
||||
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )
|
||||
|| $convcharset == $charset) { // if input and output charset are the same, we don't have to do anything...
|
||||
return $what;
|
||||
} else {
|
||||
switch ($GLOBALS['PMA_recoding_engine']) {
|
||||
case PMA_CHARSET_RECODE:
|
||||
return recode_string($charset . '..' . $convcharset, $what);
|
||||
case PMA_CHARSET_ICONV:
|
||||
return iconv($charset, $convcharset . $cfg['IconvExtraParams'], $what);
|
||||
case PMA_CHARSET_ICONV_AIX:
|
||||
return PMA_aix_iconv_wrapper($charset, $convcharset . $cfg['IconvExtraParams'], $what);
|
||||
case PMA_CHARSET_LIBICONV:
|
||||
return libiconv($charset, $convcharset . $GLOBALS['cfg']['IconvExtraParams'], $what);
|
||||
default:
|
||||
return $what;
|
||||
}
|
||||
}
|
||||
} // end of the "PMA_convert_charset()" function
|
||||
|
||||
/**
|
||||
* Converts encoding of text according to parameters with detected
|
||||
* conversion function.
|
||||
@@ -181,59 +78,9 @@ 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;
|
||||
}
|
||||
} // 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:
|
||||
case PMA_CHARSET_LIBICONV:
|
||||
$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);
|
||||
} else {
|
||||
$dist = libiconv($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
|
||||
|
||||
?>
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Get user's global privileges and some db-specific privileges
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Functions for cleanup of user input.
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -28,7 +28,6 @@
|
||||
* - db connection
|
||||
* - authentication work
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -454,7 +453,7 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
|
||||
* f.e. PMA_Config: fontsize
|
||||
*
|
||||
* @todo variables should be handled by their respective owners (objects)
|
||||
* f.e. lang, server, convcharset, collation_connection in PMA_Config
|
||||
* f.e. lang, server, collation_connection in PMA_Config
|
||||
*/
|
||||
if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['token']) {
|
||||
/**
|
||||
@@ -468,7 +467,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
|
||||
/* Session ID */
|
||||
'phpMyAdmin',
|
||||
/* Cookie preferences */
|
||||
'pma_lang', 'pma_charset', 'pma_collation_connection',
|
||||
'pma_lang', 'pma_collation_connection',
|
||||
/* Possible login form */
|
||||
'pma_servername', 'pma_username', 'pma_password',
|
||||
/* for playing blobstreamable media */
|
||||
@@ -488,14 +487,6 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @global string $GLOBALS['convcharset']
|
||||
* @see select_lang.lib.php
|
||||
*/
|
||||
if (isset($_REQUEST['convcharset'])) {
|
||||
$GLOBALS['convcharset'] = strip_tags($_REQUEST['convcharset']);
|
||||
}
|
||||
|
||||
/**
|
||||
* current selected database
|
||||
* @global string $GLOBALS['db']
|
||||
@@ -793,7 +784,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
|
||||
* @todo should be done in PMA_Config
|
||||
*/
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_charset', $GLOBALS['convcharset']);
|
||||
$GLOBALS['PMA_Config']->setCookie('pma_collation_connection', $GLOBALS['collation_connection']);
|
||||
|
||||
$_SESSION['PMA_Theme_Manager']->setThemeCookie();
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Misc functions used all over the scripts.
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -130,7 +129,6 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
|
||||
/**
|
||||
* Displays the maximum size for an upload
|
||||
*
|
||||
* @uses __('Max: %s%s')
|
||||
* @uses PMA_formatByteDown()
|
||||
* @uses sprintf()
|
||||
* @param integer the size
|
||||
@@ -346,7 +344,6 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
|
||||
* @uses $cfg['MySQLManualType']
|
||||
* @uses $cfg['MySQLManualBase']
|
||||
* @uses $cfg['ReplaceHelpImg']
|
||||
* @uses __('Documentation')
|
||||
* @uses $GLOBALS['pmaThemeImage']
|
||||
* @uses PMA_MYSQL_INT_VERSION
|
||||
* @uses strtolower()
|
||||
@@ -501,11 +498,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
|
||||
* @uses footer.inc.php
|
||||
* @uses header.inc.php
|
||||
* @uses $GLOBALS['sql_query']
|
||||
* @uses __('Error')
|
||||
* @uses __('SQL query')
|
||||
* @uses $GLOBALS['pmaThemeImage']
|
||||
* @uses __('Edit')
|
||||
* @uses __('MySQL said: ')
|
||||
* @uses $GLOBALS['cfg']['PropertiesIconic']
|
||||
* @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
|
||||
* @uses PMA_backquote()
|
||||
@@ -1137,7 +1130,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
if (! empty($GLOBALS['show_as_php'])) {
|
||||
$query_base = '$sql = "' . $query_base;
|
||||
} elseif (! empty($GLOBALS['validatequery'])) {
|
||||
try {
|
||||
$query_base = PMA_validateSQL($query_base);
|
||||
} catch (Exception $e) {
|
||||
PMA_Message::error(__('Failed to connect to SQL validator!'))->display();
|
||||
}
|
||||
} elseif (isset($parsed_sql)) {
|
||||
$query_base = PMA_formatSql($parsed_sql, $query_base);
|
||||
}
|
||||
@@ -1253,7 +1250,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
$validate_link = '';
|
||||
} //validator
|
||||
|
||||
if (!empty($GLOBALS['validatequery'])) {
|
||||
echo '<div class="sqlvalidate">';
|
||||
} else {
|
||||
echo '<code class="sql">';
|
||||
}
|
||||
if ($query_too_big) {
|
||||
echo $shortened_query_base;
|
||||
} else {
|
||||
@@ -1264,7 +1265,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
if (! empty($GLOBALS['show_as_php'])) {
|
||||
echo '";';
|
||||
}
|
||||
if (!empty($GLOBALS['validatequery'])) {
|
||||
echo '</div>';
|
||||
} else {
|
||||
echo '</code>';
|
||||
}
|
||||
|
||||
echo '<div class="tools">';
|
||||
// avoid displaying a Profiling checkbox that could
|
||||
@@ -1614,8 +1619,6 @@ function PMA_localisedDate($timestamp = -1, $format = '')
|
||||
* If the variables $link and $args ar left empty, an inactive tab is created
|
||||
*
|
||||
* @uses $GLOBALS['PMA_PHP_SELF']
|
||||
* @uses __('Empty')
|
||||
* @uses __('Drop')
|
||||
* @uses $GLOBALS['active_page']
|
||||
* @uses $GLOBALS['url_query']
|
||||
* @uses $cfg['MainPageIconic']
|
||||
@@ -1882,7 +1885,6 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
|
||||
/**
|
||||
* Returns a given timespan value in a readable format.
|
||||
*
|
||||
* @uses __('%s days, %s hours, %s minutes and %s seconds')
|
||||
* @uses sprintf()
|
||||
* @uses floor()
|
||||
* @param int the timespan
|
||||
@@ -2191,7 +2193,6 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
|
||||
* Generate a pagination selector for browsing resultsets
|
||||
*
|
||||
* @todo $url is not javascript escaped!?
|
||||
* @uses __('Page number:')
|
||||
* @uses range()
|
||||
* @param string URL for the JavaScript
|
||||
* @param string Number of rows in the pagination set
|
||||
@@ -2295,7 +2296,6 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
|
||||
* Generate navigation for a list
|
||||
*
|
||||
* @todo use $pos from $_url_params
|
||||
* @uses __('Page number:')
|
||||
* @uses range()
|
||||
* @param integer number of elements in the list
|
||||
* @param integer current position in the list
|
||||
@@ -2406,7 +2406,6 @@ function PMA_userDir($dir)
|
||||
*
|
||||
* @uses $cfg['DefaultTabDatabase']
|
||||
* @uses $GLOBALS['db']
|
||||
* @uses __('Jump to database "%s".')
|
||||
* @uses PMA_generate_common_url()
|
||||
* @uses PMA_unescape_mysql_wildcards()
|
||||
* @uses strlen()
|
||||
@@ -2436,7 +2435,6 @@ function PMA_getDbLink($database = null)
|
||||
* that affects a functionality
|
||||
*
|
||||
* @uses PMA_MYSQL_INT_VERSION
|
||||
* @uses __('The %s functionality is affected by a known bug, see %s')
|
||||
* @uses PMA_showHint()
|
||||
* @uses sprintf()
|
||||
* @param string $functionality localized message explaining the func.
|
||||
@@ -2841,19 +2839,54 @@ $mapping = array(
|
||||
return $mapping[$target];
|
||||
}
|
||||
|
||||
function PMA_js($code, $print=true)
|
||||
{
|
||||
// these generated newlines are needed
|
||||
$out = '';
|
||||
$out .= '<script type="text/javascript">'."\n";
|
||||
$out .= "\n" . '// <![CDATA[' . "\n";
|
||||
$out .= $code;
|
||||
$out .= "\n" . '// ]]>' . "\n";
|
||||
$out .= '</script>'."\n";
|
||||
/**
|
||||
* Formats user string, expading @VARIABLES@, accepting strftime format string.
|
||||
*
|
||||
* @param string Text where to do expansion.
|
||||
* @param function Function to call for escaping variable values.
|
||||
* @param array Array with overrides for default parameters (obtained from GLOBALS).
|
||||
*/
|
||||
function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
|
||||
/* Content */
|
||||
$vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
|
||||
$vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
|
||||
$vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
|
||||
$vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
|
||||
$vars['database'] = $GLOBALS['db'];
|
||||
$vars['table'] = $GLOBALS['table'];
|
||||
$vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
|
||||
|
||||
if ($print)
|
||||
echo $out;
|
||||
/* Update forced variables */
|
||||
foreach($updates as $key => $val) {
|
||||
$vars[$key] = $val;
|
||||
}
|
||||
|
||||
return $out;
|
||||
/* Replacement mapping */
|
||||
/*
|
||||
* The __VAR__ ones are for backward compatibility, because user
|
||||
* might still have it in cookies.
|
||||
*/
|
||||
$replace = array(
|
||||
'@HTTP_HOST@' => $vars['http_host'],
|
||||
'@SERVER@' => $vars['server_name'],
|
||||
'__SERVER__' => $vars['server_name'],
|
||||
'@VERBOSE@' => $vars['server_verbose'],
|
||||
'@VSERVER@' => $vars['server_verbose_or_name'],
|
||||
'@DATABASE@' => $vars['database'],
|
||||
'__DB__' => $vars['database'],
|
||||
'@TABLE@' => $vars['table'],
|
||||
'__TABLE__' => $vars['table'],
|
||||
'@PHPMYADMIN@' => $vars['phpmyadmin_version'],
|
||||
);
|
||||
|
||||
/* Optional escaping */
|
||||
if (!is_null($escape)) {
|
||||
foreach($replace as $key => $val) {
|
||||
$replace[$key] = $escape($val);
|
||||
}
|
||||
}
|
||||
|
||||
/* Do the replacement */
|
||||
return str_replace(array_keys($replace), array_values($replace), strftime($string));
|
||||
}
|
||||
?>
|
||||
|
@@ -16,7 +16,6 @@
|
||||
*
|
||||
* All directives are explained in Documentation.html
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -587,7 +586,8 @@ $cfg['Confirm'] = true;
|
||||
$cfg['LoginCookieRecall'] = true;
|
||||
|
||||
/**
|
||||
* validity of cookie login (in seconds)
|
||||
* validity of cookie login (in seconds; 1440 matches php.ini's
|
||||
* session.gc_maxlifetime)
|
||||
*
|
||||
* @global integer $cfg['LoginCookieValidity']
|
||||
*/
|
||||
@@ -1116,21 +1116,21 @@ $cfg['Export']['remember_file_template'] = true;
|
||||
*
|
||||
* @global string $cfg['Export']['file_template_table']
|
||||
*/
|
||||
$cfg['Export']['file_template_table'] = '__TABLE__';
|
||||
$cfg['Export']['file_template_table'] = '@TABLE@';
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @global string $cfg['Export']['file_template_database']
|
||||
*/
|
||||
$cfg['Export']['file_template_database'] = '__DB__';
|
||||
$cfg['Export']['file_template_database'] = '@DB@';
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @global string $cfg['Export']['file_template_server']
|
||||
*/
|
||||
$cfg['Export']['file_template_server'] = '__SERVER__';
|
||||
$cfg['Export']['file_template_server'] = '@SERVER@';
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1431,14 +1431,14 @@ $cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContin
|
||||
*
|
||||
* @global string $cfg['Export']['latex_data_label']
|
||||
*/
|
||||
$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data';
|
||||
$cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data';
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @global string $cfg['Export']['latex_structure_label']
|
||||
*/
|
||||
$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
|
||||
$cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure';
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -1949,26 +1949,6 @@ $cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
|
||||
*/
|
||||
$cfg['FilterLanguages'] = '';
|
||||
|
||||
/**
|
||||
* Default character set to use for recoding of MySQL queries, does not take
|
||||
* any effect when character sets recoding is switched off by
|
||||
* $cfg['AllowAnywhereRecoding'] or in language file
|
||||
* (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
|
||||
*
|
||||
* @global string $cfg['DefaultCharset']
|
||||
*/
|
||||
$cfg['DefaultCharset'] = 'utf-8';
|
||||
|
||||
/**
|
||||
* Allow character set recoding of MySQL queries, must be also enabled in language
|
||||
* file to make harder using other language files than Unicode.
|
||||
* Default value is false to avoid problems on servers without the iconv
|
||||
* extension
|
||||
*
|
||||
* @global boolean $cfg['AllowAnywhereRecoding']
|
||||
*/
|
||||
$cfg['AllowAnywhereRecoding'] = false;
|
||||
|
||||
/**
|
||||
* You can select here which functions will be used for character set conversion.
|
||||
* Possible values are:
|
||||
@@ -1976,6 +1956,7 @@ $cfg['AllowAnywhereRecoding'] = false;
|
||||
* recode)
|
||||
* iconv - use iconv or libiconv functions
|
||||
* recode - use recode_string function
|
||||
* none - disable encoding conversion
|
||||
*
|
||||
* @global string $cfg['RecodingEngine']
|
||||
*/
|
||||
@@ -2277,14 +2258,6 @@ $cfg['InitialSlidersState'] = 'closed';
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// custom-setup by mkkeck: 2004-05-04
|
||||
// some specials for new icons and scrolling
|
||||
/**
|
||||
* @todo We need to rearrange these variables.
|
||||
*/
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
* Window title settings
|
||||
*/
|
||||
|
@@ -5,7 +5,6 @@
|
||||
* This script is distinct from libraries/common.inc.php because this
|
||||
* script is called from /test.
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -202,7 +201,6 @@ function PMA_securePath($path)
|
||||
* @todo use detected argument separator (PMA_Config)
|
||||
* @uses $GLOBALS['session_name']
|
||||
* @uses $GLOBALS['text_dir']
|
||||
* @uses __('Error')
|
||||
* @uses $GLOBALS['available_languages']
|
||||
* @uses $GLOBALS['lang']
|
||||
* @uses $GLOBALS['PMA_Config']->removeCookie()
|
||||
@@ -226,7 +224,7 @@ function PMA_fatalError($error_message, $message_args = null)
|
||||
if (! isset($GLOBALS['available_languages'])) {
|
||||
$GLOBALS['cfg'] = array(
|
||||
'DefaultLang' => 'en',
|
||||
'AllowAnywhereRecoding' => false);
|
||||
);
|
||||
|
||||
// Loads the language file
|
||||
require_once './libraries/select_lang.lib.php';
|
||||
@@ -281,7 +279,8 @@ function PMA_fatalError($error_message, $message_args = null)
|
||||
*/
|
||||
function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
|
||||
{
|
||||
$message = sprintf(__('Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] extension. Please check your PHP configuration.'), $extension);
|
||||
$message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'),
|
||||
sprintf('[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]', $extension));
|
||||
if ($extra != '') {
|
||||
$message .= ' ' . $extra;
|
||||
}
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Common Option Constants For DBI Functions
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -38,10 +37,17 @@ $err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db);
|
||||
* headers
|
||||
*/
|
||||
if (! isset($is_db) || ! $is_db) {
|
||||
// Not a valid db name -> back to the welcome page
|
||||
if (strlen($db)) {
|
||||
$is_db = PMA_DBI_select_db($db);
|
||||
// This "Command out of sync" 2014 error may happen, for example
|
||||
// after calling a MySQL procedure; at this point we can't select
|
||||
// the db but it's not necessarily wrong
|
||||
if (PMA_DBI_getError() && $GLOBALS['errno'] == 2014) {
|
||||
$is_db = true;
|
||||
unset($GLOBALS['errno']);
|
||||
}
|
||||
}
|
||||
// Not a valid db name -> back to the welcome page
|
||||
if (! strlen($db) || ! $is_db) {
|
||||
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
|
||||
exit;
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -31,7 +31,6 @@
|
||||
* @uses strnatcasecmp()
|
||||
* @uses count()
|
||||
* @uses addslashes()
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -59,7 +58,6 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
|
||||
* fills given tooltip arrays
|
||||
*
|
||||
* @uses $cfg['ShowTooltipAliasTB']
|
||||
* @uses __('Creation')
|
||||
* @uses PMA_localisedDate()
|
||||
* @uses strtotime()
|
||||
* @param array $tooltip_truename tooltip data
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -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')) {
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -17,14 +16,6 @@ if (! defined('PHPMYADMIN')) {
|
||||
* @uses PMA_showHint()
|
||||
* @uses $GLOBALS['cfg']['PropertiesNumColumns']
|
||||
* @uses $GLOBALS['is_show_stats']
|
||||
* @uses __('Table')
|
||||
* @uses __('Action')
|
||||
* @uses __('Rows')
|
||||
* @uses __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')
|
||||
* @uses __('Type')
|
||||
* @uses __('Collation')
|
||||
* @uses __('Size')
|
||||
* @uses __('Overhead')
|
||||
* @uses $GLOBALS['colspan_for_structure']
|
||||
* @uses PMA_SortableTableHeader()
|
||||
* @param boolean $db_is_information_schema
|
||||
|
@@ -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')) {
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-DBG
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -19,8 +18,8 @@ if ($GLOBALS['cfg']['DBG']['php']) {
|
||||
* Loads the DBG extension if needed
|
||||
*/
|
||||
if (! @extension_loaded('dbg') ) {
|
||||
$message = PMA_Message::error(__('Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] extension. Please check your PHP configuration.'));
|
||||
$message->addParam('DBG');
|
||||
$message = PMA_Message::error(__('The %s extension is missing. Please check your PHP configuration.'),
|
||||
$message->addParam(sprintf('[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]', 'dbg'));
|
||||
$message->addMessage('<a href="./Documentation.html#faqdbg" target="documentation">', false);
|
||||
$message->addString(__('Documentation'));
|
||||
$message->addMessage('</a>', false);
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Interface to the classic MySQL extension
|
||||
*
|
||||
* @package phpMyAdmin-DBI-MySQL
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
@@ -308,9 +307,6 @@ function PMA_DBI_get_client_info()
|
||||
* @uses PMA_DBI_convert_message()
|
||||
* @uses $GLOBALS['errno']
|
||||
* @uses $GLOBALS['userlink']
|
||||
* @uses __('The server is not responding')
|
||||
* @uses __('(or the local MySQL server's socket is not correctly configured)')
|
||||
* @uses __('Details...')
|
||||
* @uses mysql_errno()
|
||||
* @uses mysql_error()
|
||||
* @uses defined()
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Interface to the improved MySQL extension (MySQLi)
|
||||
*
|
||||
* @package phpMyAdmin-DBI-MySQLi
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
@@ -144,7 +143,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
|
||||
* selects given database
|
||||
*
|
||||
* @uses $GLOBALS['userlink']
|
||||
* @uses PMA_convert_charset()
|
||||
* @uses mysqli_select_db()
|
||||
* @param string $dbname database name to select
|
||||
* @param object mysqli $link the mysqli object
|
||||
@@ -168,7 +166,6 @@ function PMA_DBI_select_db($dbname, $link = null)
|
||||
* @uses PMA_DBI_QUERY_STORE
|
||||
* @uses PMA_DBI_QUERY_UNBUFFERED
|
||||
* @uses $GLOBALS['userlink']
|
||||
* @uses PMA_convert_charset()
|
||||
* @uses MYSQLI_STORE_RESULT
|
||||
* @uses MYSQLI_USE_RESULT
|
||||
* @uses mysqli_query()
|
||||
@@ -366,8 +363,6 @@ function PMA_DBI_get_client_info()
|
||||
* @uses PMA_DBI_convert_message()
|
||||
* @uses $GLOBALS['errno']
|
||||
* @uses $GLOBALS['userlink']
|
||||
* @uses __('The server is not responding')
|
||||
* @uses __('(or the local MySQL server's socket is not correctly configured)')
|
||||
* @uses mysqli_errno()
|
||||
* @uses mysqli_error()
|
||||
* @uses mysqli_connect_errno()
|
||||
@@ -493,8 +488,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';
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Displays form for password change
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -58,7 +57,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr id="tr_element_before_generate_password">
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="radio" name="pw_hash" id="radio_pw_hash_old" value="old" />
|
||||
@@ -67,15 +66,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<?php echo __('Generate Password'); ?>
|
||||
</td>
|
||||
<td>
|
||||
<input type="button" id="button_generate_password" value="<?php echo __('Generate'); ?>" onclick="suggestPassword(this.form)" />
|
||||
<input type="text" name="generated_pw" id="generated_pw" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</fieldset>
|
||||
<fieldset id="fieldset_change_password_footer" class="tblFooters">
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Displays form for creating database (if user has privileges for that)
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -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')) {
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
@@ -148,13 +147,13 @@ echo PMA_pluginGetJavascript($export_list);
|
||||
echo __('File name template');
|
||||
|
||||
$trans = new PMA_Message;
|
||||
$trans->addMessage('__SERVER__/');
|
||||
$trans->addMessage('@SERVER@/');
|
||||
$trans->addString(__('server name'));
|
||||
if ($export_type == 'database' || $export_type == 'table') {
|
||||
$trans->addMessage('__DB__/');
|
||||
$trans->addMessage('@DB@/');
|
||||
$trans->addString(__('database name'));
|
||||
if ($export_type == 'table') {
|
||||
$trans->addMessage('__TABLE__/');
|
||||
$trans->addMessage('@TABLE@/');
|
||||
$trans->addString(__('table name'));
|
||||
}
|
||||
}
|
||||
@@ -194,6 +193,7 @@ echo PMA_pluginGetJavascript($export_list);
|
||||
?>
|
||||
/>
|
||||
|
||||
<?php echo PMA_showDocu('faq6_27'); ?>
|
||||
(
|
||||
<input type="checkbox" name="remember_template"
|
||||
id="checkbox_remember_template"
|
||||
@@ -205,7 +205,7 @@ echo PMA_pluginGetJavascript($export_list);
|
||||
<div class="formelementrow">
|
||||
<?php
|
||||
// charset of file
|
||||
if ($cfg['AllowAnywhereRecoding']) {
|
||||
if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
|
||||
echo ' <label for="select_charset_of_file">'
|
||||
. __('Character set of the file:') . '</label>' . "\n";
|
||||
|
||||
|
@@ -173,7 +173,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
|
||||
|
||||
// charset of file
|
||||
echo '<div class="formelementrow">' . "\n";
|
||||
if ($cfg['AllowAnywhereRecoding']) {
|
||||
if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
|
||||
echo '<label for="charset_of_file">' . __('Character set of the file:') . '</label>';
|
||||
reset($cfg['AvailableCharsets']);
|
||||
echo '<select id="charset_of_file" name="charset_of_file" size="1">';
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Code for displaying language selection
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* library for displaying table with results from all sort of select queries
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
@@ -2309,7 +2308,6 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
|
||||
* @uses PMA_DBI_try_query()
|
||||
* @uses PMA_DBI_num_rows()
|
||||
* @uses PMA_DBI_fetch_row()
|
||||
* @uses __('Link not found')
|
||||
* @uses PMA_DBI_free_result()
|
||||
* @uses $GLOBALS['printview']
|
||||
* @uses htmlspecialchars()
|
||||
|
@@ -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')) {
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
@@ -12,13 +11,6 @@
|
||||
class PMA_StorageEngine_innodb extends PMA_StorageEngine
|
||||
{
|
||||
/**
|
||||
* @uses __('Data home directory')
|
||||
* @uses __('The common part of the directory path for all InnoDB data files.')
|
||||
* @uses __('Data files')
|
||||
* @uses __('Autoextend increment')
|
||||
* @uses __(' The increment size for extending the size of an autoextending tablespace when it becomes full.')
|
||||
* @uses __('Buffer pool size')
|
||||
* @uses __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.')
|
||||
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
|
||||
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
|
||||
* @return array
|
||||
@@ -131,8 +123,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
|
||||
/**
|
||||
* @uses $this->support
|
||||
* @uses PMA_ENGINE_SUPPORT_YES
|
||||
* @uses __('Buffer Pool')
|
||||
* @uses __('InnoDB Status')
|
||||
* @return array detail pages
|
||||
*/
|
||||
function getInfoPages()
|
||||
@@ -152,22 +142,6 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
|
||||
* @uses PMA_DBI_fetch_result()
|
||||
* @uses PMA_formatNumber()
|
||||
* @uses PMA_formatByteDown()
|
||||
* @uses __('Buffer Pool Usage')
|
||||
* @uses __('Total')
|
||||
* @uses __('pages')
|
||||
* @uses __('Free pages')
|
||||
* @uses __('Dirty pages')
|
||||
* @uses __('Pages containing data')
|
||||
* @uses __('Pages to be flushed')
|
||||
* @uses __('Busy pages')
|
||||
* @uses __('Latched pages')
|
||||
* @uses __('Buffer Pool Activity')
|
||||
* @uses __('Read requests')
|
||||
* @uses __('Write requests')
|
||||
* @uses __('Read misses')
|
||||
* @uses __('Write waits')
|
||||
* @uses __('Read misses in %')
|
||||
* @uses __('Write waits in %')
|
||||
* @uses join()
|
||||
* @uses htmlspecialchars()
|
||||
* @uses PMA_formatNumber()
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Engines
|
||||
*/
|
||||
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to build NHibernate dumps of tables
|
||||
*
|
||||
* @package phpMyAdmin-Export-Codegen
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @package phpMyAdmin-Export-CSV
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
@@ -70,7 +69,18 @@ function PMA_exportHeader() {
|
||||
// Here we just prepare some values for export
|
||||
if ($what == 'excel') {
|
||||
$csv_terminated = "\015\012";
|
||||
$csv_separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac_excel2003' ? ';' : ',';
|
||||
switch($GLOBALS['excel_edition']) {
|
||||
case 'win':
|
||||
// as tested on Windows with Excel 2002 and Excel 2007
|
||||
$csv_separator = ';';
|
||||
break;
|
||||
case 'mac_excel2003':
|
||||
$csv_separator = ';';
|
||||
break;
|
||||
case 'mac_excel2008':
|
||||
$csv_separator = ',';
|
||||
break;
|
||||
}
|
||||
$csv_enclosed = '"';
|
||||
$csv_escaped = '"';
|
||||
if (isset($GLOBALS['excel_columns'])) {
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to build CSV dumps of tables
|
||||
*
|
||||
* @package phpMyAdmin-Export-CSV
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to build CSV dumps of tables
|
||||
*
|
||||
* @package phpMyAdmin-Export-HTMLWord
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -4,12 +4,16 @@
|
||||
* Set of functions used to build dumps of tables
|
||||
*
|
||||
* @package phpMyAdmin-Export-Latex
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
/* Messages used in default captions */
|
||||
$GLOBALS['strLatexContent'] = __('Content of table @TABLE@');
|
||||
$GLOBALS['strLatexContinued'] = __('(continued)');
|
||||
$GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@');
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@@ -32,11 +36,11 @@ if (isset($plugin_list)) {
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'));
|
||||
array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'));
|
||||
array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'));
|
||||
array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27');
|
||||
if (!empty($GLOBALS['cfgRelation']['relation'])) {
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
|
||||
@@ -56,11 +60,11 @@ if (isset($plugin_list)) {
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row'));
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'));
|
||||
array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'));
|
||||
array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'));
|
||||
array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27');
|
||||
$plugin_list['latex']['options'][] =
|
||||
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
|
||||
$plugin_list['latex']['options'][] =
|
||||
@@ -208,8 +212,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
|
||||
|
||||
$buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
|
||||
if (isset($GLOBALS['latex_caption'])) {
|
||||
$buffer .= ' \\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_caption'])
|
||||
. '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_data_label']) . '} \\\\';
|
||||
$buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
|
||||
. '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
|
||||
}
|
||||
if (!PMA_exportOutputHandler($buffer)) {
|
||||
return FALSE;
|
||||
@@ -227,7 +231,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
|
||||
return FALSE;
|
||||
}
|
||||
if (isset($GLOBALS['latex_caption'])) {
|
||||
if (!PMA_exportOutputHandler('\\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_continued_caption']) . '} \\\\ ')) return FALSE;
|
||||
if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return FALSE;
|
||||
}
|
||||
if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
|
||||
return FALSE;
|
||||
@@ -374,14 +378,14 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
|
||||
|
||||
// Table caption for first page and label
|
||||
if (isset($GLOBALS['latex_caption'])) {
|
||||
$buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_caption'])
|
||||
. '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_structure_label'])
|
||||
$buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
|
||||
. '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
|
||||
. '} \\\\' . $crlf;
|
||||
}
|
||||
$buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
|
||||
// Table caption on next pages
|
||||
if (isset($GLOBALS['latex_caption'])) {
|
||||
$buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption'])
|
||||
$buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
|
||||
. '} \\\\ ' . $crlf;
|
||||
}
|
||||
$buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Produce a PDF report (export) from a query
|
||||
*
|
||||
* @package phpMyAdmin-Export-PDF
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to build SQL dumps of tables
|
||||
*
|
||||
* @package phpMyAdmin-Export-SQL
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
@@ -187,7 +186,6 @@ function PMA_exportFooter()
|
||||
}
|
||||
|
||||
// restore connection settings
|
||||
// (not set if $cfg['AllowAnywhereRecoding'] is false)
|
||||
$charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
|
||||
if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
|
||||
$foot .= $crlf
|
||||
@@ -276,8 +274,7 @@ function PMA_exportHeader()
|
||||
// so that a utility like the mysql client can interpret
|
||||
// the file correctly
|
||||
if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
|
||||
// $cfg['AllowAnywhereRecoding'] was true so we got a charset from
|
||||
// the export dialog
|
||||
// we got a charset from the export dialog
|
||||
$set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
|
||||
} else {
|
||||
// by default we use the connection charset
|
||||
|
@@ -4,7 +4,6 @@
|
||||
*
|
||||
*
|
||||
* @package phpMyAdmin-Export-XLS
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -4,7 +4,6 @@
|
||||
*
|
||||
*
|
||||
* @package phpMyAdmin-Export-XLSX
|
||||
* @version $Id$
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Set of functions used to build XML dumps of tables
|
||||
*
|
||||
* @todo
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Export-XML
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -3,7 +3,6 @@
|
||||
/**
|
||||
* Set of functions used to build YAML dumps of tables
|
||||
*
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Export-YAML
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
@@ -4,7 +4,6 @@
|
||||
* Functions for listing directories
|
||||
*
|
||||
* @todo rename to file_listing.lib.php
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
|
||||
|
@@ -31,7 +31,6 @@
|
||||
* @uses $cfg['NavigationBarIconic']
|
||||
* @uses $cfg['DBG']['enable']
|
||||
* @uses $cfg['DBG']['profile']['enable']
|
||||
* @uses __('Open new phpMyAdmin window')
|
||||
* @uses $cfg['MaxCharactersInDisplayedSQL']
|
||||
* @uses PMA_isValid()
|
||||
* @uses PMA_setHistory()
|
||||
@@ -41,7 +40,6 @@
|
||||
* @uses PMA_generate_common_url()
|
||||
* @uses basename()
|
||||
* @uses file_exists()
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user