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

243 Commits

Author SHA1 Message Date
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Michal Čihař
16b0a64d0b Merge branch 'QA_3_4' 2011-08-17 09:59:53 +02:00
Michal Čihař
5146970826 Escape displayed user input 2011-08-17 09:57:29 +02:00
Michal Čihař
97439c45f0 This is already done 2011-08-17 09:50:42 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Aris Feryanto
351afca2c7 Grid edit: null-related things 2011-07-29 12:48:39 +08:00
Aris Feryanto
e1da98ae85 Grid edit: fix bug - notice line above SQL query now shown correctly 2011-07-29 11:43:00 +08:00
Aris Feryanto
0e55c083a9 Grid edit: update relation and transformation correctly 2011-07-28 16:46:51 +08:00
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Madhura Jayaratne
2795a9061c Resolve problems due to merge commit 2011-07-10 22:13:50 +05:30
Madhura Jayaratne
1bc0473fe2 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	tbl_replace.php
 2011-07-03 21:42:04 +05:30
Piotr Przybylski
a28d43abf3 Updated MySQL function list 2011-07-01 20:37:57 +02:00
Madhura Jayaratne
b8ddd56d78 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-30 10:01:33 +05:30
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
Madhura Jayaratne
da6fe46a4d GISFromWKB functions in data insert/edit window fixed. 2011-06-25 21:24:07 +05:30
Madhura Jayaratne
63900d0094 GIS data editor for environments without JavaScript support. 
GIS data preserved while editing.
 2011-06-25 19:39:31 +05:30
Marc Delisle
131e9caa5f Merge commit '81ebc00206d6aee95900b1c28b0212ee79d3bb25' 2011-06-15 09:09:23 -04:00
Thilanka Kaushalya
09fad13dcb Added the update row count in db structure 2011-06-14 21:51:21 +05:30
Aris Feryanto
3b7f35d5c9 Add makegrid triggering in other files 2011-06-01 12:46:12 +07:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Marc Delisle
b2b1953db1 Start to replace warning level with error level 2011-05-03 18:52:37 -04:00
Marc Delisle
bb3f6affea Obey the ShowSQL directive also for inline edit 2011-03-26 07:57:02 -04:00
Marc Delisle
23f897f34f Bug #3184858 Inline edit not accessible in some cases 2011-02-20 08:41:41 -05:00
Michal Čihař
4a6adc7e29 Do not send html headers for ajax request in this case. 2011-02-17 14:30:44 +01:00
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
2d68ee8974 clarify variable name 2010-12-05 07:14:52 -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
94b7567ec8 Merge remote branch 'origin/master' 2010-08-03 18:25:19 +05:30
Marc Delisle
148eab9121 must set the LONGBLOB field to NULL to remove a BLOB reference 2010-07-31 07:07:02 -04:00
Barry Leslie
279a8f8f21 The use of PBMS is not dependent on a primary key 2010-07-29 09:58:23 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
ninadsp
4190a5883a Improved handling of relational fields after saving inline edits. Still need to fix the anchor that is being generated, where clause is missing 2010-07-28 02:58:38 +05:30
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
ab2e4e925e correct insertion of BLOB field reference 2010-07-22 14:37:42 -04:00
Marc Delisle
362aa516ac undefined $primary_field 2010-07-22 14:10:58 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
7d11c0aa92 Added ids to some HTML elements on tbl_change.php and modified the 
output of tbl_replace.php for Ajax requests.
 2010-07-10 17:07:37 +05:30
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
c38f34393f gettext conversion 2010-05-12 12:30:00 -04:00
Michal Čihař
dfa712179b Also this one is used later. 2010-04-22 20:40:47 +02:00
Michal Čihař
ae63490dd9 Can not unset is_insert here, it is used later. 2010-04-22 20:38:43 +02:00
Michal Čihař
c2de4dd8d9 Add full uncompressed version of jquery ui. 2010-04-15 09:34:52 +02:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Michal Čihař
a2a0d9bb38 Avoid multiple loading of jQuery. 2010-04-01 17:19:37 +02:00
Michal Čihař
4dd524eaf1 Use ngettext for number of inserted rows. 2010-03-30 14:51:09 +02:00
Michal Čihař
9e345b4ab8 Use ngettext for number of affected rows. 2010-03-30 14:32:06 +02:00
Marc Delisle
bbad02a5a1 fit with new sql.php jQuery 2010-03-26 18:03:06 -04:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
d435827ba5 Whitespace cleanup. 2010-01-22 17:18:23 +00:00
Michal Čihař
65ea590395 rfe #2033616 [edit] Add option to just display insert query. 2010-01-21 14:12:18 +00:00
Michal Čihař
94c2f864ae [core] Remove config data from session as it brings chicken-egg problem. 
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
 2010-01-21 11:18:18 +00:00
Michal Čihař
ca83c56f5d rfe #2823707 [edit] Call UUID function separately to show it in insert. 2010-01-21 11:01:13 +00:00
Michal Čihař
4c1d5e827a rfe #2924956 [interface] Add insert ignore option to editing row. 2010-01-13 13:50:24 +00:00
Michal Čihař
be5e0baab4 Do not use translated messages for values, rather use hardcoded strings. 
This way we avoid possible breakage on language change.
 2010-01-13 13:38:38 +00:00
Michal Čihař
78b00824eb [core] Updated mootools to fix some glitches with Safari. 
Mootools are now in separate files as distributed upstream.
 2010-01-04 15:35:23 +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
87b994743b primary_key is really a WHERE clause (that works also on tables where no PK is defined) 2009-12-30 15:27:27 +00:00
Marc Delisle
182c02c5e8 bug #2893221 [core] Statement may not be safe to log in statement format 2009-11-21 13:22:08 +00:00
Marc Delisle
869571ee16 optimize: use high-level function to fetch a single row 2009-07-16 12:21:21 +00:00
Marc Delisle
56defc1153 optimize: skip unneeded code in case BLOB streaming is not available 2009-07-16 11:51:09 +00:00
Marc Delisle
208a02fdcd optimizations 2009-07-15 10:07:24 +00:00
Marc Delisle
7967d17690 bug #2821757 [insert] "Insert another new row" no longer worked 2009-07-15 09:46:45 +00:00
Marc Delisle
7381ddfb27 bug #2816165 [display] Executed query not always displayed 2009-07-10 14:30:18 +00:00
Marc Delisle
55a516e39c patch #2745215 [edit] Multi-row change with "]" improved 2009-05-04 16:05:24 +00:00
Herman van Rink
ff0b627cc7 bug #2682140 UUID() and CURRENT_USER() should not accept arguments 2009-03-12 20:18:42 +00:00
Marc Delisle
0b498a58be patch #1760205 [data] Insert as new row: BLOB is lost 2009-02-23 08:36:34 +00:00
Marc Delisle
5a1df0684d patch #2602633 [core] support column name having square brackets 2009-02-20 09:37:49 +00:00
Marc Delisle
dd898010ba patch #2496403 [display] Multi-row change with "]" 2009-01-13 21:59:45 +00:00
Michal Čihař
84ae0420fe Adding @package, third part. 2008-11-24 11:22:44 +00:00
Michal Čihař
37315b0c79 Document some require/includes as phpdoc otherwise takes random block before to document it. 2008-11-24 10:02:56 +00:00
Marc Delisle
e77938bb20 BLOBstreaming support (Google Summer of Code 2008, Raj Kissu Rajandran) -- work in progress 2008-08-20 17:04:37 +00:00
Marc Delisle
2ac75d4591 upgrade to mootools 1.2; temporarily deactivate the color picker that does not work with this mootools version 2008-07-14 19:52:16 +00:00
Marc Delisle
b9baa825c1 display options (work in progress) 2008-05-21 15:49:57 +00:00
Marc Delisle
076ede089d unused variable 2008-05-18 15:53:27 +00:00
Sebastian Mendel
e5458c0799 do not use urlencode() in forms 2008-05-06 08:28:27 +00:00
Marc Delisle
6250cd0506 strRowsInserted 2007-10-19 11:40:27 +00:00
Marc Delisle
e9da128bc0 strRowsDeleted, strRowsAffected 2007-10-18 17:15:39 +00:00
Sebastian Mendel
107fc46ad9 make use of PMA_Message 2007-10-16 12:14:19 +00:00
Sebastian Mendel
1708f2ecdd make use of new message object 2007-10-10 14:31:42 +00:00
Sebastian Mendel
40b3ce9fd1 use array to define included JavaScript libraries 2007-10-04 09:22:50 +00:00
Marc Delisle
1df1e6b3c2 last fix for bug #1729583 2007-06-14 16:52:26 +00:00
Sebastian Mendel
fa30ac8c33 store browse state in session per query 2007-05-15 11:16:10 +00:00
Marc Delisle
501ba4a6b6 bug #1699532 Cause of data manipulation issues; still have to work on updating an ENUM value 2007-05-14 17:39:40 +00:00
Sebastian Mendel
573a6161bd fixed code indention 2007-05-09 12:18:57 +00:00
Marc Delisle
e3012401d4 insert a row if BLOB is empty 2007-03-31 12:19:02 +00:00
Sebastian Mendel
008734f8b0 do NEVER unset $table or $db; 
no need to test for isset() on $db and $table;
always test with strlen() for valid $table or $db;
 2007-03-30 09:12:05 +00:00
Marc Delisle
d298724fd4 Edit next row: do not offer if no unique key on table 2007-03-26 13:23:24 +00:00
Marc Delisle
04e26c61a9 bug #1681598 [interface] Edit next row 2007-03-25 13:06:33 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
91093f0b25 bug #1680952 [core] undefined function PMA_getUvaCondition() 2007-03-15 17:22:18 +00:00
Marc Delisle
42ac66ad74 get rid of propicon 2007-02-10 15:58:46 +00:00
Sebastian Mendel
d3f335ac3d refactored: 
made register_globals independent;
added documentation;
removed unused code;
fixed bug #1597686 last insert id message wrong;
and much more i don't remember ...
 2006-12-19 16:54:29 +00:00
Marc Delisle
d01f9977fb remove uva prefix 2006-12-10 12:32:41 +00:00
Michal Čihař
cac4247057 Rename db_* files to drop useless _details part. 2006-10-25 12:25:01 +00:00
Michal Čihař
ad06b4a991 Rename tbl_* files to drop useless _properties part. 2006-10-25 10:55:20 +00:00
Michal Čihař
1491e4f83e Add support for UTC_DATE, UTC_TIME and UTC_TIMESTAMP functions, based on patch #1563585, thanks to Alexander Schuch - ci-dev. 2006-10-04 12:58:55 +00:00
Sebastian Mendel
1eadc0a41a use @todo tag for todo items, to show up in generated documentation 2006-09-21 14:28:46 +00:00
Marc Delisle
26019039ca bug #1438999 updating a multi-table view 2006-05-23 16:54:30 +00:00
Marc Delisle
48c548e515 bug #1255923, detect and report silent truncation (mysqli) 2006-04-09 11:01:41 +00:00
Marc Delisle
b8da992112 bug 1429074, go back to this page choice not sticky 2006-02-12 14:19:42 +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
Marc Delisle
3e02476635 add comments 2005-12-22 17:57:30 +00:00
Marc Delisle
8db1bbc4cf bug #1385974, cannot un-null a value 2005-12-20 21:31:05 +00:00
Sebastian Mendel
82572774cd define variables only where needed 2005-11-26 06:59:49 +00:00
Michal Čihař
6aeabf44d1 Move footer.inc.php, header.inc.php and header_printview.inc.php to libraries folder as it does not require direct access. 2005-11-24 09:12:17 +00:00
Michal Čihař
e040c424fa Move tbl_replace_fields.php to libraries folder as it does not require direct access. 2005-11-24 09:00:21 +00:00
Sebastian Mendel
fcf387bc70 common.lib.php should REALLY REALLY and ALWAYS be the first include 2005-11-18 12:50:49 +00:00
Marc Delisle
91870dadbe bug #1339184, MySQL 5 strict mode, errors inserting auto-increment fields 2005-11-03 18:24:15 +00:00
Michal Čihař
f1f39b8ed1 added infou about UFPDF to documentation 2004-12-29 14:16:51 +00:00
Michal Čihař
0e9ad7053e UNIX_TIMESTAMP can take optional parameter (bug #1039193). 2004-10-19 16:34:30 +00:00
Marc Delisle
ec0721f053 error uploading a binary field in mysqli 2004-08-21 13:06:26 +00:00
Michal Čihař
4b9ace4f66 Do not empty protected values (bug #1006812). 2004-08-11 13:45:31 +00:00
Michal Čihař
3c813982d1 Some functions do not take parameters (bug #1000021). 2004-08-06 15:29:50 +00:00
Alexander M. Turek
a95837729f yet another PMA_DBI_free_result() 2004-07-31 15:06:55 +00:00
Marc Delisle
5fb6e7976d PMA_securePath 2004-06-15 16:55:53 +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
Michal Čihař
72b3f91917 Use same code for generating INSERT and UPDATE queries (also fixes bug #953250). 2004-05-13 14:41:28 +00:00
Marc Delisle
c9bbf1e03f use PMA_sendHeaderLocation 2004-05-11 12:41:12 +00:00
Michal Čihař
0b9bdd62a7 Support for insert multiple rows at once (RFE #749733). 2004-05-05 10:05:30 +00:00
Marc Delisle
3315aacde9 bug 898484 IIS crash 2004-04-13 18:59:22 +00:00
Marcel Tschopp
a1417f09f0 bug 926986, code optimizations 2004-04-08 14:19:31 +00:00
Michal Čihař
1ead79a1bc New "Go back to this page" while editing. 2004-03-10 14:38:42 +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
a7bd761f3f PMA_DBI_affected_rows 2004-01-20 21:03:31 +00:00
Marc Delisle
a69eb2ebbc PMA_DBI_insert_id 2004-01-20 20:52:28 +00:00
Garvin Hicking
2083c2b226 safer array-index checks 2003-12-15 21:40:22 +00:00
Marc Delisle
9d5504973a bug 857445, affected rows 2003-12-11 16:54:43 +00:00
Garvin Hicking
69cbb41a5c fixed(?) right bracketing 2003-12-11 12:45:44 +00:00
Garvin Hicking
56edf51600 Undefined indexes bug 2003-12-11 10:43:52 +00:00
Garvin Hicking
398b7a9f4a Editing of multiple records at once. 
This is a hook-in to the 'delete multiple records' and basically just wraps all data in some kind of Ueber-Array. It should be compatible with single records editing. I tried various combinations already and it seems to work. But this can heavily break stuff, so expect this to be EXPERIMENTAL! We should only release RC1 after this has been thoroughly tested (will do so in the next days by myself).

What maybe needs fixing is the way of evaluating $goto/ $err_url and similars. As I am not much into that redirection stuff, maybe one can see if I did something wrong in the area.
 2003-12-04 16:09:13 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
8d1bfe6f3b Reverted some obfuscated RegExes. Nijel, as you where working on that: I removed the bugfixes you threw in for my faulty code because there where some issue left (for me): 
The lines

$re0 = '@(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards
$re1 = '@(^|[^\])(\\\)+'; // escaped wildcards

as they currently where made no sense to me, because the single [^\] should be replaced to [^\\\\] as well, doesn't it? To not seriously break more stuff I decided to revert to the previous mechanism here.

I will do more serious tests the next days and will actually work with my PMA again and I pay close attention to see if there are any issues left.

I also searched through the code to see if the setting of the array points from former while() constructs was in any way used [current(), next(), prev(), key(), end(), each()] but did find none.
 2003-11-25 19:20:20 +00:00
Garvin Hicking
c2b46ac945 Final batch of PHP3-Compatibility fixes. Please test. :-) 2003-11-22 20:57:48 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00