Merge remote-tracking branch 'origin/master'
This commit is contained in:
Weblate
commit
7ebf9d1f5a
@ -4,7 +4,7 @@ As an open source project, phpMyAdmin welcomes contributions of many forms.
|
||||
|
||||
## Bug reporting
|
||||
|
||||
Please report [bugs on SourceForge.net][1].
|
||||
Please report [bugs on SourceForge.net][1].
|
||||
|
||||
[1]: https://sourceforge.net/p/phpmyadmin/bugs/new/
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ phpMyAdmin - ChangeLog
|
||||
- bug #4324 Datepicker not showing up on insert page
|
||||
- bug #3991 Problem selecting item in select boxes with the ENTER keystroke in some browsers
|
||||
- bug #4323 QueryWindow ignores CodeMirror
|
||||
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
|
||||
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
|
||||
|
||||
4.1.9.0 (2014-03-06)
|
||||
- bug #4279 CTRL + up or down moves two fields (part one)
|
||||
|
||||
4
DCO
4
DCO
@ -1,5 +1,5 @@
|
||||
If you would like to make a contribution to the phpMyAdmin Project, please
|
||||
certify to the following:
|
||||
If you would like to make a contribution to the phpMyAdmin Project, please
|
||||
certify to the following:
|
||||
***
|
||||
phpMyAdmin Developer's Certificate of Origin. Version 1.0
|
||||
|
||||
|
||||
@ -142,13 +142,13 @@ Basic settings
|
||||
preferences. If the person in charge of a multi-user installation prefers
|
||||
to disable this feature for all users, a value of ``'never'`` should be
|
||||
set, and the :config:option:`$cfg['UserprefsDisallow']` directive should
|
||||
contain ``'SendErrorReports'`` in one of its array values.
|
||||
contain ``'SendErrorReports'`` in one of its array values.
|
||||
|
||||
.. config:option:: $cfg['AllowThirdPartyFraming']
|
||||
|
||||
:type: boolean
|
||||
:default: false
|
||||
|
||||
|
||||
Setting this to ``true`` allows phpMyAdmin to be included inside a frame,
|
||||
and is a potential security hole allowing cross-frame scripting attacks or
|
||||
clickjacking.
|
||||
@ -1159,7 +1159,7 @@ Generic settings
|
||||
:default: false
|
||||
|
||||
Whether to force using https while accessing phpMyAdmin.
|
||||
|
||||
|
||||
.. note::
|
||||
|
||||
In some setups (like separate SSL proxy or load balancer) you might
|
||||
@ -1602,8 +1602,8 @@ Browse mode
|
||||
:type: string
|
||||
:default: ``'icons'``
|
||||
|
||||
Defines whether the table navigation links contain ``'icons'``, ``'text'``
|
||||
or ``'both'``.
|
||||
Defines whether the table navigation links contain ``'icons'``, ``'text'``
|
||||
or ``'both'``.
|
||||
|
||||
.. config:option:: $cfg['ShowAll']
|
||||
|
||||
@ -1791,7 +1791,7 @@ Tabs display settings
|
||||
:type: string
|
||||
:default: ``'both'``
|
||||
|
||||
Defines whether the menu tabs contain ``'icons'``, ``'text'`` or ``'both'``.
|
||||
Defines whether the menu tabs contain ``'icons'``, ``'text'`` or ``'both'``.
|
||||
|
||||
.. config:option:: $cfg['ActionLinksMode']
|
||||
|
||||
@ -1800,7 +1800,7 @@ Tabs display settings
|
||||
|
||||
If set to ``icons``, will display icons instead of text for db and table
|
||||
properties links (like :guilabel:`Browse`, :guilabel:`Select`,
|
||||
:guilabel:`Insert`, ...). Can be set to ``'both'``
|
||||
:guilabel:`Insert`, ...). Can be set to ``'both'``
|
||||
if you want icons AND text. When set to ``text``, will only show text.
|
||||
|
||||
.. config:option:: $cfg['PropertiesNumColumns']
|
||||
@ -2018,7 +2018,7 @@ Web server settings
|
||||
Limit for length of :term:`URL` in links. When length would be above this
|
||||
limit, it is replaced by form with button. This is required as some web
|
||||
servers (:term:`IIS`) have problems with long :term:`URL` .
|
||||
|
||||
|
||||
.. config:option:: $cfg['CSPAllow']
|
||||
|
||||
:type: string
|
||||
|
||||
@ -39,7 +39,7 @@ Credits, in chronological order
|
||||
|
||||
* rewrote and optimized javascript, DHTML and DOM stuff
|
||||
|
||||
* rewrote the scripts so they fit the :term:`PEAR` coding standards and
|
||||
* rewrote the scripts so they fit the :term:`PEAR` coding standards and
|
||||
generate XHTML1.0 and CSS2 compliant codes
|
||||
|
||||
* improved the language detection system
|
||||
@ -327,19 +327,19 @@ Credits, in chronological order
|
||||
* New plugins and properties system
|
||||
|
||||
* Thilina Buddika Abeyrathna (Google Summer of Code 2012)
|
||||
|
||||
|
||||
* Refactoring
|
||||
|
||||
* Atul Pratap Singh (Google Summer of Code 2012)
|
||||
|
||||
|
||||
* Refactoring
|
||||
|
||||
* Chanaka Indrajith (Google Summer of Code 2012)
|
||||
|
||||
|
||||
* Refactoring
|
||||
|
||||
* Yasitha Pandithawatta (Google Summer of Code 2012)
|
||||
|
||||
|
||||
* Automated testing
|
||||
|
||||
* Jim Wigginton (phpseclib.sourceforge.net)
|
||||
@ -368,7 +368,7 @@ Credits, in chronological order
|
||||
|
||||
* Kasun Chathuranga (Google Summer of Code 2013)
|
||||
|
||||
* Interface improvements
|
||||
* Interface improvements
|
||||
|
||||
* Hugues Peccatte
|
||||
|
||||
@ -396,11 +396,11 @@ Translators
|
||||
|
||||
Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* Arabic
|
||||
* Arabic
|
||||
|
||||
* Abdullah Al-Saedi <abdullah.10\_at\_windowslive.com>
|
||||
|
||||
* Bulgarian
|
||||
* Bulgarian
|
||||
|
||||
* stoyanster <stoyanster\_at\_gmail.com>
|
||||
|
||||
@ -408,16 +408,16 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* Xavier Navarro <xvnavarro\_at\_gmail.com>
|
||||
|
||||
* Czech
|
||||
* Czech
|
||||
|
||||
* Michal Čihař <michal\_at\_cihar.com>
|
||||
|
||||
* Danish
|
||||
* Danish
|
||||
|
||||
* opensource <opensource\_at\_jth.net>
|
||||
* Jørgen Thomsen <opensource\_at\_jth.net>
|
||||
|
||||
* German
|
||||
* German
|
||||
|
||||
* mrbendig <mrbendig\_at\_mrbendig.com>
|
||||
* torsten.funck <torsten.funck\_at\_googlemail.com>
|
||||
@ -425,7 +425,7 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
* typo3 <typo3\_at\_dirk-weise.de>
|
||||
* Jo Michael <me\_at\_mynetx.net>
|
||||
|
||||
* Greek
|
||||
* Greek
|
||||
|
||||
* Panagiotis Papazoglou <papaz_p\_at\_yahoo.com>
|
||||
|
||||
@ -437,28 +437,28 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* Matías Bellone <matiasbellone\_at\_gmail.com>
|
||||
|
||||
* French
|
||||
* French
|
||||
|
||||
* Marc Delisle <marc\_at\_infomarc.info>
|
||||
|
||||
* Hindi
|
||||
* Hindi
|
||||
|
||||
* u4663530 <u4663530\_at\_anu.edu.au>
|
||||
* rsedwardian <rsedwardian\_at\_gmail.com>
|
||||
|
||||
* Hungarian
|
||||
* Hungarian
|
||||
|
||||
* gergo314 <gergo314\_at\_gmail.com>
|
||||
|
||||
* Italian
|
||||
* Italian
|
||||
|
||||
* Rouslan Placella <rouslan\_at\_placella.com>
|
||||
|
||||
* Japanese
|
||||
* Japanese
|
||||
|
||||
* Yuichiro <yuichiro\_at\_pop07.odn.ne.jp>
|
||||
|
||||
* Lithuanian
|
||||
* Lithuanian
|
||||
|
||||
* Kęstutis <forkik\_at\_gmail.com>
|
||||
|
||||
@ -466,12 +466,12 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* Sven-Erik Andersen <sven.erik.andersen\_at\_gmail.com>
|
||||
|
||||
* Dutch
|
||||
* Dutch
|
||||
|
||||
* Dieter Adriaenssens <ruleant\_at\_users.sourceforge.net>
|
||||
* Herman van Rink <rink\_at\_initfour.nl>
|
||||
|
||||
* Polish
|
||||
* Polish
|
||||
|
||||
* Stanisław Krukowski <stankruk\_at\_neostrada.pl>
|
||||
* Marcin Kozioł <lord_dark\_at\_wp.pl>
|
||||
@ -480,28 +480,28 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* JoaoTMDias <contacto\_at\_joaodias.me>
|
||||
|
||||
* Portuguese (Brazil)
|
||||
* Portuguese (Brazil)
|
||||
|
||||
* wiltave <wiltave\_at\_gmail.com>
|
||||
* emerson4br <emerson4br\_at\_gmail.com>
|
||||
|
||||
* Romanian
|
||||
* Romanian
|
||||
|
||||
* alexukf <alex.ukf\_at\_gmail.com>
|
||||
|
||||
* Russian
|
||||
* Russian
|
||||
|
||||
* Victor Volkov <hanut\_at\_php-myadmin.ru>
|
||||
|
||||
* Sinhala
|
||||
* Sinhala
|
||||
|
||||
* Madhura Jayaratne <madhura.cj\_at\_gmail.com>
|
||||
|
||||
* Slovak
|
||||
* Slovak
|
||||
|
||||
* Martin Lacina <martin\_at\_whistler.sk>
|
||||
|
||||
* Slovenian
|
||||
* Slovenian
|
||||
|
||||
* Domen <dbc334\_at\_gmail.com>
|
||||
|
||||
@ -509,15 +509,15 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* stefan <stefan\_at\_inkopsforum.se>
|
||||
|
||||
* Tamil
|
||||
* Tamil
|
||||
|
||||
* ysajeepan <ysajeepan\_at\_live.com>
|
||||
|
||||
* Telugu
|
||||
* Telugu
|
||||
|
||||
* veeven <veeven\_at\_gmail.com>
|
||||
|
||||
* Thai
|
||||
* Thai
|
||||
|
||||
* kanitchet <kanichet\_at\_hotmail.com>
|
||||
|
||||
@ -525,16 +525,16 @@ Following people have contributed to translation of phpMyAdmin:
|
||||
|
||||
* Burak Yavuz <hitowerdigit\_at\_hotmail.com>
|
||||
|
||||
* Uighur
|
||||
* Uighur
|
||||
|
||||
* gheni <gheni\_at\_yahoo.cn>
|
||||
|
||||
* Ukrainian
|
||||
* Ukrainian
|
||||
|
||||
* typim <duke3d\_at\_ukr.net>
|
||||
* oleg-ilnytskyi <ukraine.oleg\_at\_gmail.com>
|
||||
|
||||
* Urdu
|
||||
* Urdu
|
||||
|
||||
* Mehbooob Khan <mehboobbugti\_at\_gmail.com>
|
||||
|
||||
@ -551,35 +551,35 @@ Documentation translators
|
||||
|
||||
Following people have contributed to translation of phpMyAdmin documentation:
|
||||
|
||||
* Czech
|
||||
* Czech
|
||||
|
||||
* Michal Čihař <michal\_at\_cihar.com>
|
||||
|
||||
* Greek
|
||||
* Greek
|
||||
|
||||
* Panagiotis Papazoglou <papaz_p\_at\_yahoo.com>
|
||||
|
||||
* English (United Kingdom)
|
||||
* English (United Kingdom)
|
||||
|
||||
* Robert Readman <robert_readman\_at\_hotmail.com>
|
||||
|
||||
* French
|
||||
* French
|
||||
|
||||
* Cédric Corazza <cedric.corazza\_at\_wanadoo.fr>
|
||||
|
||||
* Japanese
|
||||
* Japanese
|
||||
|
||||
* Yuichiro Takahashi <yuichiro\_at\_pop07.odn.ne.jp>
|
||||
|
||||
* Polish
|
||||
* Polish
|
||||
|
||||
* Stanisław Krukowski <stankruk\_at\_neostrada.pl>
|
||||
|
||||
* Portuguese (Brazil)
|
||||
* Portuguese (Brazil)
|
||||
|
||||
* mjaning <mjaning\_at\_gmail.com>
|
||||
|
||||
* Slovenian
|
||||
* Slovenian
|
||||
|
||||
* Domen <dbc334\_at\_gmail.com>
|
||||
|
||||
|
||||
@ -8,5 +8,5 @@ great features have been written by other people and you too can help
|
||||
to make phpMyAdmin a useful tool.
|
||||
|
||||
You can check out all the possibilities to contribute in the
|
||||
`contribute section on our website
|
||||
<http://www.phpmyadmin.net/home_page/improve.php>`_.
|
||||
`contribute section on our website
|
||||
<http://www.phpmyadmin.net/home_page/improve.php>`_.
|
||||
|
||||
104
doc/faq.rst
104
doc/faq.rst
@ -200,7 +200,7 @@ link the MySQL extension of your choice to a MySQL client library of
|
||||
at least the same minor version since the one that is bundled with
|
||||
some PHP distributions is rather old and might cause problems see
|
||||
:ref:`faq1_17a`. `MariaDB <http://mariadb.org/>`_ is also supported
|
||||
(versions 5.1 and 5.2 were tested).
|
||||
(versions 5.1 and 5.2 were tested).
|
||||
|
||||
.. versionchanged:: 3.5
|
||||
Since phpMyAdmin 3.5 `Drizzle <http://www.drizzle.org/>`_ is supported.
|
||||
@ -304,7 +304,7 @@ httpd.conf, like this:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
# mod_gzip_item_include file \.php$
|
||||
# mod_gzip_item_include mime "application/x-httpd-php.*"
|
||||
|
||||
@ -356,7 +356,7 @@ directives are used:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
SetOutputFilter PHP
|
||||
SetInputFilter PHP
|
||||
|
||||
@ -374,7 +374,7 @@ restart Apache:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
#SetOutputFilter PHP
|
||||
#SetInputFilter PHP
|
||||
|
||||
@ -441,7 +441,7 @@ forget to change directory name inside of it):
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
RewriteEngine On
|
||||
RewriteBase /path_to_phpMyAdmin
|
||||
RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\.php)$ index.php?db=$1&table=$2&target=$3 [R]
|
||||
@ -459,7 +459,7 @@ following rewrite rule:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
RewriteEngine On
|
||||
RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
|
||||
|
||||
@ -541,7 +541,7 @@ You can also disable the warning using the :config:option:`$cfg['SuhosinDisableW
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Be sure that you have enabled ``SSLOptions`` and ``StdEnvVars`` in
|
||||
your Apache configuration.
|
||||
your Apache configuration.
|
||||
|
||||
.. seealso:: <http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions>
|
||||
|
||||
@ -555,7 +555,7 @@ the set-cookie headers. Example from the Apache 2.2 documentation:
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
ProxyPass /mirror/foo/ http://backend.example.com/
|
||||
ProxyPassReverse /mirror/foo/ http://backend.example.com/
|
||||
ProxyPassReverseCookieDomain backend.example.com public.example.com
|
||||
@ -567,7 +567,7 @@ This is not specific to phpmyadmin, it's just the behavior of Apache.
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin
|
||||
ProxyPassReverse /mirror/foo/ http://backend.example.com/%7Euser/phpmyadmin
|
||||
ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo
|
||||
@ -593,18 +593,18 @@ some robots accessing your installation.
|
||||
|
||||
.. code-block:: apache
|
||||
|
||||
|
||||
|
||||
RewriteEngine on
|
||||
|
||||
|
||||
# Allow only GET and POST verbs
|
||||
RewriteCond %{REQUEST_METHOD} !^(GET|POST)$ [NC,OR]
|
||||
|
||||
|
||||
# Ban Typical Vulnerability Scanners and others
|
||||
# Kick out Script Kiddies
|
||||
RewriteCond %{HTTP_USER_AGENT} ^(java|curl|wget).* [NC,OR]
|
||||
RewriteCond %{HTTP_USER_AGENT} ^.*(libwww-perl|curl|wget|python|nikto|wkito|pikto|scan|acunetix).* [NC,OR]
|
||||
RewriteCond %{HTTP_USER_AGENT} ^.*(winhttp|HTTrack|clshttp|archiver|loader|email|harvest|extract|grab|miner).* [NC,OR]
|
||||
|
||||
|
||||
# Ban Search Engines, Crawlers to your administrative panel
|
||||
# No reasons to access from bots
|
||||
# Ultimately Better than the useless robots.txt
|
||||
@ -615,7 +615,7 @@ some robots accessing your installation.
|
||||
|
||||
.. _faq1_43:
|
||||
|
||||
1.43 Why can't I display the structure of my table containing hundreds of columns?
|
||||
1.43 Why can't I display the structure of my table containing hundreds of columns?
|
||||
----------------------------------------------------------------------------------
|
||||
|
||||
Because your PHP's ``memory_limit`` is too low; adjust it in :file:`php.ini`.
|
||||
@ -727,7 +727,7 @@ doesn't work in this configuration with port forwarding. If you enter
|
||||
-----------------------------
|
||||
|
||||
Themes are configured with :config:option:`$cfg['ThemePath']`,
|
||||
:config:option:`$cfg['ThemeManager']` and :config:option:`$cfg['ThemeDefault']`.
|
||||
:config:option:`$cfg['ThemeManager']` and :config:option:`$cfg['ThemeDefault']`.
|
||||
Under :config:option:`$cfg['ThemePath']`, you should not delete the
|
||||
directory ``pmahomme`` or its underlying structure, because this is the
|
||||
system theme used by phpMyAdmin. ``pmahomme`` contains all images and
|
||||
@ -801,7 +801,7 @@ If using APC, you must set ``apc.rfc1867`` to ``on`` in your :file:`php.ini`.
|
||||
If using PHP 5.4.0 or higher, you must set
|
||||
``session.upload_progress.enabled`` to ``1`` in your :file:`php.ini`. However,
|
||||
starting from phpMyAdmin version 4.0.4, session-based upload progress has
|
||||
been temporarily deactivated due to its problematic behavior.
|
||||
been temporarily deactivated due to its problematic behavior.
|
||||
|
||||
.. seealso:: :rfc:`1867`
|
||||
|
||||
@ -848,7 +848,7 @@ comments like this:
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
|
||||
|
||||
-- MySQL dump 8.22
|
||||
--
|
||||
-- Host: localhost Database: database
|
||||
@ -1021,7 +1021,7 @@ ISPs, multi-user installations
|
||||
Since version 2.0.3, you can setup a central copy of phpMyAdmin for all your
|
||||
users. The development of this feature was kindly sponsored by NetCologne GmbH.
|
||||
This requires a properly setup MySQL user management and phpMyAdmin
|
||||
:term:`HTTP` or cookie authentication.
|
||||
:term:`HTTP` or cookie authentication.
|
||||
|
||||
.. seealso:: :ref:`authentication_modes`
|
||||
|
||||
@ -1034,8 +1034,8 @@ This depends on your system. If you're running a server which cannot be
|
||||
accessed by other people, it's sufficient to use the directory protection
|
||||
bundled with your webserver (with Apache you can use :term:`.htaccess` files,
|
||||
for example). If other people have telnet access to your server, you should use
|
||||
phpMyAdmin's :term:`HTTP` or cookie authentication features.
|
||||
|
||||
phpMyAdmin's :term:`HTTP` or cookie authentication features.
|
||||
|
||||
Suggestions:
|
||||
|
||||
* Your :file:`config.inc.php` file should be ``chmod 660``.
|
||||
@ -1096,7 +1096,7 @@ network :term:`IP` blocks.
|
||||
|
||||
.. code-block:: php
|
||||
|
||||
|
||||
|
||||
//block root from logging in except from the private networks
|
||||
$cfg['Servers'][$i]['AllowDeny']['order'] = 'deny,allow';
|
||||
$cfg['Servers'][$i]['AllowDeny']['rules'] = array(
|
||||
@ -1389,15 +1389,15 @@ create the example tables:
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
|
||||
|
||||
CREATE TABLE REL_countries (
|
||||
country_code char(1) NOT NULL default '',
|
||||
description varchar(10) NOT NULL default '',
|
||||
PRIMARY KEY (country_code)
|
||||
) TYPE=MyISAM;
|
||||
|
||||
|
||||
INSERT INTO REL_countries VALUES ('C', 'Canada');
|
||||
|
||||
|
||||
CREATE TABLE REL_persons (
|
||||
id tinyint(4) NOT NULL auto_increment,
|
||||
person_name varchar(32) NOT NULL default '',
|
||||
@ -1405,16 +1405,16 @@ create the example tables:
|
||||
country_code char(1) NOT NULL default '',
|
||||
PRIMARY KEY (id)
|
||||
) TYPE=MyISAM;
|
||||
|
||||
|
||||
INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');
|
||||
INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');
|
||||
|
||||
|
||||
CREATE TABLE REL_towns (
|
||||
town_code varchar(5) NOT NULL default '0',
|
||||
description varchar(30) NOT NULL default '',
|
||||
PRIMARY KEY (town_code)
|
||||
) TYPE=MyISAM;
|
||||
|
||||
|
||||
INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
|
||||
INSERT INTO REL_towns VALUES ('M', 'Montréal');
|
||||
|
||||
@ -1477,9 +1477,9 @@ schema layout. Which tables will go on which pages?
|
||||
fit the page. When initially placing tables on the page, just pick any
|
||||
coordinates -- say, 50x50. After clicking Save, you can then use the
|
||||
:ref:`wysiwyg` to position the element correctly.
|
||||
* When you'd like to look at your :term:`PDF`, first be sure to click the Save
|
||||
button beneath the list of tables and coordinates, to save any changes you
|
||||
made there. Then scroll all the way down, select the :term:`PDF` options you
|
||||
* When you'd like to look at your :term:`PDF`, first be sure to click the Save
|
||||
button beneath the list of tables and coordinates, to save any changes you
|
||||
made there. Then scroll all the way down, select the :term:`PDF` options you
|
||||
want, and click Go.
|
||||
* Internet Explorer for Windows may suggest an incorrect filename when
|
||||
you try to save a generated :term:`PDF`.
|
||||
@ -1533,7 +1533,7 @@ It means "average".
|
||||
* "Enclose table and column names with backquotes" ensures that column
|
||||
and table names formed with special characters are protected.
|
||||
* "Add into comments" includes column comments, relations, and MIME
|
||||
types set in the pmadb in the dump as :term:`SQL` comments
|
||||
types set in the pmadb in the dump as :term:`SQL` comments
|
||||
(*/\* xxx \*/*).
|
||||
|
||||
**Data:**
|
||||
@ -1608,7 +1608,7 @@ transformations on them. Otherwise you could just put a comment on the
|
||||
column. Because entering your own mimetype will cause serious syntax
|
||||
checking issues and validation, this introduces a high-risk false-
|
||||
user-input situation. Instead you have to initialize mimetypes using
|
||||
functions or empty mimetype definitions.
|
||||
functions or empty mimetype definitions.
|
||||
|
||||
Plus, you have a whole overview of available mimetypes. Who knows all those
|
||||
mimetypes by heart so he/she can enter it at will?
|
||||
@ -1626,13 +1626,13 @@ You can now access a bookmark dropdown on each page, the query box
|
||||
appears on for that database.
|
||||
|
||||
You can also have, inside the query, a placeholder for a variable.
|
||||
This is done by inserting into the query a SQL comment between ``/*`` and
|
||||
``*/``. Inside the comment, the special string ``[VARIABLE]`` is used.
|
||||
This is done by inserting into the query a SQL comment between ``/*`` and
|
||||
``*/``. Inside the comment, the special string ``[VARIABLE]`` is used.
|
||||
Be aware that the whole query minus the SQL comment must be
|
||||
valid by itself, otherwise you won't be able to store it as a bookmark.
|
||||
|
||||
When you execute the bookmark, everything typed into the *value*
|
||||
input box on the query box page will replace the string ``/*[VARIABLE]*/`` in
|
||||
When you execute the bookmark, everything typed into the *value*
|
||||
input box on the query box page will replace the string ``/*[VARIABLE]*/`` in
|
||||
your stored query.
|
||||
|
||||
Also remember, that everything else inside the ``/*[VARIABLE]*/`` string for
|
||||
@ -1642,37 +1642,37 @@ chars. So you can use:
|
||||
.. code-block:: mysql
|
||||
|
||||
/*, [VARIABLE] AS myname */
|
||||
|
||||
which will be expanded to
|
||||
|
||||
which will be expanded to
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
, VARIABLE as myname
|
||||
|
||||
|
||||
in your query, where VARIABLE is the string you entered in the input box. If an
|
||||
empty string is provided, no replacements are made.
|
||||
empty string is provided, no replacements are made.
|
||||
|
||||
A more complex example. Say you have stored
|
||||
this query:
|
||||
this query:
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
SELECT Name, Address FROM addresses WHERE 1 /* AND Name LIKE '%[VARIABLE]%' */
|
||||
|
||||
|
||||
Say, you now enter "phpMyAdmin" as the variable for the stored query, the full
|
||||
query will be:
|
||||
query will be:
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
SELECT Name, Address FROM addresses WHERE 1 AND Name LIKE '%phpMyAdmin%'
|
||||
|
||||
You can use multiple occurrences of ``/*[VARIABLE]*/`` in a single query
|
||||
(that is, multiple occurrences of the *same* variable).
|
||||
(that is, multiple occurrences of the *same* variable).
|
||||
|
||||
**NOTE THE ABSENCE OF SPACES** inside the ``/**/`` construct. Any spaces
|
||||
inserted there will be later also inserted as spaces in your query and may lead
|
||||
to unexpected results especially when using the variable expansion inside of a
|
||||
"LIKE ''" expression.
|
||||
"LIKE ''" expression.
|
||||
|
||||
Your initial query which is going to be stored as a bookmark has to yield at
|
||||
least one result row so you can store the bookmark. You may have that to work
|
||||
@ -1689,7 +1689,7 @@ have table exported in file :file:`table.tex`):
|
||||
|
||||
.. code-block:: latex
|
||||
|
||||
|
||||
|
||||
\documentclass{article} % or any class you want
|
||||
\usepackage{longtable} % for displaying table
|
||||
\begin{document} % start of document
|
||||
@ -1739,7 +1739,7 @@ public bookmark, it will be executed.
|
||||
-----------------------------------------------------------------
|
||||
|
||||
You can use :term:`CSV` for Microsoft Excel,
|
||||
which works out of the box.
|
||||
which works out of the box.
|
||||
|
||||
.. versionchanged:: 3.4.5
|
||||
Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version
|
||||
@ -1879,7 +1879,7 @@ The Zoom search feature is an alternative to table search feature. It allows
|
||||
you to explore a table by representing its data in a scatter plot. You can
|
||||
locate this feature by selecting a table and clicking the :guilabel:`Search`
|
||||
tab. One of the sub-tabs in the :guilabel:`Table Search` page is
|
||||
:guilabel:`Zoom Search`.
|
||||
:guilabel:`Zoom Search`.
|
||||
|
||||
Consider the table REL\_persons in :ref:`faq6_6` for
|
||||
an example. To use zoom search, two columns need to be selected, for
|
||||
@ -1887,7 +1887,7 @@ example, id and town\_code. The id values will be represented on one
|
||||
axis and town\_code values on the other axis. Each row will be
|
||||
represented as a point in a scatter plot based on its id and
|
||||
town\_code. You can include two additional search criteria apart from
|
||||
the two fields to display.
|
||||
the two fields to display.
|
||||
|
||||
You can choose which field should be
|
||||
displayed as label for each point. If a display column has been set
|
||||
@ -1895,7 +1895,7 @@ for the table (see :ref:`faqdisplay`), it is taken as the label unless
|
||||
you specify otherwise. You can also select the maximum number of rows
|
||||
you want to be displayed in the plot by specifing it in the 'Max rows
|
||||
to plot' field. Once you have decided over your criteria, click 'Go'
|
||||
to display the plot.
|
||||
to display the plot.
|
||||
|
||||
After the plot is generated, you can use the
|
||||
mousewheel to zoom in and out of the plot. In addition, panning
|
||||
@ -2003,11 +2003,11 @@ Synchronization
|
||||
|
||||
.. _faq9_1:
|
||||
|
||||
9.1 (withdrawn).
|
||||
9.1 (withdrawn).
|
||||
----------------
|
||||
|
||||
.. _faq9_2:
|
||||
|
||||
9.2 (withdrawn).
|
||||
9.2 (withdrawn).
|
||||
----------------
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Blowfish_(cipher)>
|
||||
|
||||
Browser
|
||||
Browser
|
||||
a software application that enables a user to display and interact with text, images, and other information typically located on a web page at a website on the World Wide Web.
|
||||
|
||||
.. seealso:: <http://en.wikipedia.org/wiki/Web_browser>
|
||||
@ -30,7 +30,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Bzip2>
|
||||
|
||||
CGI
|
||||
CGI
|
||||
Common Gateway Interface is an important World Wide Web technology that
|
||||
enables a client web browser to request data from a program executed on
|
||||
the Web server.
|
||||
@ -62,7 +62,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Comma-separated_values>
|
||||
|
||||
DB
|
||||
DB
|
||||
look at :term:`database`
|
||||
|
||||
database
|
||||
@ -70,7 +70,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Database>
|
||||
|
||||
Engine
|
||||
Engine
|
||||
look at :term:`storage engines`
|
||||
|
||||
extension
|
||||
@ -78,7 +78,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/extension>
|
||||
|
||||
FAQ
|
||||
FAQ
|
||||
Frequently Asked Questions is a list of commonly asked question and there
|
||||
answers.
|
||||
|
||||
@ -101,12 +101,12 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.fpdf.org/>
|
||||
|
||||
GD
|
||||
GD
|
||||
Graphics Library by Thomas Boutell and others for dynamically manipulating images.
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/GD_Graphics_Library>
|
||||
|
||||
GD2
|
||||
GD2
|
||||
look at :term:`gd`
|
||||
|
||||
gzip
|
||||
@ -124,7 +124,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Hostname>
|
||||
|
||||
HTTP
|
||||
HTTP
|
||||
HyperText Transfer Protocol is the primary method used to transfer or
|
||||
convey information on the World Wide Web.
|
||||
|
||||
@ -138,7 +138,7 @@ From Wikipedia, the free encyclopedia
|
||||
IEC
|
||||
International Electrotechnical Commission
|
||||
|
||||
IIS
|
||||
IIS
|
||||
Internet Information Services is a set of Internet-based services for
|
||||
servers using Microsoft Windows.
|
||||
|
||||
@ -149,7 +149,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Index_(database)>
|
||||
|
||||
IP
|
||||
IP
|
||||
Internet Protocol is a data-oriented protocol used by source and
|
||||
destination hosts for communicating data across a packet-switched
|
||||
internetwork.
|
||||
@ -161,19 +161,19 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/IP_Address>
|
||||
|
||||
IPv6
|
||||
IPv6 (Internet Protocol version 6) is the latest revision of the
|
||||
Internet Protocol (:term:`IP`), designed to deal with the
|
||||
IPv6
|
||||
IPv6 (Internet Protocol version 6) is the latest revision of the
|
||||
Internet Protocol (:term:`IP`), designed to deal with the
|
||||
long-anticipated problem of its precedessor IPv4 running out of addresses.
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/IPv6>
|
||||
|
||||
ISAPI
|
||||
ISAPI
|
||||
Internet Server Application Programming Interface is the API of Internet Information Services (IIS).
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/ISAPI>
|
||||
|
||||
ISP
|
||||
ISP
|
||||
Internet service provider is a business or organization that offers users
|
||||
access to the Internet and related services.
|
||||
|
||||
@ -187,7 +187,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/JPEG>
|
||||
|
||||
JPG
|
||||
JPG
|
||||
look at :term:`jpeg`
|
||||
|
||||
Key
|
||||
@ -218,7 +218,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://php.net/mcrypt>
|
||||
|
||||
MIME
|
||||
MIME
|
||||
Multipurpose Internet Mail Extensions is
|
||||
an Internet Standard for the format of e-mail.
|
||||
|
||||
@ -254,7 +254,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/OS_X>
|
||||
|
||||
PDF
|
||||
PDF
|
||||
Portable Document Format is a file format developed by Adobe Systems for
|
||||
representing two dimensional documents in a device independent and
|
||||
resolution independent format.
|
||||
@ -266,7 +266,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://pear.php.net/>
|
||||
|
||||
PCRE
|
||||
PCRE
|
||||
Perl Compatible Regular Expressions is the perl-compatible regular
|
||||
expression functions for PHP
|
||||
|
||||
@ -324,7 +324,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Socket#Computer_sockets>
|
||||
|
||||
SSL
|
||||
SSL
|
||||
Secure Sockets Layer is a cryptographic protocol which provides secure
|
||||
communication on the Internet.
|
||||
|
||||
@ -353,7 +353,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Tar_(file_format)>
|
||||
|
||||
TCP
|
||||
TCP
|
||||
Transmission Control Protocol is one of the core protocols of the
|
||||
Internet protocol suite.
|
||||
|
||||
@ -386,7 +386,7 @@ From Wikipedia, the free encyclopedia
|
||||
|
||||
.. seealso:: <http://www.wikipedia.org/wiki/Webserver>
|
||||
|
||||
XML
|
||||
XML
|
||||
Extensible Markup Language is a W3C-recommended general- purpose markup
|
||||
language for creating special-purpose markup languages, capable of
|
||||
describing many different kinds of data.
|
||||
|
||||
@ -24,8 +24,8 @@ Currently phpMyAdmin can:
|
||||
* execute, edit and bookmark any :term:`SQL`-statement, even batch-queries
|
||||
* load text files into tables
|
||||
* create [#f1]_ and read dumps of tables
|
||||
* export [#f1]_ data to various formats: :term:`CSV`, :term:`XML`, :term:`PDF`,
|
||||
:term:`ISO`/:term:`IEC` 26300 - :term:`OpenDocument` Text and Spreadsheet, Microsoft
|
||||
* export [#f1]_ data to various formats: :term:`CSV`, :term:`XML`, :term:`PDF`,
|
||||
:term:`ISO`/:term:`IEC` 26300 - :term:`OpenDocument` Text and Spreadsheet, Microsoft
|
||||
Word 2000, and LATEX formats
|
||||
* import data and :term:`MySQL` structures from :term:`OpenDocument` spreadsheets, as
|
||||
well as :term:`XML`, :term:`CSV`, and :term:`SQL` files
|
||||
|
||||
@ -10,7 +10,7 @@ control over creating users, viewing and editing privileges for existing users,
|
||||
and removing users.
|
||||
|
||||
Within phpMyAdmin, user management is controlled via the :guilabel:`Users` link
|
||||
from the main page. Users can be created, edited, and removed.
|
||||
from the main page. Users can be created, edited, and removed.
|
||||
|
||||
Creating a new user
|
||||
-------------------
|
||||
|
||||
@ -12,7 +12,7 @@ web server (such as Apache, :term:`IIS`) to install phpMyAdmin's files into.
|
||||
PHP
|
||||
---
|
||||
|
||||
* You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library
|
||||
* You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library
|
||||
(SPL) extension, JSON support, and the ``mbstring`` extension.
|
||||
|
||||
* To support uploading of ZIP files, you need the PHP ``zip`` extension.
|
||||
@ -27,7 +27,7 @@ PHP
|
||||
|
||||
* To support upload progress bars, see :ref:`faq2_9`.
|
||||
|
||||
* To support XML and Open Document Spreadsheet importing, you need the
|
||||
* To support XML and Open Document Spreadsheet importing, you need the
|
||||
`libxml <http://www.php.net/libxml>`_ extension.
|
||||
|
||||
* Performance suggestion: install the ``ctype`` extension.
|
||||
@ -37,7 +37,7 @@ PHP
|
||||
Database
|
||||
--------
|
||||
|
||||
phpMyAdmin supports MySQL-compatible databases.
|
||||
phpMyAdmin supports MySQL-compatible databases.
|
||||
|
||||
* MySQL 5.5 or newer
|
||||
* MariaDB 5.5 or newer
|
||||
|
||||
@ -36,7 +36,7 @@ OpenSUSE
|
||||
|
||||
OpenSUSE already comes with phpMyAdmin package, just install packages from
|
||||
the `openSUSE Build Service <http://software.opensuse.org/package/phpMyAdmin>`_.
|
||||
|
||||
|
||||
Ubuntu
|
||||
------
|
||||
|
||||
@ -53,9 +53,9 @@ install.
|
||||
|
||||
Mandriva
|
||||
--------
|
||||
|
||||
|
||||
Mandriva ships the phpMyAdmin package in their ``contrib`` branch and can be
|
||||
installed via the usual Control Center.
|
||||
installed via the usual Control Center.
|
||||
|
||||
Fedora
|
||||
------
|
||||
@ -66,9 +66,9 @@ official phpMyAdmin documentation.
|
||||
|
||||
Red Hat Enterprise Linux
|
||||
------------------------
|
||||
|
||||
|
||||
Red Hat Enterprise Linux itself and thus derivatives like CentOS don't
|
||||
ship phpMyAdmin, but the Fedora-driven repository
|
||||
ship phpMyAdmin, but the Fedora-driven repository
|
||||
`Extra Packages for Enterprise Linux (EPEL) <http://fedoraproject.org/wiki/EPEL>`_
|
||||
is doing so, if it's
|
||||
`enabled <http://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_.
|
||||
@ -81,7 +81,7 @@ Installing on Windows
|
||||
+++++++++++++++++++++
|
||||
|
||||
The easiest way to get phpMyAdmin on Windows is using third party products
|
||||
which include phpMyAdmin together with a database and web server such as
|
||||
which include phpMyAdmin together with a database and web server such as
|
||||
`XAMPP <http://www.apachefriends.org/en/xampp.html>`_.
|
||||
|
||||
You can find more of such options at `Wikipedia <https://en.wikipedia.org/wiki/List_of_AMP_packages>`_.
|
||||
@ -94,7 +94,7 @@ Quick Install
|
||||
|
||||
#. Choose an appropriate distribution kit from the phpmyadmin.net
|
||||
Downloads page. Some kits contain only the English messages, others
|
||||
contain all languages. We'll assume you chose a kit whose name
|
||||
contain all languages. We'll assume you chose a kit whose name
|
||||
looks like ``phpMyAdmin-x.x.x -all-languages.tar.gz``.
|
||||
#. Untar or unzip the distribution (be sure to unzip the subdirectories):
|
||||
``tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz`` in your
|
||||
@ -129,10 +129,10 @@ simple configuration may look like this:
|
||||
|
||||
.. code-block:: xml+php
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // use here a value of your choice
|
||||
|
||||
|
||||
$i=0;
|
||||
$i++;
|
||||
$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
||||
@ -142,9 +142,9 @@ Or, if you prefer to not be prompted every time you log in:
|
||||
|
||||
.. code-block:: xml+php
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
|
||||
|
||||
$i=0;
|
||||
$i++;
|
||||
$cfg['Servers'][$i]['user'] = 'root';
|
||||
@ -152,7 +152,7 @@ Or, if you prefer to not be prompted every time you log in:
|
||||
$cfg['Servers'][$i]['auth_type'] = 'config';
|
||||
?>
|
||||
|
||||
For a full explanation of possible configuration values, see the
|
||||
For a full explanation of possible configuration values, see the
|
||||
:ref:`config` of this document.
|
||||
|
||||
.. index:: Setup script
|
||||
@ -169,7 +169,7 @@ Linux/Unix system you can use the following commands:
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
|
||||
|
||||
cd phpMyAdmin
|
||||
mkdir config # create directory for saving
|
||||
chmod o+rw config # give it world writable permissions
|
||||
@ -178,7 +178,7 @@ And to edit an existing configuration, copy it over first:
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
|
||||
|
||||
cp config.inc.php config/ # copy current configuration for editing
|
||||
chmod o+w config/config.inc.php # give it world writable permissions
|
||||
|
||||
@ -203,7 +203,7 @@ measure:
|
||||
|
||||
.. code-block:: sh
|
||||
|
||||
|
||||
|
||||
mv config/config.inc.php . # move file to current directory
|
||||
chmod o-rw config.inc.php # remove world read and write permissions
|
||||
rm -rf config # remove not needed directory
|
||||
@ -235,7 +235,7 @@ options which the setup script does not provide.
|
||||
webserver or limit access by web server configuration, see
|
||||
:ref:`faq1_42`.
|
||||
|
||||
.. index::
|
||||
.. index::
|
||||
single: Configuration storage
|
||||
single: phpMyAdmin configuration storage
|
||||
single: pmadb
|
||||
@ -268,16 +268,16 @@ depending on the database name.
|
||||
|
||||
After having imported the :file:`examples/create_tables.sql` file, you
|
||||
should specify the table names in your :file:`config.inc.php` file. The
|
||||
directives used for that can be found in the :ref:`config`.
|
||||
directives used for that can be found in the :ref:`config`.
|
||||
|
||||
You will also need to have a controluser
|
||||
You will also need to have a controluser
|
||||
(:config:option:`$cfg['Servers'][$i]['controluser']` and
|
||||
:config:option:`$cfg['Servers'][$i]['controlpass']` settings)
|
||||
with the proper rights to those tables. For example you can create it
|
||||
with the proper rights to those tables. For example you can create it
|
||||
using following statement:
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
|
||||
GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost' IDENTIFIED BY 'pmapass';
|
||||
|
||||
.. _upgrading:
|
||||
@ -318,7 +318,7 @@ configuration file.
|
||||
|
||||
:term:`HTTP` and cookie authentication
|
||||
modes are more secure: the MySQL login information does not need to be
|
||||
set in the phpMyAdmin configuration file (except possibly for the
|
||||
set in the phpMyAdmin configuration file (except possibly for the
|
||||
:config:option:`$cfg['Servers'][$i]['controluser']`).
|
||||
However, keep in mind that the password travels in plain text, unless
|
||||
you are using the HTTPS protocol. In cookie mode, the password is
|
||||
@ -330,12 +330,12 @@ privileges to an ordinary user, unless you understand the impact of those
|
||||
privileges (for example, you are creating a superuser).
|
||||
For example, to grant the user *real_user* with all privileges on
|
||||
the database *user_base*:
|
||||
|
||||
|
||||
.. code-block:: mysql
|
||||
|
||||
|
||||
GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real_password';
|
||||
|
||||
|
||||
|
||||
|
||||
What the user may now do is controlled entirely by the MySQL user management
|
||||
system. With HTTP or cookie authentication mode, you don't need to fill the
|
||||
user/password fields inside the :config:option:`$cfg['Servers']`.
|
||||
@ -347,8 +347,8 @@ HTTP authentication mode
|
||||
|
||||
* Uses :term:`HTTP` Basic authentication
|
||||
method and allows you to log in as any valid MySQL user.
|
||||
* Is supported with most PHP configurations. For :term:`IIS` (:term:`ISAPI`)
|
||||
support using :term:`CGI` PHP see :ref:`faq1_32`, for using with Apache
|
||||
* Is supported with most PHP configurations. For :term:`IIS` (:term:`ISAPI`)
|
||||
support using :term:`CGI` PHP see :ref:`faq1_32`, for using with Apache
|
||||
:term:`CGI` see :ref:`faq1_35`.
|
||||
* See also :ref:`faq4_4` about not using the :term:`.htaccess` mechanism along with
|
||||
':term:`HTTP`' authentication mode.
|
||||
@ -360,7 +360,7 @@ HTTP authentication mode
|
||||
Cookie authentication mode
|
||||
--------------------------
|
||||
|
||||
* You can use this method as a replacement for the :term:`HTTP` authentication
|
||||
* You can use this method as a replacement for the :term:`HTTP` authentication
|
||||
(for example, if you're running :term:`IIS`).
|
||||
* Obviously, the user must enable cookies in the browser, but this is
|
||||
now a requirement for all authentication modes.
|
||||
@ -427,7 +427,7 @@ Authentication is disabled by default. To enable it, add the following
|
||||
line to :file:`config.inc.php`:
|
||||
|
||||
.. code-block:: php
|
||||
|
||||
|
||||
$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey.conf';
|
||||
|
||||
You then have to create the ``swekey.conf`` file that will associate
|
||||
@ -448,14 +448,14 @@ Securing your phpMyAdmin installation
|
||||
The phpMyAdmin team tries hard to make the application secure, however there
|
||||
are always ways to make your installation more secure:
|
||||
|
||||
* remove ``setup`` directory from phpMyAdmin, you will probably not
|
||||
* remove ``setup`` directory from phpMyAdmin, you will probably not
|
||||
use it after initial setup
|
||||
* properly choose authentication method - :ref:`cookie`
|
||||
is probably the best choice for shared hosting
|
||||
* in case you don't want all MySQL users to be able to access
|
||||
* in case you don't want all MySQL users to be able to access
|
||||
phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them
|
||||
* consider hiding phpMyAdmin behind authentication proxy, so that
|
||||
* consider hiding phpMyAdmin behind authentication proxy, so that
|
||||
MySQL credentials are not all users need to login
|
||||
* if you are afraid of automated attacks, enabling Captcha by
|
||||
* if you are afraid of automated attacks, enabling Captcha by
|
||||
:config:option:`$cfg['CaptchaLoginPublicKey']` and
|
||||
:config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.
|
||||
|
||||
@ -24,11 +24,11 @@ one we ship.
|
||||
|
||||
Currently known list of external libraries:
|
||||
|
||||
js/jquery
|
||||
js/jquery
|
||||
jQuery js framework and various jQuery based libraries.
|
||||
|
||||
libraries/php-gettext
|
||||
libraries/php-gettext
|
||||
php-gettext library
|
||||
libraries/tcpdf
|
||||
tcpdf library, stripped down of not needed files
|
||||
libraries/tcpdf
|
||||
tcpdf library, stripped down of not needed files
|
||||
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
#
|
||||
# To activate the Swekey authentication add the following line to your config.inc.php file.
|
||||
# $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
|
||||
# Then rename this file "swekey-pma.conf" and copy it to the /etc directory.
|
||||
# Then rename this file "swekey-pma.conf" and copy it to the /etc directory.
|
||||
# Add all the Swekey ids you want to grant access to in the file.
|
||||
# After each Swekey id put the corresponding user name.
|
||||
#
|
||||
# If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
|
||||
# If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
|
||||
# while your Swekey is connected.
|
||||
#
|
||||
# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
|
||||
# since this link provides funding to PhpMyAdmin.
|
||||
# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
|
||||
# since this link provides funding to PhpMyAdmin.
|
||||
#
|
||||
|
||||
|
||||
0000000000000000000000000000763A:root
|
||||
000000000000000000000000000089E4:steve
|
||||
0000000000000000000000000000231E:scott
|
||||
@ -28,7 +28,7 @@ SERVER_STATUS=https://auth-status-ssl.musbe.net
|
||||
|
||||
#
|
||||
# The path of the root certificate file used to ensure a secure
|
||||
# communication with the authentication servers in SSL mode.
|
||||
# communication with the authentication servers in SSL mode.
|
||||
# If not specified, will use musbe-ca.crt found in your
|
||||
# phpMyAdmin/libraries/auth/swekey.
|
||||
#
|
||||
@ -36,9 +36,9 @@ SERVER_STATUS=https://auth-status-ssl.musbe.net
|
||||
#CA_FILE=/var/http-root/phpmyadmin/libraries/auth/swekey/musbe-ca.crt
|
||||
|
||||
#
|
||||
# If your server receives many login requests, you can enable the random
|
||||
# If your server receives many login requests, you can enable the random
|
||||
# token caching to accelerate the authentication process.
|
||||
# Token caching is enabled by default.
|
||||
# Token caching is enabled by default.
|
||||
#
|
||||
|
||||
#ENABLE_TOKEN_CACHE=0
|
||||
|
||||
@ -370,7 +370,7 @@ if ($import_file != 'none' && ! $error) {
|
||||
if (! empty($open_basedir)) {
|
||||
|
||||
/**
|
||||
* @todo make use of the config's temp dir with fallback to the
|
||||
* @todo make use of the config's temp dir with fallback to the
|
||||
* system's tmp dir
|
||||
*/
|
||||
$tmp_subdir = sys_get_temp_dir();
|
||||
@ -387,9 +387,9 @@ if ($import_file != 'none' && ! $error) {
|
||||
} else {
|
||||
|
||||
// If the php.ini is misconfigured (eg. there is no /tmp access defined
|
||||
// with open_basedir), $tmp_subdir won't be writable and the user gets
|
||||
// a 'File could not be read!' error (at PMA_detectCompression), which
|
||||
// is not too meaningful. Show a meaningful error message to the user
|
||||
// with open_basedir), $tmp_subdir won't be writable and the user gets
|
||||
// a 'File could not be read!' error (at PMA_detectCompression), which
|
||||
// is not too meaningful. Show a meaningful error message to the user
|
||||
// instead.
|
||||
|
||||
$message = PMA_Message::error(
|
||||
|
||||
@ -33,7 +33,7 @@ foreach ($drops as $each_drop) {
|
||||
}
|
||||
unset($drops, $each_drop);
|
||||
|
||||
/*
|
||||
/*
|
||||
* Black list of all scripts to which front-end must submit data.
|
||||
* Such scripts must not be loaded on home page.
|
||||
*
|
||||
@ -324,7 +324,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
|
||||
} else {
|
||||
$php_ext_string .= __('None');
|
||||
}
|
||||
|
||||
|
||||
PMA_printListItem(
|
||||
$php_ext_string,
|
||||
'li_used_php_extension'
|
||||
|
||||
18
js/import.js
18
js/import.js
@ -58,35 +58,35 @@ AJAX.registerTeardown('import.js', function () {
|
||||
|
||||
AJAX.registerOnload('import.js', function () {
|
||||
// import_file_form validation.
|
||||
$('#import_file_form').live('submit', function (event) {
|
||||
$('#import_file_form').live('submit', function (event) {
|
||||
var radioLocalImport = $("#radio_local_import_file");
|
||||
var radioImport = $("#radio_import_file");
|
||||
var fileMsg = '<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strImportDialogMessage + '</div>';
|
||||
|
||||
|
||||
if (radioLocalImport.length !== 0) {
|
||||
// remote upload.
|
||||
// TODO Remove this section when all browsers support HTML5 "required" property
|
||||
if (! radioLocalImport.is(":checked") && ! radioImport.is(":checked")) {
|
||||
radioImport.focus();
|
||||
var msg = '<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ';
|
||||
msg += PMA_messages.strRadioUnchecked;
|
||||
msg += PMA_messages.strRadioUnchecked;
|
||||
msg += '</div>';
|
||||
PMA_ajaxShowMessage(msg, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (radioImport.is(":checked") && $("#input_import_file").val() === '') {
|
||||
$("#input_import_file").focus();
|
||||
PMA_ajaxShowMessage(fileMsg, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (radioLocalImport.is(":checked")) {
|
||||
if ($("#select_local_import_file").length === 0) {
|
||||
PMA_ajaxShowMessage('<div class="error"><img src="themes/dot.gif" title="" alt="" class="icon ic_s_error" /> ' + PMA_messages.strNoImportFile + ' </div>', false);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if ($("#select_local_import_file").val() === '') {
|
||||
$("#select_local_import_file").focus();
|
||||
PMA_ajaxShowMessage(fileMsg, false);
|
||||
@ -107,7 +107,7 @@ AJAX.registerOnload('import.js', function () {
|
||||
$("#upload_form_status_info").css("display", "inline");
|
||||
return;
|
||||
});
|
||||
|
||||
|
||||
// Initially display the options for the selected plugin
|
||||
changePluginOpts();
|
||||
|
||||
@ -151,7 +151,7 @@ AJAX.registerOnload('import.js', function () {
|
||||
.find("h3")
|
||||
.remove();
|
||||
//$("form[name=import] *").unwrap();
|
||||
|
||||
|
||||
/**
|
||||
* for input element text_csv_enclosed and text_csv_escaped allow just one character to enter.
|
||||
* as mysql allows just one character for these fields,
|
||||
@ -164,5 +164,5 @@ AJAX.registerOnload('import.js', function () {
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
|
||||
// gloabl vars to hold Arrow Down event timeStamps
|
||||
var prevTimeStamp = 0;
|
||||
var prevTimeStamp = 0;
|
||||
var curTimeStamp = 0;
|
||||
|
||||
/**
|
||||
@ -22,7 +22,7 @@ function onKeyDownArrowsHandler(e)
|
||||
return;
|
||||
}
|
||||
prevTimeStamp = curTimeStamp;
|
||||
|
||||
|
||||
var o = (e.srcElement || e.target);
|
||||
if (!o) {
|
||||
return;
|
||||
|
||||
@ -394,7 +394,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
|
||||
var hashed_field = name_parts[1].match(/\[(.+)\]/)[1];
|
||||
$this_element.attr('name', new_name);
|
||||
|
||||
|
||||
/** If element is select[name*='funcs'], update id */
|
||||
if ($this_element.is("select[name*='funcs']")) {
|
||||
var this_id = $this_element.attr("id");
|
||||
@ -407,14 +407,14 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
$this_element.find("option").filter(function () {
|
||||
return $(this).text() === prevSelectedValue;
|
||||
}).attr("selected","selected");
|
||||
|
||||
|
||||
// If salt field is there then update its id.
|
||||
var nextSaltInput = $this_element.parent().next("td").next("td").find("input[name*='salt']");
|
||||
if (nextSaltInput.length !== 0) {
|
||||
nextSaltInput.attr("id", "salt_" + new_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// handle input text fields and textareas
|
||||
if ($this_element.is('.textfield') || $this_element.is('.char')) {
|
||||
// do not remove the 'value' attribute for ENUM columns
|
||||
@ -530,18 +530,18 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
});
|
||||
// Add all the required datepickers back
|
||||
addDateTimePicker();
|
||||
|
||||
|
||||
/**
|
||||
* @var $function_option_dialog object holds dialog for selected function options.
|
||||
*/
|
||||
*/
|
||||
var $function_option_dialog = null;
|
||||
|
||||
|
||||
PMA_tooltip(
|
||||
$("select[name*='funcs']"),
|
||||
'select',
|
||||
PMA_messages.strFunctionHint
|
||||
);
|
||||
|
||||
|
||||
$("select[name*='funcs']").live('click', function (event) {
|
||||
if (! event.shiftKey) {
|
||||
return false;
|
||||
@ -555,7 +555,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
var targetRows = $("tr").has("input[value='" + columnName + "']");
|
||||
var salt;
|
||||
var copySalt = false;
|
||||
|
||||
|
||||
if (functionName === 'AES_ENCRYPT') {
|
||||
// Dialog title.
|
||||
var title = functionName;
|
||||
@ -574,7 +574,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows);
|
||||
$(this).dialog("close");
|
||||
};
|
||||
|
||||
|
||||
// Contents of dialog.
|
||||
var dialog = "<div>" +
|
||||
"<fieldset>" +
|
||||
@ -583,7 +583,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
" ?" +
|
||||
"</fieldset>" +
|
||||
"</div>";
|
||||
|
||||
|
||||
// Show the dialog
|
||||
var width = parseInt(
|
||||
(parseInt($('html').css('font-size'), 10) / 13) * 340,
|
||||
@ -608,7 +608,7 @@ AJAX.registerOnload('tbl_change.js', function () {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
applyFunctionToAllRows(currId, functionName, copySalt, "", targetRows);
|
||||
});
|
||||
});
|
||||
@ -644,10 +644,10 @@ function applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows
|
||||
return;
|
||||
}
|
||||
} */
|
||||
|
||||
|
||||
// Append the function select list.
|
||||
var targetSelectList = $(this).find("select[name*='funcs[multi_edit]']");
|
||||
|
||||
|
||||
if (targetSelectList.attr("id") === currId) {
|
||||
return;
|
||||
}
|
||||
@ -665,7 +665,7 @@ function applyFunctionToAllRows(currId, functionName, copySalt, salt, targetRows
|
||||
" id=salt_" + targetSelectList.attr("id") + " placeholder='enter Salt'>";
|
||||
targetSelectList.parent().next("td").next("td").find("input[name*='fields']").after(new_salt_box);
|
||||
}
|
||||
|
||||
|
||||
if (copySalt) {
|
||||
$("#salt_" + targetSelectList.attr("id")).attr("value", salt);
|
||||
}
|
||||
|
||||
@ -512,7 +512,7 @@ class PMA_File
|
||||
* @todo move file read part into readChunk() or getChunk()
|
||||
* @todo add support for compression plugins
|
||||
* @access protected
|
||||
* @return mixed false on error, otherwise string MIME type of
|
||||
* @return mixed false on error, otherwise string MIME type of
|
||||
* compression, none for none
|
||||
*/
|
||||
protected function detectCompression()
|
||||
|
||||
@ -989,7 +989,7 @@ class PMA_Table
|
||||
$i = 0;
|
||||
|
||||
while ($parsed_sql[$i]['type'] != $table_delimiter) {
|
||||
$i++;
|
||||
$i++;
|
||||
}
|
||||
|
||||
$parsed_sql[$i]['data'] = $target;
|
||||
@ -1014,7 +1014,7 @@ class PMA_Table
|
||||
$GLOBALS['sql_query'] .= "\n" . $GLOBALS['sql_indexes'];
|
||||
if ($mode == 'one_table') {
|
||||
unset($GLOBALS['sql_indexes']);
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -118,7 +118,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
|
||||
) = PMA_getDescriptionAndTitle($descriptions[$indexByKeyname]);
|
||||
|
||||
// keynames and descriptions for the right section,
|
||||
// sorted by descriptions
|
||||
// sorted by descriptions
|
||||
$rightKeyname = $keys[$indexByDescription];
|
||||
list(
|
||||
$rightDescription,
|
||||
@ -169,7 +169,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the description (possibly truncated) and the title
|
||||
* Get the description (possibly truncated) and the title
|
||||
*
|
||||
* @param string $description the keyname's description
|
||||
*
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* function for the main export logic
|
||||
* function for the main export logic
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
@ -12,9 +12,9 @@ if (! defined('PHPMYADMIN')) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a session variable upon a possible fatal error during export
|
||||
* Sets a session variable upon a possible fatal error during export
|
||||
*
|
||||
* @return void
|
||||
* @return void
|
||||
*/
|
||||
function PMA_shutdownDuringExport()
|
||||
{
|
||||
@ -173,7 +173,7 @@ function PMA_exportOutputHandler($line)
|
||||
function PMA_getHtmlForDisplayedExportFooter($back_button)
|
||||
{
|
||||
/**
|
||||
* Close the html tags and add the footers for on-screen export
|
||||
* Close the html tags and add the footers for on-screen export
|
||||
*/
|
||||
$html = '</textarea>'
|
||||
. ' </form>'
|
||||
@ -192,9 +192,9 @@ function PMA_getHtmlForDisplayedExportFooter($back_button)
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the memory limit for export
|
||||
* Computes the memory limit for export
|
||||
*
|
||||
* @return int $memory_limit the memory limit
|
||||
* @return int $memory_limit the memory limit
|
||||
*/
|
||||
function PMA_getMemoryLimitForExport()
|
||||
{
|
||||
@ -226,7 +226,7 @@ function PMA_getMemoryLimitForExport()
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the filename and MIME type for export file
|
||||
* Return the filename and MIME type for export file
|
||||
*
|
||||
* @param string $export_type type of export
|
||||
* @param string $remember_template whether to remember template
|
||||
@ -234,7 +234,7 @@ function PMA_getMemoryLimitForExport()
|
||||
* @param string $compression compression asked
|
||||
* @param string $filename_template the filename template
|
||||
*
|
||||
* @return array the filename template and mime type
|
||||
* @return array the filename template and mime type
|
||||
*/
|
||||
function PMA_getExportFilenameAndMimetype(
|
||||
$export_type, $remember_template, $export_plugin, $compression,
|
||||
@ -299,9 +299,9 @@ function PMA_getExportFilenameAndMimetype(
|
||||
* Open the export file
|
||||
*
|
||||
* @param string $filename the export filename
|
||||
* @param boolean $quick_export whether it's a quick export or not
|
||||
* @param boolean $quick_export whether it's a quick export or not
|
||||
*
|
||||
* @return array the full save filename, possible message and the file handle
|
||||
* @return array the full save filename, possible message and the file handle
|
||||
*/
|
||||
function PMA_openExportFile($filename, $quick_export)
|
||||
{
|
||||
@ -446,7 +446,7 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
|
||||
}
|
||||
|
||||
/**
|
||||
* Export at the server level
|
||||
* Export at the server level
|
||||
*
|
||||
* @param string $db_select the selected databases to export
|
||||
* @param string $whatStrucOrData structure or data or both
|
||||
@ -459,7 +459,7 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
|
||||
* @param string $do_mime whether to add MIME info
|
||||
* @param string $do_dates whether to add dates
|
||||
*
|
||||
* @return void
|
||||
* @return void
|
||||
*/
|
||||
function PMA_exportServer(
|
||||
$db_select, $whatStrucOrData, $export_plugin, $crlf, $err_url,
|
||||
@ -500,7 +500,7 @@ function PMA_exportServer(
|
||||
* @param string $do_dates whether to add dates
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
*/
|
||||
function PMA_exportDatabase(
|
||||
$db, $tables, $whatStrucOrData, $export_plugin, $crlf, $err_url,
|
||||
$export_type, $do_relation, $do_comments, $do_mime, $do_dates
|
||||
@ -533,9 +533,9 @@ function PMA_exportDatabase(
|
||||
) {
|
||||
// for a view, export a stand-in definition of the table
|
||||
// to resolve view dependencies
|
||||
|
||||
|
||||
if ($is_view) {
|
||||
|
||||
|
||||
if (isset($GLOBALS['sql_create_view'])) {
|
||||
if (! $export_plugin->exportStructure(
|
||||
$db, $table, $crlf, $err_url,
|
||||
@ -545,9 +545,9 @@ function PMA_exportDatabase(
|
||||
break 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else if (isset($GLOBALS['sql_create_table'])) {
|
||||
|
||||
|
||||
if (! $export_plugin->exportStructure(
|
||||
$db, $table, $crlf, $err_url,
|
||||
'create_table', $export_type,
|
||||
@ -555,9 +555,9 @@ function PMA_exportDatabase(
|
||||
)) {
|
||||
break 1;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// if this is a view or a merge table, don't export data
|
||||
if (($whatStrucOrData == 'data'
|
||||
@ -586,9 +586,9 @@ function PMA_exportDatabase(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (isset($GLOBALS['sql_create_view'])) {
|
||||
|
||||
|
||||
foreach ($views as $view) {
|
||||
// no data export for a view
|
||||
if ($whatStrucOrData == 'structure'
|
||||
@ -603,7 +603,7 @@ function PMA_exportDatabase(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (! $export_plugin->exportDBFooter($db)) {
|
||||
@ -612,7 +612,7 @@ function PMA_exportDatabase(
|
||||
}
|
||||
|
||||
/**
|
||||
* Export at the table level
|
||||
* Export at the table level
|
||||
*
|
||||
* @param string $db the database to export
|
||||
* @param string $table the table to export
|
||||
@ -625,9 +625,9 @@ function PMA_exportDatabase(
|
||||
* @param string $do_comments whether to add comments
|
||||
* @param string $do_mime whether to add MIME info
|
||||
* @param string $do_dates whether to add dates
|
||||
* @param string $allrows whether "dump all rows" was ticked
|
||||
* @param string $limit_to upper limit
|
||||
* @param string $limit_from starting limit
|
||||
* @param string $allrows whether "dump all rows" was ticked
|
||||
* @param string $limit_to upper limit
|
||||
* @param string $limit_from starting limit
|
||||
* @param string $sql_query query for which exporting is requested
|
||||
*
|
||||
* @return void
|
||||
@ -656,9 +656,9 @@ function PMA_exportTable(
|
||||
if ($whatStrucOrData == 'structure'
|
||||
|| $whatStrucOrData == 'structure_and_data'
|
||||
) {
|
||||
|
||||
|
||||
if ($is_view) {
|
||||
|
||||
|
||||
if (isset($GLOBALS['sql_create_view'])) {
|
||||
if (! $export_plugin->exportStructure(
|
||||
$db, $table, $crlf, $err_url,
|
||||
@ -668,9 +668,9 @@ function PMA_exportTable(
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else if (isset($GLOBALS['sql_create_table'])) {
|
||||
|
||||
|
||||
if (! $export_plugin->exportStructure(
|
||||
$db, $table, $crlf, $err_url,
|
||||
'create_table', $export_type,
|
||||
@ -678,9 +678,9 @@ function PMA_exportTable(
|
||||
)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// If this is an export of a single view, we have to export data;
|
||||
// for example, a PDF report
|
||||
|
||||
@ -1313,7 +1313,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
|
||||
/**
|
||||
* Stops the import on (mostly upload/file related) error
|
||||
*
|
||||
* @param PMA_Message $error_message The error message
|
||||
* @param PMA_Message $error_message The error message
|
||||
*
|
||||
* @return void
|
||||
* @access public
|
||||
|
||||
@ -175,7 +175,7 @@ class PMA_NavigationHeader
|
||||
|
||||
/**
|
||||
* Creates the code for displaying the links
|
||||
* at the top of the navigation panel
|
||||
* at the top of the navigation panel
|
||||
*
|
||||
* @return string HTML code for the links
|
||||
*/
|
||||
|
||||
@ -296,7 +296,7 @@ class ImportCsv extends AbstractImportCsv
|
||||
$buffer, $ch, $i, $csv_terminated_len
|
||||
);
|
||||
$i += $csv_terminated_len-1;
|
||||
|
||||
|
||||
}
|
||||
while ($i < $len) {
|
||||
// Deadlock protection
|
||||
@ -652,7 +652,7 @@ class ImportCsv extends AbstractImportCsv
|
||||
}
|
||||
|
||||
/**
|
||||
* Read the expected column_separated_with String of length
|
||||
* Read the expected column_separated_with String of length
|
||||
* $csv_terminated_len from the $buffer
|
||||
* into variable $ch and return the read string $ch
|
||||
*
|
||||
@ -667,7 +667,7 @@ class ImportCsv extends AbstractImportCsv
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
|
||||
|
||||
public function readCsvTerminatedString($buffer, $ch, $i, $csv_terminated_len)
|
||||
{
|
||||
for ($j = 0; $j < $csv_terminated_len - 1; $j++) {
|
||||
@ -700,5 +700,5 @@ class ImportCsv extends AbstractImportCsv
|
||||
{
|
||||
$this->_analyze = $analyze;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
This directory holds import plugins for phpMyAdmin. Any new plugin should
|
||||
basically follow the structure presented here. The messages must use our
|
||||
gettext mechanism, see http://wiki.phpmyadmin.net/pma/Gettext_for_developers.
|
||||
gettext mechanism, see http://wiki.phpmyadmin.net/pma/Gettext_for_developers.
|
||||
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
|
||||
@ -52,7 +52,7 @@ abstract class Bool2TextTransformationsPlugin extends TransformationsPlugin
|
||||
if (! isset($options[1])) {
|
||||
$options[1] = 'F'; // default false option
|
||||
}
|
||||
|
||||
|
||||
if ($buffer == '0') {
|
||||
return $options[1]; // return false label
|
||||
}
|
||||
|
||||
@ -1037,7 +1037,7 @@ function PMA_SQP_analyze($arr)
|
||||
* |MIN|MAX|BIT_OR|BIT_AND
|
||||
* ['queryflags']['is_count'] = 1; for the presence of SELECT COUNT
|
||||
* ['queryflags']['is_procedure'] = 1; for the presence of CALL
|
||||
* ['queryflags']['is_subquery'] = 1; contains a subquery
|
||||
* ['queryflags']['is_subquery'] = 1; contains a subquery
|
||||
*
|
||||
* query clauses
|
||||
* -------------
|
||||
|
||||
@ -2232,7 +2232,7 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows,
|
||||
(isset ($avg_size) ? $avg_size : ''),
|
||||
(isset ($avg_unit) ? $avg_unit : '')
|
||||
);
|
||||
|
||||
|
||||
$html_output .= '</fieldset>'
|
||||
. '</div>';
|
||||
|
||||
|
||||
@ -20,6 +20,6 @@ if [ ! -z "$1" ] ; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for x in po/*.po ; do
|
||||
for x in po/*.po ; do
|
||||
compile $x
|
||||
done
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
for x in po/*.po ; do
|
||||
for x in po/*.po ; do
|
||||
grep 'Team' $x | sed 's/.*: \(.*\)<.*/\1/'
|
||||
git shortlog -sne --no-merges -- $x | grep '^ [ 0-9][0-9]\{3\}'
|
||||
done
|
||||
|
||||
@ -20,11 +20,11 @@ if [ ! -z "$1" ] ; then
|
||||
THRESHOLD=$1
|
||||
fi
|
||||
|
||||
echo '<?php' > $TMPOUTPUTFILE
|
||||
echo '/* Automatically generated file, do not edit! */' >> $TMPOUTPUTFILE
|
||||
echo '/* Generated by scripts/remove-incomplete-mo */' >> $TMPOUTPUTFILE
|
||||
echo '' >> $TMPOUTPUTFILE
|
||||
echo '$GLOBALS["language_stats"] = array (' >> $TMPOUTPUTFILE
|
||||
echo '<?php' > $TMPOUTPUTFILE
|
||||
echo '/* Automatically generated file, do not edit! */' >> $TMPOUTPUTFILE
|
||||
echo '/* Generated by scripts/remove-incomplete-mo */' >> $TMPOUTPUTFILE
|
||||
echo '' >> $TMPOUTPUTFILE
|
||||
echo '$GLOBALS["language_stats"] = array (' >> $TMPOUTPUTFILE
|
||||
|
||||
check() {
|
||||
TMPOUTPUTFILE=$2
|
||||
@ -46,21 +46,21 @@ check() {
|
||||
UNTRANSLATED=0
|
||||
fi
|
||||
PERCENT=`expr 100 \* $TRANSLATED / \( $TRANSLATED + $FUZZY + $UNTRANSLATED \) || true`
|
||||
echo " '$lang' => $PERCENT," >> $TMPOUTPUTFILE
|
||||
echo " '$lang' => $PERCENT," >> $TMPOUTPUTFILE
|
||||
|
||||
if [ $PERCENT -lt $THRESHOLD ] ; then
|
||||
echo "Removing $lang, only $PERCENT%"
|
||||
rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo
|
||||
rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo
|
||||
rmdir locale/$lang/LC_MESSAGES
|
||||
rmdir locale/$lang
|
||||
fi
|
||||
}
|
||||
|
||||
for x in po/*.po ; do
|
||||
for x in po/*.po ; do
|
||||
check $x $TMPOUTPUTFILE
|
||||
done
|
||||
|
||||
echo ');' >> $TMPOUTPUTFILE
|
||||
echo '?>' >> $TMPOUTPUTFILE
|
||||
echo ');' >> $TMPOUTPUTFILE
|
||||
echo '?>' >> $TMPOUTPUTFILE
|
||||
|
||||
mv $TMPOUTPUTFILE $OUTPUTFILE
|
||||
mv $TMPOUTPUTFILE $OUTPUTFILE
|
||||
|
||||
@ -3,7 +3,7 @@ PhpMyAdmin test suite
|
||||
|
||||
This directory is protected from web visitors by a .htaccess file.
|
||||
|
||||
For more information on allowing http access to this directory see:
|
||||
For more information on allowing http access to this directory see:
|
||||
http://httpd.apache.org/docs/current/mod/mod_authz_host.html#allow
|
||||
|
||||
Please visit the wiki for more information on unit testing:
|
||||
|
||||
@ -47,7 +47,7 @@ class PMA_Font_Test extends PHPUnit_Framework_TestCase
|
||||
12,
|
||||
PMA_Font::getStringWidth("aa", "arial", "10")
|
||||
);
|
||||
|
||||
|
||||
// string "i"
|
||||
$this->assertEquals(
|
||||
3,
|
||||
|
||||
@ -1058,7 +1058,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
|
||||
$this->object->blowfishEncrypt('data123', 'sec321')
|
||||
);
|
||||
} else {
|
||||
//using our own iv for testing
|
||||
//using our own iv for testing
|
||||
$tmp = $GLOBALS['iv'];
|
||||
$GLOBALS['iv'] = "testiv09";
|
||||
$this->assertEquals(
|
||||
@ -1077,8 +1077,8 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
|
||||
public function testBlowfishDecrypt()
|
||||
{
|
||||
if (function_exists('mcrypt_encrypt')) {
|
||||
|
||||
//using our own iv for testing
|
||||
|
||||
//using our own iv for testing
|
||||
$tmp = $GLOBALS['iv'];
|
||||
$GLOBALS['iv'] = "testiv09";
|
||||
$this->assertEquals(
|
||||
@ -1086,7 +1086,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
|
||||
$this->object->blowfishDecrypt('x/2GwHKoPyc=', 'sec321')
|
||||
);
|
||||
$GLOBALS['iv'] = $tmp;
|
||||
|
||||
|
||||
} else {
|
||||
$this->assertEquals(
|
||||
'data123',
|
||||
|
||||
@ -279,19 +279,19 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
|
||||
'<code> / EVENT</code><code> / TRIGGER</code> statement',
|
||||
$leaf->getText()
|
||||
);
|
||||
|
||||
|
||||
$leaf = array_shift($leaves);
|
||||
$this->assertInstanceOf(
|
||||
'BoolPropertyItem',
|
||||
$leaf
|
||||
);
|
||||
|
||||
|
||||
$leaf = array_shift($leaves);
|
||||
$this->assertInstanceOf(
|
||||
'BoolPropertyItem',
|
||||
$leaf
|
||||
);
|
||||
|
||||
|
||||
$leaf = array_shift($leaves);
|
||||
$this->assertInstanceOf(
|
||||
'BoolPropertyItem',
|
||||
@ -1689,7 +1689,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$GLOBALS['sql_create_trigger'] = true;
|
||||
$GLOBALS['sql_drop_table'] = true;
|
||||
|
||||
|
||||
ob_start();
|
||||
$this->assertTrue(
|
||||
$this->object->exportStructure(
|
||||
@ -1707,7 +1707,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
|
||||
"foo;\nDELIMITER //\nbarDELIMITER ;\n",
|
||||
$result
|
||||
);
|
||||
|
||||
|
||||
unset($GLOBALS['sql_create_trigger']);
|
||||
unset($GLOBALS['sql_drop_table']);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
