diff --git a/CREDITS b/CREDITS index 23ed7fb50..8d322fcbb 100644 --- a/CREDITS +++ b/CREDITS @@ -1,7 +1,7 @@ $Id$ -phpMyAdmin - Credits, in chronological order -============================================ +phpMyAdmin - Credits +==================== CREDITS, in chronological order ------------------------------- @@ -15,12 +15,15 @@ CREDITS, in chronological order * various fixes [om] - Olivier Müller - * started sourceforge project + * started sourceforge phpMyAdmin project * sync'ed different existing CVS trees with new features and bugfixes + * current project maintainer, with Marc and Loic [lc] - Loïc Chapeaux + [mg] - Mirko Giese + [rj] - Robin Johnson * Database maintence controls * Table type code @@ -31,7 +34,44 @@ CREDITS, in chronological order [kc] - Korakot Chaovavanich [pk] - Pete Kelly -[xx] - ... (to be completed) +Original Credits of Version 2.1.0 +--------------------------------- + + This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his idea + to create a web-based interface to MySQL using PHP3. Although I have not + used any of his source-code, there are some concepts I've borrowed from + him. phpMyAdmin was created because Peter told me he wasn't going to further + develop his (great) tool. + Thanks go to + - Amalesh Kempf who contributed the code for + the check when dropping a table or database. He also suggested that you + should be able to specify the primary key on tbl_create.php3. To version + 1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as + a bug-report. Plus many smaller improvements. + - Jan Legenhausen : He made many of the changes that were + introduced in 1.3.0 (including quite significant ones like the + authentification). For 1.4.1 he enhanced the table-dump feature. Plus + bug-fixes and help. + - Marc Delisle made phpMyAdmin language- + independent by outsourcing the strings to a separate file. He also + contributed the French translation. + - Alexandr Bravo who contributed tbl_select.php3, + a feature to display only some fields from a table. + - Chris Jackson added support for MySQL functions in + tbl_change.php3. He also added the "Query by Example" feature in 2.0. + - Dave Walton added support for multiple servers and + is a regular contributor for bug-fixes. + - Gabriel Ash contributed the random access features + for 2.0.6. + The following people have contributed minor changes, enhancements, bugfixes + or support for a new language: + Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas Kleemann, Alexander Leidinger, + Kiko Albiol, Daniel C. Chao, Pavel Piankov, Sascha Kettler, Joe Pruett, + Renato Lins, Mark Kronsbein, Jannis Hermanns, G. Wieggers. + + And thanks to everyone else who sent me email with suggestions, bug-reports and + or just some feedback. + diff --git a/ChangeLog b/ChangeLog index 279dba70a..cc79c5314 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-07-04 Olivier Müller + * set version to 2.2.0rc1 + * removed anything about "unofficial" from the pages + * updated links, and labels in all lang files + * General cleanups and updates in the docs and README files + 2001-07-03 Marc Delisle * lib.inc.php3: patch from Chee Wai for illegal index * lang/brazilian_portuguese.inc.php3 update from @@ -33,12 +39,10 @@ $Source$ * tbl_change.php3, lang/*: merge patch: "do not edit blobs" from Bernard M. Piller -======================================================================================== 2001-06-30 Olivier Müller IMPORTANT : FROM NOW, PLEASE COMMIT YOUR CHANGES IN THE PHPMYADMIN-DEVEL BRANCH! THE PHPMYADMIN-DEVEL BRANCH (where you are now) WILL BECOME THE MAIN BRANCH AS SOON AS THE SF STAFF MAKE THE CHANGE -========================================================================================= 2001-06-30 Loïc Chapeaux * db_details.php3, line 27: fixed a bug with PHP3 thanks to diff --git a/DEVELOPERS b/DEVELOPERS index d135c6bd5..4929867e0 100755 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1,6 +1,7 @@ $Id$ phpMyAdmin - Developer's Information +------------------------------------ phpMyAdmin is Open Source, so you're invited to contribute to it. Many great features have been written by other people and you too @@ -36,7 +37,9 @@ phpMyAdmin - Developer's Information - put the modified files (tar'ed and gzip'ed) inside the patch tracker of the phpMyAdmin SourceForge account (https://sourceforge.net/projects/phpmyadmin/) + Write access to the CVS tree is granted only to developers who have already contributed something useful to phpMyAdmin. If you're interested in that, - please contact us. + please contact us using the phpmyadmin-devel mailing list. + diff --git a/Documentation.html b/Documentation.html index f3e0530bc..7dd6f1e37 100755 --- a/Documentation.html +++ b/Documentation.html @@ -24,11 +24,7 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w -

phpMyAdmin 2.x.x- Documentation

-

This project is currently an unofficial continuation of - Tobias Ratschiller's work. It has not - been (at least not yet :-) accepted as an official continuation: we are still waiting - for an answer from Tobias.

+

phpMyAdmin Documentation

Official phpMyAdmin project homepage
"Unofficial" phpMyAdmin project homepage

Version history: ChangeLog
diff --git a/README b/README index de598b0e2..34c3df7a4 100755 --- a/README +++ b/README @@ -5,12 +5,15 @@ phpMyAdmin - Readme A set of PHP-scripts to adminstrate MySQL over the WWW. - Version 2.2.0 - xx/xx/2001 + Version 2.2.0 - xx/07/2001 + -------------------------- + http://phpwizard.net/projects/phpMyAdmin/ http://phpmyadmin.sourceforge.net/ Copyright (C) 1998-2000 Tobias Ratschiller Copyright (C) 2001- Olivier Müller Loïc Chapeaux + Marc Delisle [check CREDITS file for more details] This program is free software; you can redistribute it and/or modify @@ -35,54 +38,21 @@ phpMyAdmin - Readme Summary: phpMyAdmin is intended to handle the adminstration of MySQL over the WWW. Currently it can: - - create and drop databases - - create, copy, drop and alter tables - - delete, edit and add fields - - execute any SQL-statement, even batch-queries - - manage keys on fields - - load text files into tables - - create and read dumps of tables - - export and import CSV data - - administer one single database + - create and drop databases + - create, copy, drop and alter tables + - delete, edit and add fields + - execute any SQL-statement, even batch-queries + - manage keys on fields + - load text files into tables + - create and read dumps of tables + - export and import CSV data + - administer one single database Download: - You can get the newest version at http://www.phpwizard.net/projects/phpMyAdmin/. + You can get the newest version at http://phpmyadmin.sourceforge.net/. Credits: - This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his idea - to create a web-based interface to MySQL using PHP3. Although I have not - used any of his source-code, there are some concepts I've borrowed from - him. phpMyAdmin was created because Peter told me he wasn't going to further - develop his (great) tool. - Thanks go to - - Amalesh Kempf who contributed the code for - the check when dropping a table or database. He also suggested that you - should be able to specify the primary key on tbl_create.php3. To version - 1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as - a bug-report. Plus many smaller improvements. - - Jan Legenhausen : He made many of the changes that were - introduced in 1.3.0 (including quite significant ones like the - authentification). For 1.4.1 he enhanced the table-dump feature. Plus - bug-fixes and help. - - Marc Delisle made phpMyAdmin language- - independent by outsourcing the strings to a separate file. He also - contributed the French translation. - - Alexandr Bravo who contributed tbl_select.php3, - a feature to display only some fields from a table. - - Chris Jackson added support for MySQL functions in - tbl_change.php3. He also added the "Query by Example" feature in 2.0. - - Dave Walton added support for multiple servers and - is a regular contributor for bug-fixes. - - Gabriel Ash contributed the random access features - for 2.0.6. - The following people have contributed minor changes, enhancements, bugfixes - or support for a new language: - Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas Kleemann, Alexander Leidinger, - Kiko Albiol, Daniel C. Chao, Pavel Piankov, Sascha Kettler, Joe Pruett, - Renato Lins, Mark Kronsbein, Jannis Hermanns, G. Wieggers. - - And thanks to everyone else who sent me email with suggestions, bug-reports and - or just some feedback. + Please see the CREDITS file. Installation: Please see the INSTALL file. @@ -94,13 +64,18 @@ phpMyAdmin - Readme Documentation: Basic documentation available in Documentation.html + Support: + There is a support forum under http://phpwizard.net/phorum/list.php?f=1 + + Enjoy, - Tobias Ratschiller & Devel team + The phpMyAdmin Devel team + PS: Please, don't send us emails with question like "How do I compile - PHP3 with MySQL-support". I do answer all emails regarding - phpMyAdmin, but I just don't have the time to be your free helpdesk. + PHP3 with MySQL-support". We do answer all emails regarding + phpMyAdmin, but we just don't have the time to be your free helpdesk. Please send your questions to the appropiate mailinglists. - Before contacting me, please read the Documentation.html (esp. the FAQ- - part). + Before contacting us, please read the Documentation.html (esp. the + FAQ part). diff --git a/TODO b/TODO index e516e24c1..52f60451a 100755 --- a/TODO +++ b/TODO @@ -3,20 +3,9 @@ $Id$ phpMyAdmin - Todo ================= -High priority -------------- -[ ] code cleanup, and release +We are currently using the Sourceforge Tracker as Todo list: -Normal priority ---------------- -[ ] create a new project homepage - -Low priority ------------- -[X] add a [save & insert] button on the record insert form. + http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse --------------------------------------------------------------------------- -[ ] Todo [X] Done [.] On the way/currently thinking about it --------------------------------------------------------------------------- - +-- swix/20010704 diff --git a/config.inc.php3 b/config.inc.php3 index 151b8cd6d..475d70198 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -26,9 +26,9 @@ $cfgServers[1]['port'] = ''; // MySQL port - leave blank for $cfgServers[1]['adv_auth'] = false; // Use advanced authentication? $cfgServers[1]['stduser'] = ''; // MySQL standard user (only needed with advanced auth) $cfgServers[1]['stdpass'] = ''; // MySQL standard password (only needed with advanced auth) -$cfgServers[1]['user'] = 'phpMyAdmin'; // MySQL user (only needed with basic auth) -$cfgServers[1]['password'] = 'test99'; // MySQL password (only needed with basic auth) -$cfgServers[1]['only_db'] = 'phpMyAdmin'; // If set to a db-name, only this db is accessible +$cfgServers[1]['user'] = 'root'; // MySQL user (only needed with basic auth) +$cfgServers[1]['password'] = 'qmail'; // MySQL password (only needed with basic auth) +$cfgServers[1]['only_db'] = ''; // If set to a db-name, only this db is accessible $cfgServers[1]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname $cfgServers[1]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support $cfgServers[1]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support @@ -67,7 +67,7 @@ $cfgServer = ''; unset($cfgServers[0]); // Be sure to include no trailing slash on the path -$cfgManualBase = "http://www.mysql.com/documentation/mysql/bychapter"; +$cfgManualBase = "http://www.mysql.com/documentation/mysql/"; $cfgConfirm = true; $cfgPersistentConnections = false; diff --git a/defines.inc.php3 b/defines.inc.php3 index e828cb619..159a1cfa8 100755 --- a/defines.inc.php3 +++ b/defines.inc.php3 @@ -10,7 +10,7 @@ // PMA_WINDOWS (bool) - mark if phpMyAdmin running on windows server -define("PHPMYADMIN_VERSION", "2.3.0alpha-20010627"); +define("PHPMYADMIN_VERSION", "2.2.0rc1"); if (!ereg("([0-9]).([0-9]).([0-9])", phpversion(), $match)) $result=ereg("([0-9]).([0-9])",phpversion(),$match); @@ -33,4 +33,4 @@ define("MYSQL_MINOR_VERSION", (double)substr($row["version"], 5)); /* ------------------------- */ -?> \ No newline at end of file +?> diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index 0fe92907c..f96792459 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = "foi eliminado."; $strHasBeenEmptied = "foi esvaziado."; $strHome = "Base"; // Alguem tem alguma palavra melhor para 'Home'? $strHomepageOfficial = "Página Oficial do phpMyAdmin"; -$strHomepageSourceforge = "Nova (mas ainda não oficial) Página do phpMyAdmin"; +$strHomepageSourceforge = "Nova Página do phpMyAdmin"; $strHost = "Servidor"; $strHostEmpty = "O nome do servidor está vazio!"; diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index ef0ea2af5..ba8fe32cc 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = " $strHasBeenEmptied = "áåøå èçïðàçíåíà."; $strHome = "Íà÷àëî"; $strHomepageOfficial = "Official phpMyAdmin Homepage"; //to translate -$strHomepageSourceforge = "new (but still unofficial) phpMyAdmin Homepage"; //to translate +$strHomepageSourceforge = "Sourceforge phpMyAdmin Download Page"; //to translate $strHost = "Õîñò"; $strHostEmpty = "The host name is empty!"; //to translate diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index ea6161279..8a9b6991c 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = "ha estat eliminada."; $strHasBeenEmptied = "ha estat buidada."; $strHome = "Inici"; $strHomepageOfficial = "Official phpMyAdmin Homepage"; //to translate -$strHomepageSourceforge = "new (but still unofficial) phpMyAdmin Homepage"; //to translate +$strHomepageSourceforge = "Sourceforge phpMyAdmin Download Page"; //to translate $strHost = "Servidor"; $strHostEmpty = "The host name is empty!"; //to translate diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 67401fe7f..4923365de 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = " $strHasBeenEmptied = "¤w¸g³Q²MªÅ¡C"; $strHome = "¥D¥Ø¿ý"; $strHomepageOfficial = "Official phpMyAdmin Homepage"; //to translate -$strHomepageSourceforge = "new (but still unofficial) phpMyAdmin Homepage"; //to translate +$strHomepageSourceforge = "Sourceforge phpMyAdmin Download Page"; //to translate $strHost = "¥D¾÷"; $strHostEmpty = "The host name is empty!"; //to translate diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index d7466ac94..6831f4cbd 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = " $strHasBeenEmptied = "ÒѾ­±»Çå¿Õ¡£"; $strHome = "Ö÷Ŀ¼"; $strHomepageOfficial = "Official phpMyAdmin Homepage"; //to translate -$strHomepageSourceforge = "new (but still unofficial) phpMyAdmin Homepage"; //to translate +$strHomepageSourceforge = "Sourceforge phpMyAdmin Download Page"; //to translate $strHost = "Ö÷»ú"; $strHostEmpty = "The host name is empty!"; //to translate diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 3736c20e2..c5743cf71 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -107,7 +107,7 @@ $strHasBeenDropped = "byla odstran $strHasBeenEmptied = "byla vyprázdnìna."; $strHome = "Domu"; $strHomepageOfficial = " Oficiální stránka phpMyAdmina "; -$strHomepageSourceforge = " nová (ale neoficiální) stránka phpMyAdmina "; +$strHomepageSourceforge = " nová stránka phpMyAdmina "; $strHost = "Hostitel"; $strHostEmpty = "Jméno hostitele je prázdné!"; diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index a20955707..5fbe2e28f 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -1,4 +1,4 @@ -$strWelcome phpMyAdmin
"; -echo PHPMYADMIN_VERSION." (unofficial devel-branch)"; +echo "

$strWelcome phpMyAdmin "; +echo PHPMYADMIN_VERSION; echo "

\n"; // Don't display server info if $server == 0 (no server selected) @@ -250,14 +250,14 @@ if ($server > 0
  • - -  (SourceForge)    [ ChangeLog ] + phpMyAdmin
  • - +
  • - phpMyAdmin + +    [ ChangeLog ]
    • diff --git a/tbl_dump.php3 b/tbl_dump.php3 index c02f817d4..3979ef313 100755 --- a/tbl_dump.php3 +++ b/tbl_dump.php3 @@ -82,9 +82,9 @@ else if($what != "csv") { echo "# phpMyAdmin MySQL-Dump$crlf"; - echo "# ".PHPMYADMIN_VERSION."$crlf"; + echo "# version ".PHPMYADMIN_VERSION."$crlf"; echo "# http://phpwizard.net/phpMyAdmin/$crlf"; - echo "# http://phpmyadmin.sourceforge.net/ (unofficial)$crlf"; + echo "# http://phpmyadmin.sourceforge.net/ (download page)$crlf"; echo "#$crlf"; echo "# $strHost: ".$cfgServer['host']; if(!empty($cfgServer['port'])) echo ":" . $cfgServer['port'];