gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

326 Commits

Author SHA1 Message Date
Michal Čihař
1a171a9e2f Fix function name 2012-06-04 13:31:08 +02:00
Michal Čihař
a9d7091b84 Wrap some long lines 2012-06-04 13:24:01 +02:00
Michal Čihař
e544705e3c Wrap some long lines 2012-06-04 12:12:49 +02:00
Michal Čihař
6313931432 Add missing comment 2012-06-04 12:08:58 +02:00
Michal Čihař
705c01b5c9 Better name for function 2012-06-04 12:08:14 +02:00
Michal Čihař
fae33dee87 Add documentation 2012-06-04 12:07:21 +02:00
Michal Čihař
9e4a145297 Correct wrapping 2012-06-04 12:07:04 +02:00
Michal Čihař
9e09c575d7 Missing doc 2012-06-04 12:06:37 +02:00
Michal Čihař
7faef41a23 This code is broken anyway (see comment above) 2012-06-04 12:03:46 +02:00
Michal Čihař
5162efa87c Single place to handle table renaming for configuration storage 2012-06-04 12:02:55 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
fbfe2dc3d4 Another syntax error I introduced 2012-04-27 09:53:38 +02:00
Michal Čihař
dbf1f40808 Another missing comma 2012-04-27 09:52:39 +02:00
Michal Čihař
6ad180e22e Oops, missing comas 2012-04-27 09:31:42 +02:00
Michal Čihař
16d040b4a5 Wrap some function calls 2012-04-27 09:15:31 +02:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Madhura Jayaratne
b531455738 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/mult_submits.inc.php
 2012-03-21 05:59:46 +05:30
Madhura Jayaratne
ac83360796 Coding style improvements 2012-03-21 05:45:58 +05:30
Marc Delisle
a196cbd85f Merge pull request #7 from mynetx/master 
Various
 2012-03-18 12:09:23 -07:00
Jo Michael
c36a9113e0 Replaced td[align] with td[class] due to HTML5 2012-03-18 19:53:43 +01:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Michal Čihař
3bf006c5eb Better context 2012-03-09 16:09:02 +01:00
Michal Čihař
fde7faa749 Chinese needs different word here than in other places 2012-03-09 16:03:10 +01:00
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
21e2913add Remove not needed param from PMA_REL_create_page 2011-08-15 11:37:23 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
ca8a30f7f8 Fix usage of PMA_DBI_get_columns 2011-08-05 01:24:02 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Madhura Jayaratne
c1f586b9fd Bug #3383904 - Column comments are not displayed 2011-08-03 20:48:28 +05:30
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
b40fdde6e8 Revert "Avoid double underscore in function name" 
This reverts commit c29c0e0eb5.

Oops, this is actually needed.
 2011-07-21 11:08:44 +02:00
Michal Čihař
c29c0e0eb5 Avoid double underscore in function name 2011-07-21 11:04:37 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Piotr Przybylski
86d5ae2697 Emulate relations for some data_dictionary tables 2011-05-24 19:35:57 +02:00
Marc Delisle
8f2a040f41 Merge commit 'ab6d16ed2f4728c9f066353a851621a352ef969f' 2011-05-24 08:18:25 -04:00
Aris Feryanto
8f99ac7a28 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-24 08:42:32 +07:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Aris Feryanto
4ab5d6aded Update documentation and string for the pma_recent 2011-05-10 20:42:48 +07:00
Aris Feryanto
23021911b1 Recently used tables (class, configuration, remember in pma database) 2011-05-08 02:42:38 +07:00
Madhura Jayaratne
da82fe392b Bug #3183970 Losing SQL history 2011-02-18 18:54:36 +05:30
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Marc Delisle
ab393d3f82 Bug #3141327 (Foreign key input options) 2010-12-27 08:29:31 -05:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
Crack
d68f2db904 add warnings if pma_userconfig is not present 2010-06-18 20:22:34 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Michal Čihař
f8d0e57a3d Can not use text as index here. 
We already get translated string.
 2010-05-25 16:56:29 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Herman van Rink
85d3b6258e rfe #2792992 [doc] Added advice to re-login after changing pmadb settings 2010-02-15 15:21:55 +00:00
Michal Čihař
eef869d8dd rfe #2937850 [doc] Add some hints to chk_rel.php for quick setup. 2010-01-25 12:43:35 +00:00
Marc Delisle
eacec1d091 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
ba66e07181 bug #2931216 Relations settings not updated on config change 2010-01-20 18:10:37 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
71e6f68763 bug [history] QueryHistoryDB is not respected 2009-11-28 13:11:13 +00:00
Marc Delisle
40b28baf4d patch #2903400 [bookmarks] Status of bookmark table 2009-11-25 10:52:32 +00:00
Marc Delisle
1419fcf3c2 remove deprecated parameter of PMA_Table::countRecords() 2009-10-23 10:02:09 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
e5892a65fc Incorrect report of missing relational features 2009-06-24 21:18:00 +00:00
Marc Delisle
e67f4cbc54 clarify function name 2009-06-24 11:34:56 +00:00
Marc Delisle
cef9b6889c patch #2538358 part 2 2009-02-10 19:21:01 +00:00
Marc Delisle
3942544d52 patch #2538358 [display] Conditions for relational display field 2009-01-27 18:26:30 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
e946798332 bug #2163437 [core] Cannot disable PMA tables 2008-10-19 00:42:04 +00:00
Marc Delisle
fe78d240bb b to strong, and remove bold for MySQL charset 2008-07-09 15:24:44 +00:00
Marc Delisle
374963344a Do not save too big queries in history 2008-07-09 14:17:19 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
8f4f6d8878 rfe #1962383 [designer] Option to create a PDF page 2008-06-30 19:07:09 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
07bea9b00d improved doc for function 2008-05-11 12:45:46 +00:00
Sebastian Mendel
c69ae450aa cache relation information (saves at least two queries per HTTP request) 2008-05-08 05:06:50 +00:00
Sebastian Mendel
e8a6b1af54 new function to rename a field in relation tables (from tbl_alter.php) 2008-05-06 14:04:54 +00:00
Marc Delisle
7c5d5c466a PBXT: foreign key support 2008-05-04 18:36:17 +00:00
Sebastian Mendel
b7733ad022 get all db comments at once, not with single queries 2008-01-21 13:52:26 +00:00
Sebastian Mendel
9b7f22ae50 cleanup 
moved relation function into relation library file
(some of the changes where checked in with previous checkin by accident)
 2007-10-16 15:00:51 +00:00
Sebastian Mendel
d9eebc2ae0 removed closing of db connection, closing database connection is only required if script runs longer than database connection is needed 2007-10-16 14:02:16 +00:00
Sebastian Mendel
a42354c9d0 removed MySQL < 5 code; 
new own function for getting db comment;
remove code for getting column comments from PMA db;
 2007-10-02 14:14:59 +00:00
Marc Delisle
111e7b046c refactoring 2007-09-29 13:45:35 +00:00
Marc Delisle
5c70b88927 problem between tbl_change and get_foreign.lib.php so start to remove this library 2007-09-19 17:06:43 +00:00
Marc Delisle
8eb4d37fe2 XHTML fixes 2007-09-02 19:23:59 +00:00
Marc Delisle
9f9da6d7ac do not use controllink for this one 2007-03-26 16:13:44 +00:00
Sebastian Mendel
ae4f0d37dd typos 2007-03-26 09:49:43 +00:00
Sebastian Mendel
c9a7e3040c documentation, backticks in SQL, minor tweaks 2007-03-26 09:34:37 +00:00
Sebastian Mendel
f15108e242 fixed missing check for 'historywork' 2007-03-26 06:45:20 +00:00
Marc Delisle
429a428ecd bug #1614004 [relation] foreign key spanning multiple columns are incorrectly displayed 2007-03-25 12:35:04 +00:00
Sebastian Mendel
c8cfbaff7a now really store it ... 2007-03-22 15:48:49 +00:00
Sebastian Mendel
2fe8c36bd7 fixed endless cycle (introduced by Revision: 10178) 2007-03-22 15:44:32 +00:00
Sebastian Mendel
77ba966984 documentation; 
make use of session for SQL history;
PMA_getRelationsParam caches result, to speed up multiple calls;
smaller improvements;
all functions are self responsible for getting $cfgRelation and validate it - no need to check before function call;
 2007-03-22 14:47:58 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Marc Delisle
d5d8aef10f bug #1437754, search combos default to key zero 2006-02-24 20:31:45 +00:00
Sebastian Mendel
ac9d8b21a3 check if $cfg['Server']['pmadb'] really exists and is selectable, minor tweaks and formating 2006-02-21 15:31:37 +00:00
Sebastian Mendel
cd340d8496 moved PMA_generateFieldSpec(), PMA_tableIsView(), PMA_countRecords(), PMA_generateAlterTable() into class PMA_Table 2006-02-21 11:07:46 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Sebastian Mendel
7358f5a712 allow 0 as name for database, table collumn, alias and index 2006-01-14 23:17:17 +00:00
Sebastian Mendel
16a71a194e added database name to relation querys 2005-12-17 17:36:58 +00:00
Sebastian Mendel
5b9cab5a91 check magic_quotes only once in common.inc.php 2005-12-12 14:28:28 +00:00
Marc Delisle
9cc77d6ecb bug #1370785, error browsing a table under PHP 4 when no controluser is defined but a pmadb is defined 2005-12-10 15:51:38 +00:00
Sebastian Mendel
b755b20bde uninitialized variable 2005-11-23 17:34:44 +00:00
Marc Delisle
3885bb6bd7 dbh becomes controllink 2005-11-20 14:00:49 +00:00
Marc Delisle
6f7d44b596 already a function to do the job 2005-10-23 12:15:15 +00:00
Marc Delisle
4373f1ae3c sort id-content by id and content-id by content 2005-10-21 20:06:32 +00:00
Michal Čihař
b654a24543 Do not set database if not needed. 2005-10-18 14:53:36 +00:00
Michal Čihař
a841d13500 Do not try to restore database as control user, it has to fail. 2005-10-08 18:27:48 +00:00
Michal Čihař
96722c24f4 fix undefined variable warning 2005-10-08 17:53:31 +00:00
Michal Čihař
ae6aa68843 Fix reading native MySQL comments when no phpMyAdmin one defined (bug #1312758). 2005-10-08 17:41:23 +00:00
Michal Čihař
c62f975a47 Use common code for CREATE/ALTER TABLE, set comments on creating table, so that user can see it in the query. 2005-10-08 17:28:31 +00:00
Marc Delisle
171613c0d0 bug #1262250, cannot change ENUM default value to empty 2005-09-28 11:50:50 +00:00
Marc Delisle
8f9b686e20 for the new ForeignKeyDropdownOrder, id and content were reversed (id-content showed content then id) 2005-07-22 18:01:37 +00:00
Robin Johnson
131866b448 Support for customizing foreign-key dropdown, take #2, now very customizable, 
incl max item limit.
 2005-06-23 14:16:33 +00:00
Robin Johnson
3576fd016a Allow selection of drop-down order. 2005-06-22 16:45:17 +00:00
Marc Delisle
8ddcb6d302 create table and TIMESTAMP options 2005-03-31 21:54:36 +00:00
Marc Delisle
c021e6b464 bug #1170549 Adding fields NOT NULL under MySQl 4.1 2005-03-28 01:22:45 +00:00
Alexander M. Turek
456a26f636 information_schema relations 2005-03-27 23:26:00 +00:00
Alexander M. Turek
96fff6fe00 Removed recoding function calls from controluser queries as they do not depend on the connection charset anymore. 2005-03-25 14:05:24 +00:00
Alexander M. Turek
a4a372597d bug #1159415 2005-03-10 21:40:44 +00:00
Marc Delisle
c84507f8d9 problem with getting comments when creating a new table under MySQL 4.1.x with extension mysql 2005-03-10 19:49:09 +00:00
Marc Delisle
41ae394e2e bug #1159415, data dictionary broken 2005-03-09 16:06:10 +00:00
Marc Delisle
287af827e5 bug 1157972, db comments broken 2005-03-07 14:56:26 +00:00
Marc Delisle
e430651d24 native comments 2005-03-06 12:33:19 +00:00
Marc Delisle
9bef31439e native comments 2005-03-05 23:21:25 +00:00
Alexander M. Turek
fa8541025e Code redundancy 2005-01-11 21:11:23 +00:00
Michal Čihař
fbd56678f8 CONVERT is for MySQL >= 4.1 and not for MySQL >= 4.0. 2004-08-16 15:19:15 +00:00
Michal Čihař
422bf9d741 Fix typo. 2004-08-16 15:14:16 +00:00
Alexander M. Turek
1f89127a2a bug #995359 2004-08-16 14:31:31 +00:00
Marc Delisle
c469625d0b natural order sort if possible 2004-08-08 18:20:47 +00:00
Marc Delisle
160e4e29bc bugs 1005414 and 1004546 2004-08-08 11:21:05 +00:00
Marc Delisle
b1fe7b3a21 bug 1001159 2004-08-01 16:45:02 +00:00
Alexander M. Turek
e0b4565515 Small optimizations, freed some results 2004-07-31 10:28:47 +00:00
Michal Čihař
9e6c5665c9 Fix possible error on non existant pma db. 2004-06-22 12:46:24 +00:00
Michal Čihař
1aaa89fa54 Little code reorganistaion (RFE #957308), removed some remaining php3 compatibility code in SQL parser. 2004-05-20 16:14:13 +00:00
Marc Delisle
6003e8dd37 bug 930445 when table_info not defined 2004-04-13 12:39:55 +00:00
Marcel Tschopp
031ecca8b7 Changed some queries to use MYSQLI_STORE_RESULT. 2004-04-12 18:34:58 +00:00
Marcel Tschopp
181e1aca82 Use PMA_DBI_fetch_row instead of PMA_DBI_fetch_array in display_tbl.lib.php 2004-04-10 19:04:01 +00:00
Marcel Tschopp
16de478154 Changed some queries to use MYSQLI_STORE_RESULT. 
phpMyAdmin now works with MYSQLI_USE_RESULT as default.
 2004-04-10 16:27:23 +00:00
Marcel Tschopp
4e62f7658f Changed some queries to use MYSQLI_STORE_RESULT. 
phpMyAdmin now works with MYSQLI_USE_RESULT as default.
 2004-04-10 16:19:21 +00:00
Marc Delisle
0f6eb412ec bug 877359, constraint and MySQL 3.23.58 2004-03-10 15:57:59 +00:00
Michal Čihař
88dc344cdb Use charset aware substr and strlen functions (bugs #854755 and #910575). 2004-03-09 15:02:28 +00:00
Garvin Hicking
b8df10e41e Get rid of mysql_data_seek(). Use pre-cached PHP array for mysqli 
compatibility and bandwidth saving.

Memory issues by caching should not arise, as the used cache will (in our
previously used cases) only cache index fields and max. 200 relation rows.

I tested performance on my machine: By fetching 400kb of data twice via
mysql_fetch_row() -> mysql_data_seek() -> mysql_fetch_row() this was
performed in 0.25 seconds. By fetching it once and caching in a PHP array
via mysql_fetch_row -> foreach this is performed in 0.32 seconds.

With usual data as used in PMA (10kb) I could only detect a performance
change of 0.009 seconds, which is respectable I think.

By not using mysql_data_seek we are later able to use global mysqli
USE_RESULT options to fetch rows singly. I discussed that yesterday with
Rabus, and if there are any objections we can surely discuss that further on
the list.
 2004-01-28 11:23:38 +00:00
Marc Delisle
ba7aa0770d need PMA_DBI_fetch_row 2004-01-24 21:18:32 +00:00
Alexander M. Turek
2915b5c3ce Added MySQLi library; Removed calls to old mysql_wrappers library. 2004-01-22 02:13:48 +00:00
Marc Delisle
55d1fe7b93 use PMA_DBI function 2004-01-20 20:31:40 +00:00
Marc Delisle
28a5d0476e PMA_DBI_num_rows 2004-01-20 19:35:37 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
f0da471ec3 /libraries cleanup hopefully done. Double-Checked every change, my installation still works. ;) 
Will continue working on remaining files tomorrow and hope to make it to the end of the next day.
 2003-11-20 16:31:51 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00