Skip to content

Commit

Permalink
Check before commit!
Browse files Browse the repository at this point in the history
  • Loading branch information
nijel committed Nov 17, 2006
1 parent f0780e3 commit fb9a3a5
Show file tree
Hide file tree
Showing 264 changed files with 12,329 additions and 5,377 deletions.
126 changes: 126 additions & 0 deletions ChangeLog
Expand Up @@ -5,6 +5,132 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL$

2006-11-17 Michal Čihař <michal@cihar.com>
* sql.php, libraries/display_tbl.lib.php: Force pos to be integer to avoid
XSS.

2006-11-16 Marc Delisle <lem9@users.sourceforge.net>
* pmd_pdf.php: export coordinates to PDF page even if the tables
were not defined on this PDF page

2006-11-13 Marc Delisle <lem9@users.sourceforge.net>
* libraries/relation.lib.php: verify the presence of designer_coords

2006-11-13 Michal Čihař <michal@cihar.com>
* server_status.php: Check for divison by zero (bug #1594460).
* db_operations.php: Change information about not configured pmadb to
notice (bug #1589294).
* scripts/setup.php: Configure also designer table.

2006-11-12 Marc Delisle <lem9@users.sourceforge.net>
* pmd_get_info.php: avoid error if no index defined for a table

2006-11-11 Michal Čihař <michal@cihar.com>
* lang/czech: Update.

2006-11-11 Marc Delisle <lem9@users.sourceforge.net>
* pmd_general.php, pmd_get_info.php, pmd/scripts/move.js, lang/*:
in InnoDB, it's allowed to create a relation even if it's not on
a primary key, so display the InnoDB-related options (ON UPDATE,
ON CASCADE)

2006-11-10 Michal Čihař <michal@cihar.com>
* lang/czech: Translate designer.
* config.sample.inc.php: Comment out pmadb and controluser to avoid
confusion when they are not properly created.

2006-11-09 Marc Delisle <lem9@users.sourceforge.net>
### 2.9.1 released from MAINT_2_9_1

2006-11-07 Michal Čihař <michal@cihar.com>
* lang/czech: Translate designer.

2006-11-07 Marc Delisle <lem9@users.sourceforge.net>
* (many files) new Designer feature, thanks to Ivan A Kirillov

2006-11-03 Michal Čihař <michal@cihar.com>
* config.sample.inc.php: Make it use CRLF to make Windows users happy.

2006-11-02 Michal Čihař <michal@cihar.com>
* Documentation.html: Mention problems with Hardened-PHP.
* user_password.php, tbl_move_copy.php, export.php,
libraries/session.inc.php, libraries/mcrypt.lib.php,
libraries/auth/cookie.auth.lib.php: Use PMA_{set,remove}Cookie functions
instead of PHP ones (no need to define params on all places).
* libraries/common.lib.php, libraries/session.inc.php: Make all cookies
httponly as default - this protects them from usage in javascript in
modern browsers (RFE #1586078).
* pdf_schema.php, contrib/packaging/Fedora/phpMyAdmin.spec,
libraries/export/pdf.php, libraries/fpdf, libraries/tcpdf: Switch to
TCPDF for PDF generating (RFE #1501452).
* readme.php, README: Make README utf-8.
* Documentation.html, libraries/dbi/mysqli.dbi.lib.php,
libraries/dbi/mysql.dbi.lib.php, libraries/config.default.php: Add
support for SSL connections (based on patch #1588882).
* libraries/sqlparser.data.php: Add support for XML manipulating functions
- UpdateXML and ExtractValue (RFE #1532712).
* scripts/setup.php: Make end of line in generated file configurable (RFE
#1493897).
* server_status.php: Calculate key read/write ration (RFE #1466287).
* Documentation.html, navigation.php,
themes/original/css/theme_left.css.php,
libraries/PMA_List_Database.class.php, libraries/config.default.php:
Optional display of databases in navigation frame as list instead of
dropdown (RFE #1435922).
* scripts/setup.php: Configuration for list/drop down choice.
* tbl_change.php: Automatically edit text in textarea if it contains new
lines (RFE #1224791).
* lang/dutch: Fix typo, thanks to Thijs Kinkhorst - kink.

2006-10-27 Marc Delisle <lem9@users.sourceforge.net>
* libraries/fpdf/font: replace broken binary files

2006-10-27 Michal Čihař <michal@cihar.com>
* export.php: Define $tables on correct place (bug #1585374).
* import.php: Do not load header to soon to avoid reading table stats
before query gets executed (bug #1441833).
* libraries/tbl_links.inc.php, libraries/db_links.inc.php,
libraries/common.lib.php, lang/*,
themes/darkblue_orange/css/theme_right.css.php,
themes/original/css/theme_right.css.php: Do not disable tabs for empty
tables/databases, only make them look different (RFE #1584296).
* libraries/common.lib.php: Show messages in notice div to make them look
better and more visible.
* sql.php, lang/*: Better message when showing as PHP code.
* libraries/common.lib.php: Add missing quotes.
* import.php, libraries/db_common.inc.php: Avoid query execution when
showing PHP code (bug #1567314).
* sql.php, libraries/common.lib.php, lang/*: Correct behaviour when
switching from PHP to SQL display mode (no execution of query).

2006-10-26 Marc Delisle <lem9@users.sourceforge.net>
* error.php, libraries/common.lib.php, /database_interface.lib.php,
/session.inc.php: force utf-8 charset to avoid XSS with crafted URL
and utf-7 in charset; error messages won't display correctly if
the chosen lang is not utf-8

2006-10-26 Michal Čihař <michal@cihar.com>
* libraries/import/csv.php: Fix wrong import when ;; is at buffer boundary
(bug #1584836).
* tbl_operations.php: Fix duplicate ID for checkbox (bug #1584770).
* libraries/import/README: Fix example import plugin to match current
state.
* libraries/import.lib.php: Add support for running queries as control
user.
* db_importdocsql.php, Documentation.html, scripts/setup.php,
db_operations.php, libraries/read_dump.lib.php,
libraries/import/docsql.php, libraries/config.default.php, lang/*:
Convert DocSQL import to import plugin, remove not needed messages and
files it used.
* lang/*: Remove profiling messages as profiling extension has been
dropped some time ago.
* libraries/common.lib.php: pma_convcharset never existed :-).
* libraries/tbl_properties.inc.php: Check form only when saving table
fields (bug #1566222).
* libraries/transformations.lib.php: Improve options parser.
* libraries/transformations/application_octetstream__download.inc.php:
Again accept column name (bug #1562864).

2006-10-25 Michal Čihař <michal@cihar.com>
* Documentation.html, libraries/tbl_properties.inc.php,
libraries/config.default.php: Allow to edit small number of fields
Expand Down
39 changes: 30 additions & 9 deletions Documentation.html
Expand Up @@ -598,6 +598,10 @@ <h2 id="config">Configuration</h2>
<tt>mysql</tt> command&#8211;line client, issue the <tt>status</tt> command.
Among the resulting information displayed will be the socket used.</dd>

<dt id="cfg_Servers_ssl">$cfg['Servers'][$i]['ssl'] boolean</dt>
<dd>Whether to enable SSL for connection to MySQL server.
</dd>

<dt id="cfg_Servers_connect_type">$cfg['Servers'][$i]['connect_type'] string</dt>
<dd>What type connection to use with the MySQL server. Your options are
<tt>'socket'</tt> and <tt>'tcp'</tt>. It defaults to 'tcp' as that
Expand Down Expand Up @@ -947,6 +951,22 @@ <h2 id="config">Configuration</h2>
</ul>
</dd>

<dt id="designer_coords">
<span id="cfg_Servers_designer_coords">$cfg['Servers'][$i]['designer_coords']</span> string
</dt>
<dd>Since release 2.10.0 a Designer interface is available; it permits
to visually manage the relations.
<br /><br />

To allow the usage of this functionality:

<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>
</li>
</ul>
</dd>

<dt><span id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> boolean
</dt>
<dd>Because release 2.5.0 introduced the new MIME-transformation support, the
Expand Down Expand Up @@ -1197,6 +1217,9 @@ <h2 id="config">Configuration</h2>
<dt id="cfg_DisplayServersList">$cfg['DisplayServersList'] boolean</dt>
<dd>Defines whether to display this server choice as links instead of in a drop-down.
Defaults to FALSE (drop-down).</dd>
<dt id="cfg_DisplayDatabasesList">$cfg['DisplayDatabasesList'] boolean</dt>
<dd>Defines whether to display database choice in light navigation frame as links
instead of in a drop-down. Defaults to FALSE (drop-down).</dd>
<dt id="cfg_ShowStats">$cfg['ShowStats'] boolean</dt>
<dd>Defines whether or not to display space usage and statistics about databases
and tables.<br />
Expand Down Expand Up @@ -1605,15 +1628,6 @@ <h2 id="config">Configuration</h2>
alternatives.
</dd>

<dt id="cfg_docSQLDir">$cfg['docSQLDir'] string</dt>
<dd>
The name of the directory where docSQL files can be uploaded for
import into phpMyAdmin.
<br /><br />
Please note that if PHP is running in safe mode, this directory must
be owned by the same user as the owner of the phpMyAdmin scripts.
</dd>

<dt id="cfg_SaveDir">$cfg['SaveDir'] string</dt>
<dd>
The name of the directory where dumps can be saved.<br /><br />
Expand Down Expand Up @@ -2855,6 +2869,10 @@ <h4 id="faqmissingparameters">
<li>In the <tt>php.ini</tt> directive <tt>arg_separator.input</tt>, a value
of &quot;;&quot; will cause this error. Replace it with &quot;&amp;;&quot;.
</li>
<li>If you are using <a href="http://www.hardened-php.net/">Hardened-PHP</a>,
you might want to increase
<a href="http://www.hardened-php.net/hphp/troubleshooting.html">request limits</a>.
</li>
</ul>

<h3 id="faqlimitations">Known limitations</h3>
Expand Down Expand Up @@ -4024,6 +4042,9 @@ <h2 id="credits">Credits</h2>
* interface improvements
* various bugfixes

- Ivan A Kirillov
* new relations Designer

And also to the following people who have contributed minor changes,
enhancements, bugfixes or support for a new language since version 2.1.0:

Expand Down
4 changes: 2 additions & 2 deletions README
Expand Up @@ -11,10 +11,10 @@ phpMyAdmin - Readme

Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
Copyright (C) 2001-2006 Marc Delisle <DelislMa_at_CollegeSherbrooke.qc.ca>
Olivier M�ller <om_at_omnis.ch>
Olivier Müller <om_at_omnis.ch>
Robin Johnson <robbat2_at_users.sourceforge.net>
Alexander M. Turek <me_at_derrabus.de>
Michal Cihar <michal_at_cihar.com>
Michal Čihař <michal_at_cihar.com>
Garvin Hicking <me_at_supergarv.de>
Michael Keck <mkkeck_at_users.sourceforge.net>
Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
Expand Down
121 changes: 61 additions & 60 deletions config.sample.inc.php
@@ -1,60 +1,61 @@
<?php

/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:

/**
* phpMyAdmin sample configuration, you can use it as base for
* manual configuration. For easier setup you can use scripts/setup.php
*
* All directives are explained in Documentation.html and on phpMyAdmin
* wiki <http://wiki.cihar.com>.
*/

/*
* This is needed for cookie based authentication to encrypt password in
* cookie
*/
$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */

/*
* Servers configuration
*/
$i = 0;

/*
* First server
*/
$i++;
/* Authentication type */
$cfg['Servers'][$i]['auth_type'] = 'cookie';
/* Server parameters */
$cfg['Servers'][$i]['host'] = 'localhost';
$cfg['Servers'][$i]['connect_type'] = 'tcp';
$cfg['Servers'][$i]['compress'] = false;
/* Select mysqli if your server has it */
$cfg['Servers'][$i]['extension'] = 'mysql';
/* User for advanced features */
$cfg['Servers'][$i]['controluser'] = 'pmausr';
$cfg['Servers'][$i]['controlpass'] = 'pmapass';
/* Advanced phpMyAdmin features */
$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
$cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
$cfg['Servers'][$i]['relation'] = 'pma_relation';
$cfg['Servers'][$i]['table_info'] = 'pma_table_info';
$cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
$cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
$cfg['Servers'][$i]['column_info'] = 'pma_column_info';
$cfg['Servers'][$i]['history'] = 'pma_history';

/*
* End of servers configuration
*/

/*
* Directories for saving/loading files from server
*/
$cfg['UploadDir'] = '';
$cfg['SaveDir'] = '';

?>
<?php

/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:

/**
* phpMyAdmin sample configuration, you can use it as base for
* manual configuration. For easier setup you can use scripts/setup.php
*
* All directives are explained in Documentation.html and on phpMyAdmin
* wiki <http://wiki.cihar.com>.
*/

/*
* This is needed for cookie based authentication to encrypt password in
* cookie
*/
$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */

/*
* Servers configuration
*/
$i = 0;

/*
* First server
*/
$i++;
/* Authentication type */
$cfg['Servers'][$i]['auth_type'] = 'cookie';
/* Server parameters */
$cfg['Servers'][$i]['host'] = 'localhost';
$cfg['Servers'][$i]['connect_type'] = 'tcp';
$cfg['Servers'][$i]['compress'] = false;
/* Select mysqli if your server has it */
$cfg['Servers'][$i]['extension'] = 'mysql';
/* User for advanced features */
// $cfg['Servers'][$i]['controluser'] = 'pma';
// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
/* Advanced phpMyAdmin features */
// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
// $cfg['Servers'][$i]['relation'] = 'pma_relation';
// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
// $cfg['Servers'][$i]['history'] = 'pma_history';
// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';

/*
* End of servers configuration
*/

/*
* Directories for saving/loading files from server
*/
$cfg['UploadDir'] = '';
$cfg['SaveDir'] = '';

?>
12 changes: 6 additions & 6 deletions contrib/packaging/Fedora/phpMyAdmin.spec
Expand Up @@ -53,9 +53,9 @@ manual. Currently phpMyAdmin can:

install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/{css,js,lang,libraries,themes}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{auth,dbg,dbi,engines}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,fpdf,import}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,tcpdf,import}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/transformations
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/fpdf/font
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/tcpdf/font
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/{darkblue_orange,original}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/darkblue_orange/{css,img}
install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/original/{css,img}
Expand All @@ -78,9 +78,9 @@ install libraries/engines/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/engines"/
install libraries/export/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/export"/
install libraries/fpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/fpdf"/
install libraries/fpdf/font/*.{php,z} \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/fpdf/font"/
install libraries/tcpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf"/
install libraries/tcpdf/font/*.{php,z} \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf/font"/
install libraries/import/*.php \
"${RPM_BUILD_ROOT}%{_myadminpath}/libraries/import"/
install libraries/transformations/*.php \
Expand Down Expand Up @@ -113,7 +113,7 @@ install Documentation.* docs.css "${DOCROOT}"/
install translators.html "${DOCROOT}"/
install lang/*.sh "${DOCROOT}"/lang/
install scripts/* "${DOCROOT}"/scripts/
install libraries/fpdf/README "${DOCROOT}"/README.fpdf
install libraries/tcpdf/README "${DOCROOT}"/README.tcpdf
install libraries/import/README "${DOCROOT}"/README.import
install libraries/transformations/README "${DOCROOT}"/transformations/
install libraries/transformations/TEMPLATE* "${DOCROOT}"/transformations/
Expand Down

0 comments on commit fb9a3a5

Please sign in to comment.