The branch, master has been updated via 9c34a0eec92b48c39f6918693976e02c6b760a16 (commit) via cce1ef0edacfd30a3cd913d0e0688e0adb6fb706 (commit) via 8ddfb7140dbff7556ceab8d8b293f21c8d97f79c (commit) via f1e72d766498a64a5cc52962978585f4c3316c93 (commit) via 43c18c50b83ed5ca5bf2e5c3ad9b4ecb3b80f0b6 (commit) via bbb94f628f6fb46a61b9b7692dea3c8474c42627 (commit) via 50f2a0d6eacd64096e26a9fc892bf67723838826 (commit) via 7f9d141a8566d94cc81a7c68f64fb6be97843367 (commit) via 9399f8af8d5fe035ef977ee9e24b800a37b19e9a (commit) via 5a27df6ad8987766f3ad4f5b0b4a60b644f6c9d5 (commit) via 6a2445ccf29a26ecf2294755dedca54ad258d96a (commit) via c9253c0a0ed223ebeba21b25a16391a4acd611cf (commit) via e1f319eef175d23474ca82455c761f8ecffca741 (commit) via c0ee037c594683db833e0c0a6f1a298e0e108634 (commit) via 0b2b21712e3fe54f56717c2581666f30c25cfac8 (commit) via 6a3d0a7f58a78fbe7e8d4bceea7f649dc031fe25 (commit) via 880e4665c3d87570188ba831cd14ec9475980fb7 (commit) via eccad201bf005f117cc122cab7cf1d12b4730a95 (commit) via 98d3916e910c9982dacaf3b924a8ab33cc9205bb (commit) via ee6bcb1b1685efbb62fcd905542b4c5ecd6a1bdd (commit) via 43f4812dbf4184fe30990ba9fa662836cff1f74b (commit) via 95a8521f1106e18850d51287b0d997b0efa82ca9 (commit) via 2ba0095ab5c0efd308daac9fcdfc813281d8c50b (commit) via 0373ae671349946891dcf53e27e48b1446d25083 (commit) via 2ca8e1eea2b8ae45fbb203173a301e9394df3fcb (commit) via a69154b5c99f28504009d7215867c9016c41662e (commit) via a45814796986e6a39f9bec853554df0ff2d5da57 (commit) via 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0 (commit) via 3d1a420a6f32662567a26fb1cfa6cd938ab06715 (commit) via b99bad8cdd6430e2dc7b4a45b28b758044bed700 (commit) via ab16573b34a4a2cc80f3a4a99420aed5300610f5 (commit) via a7f2cbd2ba8e85280afbe30797cef1d68b70805d (commit) via 3ab3b35a76b6000cf8748b6e64c2adbbe8c80818 (commit) via c897adc3a4b58a432a67460d9308ff157401d2d3 (commit) via 94b7567ec8453ed268305094b9245f82449d99b3 (commit) via e6f083c7030b0d19b46e9ba1807fb8c6009496cb (commit) via b19fa7c60f7c085138617693bd862a2c00f510e1 (commit) via 6547920e8ac7566e8d97b7a25ee74d796bf29753 (commit) via 5996773bf72f85291b3765d0b1db64f2890d012f (commit) via e47b2132368cce14d83e6ccf59f3f8ac9068e2be (commit) via b66f8f7fb91e5c7956b7c3884a9f3bc09ed685bc (commit) via 43ed78a0f887e996cdc1459428bbcc7111bed38c (commit) via e8e87ae67556a32a43e3dd7601cd52c7d2e36e07 (commit) via cd42d616f72b776873ef126a93cb5877521cfc3a (commit) via a2f78a6d38f74f0cc62f2a5837e682901331c21e (commit) via 2bec345a46d11293b93c2b06bf8009c913cde8fb (commit) via 4190a5883aef7c3fe344bcd92c78f08825dc5904 (commit) via fd4b33de85c7b67a2565e5b5db1ee098205dfb9e (commit) via 9578aad8ef4deebe80c4ce24740c954ccc640634 (commit) via 4c13428e2821446dbdbe569f7a92d6fa1ba0ceaa (commit) via 4f8c85b31d552aba1c7a83fd2a36523c3587fe3e (commit) via 25dbe9b039af0b301898c9ea84b1a5dbfb9e0272 (commit) via 9391e869ac76d0811cb09eb41db83a12a78c5102 (commit) via e646a2760c65204894cb96a7cce61469bee5b9e3 (commit) via 13ec1423f61e613e653872f3066ca7c9032306d1 (commit) via 405433264187a1a16f61045bb05500fffb0abca5 (commit) via 85d42b8a5763ad548ccfd934e9d54f2fa4353409 (commit) via c0db21c3e5cb574240507233b4b354e73c9dda18 (commit) via 9640a580ffb9fcbdab98032dcecd5ee180fbbcbe (commit) via 6e908dfeb255f1e02140545c46e7a68f1ed0025a (commit) via 23c8cf44218938b1046f51994752ad5bec9cc25c (commit) via 1bdbb9f2749d83c95231435aaccca0bb490735df (commit) via a67fe76e5039eeec67d339e8dfa11d2eae261cc2 (commit) via 0b18458fe758477c1787bc462a7a95a5df5e6745 (commit) via e9731e39c745e73ff8cb0c14a16fc24d145ce611 (commit) via f7076ab686fa39ff942dd26d9b7c5ed09a1331c0 (commit) via 7b99e3b0e4e3963e216458afd8b13065e6ad1df5 (commit) via e7b130baf78bf707f7473b4ce507b0eed81a13bb (commit) via 85e2225ac787d96b7afea0615c35aaf853dd518c (commit) via 7033154eb49ec1f295680e320e7dffd5a6acdec3 (commit) via 4b18b4c7d60f29d89933e33fe29f0b971f511f93 (commit) via 7da51f1a8ebf9bc9b42d1e591068d8f1e5c14fd1 (commit) via e309386703301bc23c565f6676c008f0d1fbf8f3 (commit) via ec38092bdee44485257f4d6d9cf53349a6748517 (commit) via 041a5837c5f6a6107efffb2fbd894afd29bd4b1c (commit) via c47a1a345a94277b342edf883c1e22ea1d7d0367 (commit) via 57fa27e22eb52a77f0a905adb1b88b63d009eeb7 (commit) via 9dd93987ca550f01e7a695581b1faed9f2d4d91e (commit) via 98676380f96e102ad4bd137d75b98b18380ec681 (commit) via ea959071473b029d47ed8b7a6b0b6eb65b279aff (commit) via a40aaaa7b08714312db958c163a32fa9b96eb3e1 (commit) via 10a9e6912c9f2011b69a67ba4b9d539c9550509b (commit) via 98a57e22190f525e1fdcde49e9640763d87752c7 (commit) via f0f5358ede7e58e4eb2807ae22cb09f8736ef2a0 (commit) via 6aa731568255a46d22382017731777c08483cf33 (commit) via 7dd8745778164a3bf44a6418b0554fc8006e355a (commit) via fcae63bbd79939bb977fd3b3638426b88f064a79 (commit) via 3bcffd86e9d1072841a1313c763dfb5a09ae6220 (commit) via a1e97024343ca8006cb91f3203d40c49dd4e348a (commit) via e0f80088aae7fe13c410461fbf6e07c5fd41d1ef (commit) via 7d3245cbcdd189265e13072d5fce2b1c9c26151b (commit) via f06bb69bb8575243b9f1164e0940786833caf3ec (commit) via 35c922e70461a189351a5093026900197c132c33 (commit) via 4eb4d318bbfbadd3df9b33dab0b72d14c9897a6c (commit) via fe9f539ed2a5aa850c41e9f036caef75a26b662a (commit) via dd58a5bc239b6dedb1e2ec971a0c812ec44fca4c (commit) via a1800171063b31a971ae312051b89d7ad21ee42e (commit) via 94a911a623f5eb2f8556ce32e0ad741d425d3a20 (commit) via 3586dd6408be48b95b2ef0ce45d3b2bbe0b06444 (commit) via 505884174bfcf223d111b0f24975dbb658846960 (commit) via d5ed68aa71760193420ea33eaa3309a114571ab2 (commit) via 70a8735c071061c1e78e5b2b42ee25942486b5ac (commit) via e98edae53be838ed13ac524f9131c064fbb7273d (commit) via 6230a545bfc91ed23fa2eafc689a0f72e5662bff (commit) via cbe82879e863f542404ceaf79864bb680a2fb2dc (commit) via ca0af7fff77a0b0006e5743aa9d550cb247f4bba (commit) via 7d11c0aa92ae3214f672f05c5bb676a6a217e351 (commit) via 8358b8c8d35e4e2275cfa68185f355f4c0c101c2 (commit) via 020dac8c89c7e78473e797bcb67d2d4b933a8fda (commit) via 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4 (commit) via fdd8b51b005dc189f0882c8daef79bab0161cb4a (commit) via 47142291a1983f2a541a947b50a6f1dba29f48d0 (commit) via 4f1c348074957287ba5c6186dab52a315870b8e1 (commit) via 224fdfd2867cedbdee4eb5cd01dba7b41d502650 (commit) via 99eff08c0c18fd19d5f5f992230a174d040c60d0 (commit) via e049c1d1583180183645a59de3d97db7f6302448 (commit) via 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37 (commit) via 6e9e3836e5c0c5e05531caf0be81dac718ec7068 (commit) via 379d392b3fbc18f2fd908df4eb7eef9fc5915aa2 (commit) via 034e189bcb55fc63eea484a46608e76f598ce086 (commit) via 4767612d3c88033089ed1657b89749d8de3d247a (commit) via 77aa8c50dda582894c1178b9bf3117e1d42a67af (commit) via be70c9d202617dc9bf31e6f0eaaaa78c8737fed2 (commit) via 5c1052ad9692ecb1888da2f1e230bddd8d9ab5b3 (commit) via b1dcb9493d3b6756a090f877a79afd5f8bfdb176 (commit) via 466d3f7ae5141c742e7fe2e574b4dd5d518b6025 (commit) via dac68adc52cc368a8fe2922251f9c8e4cbeb3d7c (commit) via eb0e019fa6750fc0cb696a555df832b8ee94b269 (commit) via 5677d17722e53f4ba29462a2edec15891e3df0cd (commit) via 7f062310c6a6b0c5c8c91c3ef129206b18e6bd45 (commit) via fe92d38e388e8db524b79d44ccf3359491e7f5fc (commit) via fd2e5e226d7bbc8fc91a17967e365b9438f5d375 (commit) via e32644ea0962979b544bd6efe4b19f411cd4ac97 (commit) via 4f6339b6a4a0c74de248331bb14e1ff608b24fb4 (commit) via b48033fbd6b53fe48144fe7a137a013205f5ae1c (commit) via f9d7058cd61858d35710ede475c51176eff429fa (commit) via bcbf3271399a2e41a55813eb4f773471c59d659b (commit) via 34c68f8aad09967f3701f7d0f9a5126c826cc7af (commit) via ca764244a0b0ddd74a6034ef38667cf4aed92ce6 (commit) via 57f29359780026a169634ba42bfe1861fb685124 (commit) via 25b8d37506249a43758fcbfa23b48e159a6afe92 (commit) via c8fcb2fa2a38580ccc3d2ef3ce288b3dccea63e7 (commit) via f5b71f06dd9e337c9fcc3434a4ca501ec15bc5ac (commit) via ad8d64e360f4c182ce8fcc13a9401c7529b09167 (commit) via 7da7d49625aca60a8f2460ee1d26127ddbfcbfde (commit) via 9a4b524db73ac767a00251c51b45c04f90c5c489 (commit) via e2cef4bc231be49482c270b4ea45a6252f9c9e40 (commit) via a5ae31a2204240c0c95929f8e32516474bd29c3a (commit) via 46ea470888f344bf8fb097da0828cce7070d56c7 (commit) via c1f8f3d77a677496734753d35cba8ec5e2b2e3ff (commit) via a968b58d5c6d6063bf679ff218a5b0e297c50c79 (commit) via a3dd431bdbfa14744655dd03f3d89694fecfe536 (commit) via a87c4fc363926ab2613a28ae9a3cd840f04cbdb8 (commit) via 6ab286d6cad89a0f9ce50820590af6072d572c93 (commit) via ac7cab7160e52a710bb3a6c606efebfbfa652271 (commit) via 4214d83e123e4246c5e10963f607b33f8d301d35 (commit) via c850b8be8ba2987f395eb76948a9a29c70dda2f8 (commit) via dcdde2f99f1fe94e3baaf41d07cea747411ca3c8 (commit) via 217968fb92146a174a0d842b33dbb7358e7d1f03 (commit) via a8073a1875cb2232eeb1d13533cfe7af0045e373 (commit) via f56758e50e49a0fca98064841f0e0e710aba0314 (commit) via dd1ec1c0191d461c3451c195ebf735d6ad6ac268 (commit) via c3d2d0fed4a1d34739d9d999ffaccff4ecb59936 (commit) via 9737dbc6755d98998669ec0fd118fe4322366456 (commit) via cf15d940cd6d8f94fbe9d25c404b4f9f1372888c (commit) via fff89f83a85bd3f3ede1126ecda0cdb86c68ad8c (commit) via a871eba3025a822c402a84614ad197b44e68d24a (commit) via 51dffa100facad11753902fcae91fe66cdc7541f (commit) via 06a7736b88a9212501cdc21ffc7a522a326c095f (commit) via a7e77314afa03120dd02b0cc35154eb1fd22cd36 (commit) via ce79f6cdf1bb420748a993bcf729eaa6aa9c3f5f (commit) via 1a9526a4ff9507fec88bd03de0a395cca3ce6214 (commit) via 603b6bf47b3b8eab1e936613b6294a79fa24c0a2 (commit) via cb4c1100749fa72dc3e0a7e7f3749187557689f3 (commit) via e9ffc7c5d5751cf20006dd77cfceec2640733316 (commit) via 78b39d71eaa60d3fdc7e1391c74305a008dfb0d1 (commit) via 8f3c8838a1c41ba529d657322ad8b1c1af825152 (commit) via f04f154c241c81cf612dbe1904caee4c4d1a6099 (commit) via 52774d7616438ca9e86e96e56fb21ff7bc475db1 (commit) via 8b37b825ef3c3be2ebf7503bd12980e41e6f7cf7 (commit) via fd5e2dc3c115a3b642272f10163718bfd18d3bdb (commit) via 266447bcd92eee17afae5ff243a747e70fbcb81a (commit) via a8d6f9ff4c91f6effba521c2712fc908eb413af6 (commit) via d2c6e1c5e372cba7517b1ecc376c97dc032f003a (commit) via 0f081a843791d3d26c209b13f8b798462b44f8bf (commit) via 2986a7b1a05ad71d5a775646e512e20e522bb6bf (commit) via 834b36bd6a1d8c12d683932b19805bfc1c3bb8ba (commit) via 5f255406bde5d63b67806c323f8891c3295610d2 (commit) via 3553df0dc2fc9d9f641b6dbb29c28827cc18137f (commit) via 96c0bf55119b21f0448b528ac5d9b2b6688b678c (commit) via 6ede5986ad0b35b2c4f3fdffb5ef5466f09a9031 (commit) via 42de77813c7c34f2e9255c30fb6d053ed69b5454 (commit) via 86558dfd96e28527316f15a1c440c4b1b9367fbb (commit) via 50dabaf4e7dc4f165d0fc607db6a278f1b8180a5 (commit) via 049c90ee0ba89074b3d53a81d9c56b0e46415007 (commit) via 160f4314eb518afcc1eba80da9575657584b2e34 (commit) via 3bb4dbd0acc962969000cd2d0dab230d858dc28c (commit) via d195582cf808d453827c5c23afa023e0817cabb2 (commit) via bd139f2465eac695f9bab9ccae5751383ec1e17f (commit) via d5b50587e7af9a3e506acc84d7fe4336adf0a38d (commit) via 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf (commit) via d775f341a4791c108dab4839d094b4f654d97f32 (commit) via 6276ad45a6a5ab2f14e8b33f8a0db5504bbe4e16 (commit) via ed3e6a2925fb2fda00249b94b28c20d992f89350 (commit) via d14abc17ca31bf9554afc5d26ceb921b4d612974 (commit) via 8a81f9111b469dfedd34a56ec7b9b8be9919c719 (commit) via 0e910967b09f31f0bb9ca89c1403bb578a96e4b7 (commit) via 5ab3a60612ebf397406636503a59d6926ee63fff (commit) via 0a417e3c2af9a2fea00005508a457d4ebf33ba3c (commit) via 38ac78e3baa6e925e6ef023a4196ae1d323bffc9 (commit) via bed1948d044f0e5d9125d3c905e8390d8a75b0de (commit) from ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b (commit)
- Log ----------------------------------------------------------------- commit 9c34a0eec92b48c39f6918693976e02c6b760a16 Merge: cce1ef0edacfd30a3cd913d0e0688e0adb6fb706 ac5cab4f6f6184484ad0f68c8afbdf06c2914b9b Author: ninadsp ninadsp16289@gmail.com Date: Sat Aug 28 01:53:52 2010 +0530
Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
commit cce1ef0edacfd30a3cd913d0e0688e0adb6fb706 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 22:52:38 2010 +0530
Fixed the display_query undefined error by adding a check to see if it exists
commit 8ddfb7140dbff7556ceab8d8b293f21c8d97f79c Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 22:22:39 2010 +0530
Used localized string for the Inline Edit anchor being generated
commit f1e72d766498a64a5cc52962978585f4c3316c93 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 20:20:51 2010 +0530
Removed the inline call to confirmLink() and instead attached the jQuery call to it. jQuery call attached to the proper class
commit 43c18c50b83ed5ca5bf2e5c3ad9b4ecb3b80f0b6 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 20:19:51 2010 +0530
Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it
commit bbb94f628f6fb46a61b9b7692dea3c8474c42627 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 20:03:15 2010 +0530
Created a new js file for the tbl_structure.php page and moved jQuery scripts for it into that file
commit 50f2a0d6eacd64096e26a9fc892bf67723838826 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 26 19:53:27 2010 +0530
Improved response of the Truncate table action on success
commit 7f9d141a8566d94cc81a7c68f64fb6be97843367 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 24 18:25:09 2010 +0530
Removed the blank new line at the end, which was causing issues
commit 9399f8af8d5fe035ef977ee9e24b800a37b19e9a Author: ninadsp ninadsp16289@gmail.com Date: Sun Aug 22 13:23:16 2010 +0530
Improved the appendInlineAnchor() function to edit the text now displayed with each anchor
commit 5a27df6ad8987766f3ad4f5b0b4a60b644f6c9d5 Author: ninadsp ninadsp16289@gmail.com Date: Sun Aug 22 12:59:53 2010 +0530
Missing brackets during the merge. Added them
commit 6a2445ccf29a26ecf2294755dedca54ad258d96a Author: ninadsp ninadsp16289@gmail.com Date: Sun Aug 22 12:59:25 2010 +0530
Fixed the error caused due to a missing index , relocated the code that sets the null class for a null element
commit c9253c0a0ed223ebeba21b25a16391a4acd611cf Merge: e1f319eef175d23474ca82455c761f8ecffca741 7be82362080f862de054c85646fb54b3bf6402b9 Author: ninadsp ninadsp16289@gmail.com Date: Sun Aug 22 12:42:54 2010 +0530
Merge conflict resolved for Lori's tree merge to main
commit e1f319eef175d23474ca82455c761f8ecffca741 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 19 00:45:50 2010 +0530
Trailing } left while resolving merge conflict. Removed it
commit c0ee037c594683db833e0c0a6f1a298e0e108634 Merge: 0b2b21712e3fe54f56717c2581666f30c25cfac8 b51a217c36b45194f79915992a599338b3bac9ef Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 17 18:25:03 2010 +0530
Resolved a Merge Conflict
commit 0b2b21712e3fe54f56717c2581666f30c25cfac8 Author: ninadsp ninadsp16289@gmail.com Date: Sun Aug 15 01:50:47 2010 +0530
Added documentation to PHP files
commit 6a3d0a7f58a78fbe7e8d4bceea7f649dc031fe25 Author: ninadsp ninadsp16289@gmail.com Date: Fri Aug 13 23:34:10 2010 +0530
Added documentation, fixed some minor bugs/typos
commit 880e4665c3d87570188ba831cd14ec9475980fb7 Author: ninadsp ninadsp16289@gmail.com Date: Wed Aug 11 00:28:28 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/sql.js
commit eccad201bf005f117cc122cab7cf1d12b4730a95 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 10 19:56:04 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_structure.js
commit 98d3916e910c9982dacaf3b924a8ab33cc9205bb Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 10 19:30:43 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_search.js
commit ee6bcb1b1685efbb62fcd905542b4c5ecd6a1bdd Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 10 19:25:56 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/db_operations.js
commit 43f4812dbf4184fe30990ba9fa662836cff1f74b Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 10 19:25:40 2010 +0530
Added JSDoc-Toolkit compatible documentation to js/server_privileges.js
commit 95a8521f1106e18850d51287b0d997b0efa82ca9 Merge: 2ba0095ab5c0efd308daac9fcdfc813281d8c50b ba038ed6e1527d5470a5532d4198889ad80943a9 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 10 00:55:22 2010 +0530
Merge remote branch 'origin/master'
commit 2ba0095ab5c0efd308daac9fcdfc813281d8c50b Author: ninadsp ninadsp16289@gmail.com Date: Mon Aug 9 00:49:11 2010 +0530
We can now edit NULL fields and set fields to NULL in inline editing.
commit 0373ae671349946891dcf53e27e48b1446d25083 Author: ninadsp ninadsp16289@gmail.com Date: Mon Aug 9 00:06:36 2010 +0530
Removed an alert() call which was around for testing purposes.
commit 2ca8e1eea2b8ae45fbb203173a301e9394df3fcb Author: ninadsp ninadsp16289@gmail.com Date: Fri Aug 6 20:29:09 2010 +0530
Added the loading gif from the themes to the ajax notification
commit a69154b5c99f28504009d7215867c9016c41662e Author: ninadsp ninadsp16289@gmail.com Date: Fri Aug 6 19:23:17 2010 +0530
Removed the appendInlineAnchor call from ajaxSuccess event as it was also fired at a successful inline edit query. Instead, created a custom event appendAnchor on #sqlqueryresults which is triggered when necessary. Also got transformations working for application/octetstream mime type.
commit a45814796986e6a39f9bec853554df0ff2d5da57 Merge: 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0 d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 Author: ninadsp ninadsp16289@gmail.com Date: Thu Aug 5 23:51:14 2010 +0530
Merge from upstream. Resolved a conflict in js/functions.js
commit 7acb4cb99d215c8c0fab7cfe27d7395dd73afee0 Author: ninadsp ninadsp16289@gmail.com Date: Wed Aug 4 22:58:05 2010 +0530
Finalised CSS rules for the Ajax notification division. It now centers correctly and handles not very large messages pretty well.
commit 3d1a420a6f32662567a26fb1cfa6cd938ab06715 Author: ninadsp ninadsp16289@gmail.com Date: Wed Aug 4 21:54:35 2010 +0530
Moved the code that appends the inline edit anchor into a function and registered it to all Ajax events that complete successfully. The anchor is now appended even after retrieving results over Ajax.
commit b99bad8cdd6430e2dc7b4a45b28b758044bed700 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 23:28:31 2010 +0530
Almost completed appending of newly created database to the database table. Still need to get db statistics
commit ab16573b34a4a2cc80f3a4a99420aed5300610f5 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 23:27:13 2010 +0530
Append a new anchor for inline edit to each row if javascript is supported instead of using the edit anchor for inline editing
commit a7f2cbd2ba8e85280afbe30797cef1d68b70805d Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 21:01:20 2010 +0530
Converted the PMA_sort_table into a jQuery function as there was a race condition caused due to simultaneous adding of a row and sorting of the table
commit 3ab3b35a76b6000cf8748b6e64c2adbbe8c80818 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 20:22:36 2010 +0530
Created a function to sort a table after a new row has been appended to it. Required for Create Table, Add User and Create Database actions
commit c897adc3a4b58a432a67460d9308ff157401d2d3 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 19:10:37 2010 +0530
Ajaxified Change Password action on main page
commit 94b7567ec8453ed268305094b9245f82449d99b3 Merge: e6f083c7030b0d19b46e9ba1807fb8c6009496cb 148eab912112004aab23f27138f93406d87b00f0 Author: ninadsp ninadsp16289@gmail.com Date: Tue Aug 3 18:25:19 2010 +0530
Merge remote branch 'origin/master'
commit e6f083c7030b0d19b46e9ba1807fb8c6009496cb Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 31 02:25:29 2010 +0530
Ajaxified Create Database action. Have to append newly created db to table yet though
commit b19fa7c60f7c085138617693bd862a2c00f510e1 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 31 02:02:16 2010 +0530
Retrieve a link instead of the dropdown fields when the number of foreign fields is more than ['ForeignKeyMaxLimit']. Could use an icon in the anchor like it is in tbl_change.php
commit 6547920e8ac7566e8d97b7a25ee74d796bf29753 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 31 01:34:47 2010 +0530
The anchor is now correctly generated for a saved relational field during inline edit with the correct where clause. Trying to fix the bug with ['ForeignKeyMaxLimit']
commit 5996773bf72f85291b3765d0b1db64f2890d012f Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 30 20:34:06 2010 +0530
Removed the duplicate table link being shown in the serverinfo div. Most probably caused due to an incorrect merge resolution
commit e47b2132368cce14d83e6ccf59f3f8ac9068e2be Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 30 20:10:10 2010 +0530
In inline edit, when getting the field name, ignore the column comments.
commit b66f8f7fb91e5c7956b7c3884a9f3bc09ed685bc Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 30 00:16:24 2010 +0530
Improved handling of text/plain mimetype fields for inline editing
commit 43ed78a0f887e996cdc1459428bbcc7111bed38c Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 29 23:36:35 2010 +0530
Transformed values are returned from server for newly edited values. Handling of mimetypes other than text/plain needs to be implemented
commit e8e87ae67556a32a43e3dd7601cd52c7d2e36e07 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 29 22:53:07 2010 +0530
Resolved conflicts left over from previous merge
commit cd42d616f72b776873ef126a93cb5877521cfc3a Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 29 21:26:21 2010 +0530
Removed unresolved section
commit a2f78a6d38f74f0cc62f2a5837e682901331c21e Merge: 2bec345a46d11293b93c2b06bf8009c913cde8fb d0fc397fe1c474150883e85a791a012a7ae03380 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 29 19:17:25 2010 +0530
Resolve merge conflicts for upstream merge
commit 2bec345a46d11293b93c2b06bf8009c913cde8fb Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 29 19:07:18 2010 +0530
Trying to improve jQuery's behaviour for transformed field inline editing
commit 4190a5883aef7c3fe344bcd92c78f08825dc5904 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 28 02:58:38 2010 +0530
Improved handling of relational fields after saving inline edits. Still need to fix the anchor that is being generated, where clause is missing
commit fd4b33de85c7b67a2565e5b5db1ee098205dfb9e Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 26 01:21:52 2010 +0530
Added handling of enum values to inline editing
commit 9578aad8ef4deebe80c4ce24740c954ccc640634 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 25 01:04:07 2010 +0530
Sort the table of tables on db structure page after a new table's row is added.
commit 4c13428e2821446dbdbe569f7a92d6fa1ba0ceaa Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 25 00:49:32 2010 +0530
On deleting users, the classes of the rows remaining are re-adjusted so the table looks the way its supposed to
commit 4f8c85b31d552aba1c7a83fd2a36523c3587fe3e Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 25 00:34:35 2010 +0530
The user's table is now sorted after a new user is added. Moved common code for add user and copy user to a function
commit 25dbe9b039af0b301898c9ea84b1a5dbfb9e0272 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 24 00:32:50 2010 +0530
Relational values are now retrieved from the server for inline editing. However, the displaying of relational values after a successful inline edit has to be handled better. The link to the sql query is lost, and we dont know how the relational display column setting will be handled
commit 9391e869ac76d0811cb09eb41db83a12a78c5102 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 23 23:17:15 2010 +0530
The updated privileges are now wrapped with dfn tags as well.
commit e646a2760c65204894cb96a7cce61469bee5b9e3 Merge: 13ec1423f61e613e653872f3066ca7c9032306d1 049886139c62c3ed8b6573a0637ec5516857661f Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 23 21:59:15 2010 +0530
Fixed conflict due to upstream merge
commit 13ec1423f61e613e653872f3066ca7c9032306d1 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 23 00:23:38 2010 +0530
Minor bug due to which the ajax response to revoke users was failing. Fixed it
commit 405433264187a1a16f61045bb05500fffb0abca5 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 23 00:18:15 2010 +0530
Update the privileges field in the usersForm table when the user is changed
commit 85d42b8a5763ad548ccfd934e9d54f2fa4353409 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 23 00:03:12 2010 +0530
Newly copied user too is appended to the table now
commit c0db21c3e5cb574240507233b4b354e73c9dda18 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 22 23:27:26 2010 +0530
Inline edit is now saved, for normal and truncated fields. Relational, enum and transformed fields need special care
commit 9640a580ffb9fcbdab98032dcecd5ee180fbbcbe Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 22 00:12:43 2010 +0530
Drop Table and Create Table work as expected now on db_create.php too
commit 6e908dfeb255f1e02140545c46e7a68f1ed0025a Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 22 00:01:16 2010 +0530
Refresh navigation on creation of new table. Bug noticed by Marc Delisle
commit 23c8cf44218938b1046f51994752ad5bec9cc25c Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 22 00:00:02 2010 +0530
This page can now handle ajax requests
commit 1bdbb9f2749d83c95231435aaccca0bb490735df Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 23:25:23 2010 +0530
Handled the race condition caused on the loading notification div due to calls to PMA_ajaxShowMessage() in time less than the timeout. Added a .clearQueue() calls
commit a67fe76e5039eeec67d339e8dfa11d2eae261cc2 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 22:30:40 2010 +0530
Transformed values too are retrieved from the server now. Works equally well for vertical and horizontal tables
commit 0b18458fe758477c1787bc462a7a95a5df5e6745 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 00:14:12 2010 +0530
Truncated values in vertical tables are now retrieved from the server for inline edits. Also, original data is now stored in a hidden span so that it can be replaced in case of an error
commit e9731e39c745e73ff8cb0c14a16fc24d145ce611 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 00:12:17 2010 +0530
Added a few lines to handle inline edit requests
commit f7076ab686fa39ff942dd26d9b7c5ed09a1331c0 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 00:11:54 2010 +0530
Added classes and hidden input fields for inline edit
commit 7b99e3b0e4e3963e216458afd8b13065e6ad1df5 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 21 00:10:46 2010 +0530
Added a parameter for inline edit requests where truncated and transformed values are retrieved
commit e7b130baf78bf707f7473b4ce507b0eed81a13bb Merge: 85e2225ac787d96b7afea0615c35aaf853dd518c 0c9cbf6c6ee5d83c670725a903867eeac5a0bd2b Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 19 21:54:37 2010 +0530
Merge remote branch 'origin/master'
commit 85e2225ac787d96b7afea0615c35aaf853dd518c Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 16 20:14:25 2010 +0530
Fixed the issue in PMA_showMessage() where ['cell_align_left'] is not set in an Ajax request. Put an isset() conditional in place
commit 7033154eb49ec1f295680e320e7dffd5a6acdec3 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 16 19:59:14 2010 +0530
If the last user with a given initial is deleted, update the users overview table and remove the link
commit 4b18b4c7d60f29d89933e33fe29f0b971f511f93 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 16 19:36:12 2010 +0530
When a new user is created, the user's overview table on the top is now updated to reflect the newly added user's initial
commit 7da51f1a8ebf9bc9b42d1e591068d8f1e5c14fd1 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 16 19:10:48 2010 +0530
Empty row result set was not being handled correctly for Table Search page, fixed it
commit e309386703301bc23c565f6676c008f0d1fbf8f3 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 22:23:05 2010 +0530
Modified the handlers for ajax inline edit so that only the text areas are modified
commit ec38092bdee44485257f4d6d9cf53349a6748517 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 22:21:57 2010 +0530
Added classes to data fields that are truncated/transformed/relation keys so that they can be distinguished while handling ajax inline edit
commit 041a5837c5f6a6107efffb2fbd894afd29bd4b1c Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 16:18:46 2010 +0530
Added an Ajax handler to the display options form
commit c47a1a345a94277b342edf883c1e22ea1d7d0367 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 16:01:25 2010 +0530
Started Ajaxification of Inline Editing. Simple data fields are replaced with textareas when edit button is clicked and vice versa. No provision yet for transformations and enum fields
commit 57fa27e22eb52a77f0a905adb1b88b63d009eeb7 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 15:48:10 2010 +0530
Added classes to the edit link and data fields that allow for inline editing
commit 9dd93987ca550f01e7a695581b1faed9f2d4d91e Merge: 98676380f96e102ad4bd137d75b98b18380ec681 a038d59f7a0524a00682e8a7e2f3e4cda781f98a Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 15 00:17:49 2010 +0530
Reverted po files changes.
commit 98676380f96e102ad4bd137d75b98b18380ec681 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 20:21:47 2010 +0530
Improved error handling. The ajax message was not being properly shown for an empty result set
commit ea959071473b029d47ed8b7a6b0b6eb65b279aff Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 20:21:10 2010 +0530
Improved the error handling, when an empty result set is obtained.
commit a40aaaa7b08714312db958c163a32fa9b96eb3e1 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 19:04:52 2010 +0530
Statistics for the newly created table are now taken from the SHOW TABLE STATUS query when in an Ajax request
commit 10a9e6912c9f2011b69a67ba4b9d539c9550509b Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 01:36:42 2010 +0530
A newly added table will now be appended to the tablesForm if it exists. tbl_create.php generates the necessary output for it. Need to figure out how to calculate the size and overhead, when stats are shown.
commit 98a57e22190f525e1fdcde49e9640763d87752c7 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 01:09:37 2010 +0530
A newly added table is now appended to the tablesForm on db_structure.php
commit f0f5358ede7e58e4eb2807ae22cb09f8736ef2a0 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 01:08:27 2010 +0530
Added an id to one of the tbody elements in tablesForm, so that jQuery can append to the appropriate one.
commit 6aa731568255a46d22382017731777c08483cf33 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 14 00:53:19 2010 +0530
The PMA_mysqlDie() now supports Ajax requests. It now shows a JSON response in an Ajax request. Modified the PMA_ajaxResponse() function to handle messages which are not instances of the PMA_Message class. Requited for PMA_mysqlDie()
commit 7dd8745778164a3bf44a6418b0554fc8006e355a Author: ninadsp ninadsp16289@gmail.com Date: Tue Jul 13 03:28:23 2010 +0530
Added a Math.random() parameter to negate caching issues with user's list
commit fcae63bbd79939bb977fd3b3638426b88f064a79 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jul 13 03:25:53 2010 +0530
When a new user is added, his details are now appended to the user's table
commit 3bcffd86e9d1072841a1313c763dfb5a09ae6220 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jul 13 02:30:42 2010 +0530
Stupid typo. Fixed
commit a1e97024343ca8006cb91f3203d40c49dd4e348a Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 12 23:49:27 2010 +0530
Fixed issue due to which the notifications div was visible even after clearing the message
commit e0f80088aae7fe13c410461fbf6e07c5fd41d1ef Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 12 23:33:56 2010 +0530
Fixed issue due to which the notifications div was visible even after clearing the message
commit 7d3245cbcdd189265e13072d5fce2b1c9c26151b Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 12 23:11:41 2010 +0530
Fixed the empty notice divison being generated when PMA_showMessage() was being passed a NULL query
commit f06bb69bb8575243b9f1164e0940786833caf3ec Merge: 35c922e70461a189351a5093026900197c132c33 638fe75a8b36df3049d4cc1dec7e734c71feff6c Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 12 22:47:17 2010 +0530
Merge remote branch 'origin/master'
commit 35c922e70461a189351a5093026900197c132c33 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jul 12 00:14:05 2010 +0530
Basic Table Search now works. Need to handle some error cases
commit 4eb4d318bbfbadd3df9b33dab0b72d14c9897a6c Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 23:51:02 2010 +0530
Forgot to set the context for the recently added $(document).ready() snippets. Added them
commit fe9f539ed2a5aa850c41e9f036caef75a26b662a Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 23:36:24 2010 +0530
Removed inline coding for Drop Trigger in libraries/tbl_triggers.lib.php
commit dd58a5bc239b6dedb1e2ec971a0c812ec44fca4c Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 23:14:41 2010 +0530
Removed inline calls to confirmLink() for Empty/Drop Table actions in libraries/tbl_links.inc.php
commit a1800171063b31a971ae312051b89d7ad21ee42e Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 22:33:52 2010 +0530
Moved Ajax handlers of db_structure.php to a dedicated file js/db_structure.js from js/functions.js
commit 94a911a623f5eb2f8556ce32e0ad741d425d3a20 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 22:23:57 2010 +0530
Removed inline call in libraries/display_tbl.lib.php to confirmAction() for 'Calculate Real End' action on large InnoDB tables.
commit 3586dd6408be48b95b2ef0ce45d3b2bbe0b06444 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 03:33:04 2010 +0530
Removed inline call to confirmLink() for 'Drop Primary Key/Index'
commit 505884174bfcf223d111b0f24975dbb658846960 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 03:14:02 2010 +0530
Removed inline call to confirmLink() for 'Delete Tracking action'.
commit d5ed68aa71760193420ea33eaa3309a114571ab2 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 02:32:10 2010 +0530
Removed inline call to confirmLink() for 'Drop Procedure'
commit 70a8735c071061c1e78e5b2b42ee25942486b5ac Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 02:08:47 2010 +0530
Removed inline call to confirmLink() for 'Drop Event' action
commit e98edae53be838ed13ac524f9131c064fbb7273d Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 11 00:14:12 2010 +0530
Remove previous queries if any before inserting the latest query. We don't want too many queries crowding up.
commit 6230a545bfc91ed23fa2eafc689a0f72e5662bff Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 10 23:45:03 2010 +0530
Cloning and removal of rows happens correctly now. All name/id properties of the inputs are changed on the fly with javascript.
commit cbe82879e863f542404ceaf79864bb680a2fb2dc Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 10 17:14:10 2010 +0530
Hooked in Ajax submission of data. Changint the number of insertions on the fly is still a work in progress. Insertion tables are being cloned/deleted, however, each is not unique.
commit ca0af7fff77a0b0006e5743aa9d550cb247f4bba Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 10 17:09:36 2010 +0530
Added a string for Ajax handlers in tbl_change.php
commit 7d11c0aa92ae3214f672f05c5bb676a6a217e351 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 10 17:07:37 2010 +0530
Added ids to some HTML elements on tbl_change.php and modified the output of tbl_replace.php for Ajax requests.
commit 8358b8c8d35e4e2275cfa68185f355f4c0c101c2 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 8 22:53:26 2010 +0530
Reverted po files changes.
commit 020dac8c89c7e78473e797bcb67d2d4b933a8fda Merge: 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4 bd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 7 18:53:41 2010 +0530
Merge remote branch 'origin/master'
commit 8de1f2fdf7713ba365b4211c9ba9494f9e97c2f4 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 7 18:36:28 2010 +0530
Revert "Trying to resolve a merge."
This reverts commit fdd8b51b005dc189f0882c8daef79bab0161cb4a.
commit fdd8b51b005dc189f0882c8daef79bab0161cb4a Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 7 18:32:41 2010 +0530
Trying to resolve a merge.
commit 47142291a1983f2a541a947b50a6f1dba29f48d0 Merge: 4f1c348074957287ba5c6186dab52a315870b8e1 3e9e18aebb5d551f260e178f2f311384c2653b28 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jul 7 18:31:09 2010 +0530
Merge remote branch 'origin/master'
Conflicts: po/af.po po/ar.po po/az.po po/be.po po/be@latin.po po/bg.po po/bn.po po/bs.po po/ca.po po/cs.po po/cy.po po/da.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hr.po po/hu.po po/id.po po/it.po po/ja.po po/ka.po po/ko.po po/lt.po po/lv.po po/mk.po po/mn.po po/ms.po po/nb.po po/nl.po po/phpmyadmin.pot po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr@latin.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po po/tt.po po/uk.po po/ur.po po/uz.po po/uz@latin.po po/zh_CN.po po/zh_TW.po
commit 4f1c348074957287ba5c6186dab52a315870b8e1 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 4 01:50:11 2010 +0530
Added an id to the edit users form so that the check all/uncheck all calls to setCheckboxes() will work.
commit 224fdfd2867cedbdee4eb5cd01dba7b41d502650 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jul 4 01:12:00 2010 +0530
Hide query box on retrieving results. Ajaxified results table sorting.
commit 99eff08c0c18fd19d5f5f992230a174d040c60d0 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 3 21:53:07 2010 +0530
Added a string for sql.js
commit e049c1d1583180183645a59de3d97db7f6302448 Merge: 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37 9e857f9f84591eedf3be50668356411eb52da0fa Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 3 21:00:08 2010 +0530
Merge remote branch 'origin/master'
Conflicts: po/fr.po po/sl.po
commit 4f3b8b96ae40c9cad48bb5d7dad3320a4d495c37 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 3 02:52:09 2010 +0530
If in an ajax query, we need to show the query and the time taken to process the query. Added code to get this working
commit 6e9e3836e5c0c5e05531caf0be81dac718ec7068 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jul 3 02:51:02 2010 +0530
We don't need to buffer the output in PMA_showMessage() when making an SQL query. Added a global variable which is set in sql.php during an ajax request.
commit 379d392b3fbc18f2fd908df4eb7eef9fc5915aa2 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 2 03:38:56 2010 +0530
Added a string for db_search.js
commit 034e189bcb55fc63eea484a46608e76f598ce086 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 2 03:35:30 2010 +0530
Added a basic script to retrieve db search results via ajax
commit 4767612d3c88033089ed1657b89749d8de3d247a Author: ninadsp ninadsp16289@gmail.com Date: Fri Jul 2 03:34:44 2010 +0530
Added a division to include the search results in, suppressed some output in an ajax request.
commit 77aa8c50dda582894c1178b9bf3117e1d42a67af Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 1 14:39:25 2010 +0530
Hopefully, the PMA_messages[] error will be resolved now. Most probably a context issue was causing the error.
commit be70c9d202617dc9bf31e6f0eaaaa78c8737fed2 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 1 03:04:14 2010 +0530
A string had been repeated in the js_messages array, which is most probably causing an issue.
commit 5c1052ad9692ecb1888da2f1e230bddd8d9ab5b3 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 1 02:33:31 2010 +0530
Included the sql.js file, added teh container division sqlqueryresults when generating the results table. All cases have not been handled yet.
commit b1dcb9493d3b6756a090f877a79afd5f8bfdb176 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jul 1 02:32:17 2010 +0530
The reference to PMA_messages[] for the title option was causing issues on the demo server.
commit 466d3f7ae5141c742e7fe2e574b4dd5d518b6025 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 21:00:45 2010 +0530
Discarded the unused PMA_ajaxOutputBuffelHandler() function.
commit dac68adc52cc368a8fe2922251f9c8e4cbeb3d7c Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 01:20:09 2010 +0530
Show the SQL queries too in an Ajax response.
commit eb0e019fa6750fc0cb696a555df832b8ee94b269 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 01:18:47 2010 +0530
Rudimentary script in place for retreiving SQL query results by ajax, and paginating the results table in place.
commit 5677d17722e53f4ba29462a2edec15891e3df0cd Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 01:16:49 2010 +0530
Include the query too if we are in an ajax request.
commit 7f062310c6a6b0c5c8c91c3ef129206b18e6bd45 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:38:28 2010 +0530
Fixed the bug where the initials_table division landed up at the bottom of the page after an ajax request completed. Also, fixed the issue due to which the edit users dialog was empty
commit fe92d38e388e8db524b79d44ccf3359491e7f5fc Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:37:25 2010 +0530
Fixed the bug where the initials_table division landed up at the bottom of the page after an ajax request.
commit fd2e5e226d7bbc8fc91a17967e365b9438f5d375 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:33:11 2010 +0530
Removed the $.append() calls that were conflicting with document.write() on the demo server. Instead, generating the div on the fly and not appending it to the DOM.
commit e32644ea0962979b544bd6efe4b19f411cd4ac97 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:31:59 2010 +0530
In Drop Column, the row giving the details of the column is now removed if the request completed successfully.
commit 4f6339b6a4a0c74de248331bb14e1ff608b24fb4 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:28:45 2010 +0530
We need to close the dialog when reloading the database after renaming it. The code did not do this, added it.
commit b48033fbd6b53fe48144fe7a137a013205f5ae1c Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:28:15 2010 +0530
Revert "We need to close the dialog when reloading the database after renaming"
This reverts commit f9d7058cd61858d35710ede475c51176eff429fa.
commit f9d7058cd61858d35710ede475c51176eff429fa Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 30 00:25:22 2010 +0530
We need to close the dialog when reloading the database after renaming it. The code did not do this, added it.
commit bcbf3271399a2e41a55813eb4f773471c59d659b Merge: 34c68f8aad09967f3701f7d0f9a5126c826cc7af 16ed06531a00ebac5bd33b40fbdb8139639f726c Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 23:54:01 2010 +0530
Merge remote branch 'origin/master'
commit 34c68f8aad09967f3701f7d0f9a5126c826cc7af Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 02:25:59 2010 +0530
When dropping a table now, the entire row in the table of tables is removed on db_structure.php.
commit ca764244a0b0ddd74a6034ef38667cf4aed92ce6 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit 57f29359780026a169634ba42bfe1861fb685124 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit 25b8d37506249a43758fcbfa23b48e159a6afe92 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit c8fcb2fa2a38580ccc3d2ef3ce288b3dccea63e7 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit f5b71f06dd9e337c9fcc3434a4ca501ec15bc5ac Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 29 00:17:46 2010 +0530
Added localization strings for the jQueryUI dialog buttons.
commit ad8d64e360f4c182ce8fcc13a9401c7529b09167 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 21:21:14 2010 +0530
The ajax notification div did not hide properly. Fixed it.
commit 7da7d49625aca60a8f2460ee1d26127ddbfcbfde Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 21:20:30 2010 +0530
Added some CSS rules for the ajax notifications. The color and positioning can be improved.
commit 9a4b524db73ac767a00251c51b45c04f90c5c489 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 01:59:52 2010 +0530
Hacked the PMA_generate_slider_effect() code to work with jQuery. Ajax queries were failing due to the use of document.write(). Need to find a better solution with $.append()
commit e2cef4bc231be49482c270b4ea45a6252f9c9e40 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 01:24:05 2010 +0530
Suppress the printing of the serverlinks and topmenucontainer divs when in an ajax request
commit a5ae31a2204240c0c95929f8e32516474bd29c3a Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 01:22:55 2010 +0530
Added an empty div which will be filled with the results of the SQL query by jQuery
commit 46ea470888f344bf8fb097da0828cce7070d56c7 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 01:21:20 2010 +0530
Included the new js/sql.js file in all three pages
commit c1f8f3d77a677496734753d35cba8ec5e2b2e3ff Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 28 01:19:27 2010 +0530
Added a new file for executing SQL Queries with an Ajax call. Still a basic script, will be tested and improved.
commit a968b58d5c6d6063bf679ff218a5b0e297c50c79 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jun 27 23:04:18 2010 +0530
Now shows the sql query too when renaming a database.
commit a3dd431bdbfa14744655dd03f3d89694fecfe536 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jun 27 23:03:20 2010 +0530
Modified PMA_showMessage so that it can show the sql query even in an ajax request, by using output buffering. Added a function to handle the output buffer for the ajax request. Fixed a typo in PMA_ajaxResponse
commit a87c4fc363926ab2613a28ae9a3cd840f04cbdb8 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jun 27 03:27:29 2010 +0530
Removed extra calls to PMA_ajaxResponse and added a common call to it for multiple actions. Modified the code for paginating the users table with ajax, however it is still buggy
commit 6ab286d6cad89a0f9ce50820590af6072d572c93 Author: ninadsp ninadsp16289@gmail.com Date: Sun Jun 27 03:25:57 2010 +0530
Completed the Ajax conversion for Edit User action. Converted the pagination for the users table to Ajax, still a little buggy.
commit ac7cab7160e52a710bb3a6c606efebfbfa652271 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jun 26 15:45:27 2010 +0530
Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e123e4246c5e10963f607b33f8d301d35.
commit 4214d83e123e4246c5e10963f607b33f8d301d35 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jun 26 15:43:52 2010 +0530
Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8ba2987f395eb76948a9a29c70dda2f8, reversing changes made to dcdde2f99f1fe94e3baaf41d07cea747411ca3c8.
commit c850b8be8ba2987f395eb76948a9a29c70dda2f8 Merge: dcdde2f99f1fe94e3baaf41d07cea747411ca3c8 1be2d538dfae929582b9ff6b4a6bdc643609da9e Author: ninadsp ninadsp16289@gmail.com Date: Sat Jun 26 15:38:12 2010 +0530
Merge remote branch 'origin/master'
Conflicts: po/tr.po
commit dcdde2f99f1fe94e3baaf41d07cea747411ca3c8 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 25 11:01:19 2010 +0530
Moved the jQuery script for handling Create Table action from js/db_operations.js to js/functions.js as this action is used on multiple pages.
commit 217968fb92146a174a0d842b33dbb7358e7d1f03 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 25 00:30:23 2010 +0530
Noticed a bug in the dialog close buttons. The html was not destroyed after closing, so added a .remove() call everywhere.
commit a8073a1875cb2232eeb1d13533cfe7af0045e373 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 23 11:13:10 2010 +0530
Fixed a bug with the checkAddUser call. The function is called properly now.
commit f56758e50e49a0fca98064841f0e0e710aba0314 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 23 11:04:45 2010 +0530
Added some messages for db_operations.js
commit dd1ec1c0191d461c3451c195ebf735d6ad6ac268 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 23 10:51:47 2010 +0530
Fixed the issue with the content frame not refreshing after the 'Reload Database? Y/N' dialog. When copying the database, the database is now switched with JS. Create Table action still a work in progress
commit c3d2d0fed4a1d34739d9d999ffaccff4ecb59936 Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 23 10:50:54 2010 +0530
Return the new name of the database in a rename, or the name of the copied database, so that we can switch to the database if the user wants to.
commit 9737dbc6755d98998669ec0fd118fe4322366456 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 22 13:10:40 2010 +0530
Localised the JavaScript messages. Hooked in checkAddUser() function to validate the user form. Edit User ajax call is still a work in progress
commit cf15d940cd6d8f94fbe9d25c404b4f9f1372888c Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 22 11:41:55 2010 +0530
Bug noticed by Marc Delisle in PMA_ajaxResponse fixed
commit fff89f83a85bd3f3ede1126ecda0cdb86c68ad8c Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 22 11:40:50 2010 +0530
Added strings for js/messages.php
commit a871eba3025a822c402a84614ad197b44e68d24a Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 22 11:32:45 2010 +0530
Localised strings in js/db_operations.js
commit 51dffa100facad11753902fcae91fe66cdc7541f Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 22 01:02:47 2010 +0530
Now using localized strings for all jQuery actions instead of static English strings. Added strings to js/messages.php. Yet to figure out how to localize buttons on jQueryUI dialogs.
commit 06a7736b88a9212501cdc21ffc7a522a326c095f Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 03:18:51 2010 +0530
Ajaxified Export Privileges. Added classes to Export and Edit links in the Users table
commit a7e77314afa03120dd02b0cc35154eb1fd22cd36 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 03:18:21 2010 +0530
Ajaxified Export Privileges with jQueryUI dialog
commit ce79f6cdf1bb420748a993bcf729eaa6aa9c3f5f Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 02:57:58 2010 +0530
Improved the behaviour of Reload Privileges Ajax action. Ajaxified the Revoke User action
commit 1a9526a4ff9507fec88bd03de0a395cca3ce6214 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 02:56:44 2010 +0530
Improved the behaviour for an Ajax request to Reload Privileges by using the new PMA_ajaxResponse. Modified the response for Revoke User in an Ajax request.
commit 603b6bf47b3b8eab1e936613b6294a79fa24c0a2 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 02:04:45 2010 +0530
Added the PMA_ajaxResponse function for Ajax requests that change the database charset. Required for db_operations.php
commit cb4c1100749fa72dc3e0a7e7f3749187557689f3 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 02:03:16 2010 +0530
Ajaxified Rename Database, Copy Database and Change database charset actions.
commit e9ffc7c5d5751cf20006dd77cfceec2640733316 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 01:51:44 2010 +0530
Added id's for copy database and change database charset forms. Hooked in the PMA_ajaxResponse function for change/copying a database
commit 78b39d71eaa60d3fdc7e1391c74305a008dfb0d1 Merge: 8f3c8838a1c41ba529d657322ad8b1c1af825152 e070d45aa0bc7b0fcfb9b6b28e66351a06143dfb Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 21 00:06:15 2010 +0530
Merge remote branch 'origin/master'
commit 8f3c8838a1c41ba529d657322ad8b1c1af825152 Merge: f04f154c241c81cf612dbe1904caee4c4d1a6099 0963eb36edc3e902ae12899ca306b5ce057136f3 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 18 01:51:31 2010 +0530
Merge remote branch 'origin/master'
commit f04f154c241c81cf612dbe1904caee4c4d1a6099 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 18 01:44:43 2010 +0530
Improved Truncate Table, Drop Table actions and added Ajax handlers for Drop Column and Add Primary Key actions
commit 52774d7616438ca9e86e96e56fb21ff7bc475db1 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 18 01:42:24 2010 +0530
Removed inline JavaScript calls to confirmLink and added ids to Drop Column and Add Primary Key actions
commit 8b37b825ef3c3be2ebf7503bd12980e41e6f7cf7 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jun 17 18:22:35 2010 +0530
Handled submitting of Add User form. Still need to hook in checkAddUser()
commit fd5e2dc3c115a3b642272f10163718bfd18d3bdb Author: ninadsp ninadsp16289@gmail.com Date: Thu Jun 17 18:21:03 2010 +0530
Fixed issues with submit of Add User form over Ajax. Changed the id for the Add User Form to prevent conflict for the setCheckboxes call
commit 266447bcd92eee17afae5ff243a747e70fbcb81a Author: ninadsp ninadsp16289@gmail.com Date: Thu Jun 17 00:16:13 2010 +0530
Added a function to echo a json output for an ajax request.
commit a8d6f9ff4c91f6effba521c2712fc908eb413af6 Merge: d2c6e1c5e372cba7517b1ecc376c97dc032f003a 85c00ea45b513fa7cee9d6bb9827d9fc81602141 Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 15 15:39:51 2010 +0530
Merge remote branch 'origin/master'
commit d2c6e1c5e372cba7517b1ecc376c97dc032f003a Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 15 15:16:32 2010 +0530
Improved the PMA_ajaxShowMessage() function. Now, multiple messages won't be seen at the same time
commit 0f081a843791d3d26c209b13f8b798462b44f8bf Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 15 15:06:56 2010 +0530
Removed inline JavaScript calls to confirmLink for truncate and drop table actions
commit 2986a7b1a05ad71d5a775646e512e20e522bb6bf Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 15 14:58:48 2010 +0530
Removed inline JavaScript calls to confirmLink for renaming the database, added an id to the form and submit button
commit 834b36bd6a1d8c12d683932b19805bfc1c3bb8ba Merge: 5f255406bde5d63b67806c323f8891c3295610d2 3fc1f82e3ef9bf4408786335f224aad8ad4977ae Author: ninadsp ninadsp16289@gmail.com Date: Wed Jun 9 22:49:38 2010 +0530
Merge remote branch 'origin/master'
commit 5f255406bde5d63b67806c323f8891c3295610d2 Merge: 3553df0dc2fc9d9f641b6dbb29c28827cc18137f aeb14a271ab439b0f62940049aa07edf1240f46b Author: ninadsp ninadsp16289@gmail.com Date: Tue Jun 8 00:02:50 2010 +0530
Merge remote branch 'origin/master'
commit 3553df0dc2fc9d9f641b6dbb29c28827cc18137f Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 7 02:41:46 2010 +0530
Refactored setSelectOptions with jQuery code
commit 96c0bf55119b21f0448b528ac5d9b2b6688b678c Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 7 02:13:58 2010 +0530
Refactored the setCheckboxes code with jQuery
commit 6ede5986ad0b35b2c4f3fdffb5ef5466f09a9031 Author: ninadsp ninadsp16289@gmail.com Date: Mon Jun 7 02:01:22 2010 +0530
Ajaxified Drop Table and Truncate Table actions. Refactored markAllRows and unmarkAllRows with jQuery code
commit 42de77813c7c34f2e9255c30fb6d053ed69b5454 Merge: 86558dfd96e28527316f15a1c440c4b1b9367fbb f50d6694e79bb1f8268e44123e8b6935f10a365a Author: ninadsp ninadsp16289@gmail.com Date: Sun Jun 6 20:01:39 2010 +0530
Merge remote branch 'origin/master'
commit 86558dfd96e28527316f15a1c440c4b1b9367fbb Author: ninadsp ninadsp16289@gmail.com Date: Sat Jun 5 14:57:52 2010 +0530
Created a jQuery function PMA_confirm() which uses jQueryUI's dialogs to do the same task as confirm(). Still a work in progress, the function may change. Attached the dialog and Ajax handlers to 'Drop Database' action on db_structure.php
commit 50dabaf4e7dc4f165d0fc607db6a278f1b8180a5 Author: ninadsp ninadsp16289@gmail.com Date: Sat Jun 5 14:56:08 2010 +0530
Removed the inline JavaScript confirmLinkDropDB() call and added an id "drop_db_anchor" to the tab
commit 049c90ee0ba89074b3d53a81d9c56b0e46415007 Author: ninadsp ninadsp16289@gmail.com Date: Fri Jun 4 21:27:25 2010 +0530
Edited PMA_generate_html_tab() to add the id parameter Necessary for attaching Ajax calls with jQuery to some tab links
commit 160f4314eb518afcc1eba80da9575657584b2e34 Merge: 3bb4dbd0acc962969000cd2d0dab230d858dc28c 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 Author: ninadsp ninadsp16289@gmail.com Date: Thu Jun 3 22:34:52 2010 +0530
Merge remote branch 'origin/master'
commit 3bb4dbd0acc962969000cd2d0dab230d858dc28c Author: ninadsp ninadsp16289@gmail.com Date: Sun May 30 23:27:13 2010 +0530
Using $().live instead of $().click to bind event handlers
commit d195582cf808d453827c5c23afa023e0817cabb2 Author: ninadsp ninadsp16289@gmail.com Date: Sat May 29 18:59:27 2010 +0530
Refactored addClass() and removeClass() to use jQuery's $.addClass() and $.removeClass()
commit bd139f2465eac695f9bab9ccae5751383ec1e17f Author: ninadsp ninadsp16289@gmail.com Date: Sat May 29 01:44:51 2010 +0530
document.write() conflicts with jQuery. Instead, appending Inline Edit to parent div (class="tools") with $.append(), the recommended method. $('body').append() is executed late, and hence, not used.
commit d5b50587e7af9a3e506acc84d7fe4336adf0a38d Author: ninadsp ninadsp16289@gmail.com Date: Sat May 29 01:40:05 2010 +0530
Revert "document.write conflicts with jQuery. Use $(body).append() instead at"
This reverts commit 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf.
commit 20fce4cdcde18adc09c7ac3035d8cb28e4b2d6cf Author: ninadsp ninadsp16289@gmail.com Date: Sat May 29 01:28:57 2010 +0530
document.write conflicts with jQuery. Use $(body).append() instead at the same place to inject inline HTML with JavaScript.
commit d775f341a4791c108dab4839d094b4f654d97f32 Author: ninadsp ninadsp16289@gmail.com Date: Fri May 28 13:06:51 2010 +0530
Added new js files for Ajax events on db_operations.php and tbl_operations.php
commit 6276ad45a6a5ab2f14e8b33f8a0db5504bbe4e16 Author: ninadsp ninadsp16289@gmail.com Date: Fri May 28 13:05:04 2010 +0530
Suppress the output if in an Ajax request
commit ed3e6a2925fb2fda00249b94b28c20d992f89350 Author: ninadsp ninadsp16289@gmail.com Date: Thu May 27 20:27:55 2010 +0530
Used the correct method, PMA_showMessage() instead of $message->display()
commit d14abc17ca31bf9554afc5d26ceb921b4d612974 Author: ninadsp ninadsp16289@gmail.com Date: Wed May 26 18:27:21 2010 +0530
Attached Ajax event handler to Reload Privileges
commit 8a81f9111b469dfedd34a56ec7b9b8be9919c719 Author: ninadsp ninadsp16289@gmail.com Date: Wed May 26 11:47:14 2010 +0530
Added PMA_ajaxInsertResponse and PMA_ajaxShowMessage. Yet to test PMA_ajaxInsertResponse
commit 0e910967b09f31f0bb9ca89c1403bb578a96e4b7 Author: ninadsp ninadsp16289@gmail.com Date: Wed May 26 11:46:08 2010 +0530
Attached jQuery event handlers to Add a New User using jQueryUI Dialog. Work in progress, still need to handle submission of form
commit 5ab3a60612ebf397406636503a59d6926ee63fff Author: ninadsp ninadsp16289@gmail.com Date: Wed May 26 11:38:58 2010 +0530
Header and Footr output is suppressed if it is an Ajax request
commit 0a417e3c2af9a2fea00005508a457d4ebf33ba3c Merge: 38ac78e3baa6e925e6ef023a4196ae1d323bffc9 8f03bd5517039cf0051ec74e3700ac5ccfcbd433 Author: ninadsp ninadsp16289@gmail.com Date: Mon May 24 18:34:47 2010 +0530
Merge branch 'master' into ajax
commit 38ac78e3baa6e925e6ef023a4196ae1d323bffc9 Author: ninadsp ninadsp16289@gmail.com Date: Mon May 24 18:32:42 2010 +0530
merging changes from origin
commit bed1948d044f0e5d9125d3c905e8390d8a75b0de Author: ninadsp ninadsp16289@gmail.com Date: Sun May 23 01:22:01 2010 +0530
testing git setup - no major change made in code yet only added a few comments
-----------------------------------------------------------------------
Summary of changes: db_create.php | 81 +++ db_operations.php | 26 +- db_search.php | 21 +- db_sql.php | 3 + db_structure.php | 13 +- db_tracking.php | 21 +- favicon.ico | Bin 18902 -> 18902 bytes js/colorpicker/images/blank.gif | Bin 49 -> 49 bytes js/colorpicker/images/colorpicker_background.png | Bin 1897 -> 1897 bytes js/colorpicker/images/colorpicker_hex.png | Bin 532 -> 532 bytes js/colorpicker/images/colorpicker_hsb_b.png | Bin 970 -> 970 bytes js/colorpicker/images/colorpicker_hsb_h.png | Bin 1012 -> 1012 bytes js/colorpicker/images/colorpicker_hsb_s.png | Bin 1171 -> 1171 bytes js/colorpicker/images/colorpicker_indic.gif | Bin 86 -> 86 bytes js/colorpicker/images/colorpicker_overlay.png | Bin 10355 -> 10355 bytes js/colorpicker/images/colorpicker_rgb_b.png | Bin 970 -> 970 bytes js/colorpicker/images/colorpicker_rgb_g.png | Bin 1069 -> 1069 bytes js/colorpicker/images/colorpicker_rgb_r.png | Bin 1066 -> 1066 bytes js/colorpicker/images/colorpicker_select.gif | Bin 78 -> 78 bytes js/colorpicker/images/colorpicker_submit.png | Bin 984 -> 984 bytes js/colorpicker/images/custom_background.png | Bin 1916 -> 1916 bytes js/colorpicker/images/custom_hex.png | Bin 562 -> 562 bytes js/colorpicker/images/custom_hsb_b.png | Bin 1097 -> 1097 bytes js/colorpicker/images/custom_hsb_h.png | Bin 970 -> 970 bytes js/colorpicker/images/custom_hsb_s.png | Bin 1168 -> 1168 bytes js/colorpicker/images/custom_indic.gif | Bin 86 -> 86 bytes js/colorpicker/images/custom_rgb_b.png | Bin 1008 -> 1008 bytes js/colorpicker/images/custom_rgb_g.png | Bin 1069 -> 1069 bytes js/colorpicker/images/custom_rgb_r.png | Bin 1018 -> 1018 bytes js/colorpicker/images/custom_submit.png | Bin 997 -> 997 bytes js/colorpicker/images/select.png | Bin 506 -> 506 bytes js/colorpicker/images/select2.png | Bin 518 -> 518 bytes js/colorpicker/images/slider.png | Bin 315 -> 315 bytes js/common.js | 6 +- js/db_operations.js | 127 ++++ js/db_search.js | 34 + js/db_structure.js | 224 +++++++ js/functions.js | 657 ++++++++++++++++++-- js/messages.php | 40 ++ js/server_privileges.js | 373 +++++++++++- js/sql.js | 630 +++++++++++++++++++ js/tbl_change.js | 154 +++++- js/tbl_operations.js | 21 + js/tbl_select.js | 32 + js/tbl_structure.js | 133 ++++ libraries/Index.class.php | 6 +- libraries/common.inc.php | 31 + libraries/common.lib.php | 104 +++- libraries/db_common.inc.php | 9 + libraries/db_events.inc.php | 2 +- libraries/db_info.inc.php | 5 +- libraries/db_routines.inc.php | 6 +- libraries/display_change_password.lib.php | 2 +- libraries/display_create_database.lib.php | 2 +- libraries/display_create_table.lib.php | 3 +- libraries/display_tbl.lib.php | 77 ++- libraries/display_tbl_links.lib.php | 11 +- libraries/footer.inc.php | 6 + libraries/header.inc.php | 320 +++++----- libraries/server_links.inc.php | 191 +++--- libraries/sql_query_form.lib.php | 3 + libraries/tbl_properties.inc.php | 2 +- libraries/tbl_triggers.lib.php | 2 +- libraries/tcpdf/font/dejavusans-bold.ctg.z | Bin 8509 -> 8509 bytes libraries/tcpdf/font/dejavusans-bold.z | Bin 263826 -> 263826 bytes libraries/tcpdf/font/dejavusans.ctg.z | Bin 8517 -> 8517 bytes libraries/tcpdf/font/dejavusans.z | Bin 279448 -> 279448 bytes libraries/tcpdf/font/dejavuserif-bold.ctg.z | Bin 3756 -> 3756 bytes libraries/tcpdf/font/dejavuserif-bold.z | Bin 109155 -> 109155 bytes libraries/tcpdf/font/dejavuserif.ctg.z | Bin 3756 -> 3756 bytes libraries/tcpdf/font/dejavuserif.z | Bin 116258 -> 116258 bytes main.php | 9 +- pmd/images/2leftarrow.png | Bin 881 -> 881 bytes pmd/images/2leftarrow_m.png | Bin 867 -> 867 bytes pmd/images/2rightarrow.png | Bin 897 -> 897 bytes pmd/images/2rightarrow_m.png | Bin 865 -> 865 bytes pmd/images/ang_direct.png | Bin 795 -> 795 bytes pmd/images/bord.png | Bin 75 -> 75 bytes pmd/images/bottom.png | Bin 855 -> 855 bytes pmd/images/def.png | Bin 742 -> 742 bytes pmd/images/display_field.png | Bin 786 -> 786 bytes pmd/images/downarrow1.png | Bin 880 -> 880 bytes pmd/images/downarrow2.png | Bin 893 -> 893 bytes pmd/images/downarrow2_m.png | Bin 871 -> 871 bytes pmd/images/exec.png | Bin 854 -> 854 bytes pmd/images/exec_small.png | Bin 197 -> 197 bytes pmd/images/favicon.ico | Bin 1150 -> 1150 bytes pmd/images/grid.png | Bin 803 -> 803 bytes pmd/images/help.png | Bin 876 -> 876 bytes pmd/images/help_relation.png | Bin 1355 -> 1355 bytes pmd/images/pdf.png | Bin 946 -> 946 bytes pmd/images/relation.png | Bin 324 -> 324 bytes pmd/images/reload.png | Bin 945 -> 945 bytes pmd/images/resize.png | Bin 140 -> 140 bytes pmd/images/rightarrow1.png | Bin 837 -> 837 bytes pmd/images/rightarrow2.png | Bin 878 -> 878 bytes pmd/images/save.png | Bin 580 -> 580 bytes pmd/images/table.png | Bin 171 -> 171 bytes pmd/images/uparrow2_m.png | Bin 866 -> 866 bytes pmd/styles/default/images/1.png | Bin 97 -> 97 bytes pmd/styles/default/images/2.png | Bin 172 -> 172 bytes pmd/styles/default/images/3.png | Bin 171 -> 171 bytes pmd/styles/default/images/4.png | Bin 157 -> 157 bytes pmd/styles/default/images/5.png | Bin 84 -> 84 bytes pmd/styles/default/images/6.png | Bin 93 -> 93 bytes pmd/styles/default/images/7.png | Bin 95 -> 95 bytes pmd/styles/default/images/8.png | Bin 84 -> 84 bytes pmd/styles/default/images/FieldKey_small.png | Bin 267 -> 267 bytes pmd/styles/default/images/Field_small.png | Bin 293 -> 293 bytes pmd/styles/default/images/Field_small_char.png | Bin 171 -> 171 bytes pmd/styles/default/images/Field_small_date.png | Bin 154 -> 154 bytes pmd/styles/default/images/Field_small_int.png | Bin 168 -> 168 bytes pmd/styles/default/images/Header.png | Bin 145 -> 145 bytes pmd/styles/default/images/Header_Linked.png | Bin 125 -> 125 bytes pmd/styles/default/images/left_panel_butt.png | Bin 129 -> 129 bytes pmd/styles/default/images/left_panel_tab.png | Bin 133 -> 133 bytes pmd/styles/default/images/small_tab.png | Bin 179 -> 179 bytes pmd/styles/default/images/top_panel.png | Bin 171 -> 171 bytes scripts/google-javascript-compiler/compiler.jar | Bin 4337904 -> 4337904 bytes server_databases.php | 2 +- server_privileges.php | 192 +++++-- server_sql.php | 3 + sql.php | 212 ++++++- tbl_alter.php | 4 + tbl_change.php | 9 +- tbl_create.php | 96 +++ tbl_replace.php | 6 + tbl_select.php | 5 +- tbl_sql.php | 3 + tbl_structure.php | 10 +- themes/darkblue_orange/css/theme_right.css.php | 29 + themes/darkblue_orange/img/ajax_clock_small.gif | Bin 1849 -> 1849 bytes themes/darkblue_orange/img/arrow_ltr.png | Bin 277 -> 277 bytes themes/darkblue_orange/img/arrow_rtl.png | Bin 278 -> 278 bytes themes/darkblue_orange/img/asc_order.png | Bin 124 -> 124 bytes themes/darkblue_orange/img/b_bookmark.png | Bin 372 -> 372 bytes themes/darkblue_orange/img/b_browse.png | Bin 265 -> 265 bytes themes/darkblue_orange/img/b_calendar.png | Bin 308 -> 308 bytes themes/darkblue_orange/img/b_comment.png | Bin 552 -> 552 bytes themes/darkblue_orange/img/b_dbstatistics.png | Bin 263 -> 263 bytes themes/darkblue_orange/img/b_deltbl.png | Bin 364 -> 364 bytes themes/darkblue_orange/img/b_docs.png | Bin 292 -> 292 bytes themes/darkblue_orange/img/b_docsql.png | Bin 283 -> 283 bytes themes/darkblue_orange/img/b_drop.png | Bin 311 -> 311 bytes themes/darkblue_orange/img/b_edit.png | Bin 451 -> 451 bytes themes/darkblue_orange/img/b_empty.png | Bin 298 -> 298 bytes themes/darkblue_orange/img/b_engine.png | Bin 362 -> 362 bytes themes/darkblue_orange/img/b_export.png | Bin 313 -> 313 bytes themes/darkblue_orange/img/b_firstpage.png | Bin 238 -> 238 bytes themes/darkblue_orange/img/b_ftext.png | Bin 277 -> 277 bytes themes/darkblue_orange/img/b_help.png | Bin 229 -> 229 bytes themes/darkblue_orange/img/b_home.png | Bin 370 -> 370 bytes themes/darkblue_orange/img/b_import.png | Bin 310 -> 310 bytes themes/darkblue_orange/img/b_index.png | Bin 315 -> 315 bytes themes/darkblue_orange/img/b_info.png | Bin 234 -> 234 bytes themes/darkblue_orange/img/b_insrow.png | Bin 283 -> 283 bytes themes/darkblue_orange/img/b_lastpage.png | Bin 236 -> 236 bytes themes/darkblue_orange/img/b_minus.png | Bin 183 -> 183 bytes themes/darkblue_orange/img/b_newdb.png | Bin 408 -> 408 bytes themes/darkblue_orange/img/b_newtbl.png | Bin 409 -> 409 bytes themes/darkblue_orange/img/b_nextpage.png | Bin 221 -> 221 bytes themes/darkblue_orange/img/b_pdfdoc.png | Bin 298 -> 298 bytes themes/darkblue_orange/img/b_plus.png | Bin 185 -> 185 bytes themes/darkblue_orange/img/b_prevpage.png | Bin 225 -> 225 bytes themes/darkblue_orange/img/b_primary.png | Bin 416 -> 416 bytes themes/darkblue_orange/img/b_print.png | Bin 574 -> 574 bytes themes/darkblue_orange/img/b_props.png | Bin 294 -> 294 bytes themes/darkblue_orange/img/b_relations.png | Bin 280 -> 280 bytes themes/darkblue_orange/img/b_save.png | Bin 385 -> 385 bytes themes/darkblue_orange/img/b_sbrowse.png | Bin 197 -> 197 bytes themes/darkblue_orange/img/b_sdb.png | Bin 232 -> 232 bytes themes/darkblue_orange/img/b_search.png | Bin 605 -> 605 bytes themes/darkblue_orange/img/b_selboard.png | Bin 274 -> 274 bytes themes/darkblue_orange/img/b_select.png | Bin 540 -> 540 bytes themes/darkblue_orange/img/b_snewtbl.png | Bin 272 -> 272 bytes themes/darkblue_orange/img/b_sql.png | Bin 322 -> 322 bytes themes/darkblue_orange/img/b_sqldoc.png | Bin 290 -> 290 bytes themes/darkblue_orange/img/b_sqlhelp.png | Bin 287 -> 287 bytes themes/darkblue_orange/img/b_tblanalyse.png | Bin 296 -> 296 bytes themes/darkblue_orange/img/b_tblexport.png | Bin 283 -> 283 bytes themes/darkblue_orange/img/b_tblimport.png | Bin 280 -> 280 bytes themes/darkblue_orange/img/b_tblops.png | Bin 345 -> 345 bytes themes/darkblue_orange/img/b_tbloptimize.png | Bin 300 -> 300 bytes themes/darkblue_orange/img/b_tipp.png | Bin 308 -> 308 bytes themes/darkblue_orange/img/b_unique.png | Bin 281 -> 281 bytes themes/darkblue_orange/img/b_usradd.png | Bin 523 -> 523 bytes themes/darkblue_orange/img/b_usrcheck.png | Bin 400 -> 400 bytes themes/darkblue_orange/img/b_usrdrop.png | Bin 438 -> 438 bytes themes/darkblue_orange/img/b_usredit.png | Bin 493 -> 493 bytes themes/darkblue_orange/img/b_usrlist.png | Bin 401 -> 401 bytes themes/darkblue_orange/img/b_view.png | Bin 885 -> 885 bytes themes/darkblue_orange/img/b_views.png | Bin 477 -> 477 bytes themes/darkblue_orange/img/bd_browse.png | Bin 265 -> 265 bytes themes/darkblue_orange/img/bd_deltbl.png | Bin 424 -> 424 bytes themes/darkblue_orange/img/bd_drop.png | Bin 337 -> 337 bytes themes/darkblue_orange/img/bd_empty.png | Bin 298 -> 298 bytes themes/darkblue_orange/img/bd_firstpage.png | Bin 238 -> 238 bytes themes/darkblue_orange/img/bd_ftext.png | Bin 277 -> 277 bytes themes/darkblue_orange/img/bd_index.png | Bin 315 -> 315 bytes themes/darkblue_orange/img/bd_insrow.png | Bin 347 -> 347 bytes themes/darkblue_orange/img/bd_lastpage.png | Bin 236 -> 236 bytes themes/darkblue_orange/img/bd_nextpage.png | Bin 221 -> 221 bytes themes/darkblue_orange/img/bd_prevpage.png | Bin 225 -> 225 bytes themes/darkblue_orange/img/bd_primary.png | Bin 389 -> 389 bytes themes/darkblue_orange/img/bd_sbrowse.png | Bin 197 -> 197 bytes themes/darkblue_orange/img/bd_select.png | Bin 524 -> 524 bytes themes/darkblue_orange/img/bd_unique.png | Bin 287 -> 287 bytes themes/darkblue_orange/img/error.ico | Bin 318 -> 318 bytes themes/darkblue_orange/img/eye.png | Bin 750 -> 750 bytes themes/darkblue_orange/img/item.png | Bin 206 -> 206 bytes themes/darkblue_orange/img/item_ltr.png | Bin 173 -> 173 bytes themes/darkblue_orange/img/item_rtl.png | Bin 173 -> 173 bytes themes/darkblue_orange/img/logo_left.png | Bin 6854 -> 6854 bytes themes/darkblue_orange/img/logo_right.png | Bin 5644 -> 5644 bytes themes/darkblue_orange/img/new_data.jpg | Bin 1925 -> 1925 bytes themes/darkblue_orange/img/new_data_hovered.jpg | Bin 1558 -> 1558 bytes themes/darkblue_orange/img/new_data_selected.jpg | Bin 1450 -> 1450 bytes .../img/new_data_selected_hovered.jpg | Bin 1456 -> 1456 bytes themes/darkblue_orange/img/new_struct.jpg | Bin 1118 -> 1118 bytes themes/darkblue_orange/img/new_struct_hovered.jpg | Bin 1643 -> 1643 bytes themes/darkblue_orange/img/new_struct_selected.jpg | Bin 1431 -> 1431 bytes .../img/new_struct_selected_hovered.jpg | Bin 1463 -> 1463 bytes themes/darkblue_orange/img/php_sym.png | Bin 249 -> 249 bytes themes/darkblue_orange/img/pma_logo2.png | Bin 1837 -> 1837 bytes themes/darkblue_orange/img/s_asc.png | Bin 213 -> 213 bytes themes/darkblue_orange/img/s_asci.png | Bin 254 -> 254 bytes themes/darkblue_orange/img/s_attention.png | Bin 247 -> 247 bytes themes/darkblue_orange/img/s_cancel.png | Bin 449 -> 449 bytes themes/darkblue_orange/img/s_cancel2.png | Bin 234 -> 234 bytes themes/darkblue_orange/img/s_db.png | Bin 285 -> 285 bytes themes/darkblue_orange/img/s_desc.png | Bin 221 -> 221 bytes themes/darkblue_orange/img/s_error.png | Bin 272 -> 272 bytes themes/darkblue_orange/img/s_error2.png | Bin 237 -> 237 bytes themes/darkblue_orange/img/s_fulltext.png | Bin 308 -> 308 bytes themes/darkblue_orange/img/s_host.png | Bin 316 -> 316 bytes themes/darkblue_orange/img/s_info.png | Bin 247 -> 247 bytes themes/darkblue_orange/img/s_lang.png | Bin 422 -> 422 bytes themes/darkblue_orange/img/s_loggoff.png | Bin 262 -> 262 bytes themes/darkblue_orange/img/s_notice.png | Bin 247 -> 247 bytes themes/darkblue_orange/img/s_okay.png | Bin 542 -> 542 bytes themes/darkblue_orange/img/s_partialtext.png | Bin 318 -> 318 bytes themes/darkblue_orange/img/s_passwd.png | Bin 505 -> 505 bytes themes/darkblue_orange/img/s_process.png | Bin 362 -> 362 bytes themes/darkblue_orange/img/s_really.png | Bin 229 -> 229 bytes themes/darkblue_orange/img/s_reload.png | Bin 245 -> 245 bytes themes/darkblue_orange/img/s_replication.png | Bin 447 -> 447 bytes themes/darkblue_orange/img/s_rights.png | Bin 512 -> 512 bytes themes/darkblue_orange/img/s_status.png | Bin 313 -> 313 bytes themes/darkblue_orange/img/s_success.png | Bin 612 -> 612 bytes themes/darkblue_orange/img/s_sync.png | Bin 551 -> 551 bytes themes/darkblue_orange/img/s_tbl.png | Bin 252 -> 252 bytes themes/darkblue_orange/img/s_theme.png | Bin 737 -> 737 bytes themes/darkblue_orange/img/s_vars.png | Bin 306 -> 306 bytes themes/darkblue_orange/img/s_views.png | Bin 368 -> 368 bytes themes/darkblue_orange/img/s_warn.png | Bin 261 -> 261 bytes themes/darkblue_orange/img/spacer.png | Bin 153 -> 153 bytes themes/darkblue_orange/img/tbl_header.png | Bin 832 -> 832 bytes themes/darkblue_orange/img/tbl_th.png | Bin 593 -> 593 bytes themes/darkblue_orange/img/window-new.png | Bin 583 -> 583 bytes .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes .../jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes themes/darkblue_orange/screen.png | Bin 18697 -> 18697 bytes themes/original/css/theme_right.css.php | 29 + themes/original/img/ajax_clock_small.gif | Bin 1849 -> 1849 bytes themes/original/img/arrow_ltr.png | Bin 277 -> 277 bytes themes/original/img/arrow_rtl.png | Bin 278 -> 278 bytes themes/original/img/asc_order.png | Bin 124 -> 124 bytes themes/original/img/b_bookmark.png | Bin 372 -> 372 bytes themes/original/img/b_browse.png | Bin 265 -> 265 bytes themes/original/img/b_calendar.png | Bin 308 -> 308 bytes themes/original/img/b_comment.png | Bin 552 -> 552 bytes themes/original/img/b_dbstatistics.png | Bin 263 -> 263 bytes themes/original/img/b_deltbl.png | Bin 364 -> 364 bytes themes/original/img/b_docs.png | Bin 292 -> 292 bytes themes/original/img/b_docsql.png | Bin 283 -> 283 bytes themes/original/img/b_drop.png | Bin 311 -> 311 bytes themes/original/img/b_edit.png | Bin 451 -> 451 bytes themes/original/img/b_empty.png | Bin 298 -> 298 bytes themes/original/img/b_engine.png | Bin 362 -> 362 bytes themes/original/img/b_export.png | Bin 313 -> 313 bytes themes/original/img/b_firstpage.png | Bin 238 -> 238 bytes themes/original/img/b_ftext.png | Bin 277 -> 277 bytes themes/original/img/b_help.png | Bin 229 -> 229 bytes themes/original/img/b_home.png | Bin 370 -> 370 bytes themes/original/img/b_import.png | Bin 310 -> 310 bytes themes/original/img/b_index.png | Bin 315 -> 315 bytes themes/original/img/b_info.png | Bin 234 -> 234 bytes themes/original/img/b_insrow.png | Bin 283 -> 283 bytes themes/original/img/b_lastpage.png | Bin 236 -> 236 bytes themes/original/img/b_minus.png | Bin 183 -> 183 bytes themes/original/img/b_newdb.png | Bin 408 -> 408 bytes themes/original/img/b_newtbl.png | Bin 409 -> 409 bytes themes/original/img/b_nextpage.png | Bin 221 -> 221 bytes themes/original/img/b_pdfdoc.png | Bin 298 -> 298 bytes themes/original/img/b_plus.png | Bin 185 -> 185 bytes themes/original/img/b_prevpage.png | Bin 225 -> 225 bytes themes/original/img/b_primary.png | Bin 416 -> 416 bytes themes/original/img/b_print.png | Bin 574 -> 574 bytes themes/original/img/b_props.png | Bin 294 -> 294 bytes themes/original/img/b_relations.png | Bin 280 -> 280 bytes themes/original/img/b_save.png | Bin 385 -> 385 bytes themes/original/img/b_sbrowse.png | Bin 197 -> 197 bytes themes/original/img/b_sdb.png | Bin 232 -> 232 bytes themes/original/img/b_search.png | Bin 605 -> 605 bytes themes/original/img/b_selboard.png | Bin 274 -> 274 bytes themes/original/img/b_select.png | Bin 540 -> 540 bytes themes/original/img/b_snewtbl.png | Bin 272 -> 272 bytes themes/original/img/b_sql.png | Bin 322 -> 322 bytes themes/original/img/b_sqldoc.png | Bin 290 -> 290 bytes themes/original/img/b_sqlhelp.png | Bin 287 -> 287 bytes themes/original/img/b_tblanalyse.png | Bin 296 -> 296 bytes themes/original/img/b_tblexport.png | Bin 283 -> 283 bytes themes/original/img/b_tblimport.png | Bin 280 -> 280 bytes themes/original/img/b_tblops.png | Bin 345 -> 345 bytes themes/original/img/b_tbloptimize.png | Bin 300 -> 300 bytes themes/original/img/b_tipp.png | Bin 308 -> 308 bytes themes/original/img/b_unique.png | Bin 281 -> 281 bytes themes/original/img/b_usradd.png | Bin 523 -> 523 bytes themes/original/img/b_usrcheck.png | Bin 400 -> 400 bytes themes/original/img/b_usrdrop.png | Bin 438 -> 438 bytes themes/original/img/b_usredit.png | Bin 493 -> 493 bytes themes/original/img/b_usrlist.png | Bin 401 -> 401 bytes themes/original/img/b_view.png | Bin 885 -> 885 bytes themes/original/img/b_views.png | Bin 477 -> 477 bytes themes/original/img/bd_browse.png | Bin 265 -> 265 bytes themes/original/img/bd_deltbl.png | Bin 424 -> 424 bytes themes/original/img/bd_drop.png | Bin 337 -> 337 bytes themes/original/img/bd_empty.png | Bin 298 -> 298 bytes themes/original/img/bd_firstpage.png | Bin 238 -> 238 bytes themes/original/img/bd_ftext.png | Bin 277 -> 277 bytes themes/original/img/bd_index.png | Bin 315 -> 315 bytes themes/original/img/bd_insrow.png | Bin 347 -> 347 bytes themes/original/img/bd_lastpage.png | Bin 236 -> 236 bytes themes/original/img/bd_nextpage.png | Bin 221 -> 221 bytes themes/original/img/bd_prevpage.png | Bin 225 -> 225 bytes themes/original/img/bd_primary.png | Bin 389 -> 389 bytes themes/original/img/bd_sbrowse.png | Bin 197 -> 197 bytes themes/original/img/bd_select.png | Bin 524 -> 524 bytes themes/original/img/bd_unique.png | Bin 287 -> 287 bytes themes/original/img/docs_menu_bg.png | Bin 148 -> 148 bytes themes/original/img/error.ico | Bin 318 -> 318 bytes themes/original/img/eye.png | Bin 750 -> 750 bytes themes/original/img/eye_grey.png | Bin 550 -> 550 bytes themes/original/img/item.png | Bin 206 -> 206 bytes themes/original/img/item_ltr.png | Bin 173 -> 173 bytes themes/original/img/item_rtl.png | Bin 173 -> 173 bytes themes/original/img/logo_left.png | Bin 6854 -> 6854 bytes themes/original/img/logo_right.png | Bin 5658 -> 5658 bytes themes/original/img/new_data.jpg | Bin 1925 -> 1925 bytes themes/original/img/new_data_hovered.jpg | Bin 1558 -> 1558 bytes themes/original/img/new_data_selected.jpg | Bin 1450 -> 1450 bytes themes/original/img/new_data_selected_hovered.jpg | Bin 1456 -> 1456 bytes themes/original/img/new_struct.jpg | Bin 1118 -> 1118 bytes themes/original/img/new_struct_hovered.jpg | Bin 1643 -> 1643 bytes themes/original/img/new_struct_selected.jpg | Bin 1431 -> 1431 bytes .../original/img/new_struct_selected_hovered.jpg | Bin 1463 -> 1463 bytes themes/original/img/php_sym.png | Bin 249 -> 249 bytes themes/original/img/pma_logo2.png | Bin 1837 -> 1837 bytes themes/original/img/s_asc.png | Bin 213 -> 213 bytes themes/original/img/s_asci.png | Bin 254 -> 254 bytes themes/original/img/s_attention.png | Bin 247 -> 247 bytes themes/original/img/s_cancel.png | Bin 449 -> 449 bytes themes/original/img/s_cancel2.png | Bin 234 -> 234 bytes themes/original/img/s_db.png | Bin 285 -> 285 bytes themes/original/img/s_desc.png | Bin 221 -> 221 bytes themes/original/img/s_error.png | Bin 272 -> 272 bytes themes/original/img/s_error2.png | Bin 237 -> 237 bytes themes/original/img/s_fulltext.png | Bin 308 -> 308 bytes themes/original/img/s_host.png | Bin 316 -> 316 bytes themes/original/img/s_info.png | Bin 247 -> 247 bytes themes/original/img/s_lang.png | Bin 422 -> 422 bytes themes/original/img/s_loggoff.png | Bin 262 -> 262 bytes themes/original/img/s_notice.png | Bin 247 -> 247 bytes themes/original/img/s_okay.png | Bin 542 -> 542 bytes themes/original/img/s_partialtext.png | Bin 318 -> 318 bytes themes/original/img/s_passwd.png | Bin 505 -> 505 bytes themes/original/img/s_process.png | Bin 362 -> 362 bytes themes/original/img/s_really.png | Bin 229 -> 229 bytes themes/original/img/s_reload.png | Bin 245 -> 245 bytes themes/original/img/s_replication.png | Bin 447 -> 447 bytes themes/original/img/s_rights.png | Bin 512 -> 512 bytes themes/original/img/s_status.png | Bin 313 -> 313 bytes themes/original/img/s_success.png | Bin 612 -> 612 bytes themes/original/img/s_sync.png | Bin 551 -> 551 bytes themes/original/img/s_tbl.png | Bin 252 -> 252 bytes themes/original/img/s_theme.png | Bin 737 -> 737 bytes themes/original/img/s_vars.png | Bin 306 -> 306 bytes themes/original/img/s_views.png | Bin 368 -> 368 bytes themes/original/img/s_warn.png | Bin 261 -> 261 bytes themes/original/img/spacer.png | Bin 153 -> 153 bytes themes/original/img/vertical_line.png | Bin 83 -> 83 bytes themes/original/img/window-new.png | Bin 583 -> 583 bytes .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes .../jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes .../jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes themes/original/screen.png | Bin 23699 -> 23699 bytes user_password.php | 16 +- 418 files changed, 3563 insertions(+), 440 deletions(-) mode change 100644 => 100755 CREDITS mode change 100644 => 100755 ChangeLog mode change 100644 => 100755 Documentation.html mode change 100644 => 100755 INSTALL mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README mode change 100644 => 100755 README.VENDOR mode change 100644 => 100755 TODO mode change 100644 => 100755 browse_foreigners.php mode change 100644 => 100755 bs_disp_as_mime_type.php mode change 100644 => 100755 bs_play_media.php mode change 100644 => 100755 changelog.php mode change 100644 => 100755 chk_rel.php mode change 100644 => 100755 config.sample.inc.php mode change 100644 => 100755 contrib/README mode change 100644 => 100755 contrib/htaccess mode change 100644 => 100755 contrib/packaging/Fedora/phpMyAdmin-http.conf mode change 100644 => 100755 contrib/packaging/Fedora/phpMyAdmin.spec mode change 100644 => 100755 contrib/swekey.sample.conf mode change 100644 => 100755 db_create.php mode change 100644 => 100755 db_datadict.php mode change 100644 => 100755 db_export.php mode change 100644 => 100755 db_import.php mode change 100644 => 100755 db_operations.php mode change 100644 => 100755 db_printview.php mode change 100644 => 100755 db_qbe.php mode change 100644 => 100755 db_search.php mode change 100644 => 100755 db_sql.php mode change 100644 => 100755 db_structure.php mode change 100644 => 100755 db_tracking.php mode change 100644 => 100755 docs.css mode change 100644 => 100755 error.php mode change 100644 => 100755 export.php mode change 100644 => 100755 favicon.ico mode change 100644 => 100755 import.php mode change 100644 => 100755 import_status.php mode change 100644 => 100755 index.php mode change 100644 => 100755 js/colorpicker/css/colorpicker.css mode change 100644 => 100755 js/colorpicker/css/layout.css mode change 100644 => 100755 js/colorpicker/images/blank.gif mode change 100644 => 100755 js/colorpicker/images/colorpicker_background.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_hex.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_b.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_h.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_hsb_s.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_indic.gif mode change 100644 => 100755 js/colorpicker/images/colorpicker_overlay.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_b.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_g.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_rgb_r.png mode change 100644 => 100755 js/colorpicker/images/colorpicker_select.gif mode change 100644 => 100755 js/colorpicker/images/colorpicker_submit.png mode change 100644 => 100755 js/colorpicker/images/custom_background.png mode change 100644 => 100755 js/colorpicker/images/custom_hex.png mode change 100644 => 100755 js/colorpicker/images/custom_hsb_b.png mode change 100644 => 100755 js/colorpicker/images/custom_hsb_h.png mode change 100644 => 100755 js/colorpicker/images/custom_hsb_s.png mode change 100644 => 100755 js/colorpicker/images/custom_indic.gif mode change 100644 => 100755 js/colorpicker/images/custom_rgb_b.png mode change 100644 => 100755 js/colorpicker/images/custom_rgb_g.png mode change 100644 => 100755 js/colorpicker/images/custom_rgb_r.png mode change 100644 => 100755 js/colorpicker/images/custom_submit.png mode change 100644 => 100755 js/colorpicker/images/select.png mode change 100644 => 100755 js/colorpicker/images/select2.png mode change 100644 => 100755 js/colorpicker/images/slider.png mode change 100644 => 100755 js/colorpicker/js/colorpicker.js mode change 100644 => 100755 js/common.js mode change 100644 => 100755 js/cross_framing_protection.js create mode 100644 js/db_operations.js create mode 100644 js/db_search.js create mode 100644 js/db_structure.js mode change 100644 => 100755 js/dom-drag.js mode change 100644 => 100755 js/functions.js mode change 100644 => 100755 js/indexes.js mode change 100644 => 100755 js/jquery/jquery-1.4.2.js mode change 100644 => 100755 js/jquery/jquery-ui-1.8.custom.js mode change 100644 => 100755 js/jquery/jquery.json-2.2.js mode change 100644 => 100755 js/jquery/timepicker.js mode change 100644 => 100755 js/keyhandler.js mode change 100644 => 100755 js/main_custom_color.js mode change 100644 => 100755 js/messages.php mode change 100644 => 100755 js/navigation.js mode change 100644 => 100755 js/querywindow.js mode change 100644 => 100755 js/replication.js mode change 100644 => 100755 js/server_privileges.js mode change 100644 => 100755 js/server_synchronize.js create mode 100644 js/sql.js mode change 100644 => 100755 js/tbl_change.js create mode 100644 js/tbl_operations.js mode change 100644 => 100755 js/tbl_relation.js create mode 100644 js/tbl_select.js create mode 100644 js/tbl_structure.js mode change 100644 => 100755 js/update-location.js mode change 100644 => 100755 libraries/.htaccess mode change 100644 => 100755 libraries/Config.class.php mode change 100644 => 100755 libraries/Error.class.php mode change 100644 => 100755 libraries/Error_Handler.class.php mode change 100644 => 100755 libraries/File.class.php mode change 100644 => 100755 libraries/Index.class.php mode change 100644 => 100755 libraries/List.class.php mode change 100644 => 100755 libraries/List_Database.class.php mode change 100644 => 100755 libraries/Message.class.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Autoloader.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Exception.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Function.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/Functions.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DataType.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DataValidation.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Comment.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/DocumentProperties.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/DocumentSecurity.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/HashTable.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/IComparable.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/IOFactory.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/NamedRange.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/CSV.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel2007.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel5.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/IReader.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Reader/Serialized.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/ReferenceHelper.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/ITextElement.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/Run.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/RichText/TextElement.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Date.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Drawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Excel5.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/File.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/Font.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/OLERead.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/String.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Alignment.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Border.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Borders.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Color.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Conditional.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Fill.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Font.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/NumberFormat.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Style/Protection.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Protection.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/Row.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/WorksheetIterator.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/CSV.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/HTML.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/IWriter.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/PDF.php mode change 100644 => 100755 libraries/PHPExcel/PHPExcel/Writer/Serialized.php mode change 100644 => 100755 libraries/PMA.php mode change 100644 => 100755 libraries/Partition.class.php mode change 100644 => 100755 libraries/StorageEngine.class.php mode change 100644 => 100755 libraries/Table.class.php mode change 100644 => 100755 libraries/Theme.class.php mode change 100644 => 100755 libraries/Theme_Manager.class.php mode change 100644 => 100755 libraries/Tracker.class.php mode change 100644 => 100755 libraries/auth/config.auth.lib.php mode change 100644 => 100755 libraries/auth/cookie.auth.lib.php mode change 100644 => 100755 libraries/auth/http.auth.lib.php mode change 100644 => 100755 libraries/auth/signon.auth.lib.php mode change 100644 => 100755 libraries/auth/swekey/authentication.inc.php mode change 100644 => 100755 libraries/auth/swekey/musbe-ca.crt mode change 100644 => 100755 libraries/auth/swekey/swekey.auth.lib.php mode change 100644 => 100755 libraries/auth/swekey/swekey.php mode change 100644 => 100755 libraries/blobstreaming.lib.php mode change 100644 => 100755 libraries/blowfish.php mode change 100644 => 100755 libraries/bookmark.lib.php mode change 100644 => 100755 libraries/charset_conversion.lib.php mode change 100644 => 100755 libraries/check_user_privileges.lib.php mode change 100644 => 100755 libraries/cleanup.lib.php mode change 100644 => 100755 libraries/common.inc.php mode change 100644 => 100755 libraries/common.lib.php mode change 100644 => 100755 libraries/config.default.php mode change 100644 => 100755 libraries/config/Form.class.php mode change 100644 => 100755 libraries/config/FormDisplay.class.php mode change 100644 => 100755 libraries/config/validate.lib.php mode change 100644 => 100755 libraries/core.lib.php mode change 100644 => 100755 libraries/database_interface.lib.php mode change 100644 => 100755 libraries/db_common.inc.php mode change 100644 => 100755 libraries/db_events.inc.php mode change 100644 => 100755 libraries/db_info.inc.php mode change 100644 => 100755 libraries/db_links.inc.php mode change 100644 => 100755 libraries/db_routines.inc.php mode change 100644 => 100755 libraries/db_structure.lib.php mode change 100644 => 100755 libraries/db_table_exists.lib.php mode change 100644 => 100755 libraries/dbg/setup.php mode change 100644 => 100755 libraries/dbi/mysql.dbi.lib.php mode change 100644 => 100755 libraries/dbi/mysqli.dbi.lib.php mode change 100644 => 100755 libraries/display_change_password.lib.php mode change 100644 => 100755 libraries/display_create_database.lib.php mode change 100644 => 100755 libraries/display_create_table.lib.php mode change 100644 => 100755 libraries/display_export.lib.php mode change 100644 => 100755 libraries/display_import.lib.php mode change 100644 => 100755 libraries/display_import_ajax.lib.php mode change 100644 => 100755 libraries/display_select_lang.lib.php mode change 100644 => 100755 libraries/display_tbl.lib.php mode change 100644 => 100755 libraries/display_tbl_links.lib.php mode change 100644 => 100755 libraries/engines/bdb.lib.php mode change 100644 => 100755 libraries/engines/berkeleydb.lib.php mode change 100644 => 100755 libraries/engines/binlog.lib.php mode change 100644 => 100755 libraries/engines/innobase.lib.php mode change 100644 => 100755 libraries/engines/innodb.lib.php mode change 100644 => 100755 libraries/engines/memory.lib.php mode change 100644 => 100755 libraries/engines/merge.lib.php mode change 100644 => 100755 libraries/engines/mrg_myisam.lib.php mode change 100644 => 100755 libraries/engines/myisam.lib.php mode change 100644 => 100755 libraries/engines/ndbcluster.lib.php mode change 100644 => 100755 libraries/engines/pbxt.lib.php mode change 100644 => 100755 libraries/export/codegen.php mode change 100644 => 100755 libraries/export/csv.php mode change 100644 => 100755 libraries/export/excel.php mode change 100644 => 100755 libraries/export/htmlword.php mode change 100644 => 100755 libraries/export/latex.php mode change 100644 => 100755 libraries/export/mediawiki.php mode change 100644 => 100755 libraries/export/ods.php mode change 100644 => 100755 libraries/export/odt.php mode change 100644 => 100755 libraries/export/pdf.php mode change 100644 => 100755 libraries/export/php_array.php mode change 100644 => 100755 libraries/export/sql.php mode change 100644 => 100755 libraries/export/texytext.php mode change 100644 => 100755 libraries/export/xls.php mode change 100644 => 100755 libraries/export/xlsx.php mode change 100644 => 100755 libraries/export/xml.php mode change 100644 => 100755 libraries/export/yaml.php mode change 100644 => 100755 libraries/file_listing.php mode change 100644 => 100755 libraries/footer.inc.php mode change 100644 => 100755 libraries/grab_globals.lib.php mode change 100644 => 100755 libraries/header.inc.php mode change 100644 => 100755 libraries/header_http.inc.php mode change 100644 => 100755 libraries/header_meta_style.inc.php mode change 100644 => 100755 libraries/header_printview.inc.php mode change 100644 => 100755 libraries/header_scripts.inc.php mode change 100644 => 100755 libraries/iconv_wrapper.lib.php mode change 100644 => 100755 libraries/import.lib.php mode change 100644 => 100755 libraries/import/README mode change 100644 => 100755 libraries/import/csv.php mode change 100644 => 100755 libraries/import/docsql.php mode change 100644 => 100755 libraries/import/ldi.php mode change 100644 => 100755 libraries/import/ods.php mode change 100644 => 100755 libraries/import/sql.php mode change 100644 => 100755 libraries/import/upload/apc.php mode change 100644 => 100755 libraries/import/upload/noplugin.php mode change 100644 => 100755 libraries/import/upload/uploadprogress.php mode change 100644 => 100755 libraries/import/xls.php mode change 100644 => 100755 libraries/import/xlsx.php mode change 100644 => 100755 libraries/import/xml.php mode change 100644 => 100755 libraries/information_schema_relations.lib.php mode change 100644 => 100755 libraries/ip_allow_deny.lib.php mode change 100644 => 100755 libraries/js_escape.lib.php mode change 100644 => 100755 libraries/kanji-encoding.lib.php mode change 100644 => 100755 libraries/logging.lib.php mode change 100644 => 100755 libraries/mime.lib.php mode change 100644 => 100755 libraries/mult_submits.inc.php mode change 100644 => 100755 libraries/mysql_charsets.lib.php mode change 100644 => 100755 libraries/navigation_header.inc.php mode change 100644 => 100755 libraries/ob.lib.php mode change 100644 => 100755 libraries/opendocument.lib.php mode change 100644 => 100755 libraries/parse_analyze.lib.php mode change 100644 => 100755 libraries/php-gettext/gettext.inc mode change 100644 => 100755 libraries/php-gettext/gettext.php mode change 100644 => 100755 libraries/php-gettext/streams.php mode change 100644 => 100755 libraries/plugin_interface.lib.php mode change 100644 => 100755 libraries/relation.lib.php mode change 100644 => 100755 libraries/relation_cleanup.lib.php mode change 100644 => 100755 libraries/replication.inc.php mode change 100644 => 100755 libraries/replication_gui.lib.php mode change 100644 => 100755 libraries/sanitizing.lib.php mode change 100644 => 100755 libraries/select_lang.lib.php mode change 100644 => 100755 libraries/select_server.lib.php mode change 100644 => 100755 libraries/server_common.inc.php mode change 100644 => 100755 libraries/server_links.inc.php mode change 100644 => 100755 libraries/server_synchronize.lib.php mode change 100644 => 100755 libraries/session.inc.php mode change 100644 => 100755 libraries/sql_query_form.lib.php mode change 100644 => 100755 libraries/sqlparser.data.php mode change 100644 => 100755 libraries/sqlparser.lib.php mode change 100644 => 100755 libraries/sqlvalidator.class.php mode change 100644 => 100755 libraries/sqlvalidator.lib.php mode change 100644 => 100755 libraries/string.lib.php mode change 100644 => 100755 libraries/string_mb.lib.php mode change 100644 => 100755 libraries/string_native.lib.php mode change 100644 => 100755 libraries/string_type_ctype.lib.php mode change 100644 => 100755 libraries/string_type_native.lib.php mode change 100644 => 100755 libraries/tbl_common.php mode change 100644 => 100755 libraries/tbl_info.inc.php mode change 100644 => 100755 libraries/tbl_links.inc.php mode change 100644 => 100755 libraries/tbl_properties.inc.php mode change 100644 => 100755 libraries/tbl_replace_fields.inc.php mode change 100644 => 100755 libraries/tbl_triggers.lib.php mode change 100644 => 100755 libraries/tcpdf/LICENSE.TXT mode change 100644 => 100755 libraries/tcpdf/font/LICENSE mode change 100644 => 100755 libraries/tcpdf/font/dejavusans-bold.ctg.z mode change 100644 => 100755 libraries/tcpdf/font/dejavusans-bold.z mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.ctg.z mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.php mode change 100644 => 100755 libraries/tcpdf/font/dejavusans.z mode change 100644 => 100755 libraries/tcpdf/font/dejavusansb.php mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif-bold.ctg.z mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif-bold.z mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.ctg.z mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.php mode change 100644 => 100755 libraries/tcpdf/font/dejavuserif.z mode change 100644 => 100755 libraries/tcpdf/font/dejavuserifb.php mode change 100644 => 100755 libraries/tcpdf/tcpdf.php mode change 100644 => 100755 libraries/tcpdf/unicode_data.php mode change 100644 => 100755 libraries/transformations.lib.php mode change 100644 => 100755 libraries/transformations/README mode change 100644 => 100755 libraries/transformations/TEMPLATE mode change 100644 => 100755 libraries/transformations/TEMPLATE_MIMETYPE mode change 100644 => 100755 libraries/transformations/application_octetstream__download.inc.php mode change 100644 => 100755 libraries/transformations/application_octetstream__hex.inc.php mode change 100644 => 100755 libraries/transformations/global.inc.php mode change 100644 => 100755 libraries/transformations/image_jpeg__inline.inc.php mode change 100644 => 100755 libraries/transformations/image_jpeg__link.inc.php mode change 100644 => 100755 libraries/transformations/image_png__inline.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__dateformat.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__external.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__formatted.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__imagelink.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__link.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__longToIpv4.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__sql.inc.php mode change 100644 => 100755 libraries/transformations/text_plain__substr.inc.php mode change 100644 => 100755 libraries/url_generating.lib.php mode change 100644 => 100755 libraries/vendor_config.php mode change 100644 => 100755 libraries/zip.lib.php mode change 100644 => 100755 libraries/zip_extension.lib.php mode change 100644 => 100755 license.php mode change 100644 => 100755 main.php mode change 100644 => 100755 navigation.php mode change 100644 => 100755 phpdoctor.ini mode change 100644 => 100755 phpinfo.php mode change 100644 => 100755 phpmyadmin.css.php mode change 100644 => 100755 pmd/images/2leftarrow.png mode change 100644 => 100755 pmd/images/2leftarrow_m.png mode change 100644 => 100755 pmd/images/2rightarrow.png mode change 100644 => 100755 pmd/images/2rightarrow_m.png mode change 100644 => 100755 pmd/images/ang_direct.png mode change 100644 => 100755 pmd/images/bord.png mode change 100644 => 100755 pmd/images/bottom.png mode change 100644 => 100755 pmd/images/def.png mode change 100644 => 100755 pmd/images/display_field.png mode change 100644 => 100755 pmd/images/downarrow1.png mode change 100644 => 100755 pmd/images/downarrow2.png mode change 100644 => 100755 pmd/images/downarrow2_m.png mode change 100644 => 100755 pmd/images/exec.png mode change 100644 => 100755 pmd/images/exec_small.png mode change 100644 => 100755 pmd/images/favicon.ico mode change 100644 => 100755 pmd/images/grid.png mode change 100644 => 100755 pmd/images/help.png mode change 100644 => 100755 pmd/images/help_relation.png mode change 100644 => 100755 pmd/images/pdf.png mode change 100644 => 100755 pmd/images/relation.png mode change 100644 => 100755 pmd/images/reload.png mode change 100644 => 100755 pmd/images/resize.png mode change 100644 => 100755 pmd/images/rightarrow1.png mode change 100644 => 100755 pmd/images/rightarrow2.png mode change 100644 => 100755 pmd/images/save.png mode change 100644 => 100755 pmd/images/table.png mode change 100644 => 100755 pmd/images/uparrow2_m.png mode change 100644 => 100755 pmd/scripts/ajax.js mode change 100644 => 100755 pmd/scripts/iecanvas.js mode change 100644 => 100755 pmd/scripts/move.js mode change 100644 => 100755 pmd/styles/default/images/1.png mode change 100644 => 100755 pmd/styles/default/images/2.png mode change 100644 => 100755 pmd/styles/default/images/3.png mode change 100644 => 100755 pmd/styles/default/images/4.png mode change 100644 => 100755 pmd/styles/default/images/5.png mode change 100644 => 100755 pmd/styles/default/images/6.png mode change 100644 => 100755 pmd/styles/default/images/7.png mode change 100644 => 100755 pmd/styles/default/images/8.png mode change 100644 => 100755 pmd/styles/default/images/FieldKey_small.png mode change 100644 => 100755 pmd/styles/default/images/Field_small.png mode change 100644 => 100755 pmd/styles/default/images/Field_small_char.png mode change 100644 => 100755 pmd/styles/default/images/Field_small_date.png mode change 100644 => 100755 pmd/styles/default/images/Field_small_int.png mode change 100644 => 100755 pmd/styles/default/images/Header.png mode change 100644 => 100755 pmd/styles/default/images/Header_Linked.png mode change 100644 => 100755 pmd/styles/default/images/left_panel_butt.png mode change 100644 => 100755 pmd/styles/default/images/left_panel_tab.png mode change 100644 => 100755 pmd/styles/default/images/small_tab.png mode change 100644 => 100755 pmd/styles/default/images/top_panel.png mode change 100644 => 100755 pmd/styles/default/style1.css mode change 100644 => 100755 pmd_common.php mode change 100644 => 100755 pmd_display_field.php mode change 100644 => 100755 pmd_general.php mode change 100644 => 100755 pmd_help.php mode change 100644 => 100755 pmd_pdf.php mode change 100644 => 100755 pmd_relation_new.php mode change 100644 => 100755 pmd_relation_upd.php mode change 100644 => 100755 pmd_save_pos.php mode change 100644 => 100755 po/.gitignore mode change 100644 => 100755 print.css mode change 100644 => 100755 querywindow.php mode change 100644 => 100755 robots.txt mode change 100644 => 100755 scripts/create_tables.sql mode change 100644 => 100755 scripts/decode_bug.php mode change 100644 => 100755 scripts/google-javascript-compiler/COPYING mode change 100644 => 100755 scripts/google-javascript-compiler/README mode change 100644 => 100755 scripts/google-javascript-compiler/compiler.jar mode change 100644 => 100755 scripts/signon.php mode change 100644 => 100755 scripts/upgrade_tables_mysql_4_1_2+.sql mode change 100644 => 100755 server_binlog.php mode change 100644 => 100755 server_collations.php mode change 100644 => 100755 server_databases.php mode change 100644 => 100755 server_engines.php mode change 100644 => 100755 server_export.php mode change 100644 => 100755 server_import.php mode change 100644 => 100755 server_privileges.php mode change 100644 => 100755 server_processlist.php mode change 100644 => 100755 server_replication.php mode change 100644 => 100755 server_sql.php mode change 100644 => 100755 server_status.php mode change 100644 => 100755 server_synchronize.php mode change 100644 => 100755 server_variables.php mode change 100644 => 100755 setup/config.php mode change 100644 => 100755 setup/frames/config.inc.php mode change 100644 => 100755 setup/frames/form.inc.php mode change 100644 => 100755 setup/frames/index.inc.php mode change 100644 => 100755 setup/frames/menu.inc.php mode change 100644 => 100755 setup/frames/servers.inc.php mode change 100644 => 100755 setup/index.php mode change 100644 => 100755 setup/lib/.htaccess mode change 100644 => 100755 setup/lib/common.inc.php mode change 100644 => 100755 setup/lib/form_processing.lib.php mode change 100644 => 100755 setup/lib/index.lib.php mode change 100644 => 100755 setup/scripts.js mode change 100644 => 100755 setup/styles.css mode change 100644 => 100755 setup/validate.php mode change 100644 => 100755 show_config_errors.php mode change 100644 => 100755 sql.php mode change 100644 => 100755 tbl_addfield.php mode change 100644 => 100755 tbl_alter.php mode change 100644 => 100755 tbl_change.php mode change 100644 => 100755 tbl_create.php mode change 100644 => 100755 tbl_export.php mode change 100644 => 100755 tbl_get_field.php mode change 100644 => 100755 tbl_import.php mode change 100644 => 100755 tbl_indexes.php mode change 100644 => 100755 tbl_move_copy.php mode change 100644 => 100755 tbl_operations.php mode change 100644 => 100755 tbl_printview.php mode change 100644 => 100755 tbl_relation.php mode change 100644 => 100755 tbl_replace.php mode change 100644 => 100755 tbl_row_action.php mode change 100644 => 100755 tbl_select.php mode change 100644 => 100755 tbl_sql.php mode change 100644 => 100755 tbl_structure.php mode change 100644 => 100755 tbl_tracking.php mode change 100644 => 100755 test/AllSeleniumTests.php mode change 100644 => 100755 test/AllTests.php mode change 100644 => 100755 test/Environment_test.php mode change 100644 => 100755 test/FailTest.php mode change 100644 => 100755 test/PMA_Message_test.php mode change 100644 => 100755 test/PMA_STR_sub_test.php mode change 100644 => 100755 test/PMA_blowfish_test.php mode change 100644 => 100755 test/PMA_cache_test.php mode change 100644 => 100755 test/PMA_escapeJsString_test.php mode change 100644 => 100755 test/PMA_escapeMySqlWildcards_test.php mode change 100644 => 100755 test/PMA_foreignKeySupported_test.php mode change 100644 => 100755 test/PMA_formatNumberByteDown_test.php mode change 100644 => 100755 test/PMA_generateCommonUrl_test.php mode change 100644 => 100755 test/PMA_get_real_size_test.php mode change 100644 => 100755 test/PMA_headerLocation_test.php mode change 100644 => 100755 test/PMA_ifSetOr_test.php mode change 100644 => 100755 test/PMA_isValid_test.php mode change 100644 => 100755 test/PMA_localisedDateTimespan_test.php mode change 100644 => 100755 test/PMA_pow_test.php mode change 100644 => 100755 test/PMA_printableBitValue_test.php mode change 100644 => 100755 test/PMA_quoting_slashing_test.php mode change 100644 => 100755 test/PMA_sanitize_test.php mode change 100644 => 100755 test/PMA_showHint_test.php mode change 100644 => 100755 test/PMA_stringOperations_test.php mode change 100644 => 100755 test/PMA_transformation_getOptions_test.php mode change 100644 => 100755 test/PMA_whichCrlf_test.php mode change 100644 => 100755 test/PmaSeleniumLoginTest.php mode change 100644 => 100755 test/PmaSeleniumPrivilegesTest.php mode change 100644 => 100755 test/PmaSeleniumTestCase.php mode change 100644 => 100755 test/PmaSeleniumXssTest.php mode change 100644 => 100755 test/theme.php mode change 100644 => 100755 test/wui.php mode change 100644 => 100755 themes.php mode change 100644 => 100755 themes/.gitignore mode change 100644 => 100755 themes/darkblue_orange/css/theme_right.css.php mode change 100644 => 100755 themes/darkblue_orange/img/ajax_clock_small.gif mode change 100644 => 100755 themes/darkblue_orange/img/arrow_ltr.png mode change 100644 => 100755 themes/darkblue_orange/img/arrow_rtl.png mode change 100644 => 100755 themes/darkblue_orange/img/asc_order.png mode change 100644 => 100755 themes/darkblue_orange/img/b_bookmark.png mode change 100644 => 100755 themes/darkblue_orange/img/b_browse.png mode change 100644 => 100755 themes/darkblue_orange/img/b_calendar.png mode change 100644 => 100755 themes/darkblue_orange/img/b_comment.png mode change 100644 => 100755 themes/darkblue_orange/img/b_dbstatistics.png mode change 100644 => 100755 themes/darkblue_orange/img/b_deltbl.png mode change 100644 => 100755 themes/darkblue_orange/img/b_docs.png mode change 100644 => 100755 themes/darkblue_orange/img/b_docsql.png mode change 100644 => 100755 themes/darkblue_orange/img/b_drop.png mode change 100644 => 100755 themes/darkblue_orange/img/b_edit.png mode change 100644 => 100755 themes/darkblue_orange/img/b_empty.png mode change 100644 => 100755 themes/darkblue_orange/img/b_engine.png mode change 100644 => 100755 themes/darkblue_orange/img/b_export.png mode change 100644 => 100755 themes/darkblue_orange/img/b_firstpage.png mode change 100644 => 100755 themes/darkblue_orange/img/b_ftext.png mode change 100644 => 100755 themes/darkblue_orange/img/b_help.png mode change 100644 => 100755 themes/darkblue_orange/img/b_home.png mode change 100644 => 100755 themes/darkblue_orange/img/b_import.png mode change 100644 => 100755 themes/darkblue_orange/img/b_index.png mode change 100644 => 100755 themes/darkblue_orange/img/b_info.png mode change 100644 => 100755 themes/darkblue_orange/img/b_insrow.png mode change 100644 => 100755 themes/darkblue_orange/img/b_lastpage.png mode change 100644 => 100755 themes/darkblue_orange/img/b_minus.png mode change 100644 => 100755 themes/darkblue_orange/img/b_newdb.png mode change 100644 => 100755 themes/darkblue_orange/img/b_newtbl.png mode change 100644 => 100755 themes/darkblue_orange/img/b_nextpage.png mode change 100644 => 100755 themes/darkblue_orange/img/b_pdfdoc.png mode change 100644 => 100755 themes/darkblue_orange/img/b_plus.png mode change 100644 => 100755 themes/darkblue_orange/img/b_prevpage.png mode change 100644 => 100755 themes/darkblue_orange/img/b_primary.png mode change 100644 => 100755 themes/darkblue_orange/img/b_print.png mode change 100644 => 100755 themes/darkblue_orange/img/b_props.png mode change 100644 => 100755 themes/darkblue_orange/img/b_relations.png mode change 100644 => 100755 themes/darkblue_orange/img/b_save.png mode change 100644 => 100755 themes/darkblue_orange/img/b_sbrowse.png mode change 100644 => 100755 themes/darkblue_orange/img/b_sdb.png mode change 100644 => 100755 themes/darkblue_orange/img/b_search.png mode change 100644 => 100755 themes/darkblue_orange/img/b_selboard.png mode change 100644 => 100755 themes/darkblue_orange/img/b_select.png mode change 100644 => 100755 themes/darkblue_orange/img/b_snewtbl.png mode change 100644 => 100755 themes/darkblue_orange/img/b_sql.png mode change 100644 => 100755 themes/darkblue_orange/img/b_sqldoc.png mode change 100644 => 100755 themes/darkblue_orange/img/b_sqlhelp.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tblanalyse.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tblexport.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tblimport.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tblops.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tbloptimize.png mode change 100644 => 100755 themes/darkblue_orange/img/b_tipp.png mode change 100644 => 100755 themes/darkblue_orange/img/b_unique.png mode change 100644 => 100755 themes/darkblue_orange/img/b_usradd.png mode change 100644 => 100755 themes/darkblue_orange/img/b_usrcheck.png mode change 100644 => 100755 themes/darkblue_orange/img/b_usrdrop.png mode change 100644 => 100755 themes/darkblue_orange/img/b_usredit.png mode change 100644 => 100755 themes/darkblue_orange/img/b_usrlist.png mode change 100644 => 100755 themes/darkblue_orange/img/b_view.png mode change 100644 => 100755 themes/darkblue_orange/img/b_views.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_browse.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_deltbl.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_drop.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_empty.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_firstpage.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_ftext.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_index.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_insrow.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_lastpage.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_nextpage.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_prevpage.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_primary.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_sbrowse.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_select.png mode change 100644 => 100755 themes/darkblue_orange/img/bd_unique.png mode change 100644 => 100755 themes/darkblue_orange/img/error.ico mode change 100644 => 100755 themes/darkblue_orange/img/eye.png mode change 100644 => 100755 themes/darkblue_orange/img/item.png mode change 100644 => 100755 themes/darkblue_orange/img/item_ltr.png mode change 100644 => 100755 themes/darkblue_orange/img/item_rtl.png mode change 100644 => 100755 themes/darkblue_orange/img/logo_left.png mode change 100644 => 100755 themes/darkblue_orange/img/logo_right.png mode change 100644 => 100755 themes/darkblue_orange/img/new_data.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_data_hovered.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_data_selected.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_data_selected_hovered.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_struct.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_hovered.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_selected.jpg mode change 100644 => 100755 themes/darkblue_orange/img/new_struct_selected_hovered.jpg mode change 100644 => 100755 themes/darkblue_orange/img/php_sym.png mode change 100644 => 100755 themes/darkblue_orange/img/pma_logo2.png mode change 100644 => 100755 themes/darkblue_orange/img/s_asc.png mode change 100644 => 100755 themes/darkblue_orange/img/s_asci.png mode change 100644 => 100755 themes/darkblue_orange/img/s_attention.png mode change 100644 => 100755 themes/darkblue_orange/img/s_cancel.png mode change 100644 => 100755 themes/darkblue_orange/img/s_cancel2.png mode change 100644 => 100755 themes/darkblue_orange/img/s_db.png mode change 100644 => 100755 themes/darkblue_orange/img/s_desc.png mode change 100644 => 100755 themes/darkblue_orange/img/s_error.png mode change 100644 => 100755 themes/darkblue_orange/img/s_error2.png mode change 100644 => 100755 themes/darkblue_orange/img/s_fulltext.png mode change 100644 => 100755 themes/darkblue_orange/img/s_host.png mode change 100644 => 100755 themes/darkblue_orange/img/s_info.png mode change 100644 => 100755 themes/darkblue_orange/img/s_lang.png mode change 100644 => 100755 themes/darkblue_orange/img/s_loggoff.png mode change 100644 => 100755 themes/darkblue_orange/img/s_notice.png mode change 100644 => 100755 themes/darkblue_orange/img/s_okay.png mode change 100644 => 100755 themes/darkblue_orange/img/s_partialtext.png mode change 100644 => 100755 themes/darkblue_orange/img/s_passwd.png mode change 100644 => 100755 themes/darkblue_orange/img/s_process.png mode change 100644 => 100755 themes/darkblue_orange/img/s_really.png mode change 100644 => 100755 themes/darkblue_orange/img/s_reload.png mode change 100644 => 100755 themes/darkblue_orange/img/s_replication.png mode change 100644 => 100755 themes/darkblue_orange/img/s_rights.png mode change 100644 => 100755 themes/darkblue_orange/img/s_status.png mode change 100644 => 100755 themes/darkblue_orange/img/s_success.png mode change 100644 => 100755 themes/darkblue_orange/img/s_sync.png mode change 100644 => 100755 themes/darkblue_orange/img/s_tbl.png mode change 100644 => 100755 themes/darkblue_orange/img/s_theme.png mode change 100644 => 100755 themes/darkblue_orange/img/s_vars.png mode change 100644 => 100755 themes/darkblue_orange/img/s_views.png mode change 100644 => 100755 themes/darkblue_orange/img/s_warn.png mode change 100644 => 100755 themes/darkblue_orange/img/spacer.png mode change 100644 => 100755 themes/darkblue_orange/img/tbl_header.png mode change 100644 => 100755 themes/darkblue_orange/img/tbl_th.png mode change 100644 => 100755 themes/darkblue_orange/img/window-new.png mode change 100644 => 100755 themes/darkblue_orange/info.inc.php mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png mode change 100644 => 100755 themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png mode change 100644 => 100755 themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css mode change 100644 => 100755 themes/darkblue_orange/layout.inc.php mode change 100644 => 100755 themes/darkblue_orange/screen.png mode change 100644 => 100755 themes/original/css/theme_left.css.php mode change 100644 => 100755 themes/original/css/theme_print.css.php mode change 100644 => 100755 themes/original/css/theme_right.css.php mode change 100644 => 100755 themes/original/img/ajax_clock_small.gif mode change 100644 => 100755 themes/original/img/arrow_ltr.png mode change 100644 => 100755 themes/original/img/arrow_rtl.png mode change 100644 => 100755 themes/original/img/asc_order.png mode change 100644 => 100755 themes/original/img/b_bookmark.png mode change 100644 => 100755 themes/original/img/b_browse.png mode change 100644 => 100755 themes/original/img/b_calendar.png mode change 100644 => 100755 themes/original/img/b_comment.png mode change 100644 => 100755 themes/original/img/b_dbstatistics.png mode change 100644 => 100755 themes/original/img/b_deltbl.png mode change 100644 => 100755 themes/original/img/b_docs.png mode change 100644 => 100755 themes/original/img/b_docsql.png mode change 100644 => 100755 themes/original/img/b_drop.png mode change 100644 => 100755 themes/original/img/b_edit.png mode change 100644 => 100755 themes/original/img/b_empty.png mode change 100644 => 100755 themes/original/img/b_engine.png mode change 100644 => 100755 themes/original/img/b_export.png mode change 100644 => 100755 themes/original/img/b_firstpage.png mode change 100644 => 100755 themes/original/img/b_ftext.png mode change 100644 => 100755 themes/original/img/b_help.png mode change 100644 => 100755 themes/original/img/b_home.png mode change 100644 => 100755 themes/original/img/b_import.png mode change 100644 => 100755 themes/original/img/b_index.png mode change 100644 => 100755 themes/original/img/b_info.png mode change 100644 => 100755 themes/original/img/b_insrow.png mode change 100644 => 100755 themes/original/img/b_lastpage.png mode change 100644 => 100755 themes/original/img/b_minus.png mode change 100644 => 100755 themes/original/img/b_newdb.png mode change 100644 => 100755 themes/original/img/b_newtbl.png mode change 100644 => 100755 themes/original/img/b_nextpage.png mode change 100644 => 100755 themes/original/img/b_pdfdoc.png mode change 100644 => 100755 themes/original/img/b_plus.png mode change 100644 => 100755 themes/original/img/b_prevpage.png mode change 100644 => 100755 themes/original/img/b_primary.png mode change 100644 => 100755 themes/original/img/b_print.png mode change 100644 => 100755 themes/original/img/b_props.png mode change 100644 => 100755 themes/original/img/b_relations.png mode change 100644 => 100755 themes/original/img/b_save.png mode change 100644 => 100755 themes/original/img/b_sbrowse.png mode change 100644 => 100755 themes/original/img/b_sdb.png mode change 100644 => 100755 themes/original/img/b_search.png mode change 100644 => 100755 themes/original/img/b_selboard.png mode change 100644 => 100755 themes/original/img/b_select.png mode change 100644 => 100755 themes/original/img/b_snewtbl.png mode change 100644 => 100755 themes/original/img/b_sql.png mode change 100644 => 100755 themes/original/img/b_sqldoc.png mode change 100644 => 100755 themes/original/img/b_sqlhelp.png mode change 100644 => 100755 themes/original/img/b_tblanalyse.png mode change 100644 => 100755 themes/original/img/b_tblexport.png mode change 100644 => 100755 themes/original/img/b_tblimport.png mode change 100644 => 100755 themes/original/img/b_tblops.png mode change 100644 => 100755 themes/original/img/b_tbloptimize.png mode change 100644 => 100755 themes/original/img/b_tipp.png mode change 100644 => 100755 themes/original/img/b_unique.png mode change 100644 => 100755 themes/original/img/b_usradd.png mode change 100644 => 100755 themes/original/img/b_usrcheck.png mode change 100644 => 100755 themes/original/img/b_usrdrop.png mode change 100644 => 100755 themes/original/img/b_usredit.png mode change 100644 => 100755 themes/original/img/b_usrlist.png mode change 100644 => 100755 themes/original/img/b_view.png mode change 100644 => 100755 themes/original/img/b_views.png mode change 100644 => 100755 themes/original/img/bd_browse.png mode change 100644 => 100755 themes/original/img/bd_deltbl.png mode change 100644 => 100755 themes/original/img/bd_drop.png mode change 100644 => 100755 themes/original/img/bd_empty.png mode change 100644 => 100755 themes/original/img/bd_firstpage.png mode change 100644 => 100755 themes/original/img/bd_ftext.png mode change 100644 => 100755 themes/original/img/bd_index.png mode change 100644 => 100755 themes/original/img/bd_insrow.png mode change 100644 => 100755 themes/original/img/bd_lastpage.png mode change 100644 => 100755 themes/original/img/bd_nextpage.png mode change 100644 => 100755 themes/original/img/bd_prevpage.png mode change 100644 => 100755 themes/original/img/bd_primary.png mode change 100644 => 100755 themes/original/img/bd_sbrowse.png mode change 100644 => 100755 themes/original/img/bd_select.png mode change 100644 => 100755 themes/original/img/bd_unique.png mode change 100644 => 100755 themes/original/img/docs_menu_bg.png mode change 100644 => 100755 themes/original/img/error.ico mode change 100644 => 100755 themes/original/img/eye.png mode change 100644 => 100755 themes/original/img/eye_grey.png mode change 100644 => 100755 themes/original/img/item.png mode change 100644 => 100755 themes/original/img/item_ltr.png mode change 100644 => 100755 themes/original/img/item_rtl.png mode change 100644 => 100755 themes/original/img/logo_left.png mode change 100644 => 100755 themes/original/img/logo_right.png mode change 100644 => 100755 themes/original/img/new_data.jpg mode change 100644 => 100755 themes/original/img/new_data_hovered.jpg mode change 100644 => 100755 themes/original/img/new_data_selected.jpg mode change 100644 => 100755 themes/original/img/new_data_selected_hovered.jpg mode change 100644 => 100755 themes/original/img/new_struct.jpg mode change 100644 => 100755 themes/original/img/new_struct_hovered.jpg mode change 100644 => 100755 themes/original/img/new_struct_selected.jpg mode change 100644 => 100755 themes/original/img/new_struct_selected_hovered.jpg mode change 100644 => 100755 themes/original/img/php_sym.png mode change 100644 => 100755 themes/original/img/pma_logo2.png mode change 100644 => 100755 themes/original/img/s_asc.png mode change 100644 => 100755 themes/original/img/s_asci.png mode change 100644 => 100755 themes/original/img/s_attention.png mode change 100644 => 100755 themes/original/img/s_cancel.png mode change 100644 => 100755 themes/original/img/s_cancel2.png mode change 100644 => 100755 themes/original/img/s_db.png mode change 100644 => 100755 themes/original/img/s_desc.png mode change 100644 => 100755 themes/original/img/s_error.png mode change 100644 => 100755 themes/original/img/s_error2.png mode change 100644 => 100755 themes/original/img/s_fulltext.png mode change 100644 => 100755 themes/original/img/s_host.png mode change 100644 => 100755 themes/original/img/s_info.png mode change 100644 => 100755 themes/original/img/s_lang.png mode change 100644 => 100755 themes/original/img/s_loggoff.png mode change 100644 => 100755 themes/original/img/s_notice.png mode change 100644 => 100755 themes/original/img/s_okay.png mode change 100644 => 100755 themes/original/img/s_partialtext.png mode change 100644 => 100755 themes/original/img/s_passwd.png mode change 100644 => 100755 themes/original/img/s_process.png mode change 100644 => 100755 themes/original/img/s_really.png mode change 100644 => 100755 themes/original/img/s_reload.png mode change 100644 => 100755 themes/original/img/s_replication.png mode change 100644 => 100755 themes/original/img/s_rights.png mode change 100644 => 100755 themes/original/img/s_status.png mode change 100644 => 100755 themes/original/img/s_success.png mode change 100644 => 100755 themes/original/img/s_sync.png mode change 100644 => 100755 themes/original/img/s_tbl.png mode change 100644 => 100755 themes/original/i mg/s_theme.png mode change 100644 => 100755 themes/original/img/s_vars.png mode change 100644 => 100755 themes/original/img/s_views.png mode change 100644 => 100755 themes/original/img/s_warn.png mode change 100644 => 100755 themes/original/img/spacer.png mode change 100644 => 100755 themes/original/img/vertical_line.png mode change 100644 => 100755 themes/original/img/window-new.png mode change 100644 => 100755 themes/original/info.inc.php mode change 100644 => 100755 themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png mode change 100644 => 100755 themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png mode change 100644 => 100755 themes/original/jquery/images/ui-icons_222222_256x240.png mode change 100644 => 100755 themes/original/jquery/images/ui-icons_2e83ff_256x240.png mode change 100644 => 100755 themes/original/jquery/images/ui-icons_454545_256x240.png mode change 100644 => 100755 themes/original/jquery/images/ui-icons_888888_256x240.png mode change 100644 => 100755 themes/original/jquery/images/ui-icons_cd0a0a_256x240.png mode change 100644 => 100755 themes/original/jquery/jquery-ui-1.8.custom.css mode change 100644 => 100755 themes/original/layout.inc.php mode change 100644 => 100755 themes/original/screen.png mode change 100644 => 100755 transformation_overview.php mode change 100644 => 100755 transformation_wrapper.php mode change 100644 => 100755 translators.html mode change 100644 => 100755 user_password.php mode change 100644 => 100755 view_create.php mode change 100644 => 100755 view_operations.php mode change 100644 => 100755 webapp.php
diff --git a/CREDITS b/CREDITS old mode 100644 new mode 100755 diff --git a/ChangeLog b/ChangeLog old mode 100644 new mode 100755 diff --git a/Documentation.html b/Documentation.html old mode 100644 new mode 100755 diff --git a/INSTALL b/INSTALL old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/README.VENDOR b/README.VENDOR old mode 100644 new mode 100755 diff --git a/TODO b/TODO old mode 100644 new mode 100755 diff --git a/browse_foreigners.php b/browse_foreigners.php old mode 100644 new mode 100755 diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php old mode 100644 new mode 100755 diff --git a/bs_play_media.php b/bs_play_media.php old mode 100644 new mode 100755 diff --git a/changelog.php b/changelog.php old mode 100644 new mode 100755 diff --git a/chk_rel.php b/chk_rel.php old mode 100644 new mode 100755 diff --git a/config.sample.inc.php b/config.sample.inc.php old mode 100644 new mode 100755 diff --git a/contrib/README b/contrib/README old mode 100644 new mode 100755 diff --git a/contrib/htaccess b/contrib/htaccess old mode 100644 new mode 100755 diff --git a/contrib/packaging/Fedora/phpMyAdmin-http.conf b/contrib/packaging/Fedora/phpMyAdmin-http.conf old mode 100644 new mode 100755 diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec old mode 100644 new mode 100755 diff --git a/contrib/swekey.sample.conf b/contrib/swekey.sample.conf old mode 100644 new mode 100755 diff --git a/db_create.php b/db_create.php old mode 100644 new mode 100755 index 50e4cf6..64a8acb --- a/db_create.php +++ b/db_create.php @@ -9,6 +9,9 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; +$GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; + require_once './libraries/mysql_charsets.lib.php';
PMA_checkParameters(array('new_db')); @@ -38,6 +41,14 @@ if (! $result) { // avoid displaying the not-created db name in header or navi panel $GLOBALS['db'] = ''; $GLOBALS['table'] = ''; + + /** + * If in an Ajax request, just display the message with {@link PMA_ajaxResponse} + */ + if($GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($message, FALSE); + } + require_once './libraries/header.inc.php'; require_once './main.php'; } else { @@ -45,6 +56,76 @@ if (! $result) { $message->addParam($new_db); $GLOBALS['db'] = $new_db;
+ /** + * If in an Ajax request, build the output and send it + */ + if($GLOBALS['is_ajax_request'] == true) { + + /** + * String containing the SQL Query formatted in pretty HTML + * @global array $GLOBALS['extra_data'] + * @name $extra_data + */ + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success'); + + //Construct the html for the new database, so that it can be appended to the list of databases on server_databases.php + + /** + * Build the array to be passed to {@link PMA_generate_common_url} to generate the links + * @global array $GLOBALS['db_url_params'] + * @name $db_url_params + */ + $db_url_params['db'] = $new_db; + + $is_superuser = PMA_isSuperuser(); + + /** + * String that will contain the output HTML + * @name $new_db_string + */ + $new_db_string = '<tr>'; + + /** + * Is user allowed to drop the database? + */ + if ($is_superuser || $cfg['AllowUserDropDatabase']) { + $new_db_string .= '<td class="tool">'; + $new_db_string .= '<input type="checkbox" title="'. $new_db .'" value="' . $new_db . '" name="selected_dbs[]" />'; + $new_db_string .='</td>'; + } + + /** + * Link to the database's page + */ + $new_db_string .= '<td class="name">'; + $new_db_string .= '<a target="_parent" title="Jump to database" href="index.php' . PMA_generate_common_url($db_url_params) . '">'; + $new_db_string .= $new_db . '</a>'; + $new_db_string .= '</td>'; + + /** + * If the user has privileges, let him check privileges for the DB + */ + if($is_superuser) { + + $db_url_params['checkprivs'] = $new_db; + + $new_db_string .= '<td class="tool">'; + $new_db_string .= '<a title="Check privileges for database" href="server_privileges.php' . PMA_generate_common_url($db_url_params) . '">'; + $new_db_string .= ($cfg['PropertiesIconic'] + ? '<img class="icon" src="' . $pmaThemeImage . 's_rights.png" width="16" height="16" alt=" ' . __('Check Privileges') . '" /> ' + : __('Check Privileges')) . '</a>'; + $new_db_string .= '</td>'; + } + + $new_db_string .= '</tr>'; + + /** @todo Statistics for newly created DB! */ + + $extra_data['new_db_string'] = $new_db_string; + + PMA_ajaxResponse($message, true, $extra_data); + } + require_once './libraries/header.inc.php'; require_once './' . $cfg['DefaultTabDatabase']; } diff --git a/db_datadict.php b/db_datadict.php old mode 100644 new mode 100755 diff --git a/db_export.php b/db_export.php old mode 100644 new mode 100755 diff --git a/db_import.php b/db_import.php old mode 100644 new mode 100755 diff --git a/db_operations.php b/db_operations.php old mode 100644 new mode 100755 index cdeac3a..535ee31 --- a/db_operations.php +++ b/db_operations.php @@ -18,6 +18,14 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php';
+// add blobstreaming library functions +require_once "./libraries/blobstreaming.lib.php"; + +// add a javascript file for jQuery functions to handle Ajax actions +// also add jQueryUI +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'db_operations.js'; + /** * Rename/move or copy database */ @@ -254,6 +262,16 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { $message = PMA_Message::error(); } } + + /** + * Database has been successfully renamed/moved. If in an Ajax request, + * generate the output with {@link PMA_ajaxResponse} and exit + */ + if( $GLOBALS['is_ajax_request'] == true) { + $extra_data['newname'] = $newname; + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + }; }
@@ -326,7 +344,7 @@ if (!$is_information_schema) { * rename database */ ?> - <form method="post" action="db_operations.php" + <form id="rename_db_form" method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php if (isset($db_collation)) { @@ -361,7 +379,7 @@ if (!$is_information_schema) { echo ')'; ?> </fieldset> <fieldset class="tblFooters"> - <input type="submit" value="<?php echo __('Go'); ?>" onclick="return confirmLink(this, 'CREATE DATABASE ... <?php echo __('and then'); ?> DROP DATABASE <?php echo PMA_jsFormat($db); ?>')" /> + <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> <?php @@ -404,7 +422,7 @@ echo __('Remove database'); * Copy database */ ?> - <form method="post" action="db_operations.php" + <form id="copy_db_form" method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php if (isset($db_collation)) { @@ -474,7 +492,7 @@ echo __('Remove database'); /** * Change database charset */ - echo '<form method="post" action="./db_operations.php">' . "\n" + echo '<form id="change_db_charset_form" method="post" action="./db_operations.php">' . "\n" . PMA_generate_common_hidden_inputs($db, $table) . '<fieldset>' . "\n" . ' <legend>'; diff --git a/db_printview.php b/db_printview.php old mode 100644 new mode 100755 diff --git a/db_qbe.php b/db_qbe.php old mode 100644 new mode 100755 diff --git a/db_search.php b/db_search.php old mode 100644 new mode 100755 index 854cba8..6c87f61 --- a/db_search.php +++ b/db_search.php @@ -37,6 +37,9 @@ */ require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js'; +$GLOBALS['js_include'][] = 'db_search.js'; + /** * Gets some core libraries and send headers */ @@ -108,11 +111,14 @@ if (empty($_REQUEST['field_str']) || ! is_string($_REQUEST['field_str'])) { }
/** - * Displays top links + * Displays top links if we are not in an Ajax request */ $sub_part = ''; -require './libraries/db_info.inc.php';
+if( $GLOBALS['is_ajax_request'] != true) { + require './libraries/db_info.inc.php'; + echo '<div id="searchresults">'; +}
/** * 1. Main search form has been submitted @@ -269,13 +275,22 @@ if (isset($_REQUEST['submit_search'])) { } } // end 1.
+/** + * If we are in an Ajax request, we need to exit after displaying all the HTML + */ +if($GLOBALS['is_ajax_request'] == true) { + exit; +} +else { + echo '</div>';//end searchresults div +}
/** * 2. Displays the main search form */ ?> <a name="db_search"></a> -<form method="post" action="db_search.php" name="db_search"> +<form id="db_search_form" method="post" action="db_search.php" name="db_search"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?> <fieldset> <legend><?php echo __('Search in database'); ?></legend> diff --git a/db_sql.php b/db_sql.php old mode 100644 new mode 100755 index 50db7bd..2020dea --- a/db_sql.php +++ b/db_sql.php @@ -13,6 +13,9 @@ require_once './libraries/common.inc.php'; /** * Runs common work */ +$GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'sql.js'; + require './libraries/db_common.inc.php'; require_once './libraries/sql_query_form.lib.php';
diff --git a/db_structure.php b/db_structure.php old mode 100644 new mode 100755 index 9e11821..44d732a --- a/db_structure.php +++ b/db_structure.php @@ -11,6 +11,7 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'db_structure.js';
/** * Prepares the tables list if the user where not redirected to this script @@ -294,13 +295,12 @@ foreach ($tables as $keyname => $each_table) {
if (! $db_is_information_schema) { if (! empty($each_table['TABLE_ROWS'])) { - $empty_table = '<a href="sql.php?' . $tbl_url_query + $empty_table = '<a class="truncate_table_anchor" href="sql.php?' . $tbl_url_query . '&sql_query='; $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) . '&zero_rows=' . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME']))) - . '" onclick="return confirmLink(this, \'TRUNCATE '; - $empty_table .= PMA_jsFormat($each_table['TABLE_NAME']) . '\')">' . $titles['Empty'] . '</a>'; + .'">' . $titles['Empty'] . '</a>'; } else { $empty_table = $titles['NoEmpty']; } @@ -384,11 +384,10 @@ foreach ($tables as $keyname => $each_table) { <?php echo $titles['Insert']; ?></a></td> <td align="center"><?php echo $empty_table; ?></td> <td align="center"> - <a href="sql.php?<?php echo $tbl_url_query; + <a class="drop_table_anchor" href="sql.php?<?php echo $tbl_url_query; ?>&reload=1&purge=1&sql_query=<?php echo urlencode($drop_query); ?>&zero_rows=<?php - echo urlencode($drop_message); ?>" - onclick="return confirmLink(this, '<?php echo PMA_jsFormat($drop_query, false); ?>')"> + echo urlencode($drop_message); ?>" > <?php echo $titles['Drop']; ?></a></td> <?php } // end if (! $db_is_information_schema)
@@ -453,7 +452,7 @@ if ($is_show_stats) { } ?> </tbody> -<tbody> +<tbody id="tbl_summary_row"> <tr><th></th> <th align="center" nowrap="nowrap"> <?php diff --git a/db_tracking.php b/db_tracking.php old mode 100644 new mode 100755 index 1c8c5ce..62f8554 --- a/db_tracking.php +++ b/db_tracking.php @@ -9,7 +9,15 @@ */ require_once './libraries/common.inc.php';
-require './libraries/db_common.inc.php'; +//Get some js files needed for Ajax requests +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; + +/** + * If we are not in an Ajax request, then do the common work and show the links etc. + */ +if($GLOBALS['is_ajax_request'] != true) { + require './libraries/db_common.inc.php'; +} $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
// Get the database structure @@ -20,6 +28,15 @@ require './libraries/db_info.inc.php'; // (here, do not use $_REQUEST['db] as it can be crafted) if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) { PMA_Tracker::deleteTracking($GLOBALS['db'], $_REQUEST['table']); + + /** + * If in an Ajax request, generate the success message and use + * {@link PMA_ajaxResponse()} to send the output + */ + if($GLOBALS['is_ajax_request'] == true) { + $message = PMA_Message::success(); + PMA_ajaxResponse($message, true); + } }
// Get tracked data about the database @@ -112,7 +129,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { <td><?php echo $version_data['date_created'];?></td> <td><?php echo $version_data['date_updated'];?></td> <td><?php echo $version_status;?></td> - <td><a href="<?php echo $delete_link;?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat(__('Delete tracking data for this table'), false); ?>')"><?php echo $drop_image_or_text; ?></a></td> + <td><a class="drop_tracking_anchor" href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> <td> <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a> | <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a> | <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td> diff --git a/docs.css b/docs.css old mode 100644 new mode 100755 diff --git a/error.php b/error.php old mode 100644 new mode 100755 diff --git a/export.php b/export.php old mode 100644 new mode 100755 diff --git a/favicon.ico b/favicon.ico old mode 100644 new mode 100755 diff --git a/import.php b/import.php old mode 100644 new mode 100755 diff --git a/import_status.php b/import_status.php old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/js/colorpicker/css/colorpicker.css b/js/colorpicker/css/colorpicker.css old mode 100644 new mode 100755 diff --git a/js/colorpicker/css/layout.css b/js/colorpicker/css/layout.css old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/blank.gif b/js/colorpicker/images/blank.gif old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_background.png b/js/colorpicker/images/colorpicker_background.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_hex.png b/js/colorpicker/images/colorpicker_hex.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_hsb_b.png b/js/colorpicker/images/colorpicker_hsb_b.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_hsb_h.png b/js/colorpicker/images/colorpicker_hsb_h.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_hsb_s.png b/js/colorpicker/images/colorpicker_hsb_s.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_indic.gif b/js/colorpicker/images/colorpicker_indic.gif old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_overlay.png b/js/colorpicker/images/colorpicker_overlay.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_rgb_b.png b/js/colorpicker/images/colorpicker_rgb_b.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_rgb_g.png b/js/colorpicker/images/colorpicker_rgb_g.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_rgb_r.png b/js/colorpicker/images/colorpicker_rgb_r.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_select.gif b/js/colorpicker/images/colorpicker_select.gif old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/colorpicker_submit.png b/js/colorpicker/images/colorpicker_submit.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_background.png b/js/colorpicker/images/custom_background.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_hex.png b/js/colorpicker/images/custom_hex.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_hsb_b.png b/js/colorpicker/images/custom_hsb_b.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_hsb_h.png b/js/colorpicker/images/custom_hsb_h.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_hsb_s.png b/js/colorpicker/images/custom_hsb_s.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_indic.gif b/js/colorpicker/images/custom_indic.gif old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_rgb_b.png b/js/colorpicker/images/custom_rgb_b.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_rgb_g.png b/js/colorpicker/images/custom_rgb_g.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_rgb_r.png b/js/colorpicker/images/custom_rgb_r.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/custom_submit.png b/js/colorpicker/images/custom_submit.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/select.png b/js/colorpicker/images/select.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/select2.png b/js/colorpicker/images/select2.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/images/slider.png b/js/colorpicker/images/slider.png old mode 100644 new mode 100755 diff --git a/js/colorpicker/js/colorpicker.js b/js/colorpicker/js/colorpicker.js old mode 100644 new mode 100755 diff --git a/js/common.js b/js/common.js old mode 100644 new mode 100755 index 8ba7bcd..f0eea25 --- a/js/common.js +++ b/js/common.js @@ -205,7 +205,7 @@ function refreshNavigation() { function addClass(element, classname) { if (element != null) { - element.className += ' ' + classname; + $("#"+element).addClass(classname); //alert('set class: ' + classname + ', now: ' + element.className); } } @@ -216,9 +216,7 @@ function addClass(element, classname) function removeClass(element, classname) { if (element != null) { - element.className = element.className.replace(' ' + classname, ''); - // if there is no other class anem there is no leading space - element.className = element.className.replace(classname, ''); + $("#"+element).removeClass(classname); //alert('removed class: ' + classname + ', now: ' + element.className); } } diff --git a/js/cross_framing_protection.js b/js/cross_framing_protection.js old mode 100644 new mode 100755 diff --git a/js/db_operations.js b/js/db_operations.js new file mode 100644 index 0000000..8bdeea2 --- /dev/null +++ b/js/db_operations.js @@ -0,0 +1,127 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @fileoverview function used in server privilege pages + * @name Database Operations + * + * @requires jQuery + * @requires jQueryUI + * @requires js/functions.js + * + * @version $Id$ + */ + +/** + * Ajax event handlers here for db_operations.php + * + * Actions Ajaxified here: + * Rename Database + * Copy Database + * Change charset + */ + +$(document).ready(function() { + + /** + * Ajax event handlers for 'Rename Database' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowUser() + */ + $("#rename_db_form").live('submit', function(event) { + event.preventDefault(); + + var question = 'CREATE DATABASE ... and then DROP DATABASE ' + window.parent.db; + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + /** + * @var button_options Object containing options for jQueryUI dialog buttons + */ + var button_options = {}; + button_options[PMA_messages['strYes']] = function() { + $(this).dialog("close").remove(); + window.parent.refreshMain(); + window.parent.refreshNavigation(); + }; + button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); } + + $(this).PMA_confirm(question, $(this).attr('action'), function(url) { + PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']); + + $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { + if(data.success == true) { + + PMA_ajaxShowMessage(data.message); + + window.parent.db = data.newname; + + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + + $("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({ + buttons: button_options + }) //end dialog options + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get() + }) + }); // end Rename Database + + /** + * Ajax Event Handler for 'Copy Database' + * + * @uses PMA_ajaxShowMessage() + */ + $("#copy_db_form").live('submit', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.get($(this).attr('action'), $(this).serialize(), function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + if( $("#checkbox_switch").is(":checked")) { + window.parent.db = data.newname; + window.parent.refreshMain(); + } + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get + }) // end copy database + + /** + * Ajax Event handler for 'Change Charset' of the database + * + * @uses PMA_ajaxShowMessage() + */ + $("#change_db_charset_form").live('submit', function(event) { + event.preventDefault(); + + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + PMA_ajaxShowMessage(PMA_messages['strChangingCharset']); + + $.get($(this).attr('action'), $(this).serialize() + "&submitcollation=" + $(this).find("input[name=submitcollation]").attr('value'), function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get() + }) // end change charset + +}, 'top.frame_content'); \ No newline at end of file diff --git a/js/db_search.js b/js/db_search.js new file mode 100644 index 0000000..8a0474f --- /dev/null +++ b/js/db_search.js @@ -0,0 +1,34 @@ +/** + * @fileoverview JavaScript functions used on Database Search page + * @name Database Search + * + * @requires jQuery + * @requires js/functions.js + */ + +/** + * AJAX script for the Database Search page. + * + * Actions ajaxified here: + * Retrieve result of SQL query + */ + +$(document).ready(function() { + + /** + * Ajax Event handler for retrieving the result of an SQL Query + * + * @uses PMA_ajaxShowMessage() + */ + $("#db_search_form").live('submit', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strSearching']); + + $(this).append('<input type="hidden" name="ajax_request" value="true"'); + + $.get($(this).attr('action'), $(this).serialize() + "&submit_search=" + $("#buttonGo").val(), function(data) { + $("#searchresults").html(data); + }) // end $.get() + }) +}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file diff --git a/js/db_structure.js b/js/db_structure.js new file mode 100644 index 0000000..8e658fb --- /dev/null +++ b/js/db_structure.js @@ -0,0 +1,224 @@ +/** + * @fileoverview functions used on the database structure page + * @name Database Structure + * + * @requires jQuery + * @requires jQueryUI + * @required js/functions.js + */ + +/** + * AJAX scripts for db_structure.php + * + * Actions ajaxified here: + * Drop Database + * Truncate Table + * Drop Table + * + */ +$(document).ready(function() { + + /** + * Ajax Event handler for 'Truncate Table' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $(".truncate_table_anchor").live('click', function(event) { + event.preventDefault(); + + //extract current table name and build the question string + /** + * @var curr_table_name String containing the name of the table to be truncated + */ + var curr_table_name = $(this).parents('tr').children('th').children('a').text(); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'TRUNCATE ' + curr_table_name; + /** + * @var this_anchor Object referring to the anchor clicked + */ + var this_anchor = $(this); + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + + $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + //Remove the action's href and class, so as to disable further attempts to truncate the table + // @todo: How to replace the icon with the disabled version? + $(this_anchor) + .removeAttr('href') + .removeClass('.truncate_table_anchor'); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) //end $.PMA_confirm() + }); //end of Truncate Table Ajax action + + /** + * Ajax Event handler for 'Drop Table' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $(".drop_table_anchor").live('click', function(event) { + event.preventDefault(); + + //extract current table name and build the question string + /** + * @var curr_row Object containing reference to the current row + */ + var curr_row = $(this).parents('tr'); + /** + * @var curr_table_name String containing the name of the table to be truncated + */ + var curr_table_name = $(curr_row).children('th').children('a').text(); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'DROP TABLE ' + curr_table_name; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + + $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + //need to find a better solution here. The icon should be replaced + $(curr_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }); // end $.get() + }); // end $.PMA_confirm() + }); //end of Drop Table Ajax action + + /** + * Ajax Event handler for 'Drop Event' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $('.drop_event_anchor').live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_event_row Object reference to current event's row + */ + var curr_event_row = $(this).parents('tr'); + /** + * @var curr_event_name String containing the name of {@link curr_event_row} + */ + var curr_event_name = $(curr_event_row).children('td:first').text(); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'DROP EVENT ' + curr_event_name; + + $(this).PMA_confirm(question, $(this).attr('href') , function(url) { + + PMA_ajaxShowMessage(PMA_messages['strDroppingEvent']); + + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(curr_event_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + }) //end Drop Event + + /** + * Ajax Event handler for 'Drop Procedure' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $('.drop_procedure_anchor').live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_proc_row Object containing reference to the current procedure's row + */ + var curr_proc_row = $(this).parents('tr'); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = $(curr_proc_row).children('.drop_procedure_sql').val(); + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strDroppingProcedure']); + + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(curr_event_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + }) //end Drop Procedure + + $('.drop_tracking_anchor').live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_tracking_row Object containing reference to the current tracked table's row + */ + var curr_tracking_row = $(this).parents('tr'); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strDeleteTrackingData']; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strDeletingTrackingData']); + + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(curr_tracking_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + }) //end Drop Tracking + + //Calculate Real End for InnoDB + /** + * Ajax Event handler for calculatig the real end for a InnoDB table + * + * @uses $.PMA_confirm + */ + $('#real_end_input').live('click', function(event) { + event.preventDefault(); + + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strOperationTakesLongTime']; + + $(this).PMA_confirm(question, '', function() { + return true; + }) + return false; + }) //end Calculate Real End for InnoDB + +}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file diff --git a/js/dom-drag.js b/js/dom-drag.js old mode 100644 new mode 100755 diff --git a/js/functions.js b/js/functions.js old mode 100644 new mode 100755 index f76d630..e8893c7 --- a/js/functions.js +++ b/js/functions.js @@ -16,6 +16,12 @@ var sql_box_locked = false; var only_once_elements = new Array();
/** + * @var ajax_message_init boolean boolean that stores status of + * notification for PMA_ajaxShowNotification + */ +var ajax_message_init = false; + +/** * selects the content of a given object, f.e. a textarea * * @param object element element of which the content will be selected @@ -99,6 +105,9 @@ function confirmLink(theLink, theSqlQuery) * @param object the message to display * * @return boolean whether to run the query or not + * + * @todo used only by libraries/display_tbl.lib.php. figure out how it is used + * and replace with a jQuery equivalent */ function confirmAction(theMessage) { @@ -876,7 +885,7 @@ function PMA_markRowsInit() { }
if (event.shiftKey == true && table.lastClicked != undefined) { - if (event.preventDefault) { event.preventDefault(); } else { event.returnValue = false; } + if (event.preventDefault) {event.preventDefault();} else {event.returnValue = false;} i = table.lastClicked;
if (i < this.rowIndex) { @@ -926,26 +935,9 @@ $(document).ready(PMA_markRowsInit); * @param container DOM element */ function markAllRows( container_id ) { - var rows = document.getElementById(container_id).getElementsByTagName('tr'); - var unique_id; - var checkbox; - - for ( var i = 0; i < rows.length; i++ ) { - - checkbox = rows[i].getElementsByTagName( 'input' )[0]; - - if ( checkbox && checkbox.type == 'checkbox' ) { - unique_id = checkbox.name + checkbox.value; - if ( checkbox.disabled == false ) { - checkbox.checked = true; - if ( typeof(marked_row[unique_id]) == 'undefined' || !marked_row[unique_id] ) { - rows[i].className += ' marked'; - marked_row[unique_id] = true; - } - } - } - } - + + $("#"+container_id).find("input:checkbox:enabled").attr('checked', 'checked') + .parents("tr").addClass("marked"); return true; }
@@ -956,22 +948,9 @@ function markAllRows( container_id ) { * @param container DOM element */ function unMarkAllRows( container_id ) { - var rows = document.getElementById(container_id).getElementsByTagName('tr'); - var unique_id; - var checkbox; - - for ( var i = 0; i < rows.length; i++ ) { - - checkbox = rows[i].getElementsByTagName( 'input' )[0]; - - if ( checkbox && checkbox.type == 'checkbox' ) { - unique_id = checkbox.name + checkbox.value; - checkbox.checked = false; - rows[i].className = rows[i].className.replace(' marked', ''); - marked_row[unique_id] = false; - } - } - + + $("#"+container_id).find("input:checkbox:enabled").removeAttr('checked') + .parents("tr").removeClass("marked"); return true; }
@@ -1231,12 +1210,12 @@ function setVerticalPointer(theRow, theColNum, theAction, theDefaultClass1, theD * @return boolean always true */ function setCheckboxes( container_id, state ) { - var checkboxes = document.getElementById(container_id).getElementsByTagName('input');
- for ( var i = 0; i < checkboxes.length; i++ ) { - if ( checkboxes[i].type == 'checkbox' ) { - checkboxes[i].checked = state; - } + if(state) { + $("#"+container_id).find("input:checkbox").attr('checked', 'checked'); + } + else { + $("#"+container_id).find("input:checkbox").removeAttr('checked'); }
return true; @@ -1297,13 +1276,13 @@ function setCheckboxColumn(theCheckbox){ */ function setSelectOptions(the_form, the_select, do_check) { - var selectObject = document.forms[the_form].elements[the_select]; - var selectCount = selectObject.length; - - for (var i = 0; i < selectCount; i++) { - selectObject.options[i].selected = do_check; - } // end for
+ if( do_check ) { + $("form[name='"+ the_form +"']").find("select[name='"+the_select+"']").find("option").attr('selected', 'selected'); + } + else { + $("form[name='"+ the_form +"']").find("select[name="+the_select+"]").find("option").removeAttr('selected'); + } return true; } // end of the 'setSelectOptions()' function
@@ -1664,6 +1643,46 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh }
/** + * popups a request for changing MIME types for files in the BLOB repository + * + * @param var db database name + * @param var table table name + * @param var reference BLOB repository reference + * @param var current_mime_type current MIME type associated with BLOB repository reference + */ +function requestMIMETypeChange(db, table, reference, current_mime_type) +{ + // no mime type specified, set to default (nothing) + if (undefined == current_mime_type) + current_mime_type = ""; + + // prompt user for new mime type + var new_mime_type = prompt("Enter custom MIME type", current_mime_type); + + // if new mime_type is specified and is not the same as the previous type, request for mime type change + if (new_mime_type && new_mime_type != current_mime_type) + changeMIMEType(db, table, reference, new_mime_type); +} + +/** + * changes MIME types for files in the BLOB repository + * + * @param var db database name + * @param var table table name + * @param var reference BLOB repository reference + * @param var mime_type new MIME type to be associated with BLOB repository reference + */ +function changeMIMEType(db, table, reference, mime_type) +{ + // specify url and parameters for jQuery POST + var mime_chg_url = 'bs_change_mime_type.php'; + var params = {bs_db: db, bs_table: table, bs_reference: reference, bs_new_mime_type: mime_type}; + + // jQuery POST + jQuery.post(mime_chg_url, params); +} + +/** * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ @@ -1742,6 +1761,103 @@ $(document).ready(function(){ });
/** + * Function to process the plain HTML response from an Ajax request. Inserts + * the various HTML divisions from the response at the proper locations. The + * array relates the divisions to be inserted to their placeholders. + * + * @param var divisions_map an associative array of id names + * + * <code> + * PMA_ajaxInsertResponse({'resultsTable':'resultsTable_response', + * 'profilingData':'profilingData_response'}); + * </code> + * + */ + +function PMA_ajaxInsertResponse(divisions_map) { + $.each(divisions_map, function(key, value) { + var content_div = '#'+value; + var target_div = '#'+key; + var content = $(content_div).html(); + + //replace content of target_div with that from the response + $(target_div).html(content); + }); +}; + +/** + * Show a message on the top of the page for an Ajax request + * + * @param var message string containing the message to be shown. + * optional, defaults to 'Loading...' + * @param var timeout number of milliseconds for the message to be visible + * optional, defaults to 5000 + */ + +function PMA_ajaxShowMessage(message, timeout) { + + //Handle the case when a empty data.message is passed. We don't want the empty message + if(message == '') { + return true; + } + + /** + * @var msg String containing the message that has to be displayed + * @default PMA_messages['strLoading'] + */ + if(!message) { + var msg = PMA_messages['strLoading']; + } + else { + var msg = message; + } + + /** + * @var timeout Number of milliseconds for which {@link msg} will be visible + * @default 5000 ms + */ + if(!timeout) { + var to = 5000; + } + else { + var to = timeout; + } + + if( !ajax_message_init) { + //For the first time this function is called, append a new div + $(function(){ + $('<div id="loading_parent"></div>') + .insertBefore("#serverinfo"); + + $('<span id="loading" class="ajax_notification"></span>') + .appendTo("#loading_parent") + .html(msg) + .slideDown('medium') + .delay(to) + .slideUp('medium', function(){ + $(this) + .html("") //Clear the message + .hide(); + }); + }, 'top.frame_content'); + ajax_message_init = true; + } + else { + //Otherwise, just show the div again after inserting the message + $("#loading") + .clearQueue() + .html(msg) + .slideDown('medium') + .delay(to) + .slideUp('medium', function() { + $(this) + .html("") + .hide(); + }) + } +} + +/** * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected */ function toggle_enum_notice(selectElement) { @@ -1756,6 +1872,451 @@ function toggle_enum_notice(selectElement) { }
/** + * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not + * return a jQuery object yet and hence cannot be chained + * + * @param string question + * @param string url URL to be passed to the callbackFn to make + * an Ajax call to + * @param function callbackFn callback to execute after user clicks on OK + */ + +jQuery.fn.PMA_confirm = function(question, url, callbackFn) { + if (PMA_messages['strDoYouReally'] == '') { + return true; + } + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + button_options[PMA_messages['strOK']] = function(){ + $(this).dialog("close").remove(); + + if($.isFunction(callbackFn)) { + callbackFn.call(this, url); + } + }; + button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} + + $('<div id="confirm_dialog"></div>') + .prepend(question) + .dialog({buttons: button_options}); +}; + +/** + * jQuery function to sort a table's body after a new row has been appended to it. + * Also fixes the even/odd classes of the table rows at the end. + * + * @param string text_selector string to select the sortKey's text + * + * @return jQuery Object for chaining purposes + */ +jQuery.fn.PMA_sort_table = function(text_selector) { + return this.each(function() { + + /** + * @var table_body Object referring to the table's <tbody> element + */ + var table_body = $(this); + /** + * @var rows Object referring to the collection of rows in {@link table_body} + */ + var rows = $(this).find('tr').get(); + + //get the text of the field that we will sort by + $.each(rows, function(index, row) { + row.sortKey = $.trim($(row).find(text_selector).text().toLowerCase()); + }) + + //get the sorted order + rows.sort(function(a,b) { + if(a.sortKey < b.sortKey) { + return -1; + } + if(a.sortKey > b.sortKey) { + return 1; + } + return 0; + }) + + //pull out each row from the table and then append it according to it's order + $.each(rows, function(index, row) { + $(table_body).append(row); + row.sortKey = null; + }) + + //Re-check the classes of each row + $(this).find('tr:odd') + .removeClass('even').addClass('odd') + .end() + .find('tr:even') + .removeClass('odd').addClass('even'); + }) +} + +/** + * jQuery coding for 'Create Table'. Used on db_operations.php, + * db_structure.php and db_tracking.php (i.e., wherever + * libraries/display_create_table.lib.php is used) + * + * Attach Ajax Event handlers for Create Table + */ +$(document).ready(function() { + + /** + * Attach event handler to the submit action of the create table minimal form + * and retrieve the full table form and display it in a dialog + * + * @uses PMA_ajaxShowMessage() + */ + $("#create_table_form_minimal").live('submit', function(event) { + event.preventDefault(); + + /* @todo Validate this form! */ + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + + PMA_ajaxShowMessage(); + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.get($(this).attr('action'), $(this).serialize(), function(data) { + $('<div id="create_table_dialog"></div>') + .append(data) + .dialog({ + title: top.frame_content.PMA_messages['strCreateTable'], + width: 900, + buttons : button_options + }); // end dialog options + }) // end $.get() + + }); + + /** + * Attach event handler for submission of create table form + * + * @uses PMA_ajaxShowMessage() + * @uses $.PMA_sort_table() + * @uses window.parent.refreshNavigation() + */ + $("#create_table_form").find("input[name=submit_num_fields], input[name=do_save_data]").live('click', function(event) { + event.preventDefault(); + + /** + * @var the_form object referring to the create table form + */ + var the_form = $("#create_table_form"); + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + + if($(this).attr('name') == 'submit_num_fields') { + //User wants to add more fields to the table + $.post($(the_form).attr('action'), $(the_form).serialize() + "&submit_num_fields=" + $(this).val(), function(data) { + $("#create_table_dialog").html(data); + }) //end $.post() + } + else if($(this).attr('name') == 'do_save_data') { + //User wants to submit the form + $.post($(the_form).attr('action'), $(the_form).serialize() + "&do_save_data=" + $(this).val(), function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $("#create_table_dialog").dialog("close").remove(); + + /** + * @var tables_table Object referring to the <tbody> element that holds the list of tables + */ + var tables_table = $("#tablesForm").find("tbody").not("#tbl_summary_row"); + + /** + * @var curr_last_row Object referring to the last <tr> element in {@link tables_table} + */ + var curr_last_row = $(tables_table).find('tr:last'); + /** + * @var curr_last_row_index_string String containing the index of {@link curr_last_row} + */ + var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0]; + /** + * @var curr_last_row_index Index of {@link curr_last_row} + */ + var curr_last_row_index = parseFloat(curr_last_row_index_string); + /** + * @var new_last_row_index Index of the new row to be appended to {@link tables_table} + */ + var new_last_row_index = curr_last_row_index + 1; + /** + * @var new_last_row_id String containing the id of the row to be appended to {@link tables_table} + */ + var new_last_row_id = 'checkbox_tbl_' + new_last_row_index; + + //append to table + $(data.new_table_string) + .find('input:checkbox') + .val(new_last_row_id) + .end() + .appendTo(tables_table); + + //Sort the table + $(tables_table).PMA_sort_table('th'); + + //Refresh navigation frame as a new table has been added + window.parent.refreshNavigation(); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + } // end elseif() + }) // end create table form submit button actions + +}, 'top.frame_content'); //end $(document).ready for 'Create Table' + +/** + * Attach event handlers for Empty Table and Drop Table. Used wherever libraries/ + * tbl_links.inc.php is used. + */ +$(document).ready(function() { + + /** + * Attach Ajax event handlers for Empty Table + * + * @uses PMA_ajaxShowMessage() + * @uses $.PMA_confirm() + */ + $("#empty_table_anchor").live('click', function(event) { + event.preventDefault(); + + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'TRUNCATE TABLE ' + window.parent.table; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get + }) // end $.PMA_confirm() + }) // end Empty Table + + /** + * Attach Ajax event handler for Drop Table + * + * @uses PMA_ajaxShowMessage() + * @uses $.PMA_confirm() + * @uses window.parent.refreshNavigation() + */ + $("#drop_table_anchor").live('click', function(event) { + event.preventDefault(); + + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'DROP TABLE/VIEW ' + window.parent.table; + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + window.parent.table = ''; + window.parent.refreshNavigation(); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get + }) // end $.PMA_confirm() + }) // end $().live() +}, 'top.frame_content'); //end $(document).ready() for libraries/tbl_links.inc.php + +/** + * Attach Ajax event handlers for Drop Trigger. Used on tbl_structure.php + */ +$(document).ready(function() { + + $(".drop_trigger_anchor").live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_row Object reference to the current trigger's <tr> + */ + var curr_row = $(this).parents('tr'); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = 'DROP TRIGGER IF EXISTS `' + $(curr_row).children('td:first').text() + '`'; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + $(curr_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + }) // end $().live() +}, 'top.frame_content'); //end $(document).ready() for Drop Trigger + +/** + * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js + * as it was also required on db_create.php + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + * @uses window.parent.refreshNavigation() + * @uses window.parent.refreshMain() + */ +$(document).ready(function() { + $("#drop_db_anchor").live('click', function(event) { + event.preventDefault(); + + //context is top.frame_content, so we need to use window.parent.db to access the db var + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'DROP DATABASE ' + window.parent.db; + + $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { + //Database deleted successfully, refresh both the frames + window.parent.refreshNavigation(); + window.parent.refreshMain(); + }) // end $.get() + }); // end $.PMA_confirm() + }); //end of Drop Database Ajax action +}) // end of $(document).ready() for Drop Database + +/** + * Attach Ajax event handlers for 'Create Database'. Used wherever libraries/ + * display_create_database.lib.php is used, ie main.php and server_databases.php + * + * @uses PMA_ajaxShowMessage() + */ +$(document).ready(function() { + + $('#create_database_form').live('submit', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(this).attr('action'), $(this).serialize(), function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + + //Append database's row to table + $("#tabledatabases") + .find('tbody') + .append(data.new_db_string) + .PMA_sort_table('.name') + .find('#db_summary_row') + .appendTo('#tabledatabases tbody') + .removeClass('odd even'); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + }) // end $().live() +}) // end $(document).ready() for Create Database + +/** + * Attach Ajax event handlers for 'Change Password' on main.php + */ +$(document).ready(function() { + + /** + * Attach Ajax event handler on the change password anchor + */ + $('#change_password_anchor').live('click', function(event) { + event.preventDefault(); + + /** + * @var button_options Object containing options to be passed to jQueryUI's dialog + */ + var button_options = {}; + + button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + + $.get($(this).attr('href'), {'ajax_request': true}, function(data) { + $('<div id="change_password_dialog></div>') + .dialog({ + title: top.frame_content.PMA_messages['strChangePassword'], + width: 600, + buttons : button_options + }) + .append(data); + }) // end $.get() + }) // end handler for change password anchor + + /** + * Attach Ajax event handler for Change Password form submission + * + * @uses PMA_ajaxShowMessage() + */ + $("#change_password_form").find('input[name=change_pw]').live('click', function(event) { + event.preventDefault(); + + /** + * @var the_form Object referring to the change password form + */ + var the_form = $("#change_password_form"); + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) { + if(data.success == true) { + + PMA_ajaxShowMessage(data.message); + + $("#topmenucontainer").after(data.sql_query); + + $("#change_password_dialog").hide().remove(); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + }) // end handler for Change Password form submission +}) // end $(document).ready() for Change Password + +/** * Toggle the hiding/showing of the "Open in ENUM/SET editor" message when * the page loads and when the selected data type changes */ diff --git a/js/indexes.js b/js/indexes.js old mode 100644 new mode 100755 diff --git a/js/jquery/jquery-1.4.2.js b/js/jquery/jquery-1.4.2.js old mode 100644 new mode 100755 diff --git a/js/jquery/jquery-ui-1.8.custom.js b/js/jquery/jquery-ui-1.8.custom.js old mode 100644 new mode 100755 diff --git a/js/jquery/jquery.json-2.2.js b/js/jquery/jquery.json-2.2.js old mode 100644 new mode 100755 diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js old mode 100644 new mode 100755 diff --git a/js/keyhandler.js b/js/keyhandler.js old mode 100644 new mode 100755 diff --git a/js/main_custom_color.js b/js/main_custom_color.js old mode 100644 new mode 100755 diff --git a/js/messages.php b/js/messages.php old mode 100644 new mode 100755 index 94e1e67..8806b07 --- a/js/messages.php +++ b/js/messages.php @@ -29,6 +29,12 @@ $js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled /* For confirmations */ $js_messages['strDoYouReally'] = __('Do you really want to '); $js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!'); +$js_messages['strDroppingEvent'] = __('Dropping Event'); +$js_messages['strDroppingProcedure'] = __('Dropping Procedure'); +$js_messages['strDeleteTrackingData'] = __('Delete tracking data for this table'); +$js_messages['strDeletingTrackingData'] = __('Deleting tracking data'); +$js_messages['strDroppingPrimaryKeyIndex'] = __('Dropping Primary Key/Index'); +$js_messages['strOperationTakesLongTime'] = __('This operation could take a long time. Proceed anyway?');
/* For blobstreaming */ $js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!'); @@ -43,11 +49,44 @@ $js_messages['strHostEmpty'] = __('The host name is empty!'); $js_messages['strUserEmpty'] = __('The user name is empty!'); $js_messages['strPasswordEmpty'] = __('The password is empty!'); $js_messages['strPasswordNotSame'] = __('The passwords aren't the same!'); +$js_messages['strAddNewUser'] = __('Add a New User'); +$js_messages['strCreateUser'] = __('Create User'); +$js_messages['strReloadingPrivileges'] = __('Reloading Privileges'); +$js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users'); +$js_messages['strClose'] = __('Close');
/* For inline query editing */ $js_messages['strGo'] = __('Go'); $js_messages['strCancel'] = __('Cancel');
+/* For Ajax Notifications */ +$js_messages['strLoading'] = __('Loading'); +$js_messages['strProcessingRequest'] = __('Processing Request'); +$js_messages['strErrorProcessingRequest'] = __('Error in Processing Request'); +$js_messages['strDroppingColumn'] = __('Dropping Column'); +$js_messages['strAddingPrimaryKey'] = __('Adding Primary Key'); +$js_messages['strOK'] = __('OK'); + +/* For db_operations.js */ +$js_messages['strRenamingDatabases'] = __('Renaming Databases'); +$js_messages['strReloadDatabase'] = __('Reload Database'); +$js_messages['strCopyingDatabase'] = __('Copying Database'); +$js_messages['strChangingCharset'] = __('Changing Charset'); +$js_messages['strTableMustHaveAtleastOneColumn'] = __('Table must have atleast 1 column'); +$js_messages['strCreateTable'] = __('Create Table'); +$js_messages['strYes'] = __('Yes'); +$js_messages['strNo'] = __('No'); + +/* For db_search.js */ +$js_messages['strSearching'] = __('Searching'); + +/* For sql.js */ +$js_messages['strToggleQueryBox'] = __('Toggle Query Box Visibility'); +$js_messages['strInlineEdit'] = __('Inline Edit'); + +/* For tbl_change.js */ +$js_messages['strIgnore'] = __('Ignore'); + /* Designer */ $js_messages['strModifications'] = __('Modifications have been saved'); $js_messages['strRelationDeleted'] = __('Relation deleted'); @@ -65,6 +104,7 @@ $js_messages['strChangeDisplay'] = __('Choose column to display'); /* password generation */ $js_messages['strGeneratePassword'] = __('Generate password'); $js_messages['strGenerate'] = __('Generate'); +$js_messages['strChangePassword'] = __('Change Password');
/* navigation tabs */ $js_messages['strMore'] = __('More'); diff --git a/js/navigation.js b/js/navigation.js old mode 100644 new mode 100755 diff --git a/js/querywindow.js b/js/querywindow.js old mode 100644 new mode 100755 diff --git a/js/replication.js b/js/replication.js old mode 100644 new mode 100755 diff --git a/js/server_privileges.js b/js/server_privileges.js old mode 100644 new mode 100755 index 3495e03..e59ec62 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -1,6 +1,11 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * function used in server privilege pages + * @fileoverview functions used in server privilege pages + * @name Server Privileges + * + * @requires jQuery + * @requires jQueryUI + * @requires js/functions.js * * @version $Id$ */ @@ -8,8 +13,8 @@ /** * Validates the password field in a form * - * @uses PMA_messages['strPasswordEmpty'] - * @uses PMA_messages['strPasswordNotSame'] + * @see PMA_messages['strPasswordEmpty'] + * @see PMA_messages['strPasswordNotSame'] * @param object the form * @return boolean whether the field value is valid or not */ @@ -93,3 +98,365 @@ function suggestPassword(passwd_form) { passwd_form.text_pma_pw2.value = passwd.value; return true; } + +/** + * When a new user is created and retrieved over Ajax, append the user's row to + * the user's table + * + * @param new_user_string the html for the new user's row + * @param new_user_initial the first alphabet of the user's name + * @param new_user_initial_string html to replace the initial for pagination + */ +function appendNewUser(new_user_string, new_user_initial, new_user_initial_string) { + //Append the newly retrived user to the table now + + //Calculate the index for the new row + var curr_last_row = $("#usersForm").find('tbody').find('tr:last'); + var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0]; + var curr_last_row_index = parseFloat(curr_last_row_index_string); + var new_last_row_index = curr_last_row_index + 1; + var new_last_row_id = 'checkbox_sel_users_' + new_last_row_index; + + //Append to the table and set the id/names correctly + $(new_user_string) + .insertAfter($(curr_last_row)) + .find('input:checkbox') + .attr('id', new_last_row_id) + .val(function() { + //the insert messes up the &27; part. let's fix it + return $(this).val().replace(/&/,'&'); + }) + .end() + .find('label') + .attr('for', new_last_row_id) + .end(); + + //Let us sort the table alphabetically + $("#usersForm").find('tbody').PMA_sort_table('label'); + + $("#initials_table").find('td:contains('+new_user_initial+')') + .html(new_user_initial_string); +}; + +/**#@+ + * @namespace jQuery + */ + +/** + * AJAX scripts for server_privileges page. + * + * Actions ajaxified here: + * Add a new user + * Revoke a user + * Edit privileges + * Export privileges + * Paginate table of users + * Flush privileges + * + * @memberOf jQuery + * @name document.ready + */ + +$(document).ready(function() { + /** @lends jQuery */ + + /** + * AJAX event handler for 'Add a New User' + * + * @see PMA_ajaxShowMessage() + * @see appendNewUser() + * @memberOf jQuery + * @name add_user_click + * + */ + $("#fieldset_add_user a").live("click", function(event) { + /** @lends jQuery */ + event.preventDefault(); + + PMA_ajaxShowMessage(); + + /** + * @var button_options Object containing options for jQueryUI dialog buttons + */ + var button_options = {}; + button_options[PMA_messages['strCreateUser']] = function() { + + /** + * @var the_form stores reference to current form + */ + var the_form = $(this).find("#addUsersForm"); + + if( ! checkAddUser($(the_form).get(0)) ) { + PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); + return false; + } + + //We also need to post the value of the submit button in order to get this to work correctly + $.post($(the_form).attr('action'), $(the_form).serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { + if(data.success == true) { + $("#add_user_dialog").dialog("close").remove(); + PMA_ajaxShowMessage(data.message); + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + + appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + } + }) + }; + button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} + + $.get($(this).attr("href"), {'ajax_request':true}, function(data) { + $('<div id="add_user_dialog"></div>') + .prepend(data) + .find("#fieldset_add_user_footer").hide() //showing the "Go" and "Create User" buttons together will confuse the user + .end() + .find("#addUsersForm").append('<input type="hidden" name="ajax_request" value="true" />') + .end() + .dialog({ + title: top.frame_content.PMA_messages['strAddNewUser'], + width: 800, + modal: true, + buttons: button_options + }); //dialog options end + }); // end $.get() + + });//end of Add New User AJAX event handler + + + /** + * Ajax event handler for 'Reload Privileges' anchor + * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name reload_privileges_click + */ + $("#reload_privileges_anchor").live("click", function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']); + + $.get($(this).attr("href"), {'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + } + else { + PMA_ajaxShowMessage(data.error); + } + }); //end $.get() + + }); //end of Reload Privileges Ajax event handler + + /** + * AJAX handler for 'Revoke User' + * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name revoke_user_click + */ + $("#fieldset_delete_user_footer #buttonGo").live('click', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']); + + $.post($("#usersForm").attr('action'), $("#usersForm").serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + + //Remove the revoked user from the users list + $("#usersForm").find("input:checkbox:checked").parents("tr").slideUp("medium", function() { + var this_user_initial = $(this).find('input:checkbox').val().charAt(0).toUpperCase(); + $(this).remove(); + + //If this is the last user with this_user_initial, remove the link from #initials_table + if($("#tableuserrights").find('input:checkbox[value^=' + this_user_initial + ']').length == 0) { + $("#initials_table").find('td > a:contains(' + this_user_initial + ')').parent('td').html(this_user_initial); + } + + //Re-check the classes of each row + $("#usersForm") + .find('tbody').find('tr:odd') + .removeClass('even').addClass('odd') + .end() + .find('tr:even') + .removeClass('odd').addClass('even'); + }) + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + }) // end Revoke User + + /** + * AJAX handler for 'Edit User' + * + * @see PMA_ajaxShowMessage() + * + */ + + /** + * Step 1: Load Edit User Dialog + * @memberOf jQuery + * @name edit_user_click + */ + $(".edit_user_anchor").live('click', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $(this).parents('tr').addClass('current_row'); + + /** + * @var button_options Object containing options for jQueryUI dialog buttons + */ + var button_options = {}; + button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} + + $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) { + $('<div id="edit_user_dialog"></div>') + .append(data) + .dialog({ + width: 900, + buttons: button_options + }) + }) // end $.get() + }) + + /** + * Step 2: Submit the Edit User Dialog + * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name edit_user_submit + */ + $("#edit_user_dialog").find("form").live('submit', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + /** + * @var curr_submit_name name of the current button being submitted + */ + var curr_submit_name = $(this).find('.tblFooters').find('input:submit').attr('name'); + + /** + * @var curr_submit_value value of the current button being submitted + */ + var curr_submit_value = $(this).find('.tblFooters').find('input:submit').val(); + + $.post($(this).attr('action'), $(this).serialize() + '&' + curr_submit_name + '=' + curr_submit_value, function(data) { + if(data.success == true) { + + PMA_ajaxShowMessage(data.message); + + //Close the jQueryUI dialog + $("#edit_user_dialog").dialog("close").remove(); + + if(data.sql_query) { + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + } //Show SQL Query that was executed + + //Append new user if necessary + if(data.new_user_string) { + appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + } + + //Change privileges if they were edited + if(data.new_privileges) { + $("#usersForm") + .find('.current_row') + .find('tt') + .html(data.new_privileges); + } + + $("#usersForm") + .find('.current_row') + .removeClass('current_row'); + } + else { + PMA_ajaxShowMessage(data.error); + } + }); + }) + //end Edit user + + /** + * AJAX handler for 'Export Privileges' + * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name export_user_click + */ + $(".export_user_anchor").live('click', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + PMA_ajaxShowMessage(); + + /** + * @var button_options Object containing options for jQueryUI dialog buttons + */ + var button_options = {}; + button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();} + + $.get($(this).attr('href'), {'ajax_request': true}, function(data) { + $('<div id="export_dialog"></div>') + .prepend(data) + .dialog({ + width : 500, + buttons: button_options + }); + }) //end $.get + }) //end export privileges + + /** + * AJAX handler to Paginate the Users Table + * + * @see PMA_ajaxShowMessage() + * @name paginate_users_table_click + * @memberOf jQuery + */ + $("#initials_table").find("a").live('click', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $.get($(this).attr('href'), {'ajax_request' : true, 'random': Math.random()}, function(data) { + $("#usersForm") + .hide("medium") + .siblings("#initials_table") + .after(data) + .show("medium") + .end() + .remove(); + $("#initials_table").siblings("h2").not(":first").remove(); + }) // end $.get + })// end of the paginate users table + +}, 'top.frame_content'); //end $(document).ready() + +/**#@- */ \ No newline at end of file diff --git a/js/server_synchronize.js b/js/server_synchronize.js old mode 100644 new mode 100755 diff --git a/js/sql.js b/js/sql.js new file mode 100644 index 0000000..a2000ac --- /dev/null +++ b/js/sql.js @@ -0,0 +1,630 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @fileoverview functions used wherever an sql query form is used + * + * @requires jQuery + * @requires js/functions.js + * + * @version $Id$ + */ + +/** + * Get the field name for the current field. Required to construct the query + * for inline editing + * + * @param this_field_obj jQuery object that points to the current field's tr + * @param disp_mode string + */ +function getFieldName(this_field_obj, disp_mode) { + + if(disp_mode == 'vertical') { + var field_name = $(this_field_obj).siblings('th').find('a').text(); + } + else { + var this_field_index = $(this_field_obj).index(); + if(window.parent.text_dir == 'ltr') { + // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors + var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ (this_field_index-4 )+') a').text(); + } + else { + var field_name = $(this_field_obj).parents('table').find('thead').find('th:nth('+ this_field_index+') a').text(); + } + } + + field_name = $.trim(field_name); + + return field_name; +} + +/** + * The function that iterates over each row in the table_results and appends a + * new inline edit anchor to each table row. + * + * @param disp_mode string + */ +function appendInlineAnchor(disp_mode) { + if(disp_mode == 'vertical') { + var cloned_row = $('.edit_row_anchor').removeClass('edit_row_anchor').parent('tr').clone(); + + var img_object = $(cloned_row).find('img:first').attr('title', PMA_messages['strInlineEdit']); + + $(cloned_row).find('td').addClass('edit_row_anchor') + .find('a').attr('href', '#') + .find('div') + .text(PMA_messages['strInlineEdit']) + .prepend(img_object); + + $(cloned_row).insertBefore($('.where_clause').parent('tr')); + + $("#table_results").find('tr:first').find('th') + .attr('rowspan', '4'); + } + else { + $('.edit_row_anchor').each(function() { + + $(this).removeClass('edit_row_anchor'); + + var cloned_anchor = $(this).clone(); + + var img_object = $(cloned_anchor).find('img').attr('title', PMA_messages['strInlineEdit']); + + $(cloned_anchor).addClass('edit_row_anchor') + .find('a').attr('href', '#') + .find('div') + .text(PMA_messages['strInlineEdit']) + .prepend(img_object); + + $(this).siblings('.where_clause') + .before(cloned_anchor); + }); + + $('#rowsDeleteForm').find('thead').find('th').each(function() { + if($(this).attr('colspan') == 3) { + $(this).attr('colspan', '4') + } + }) + } +} + +/**#@+ + * @namespace jQuery + */ + +/** + * @description <p>Ajax scripts for sql and browse pages</p> + * + * Actions ajaxified here: + * <ul> + * <li>Retrieve results of an SQL query</li> + * <li>Paginate the results table</li> + * <li>Sort the results table</li> + * <li>Change table according to display options</li> + * <li>Inline editing of data</li> + * </ul> + * + * @name document.ready + * @memberOf jQuery + */ +$(document).ready(function() { + + + /** + * current value of the direction in which the table is displayed + * @type String + * @fieldOf jQuery + * @name disp_mode + */ + var disp_mode = $("#top_direction_dropdown").val(); + + /** + * Update value of {@link jQuery.disp_mode} everytime the direction dropdown changes value + * @memberOf jQuery + * @name direction_dropdown_change + */ + $("#top_direction_dropdown, #bottom_direction_dropdown").live('change', function(event) { + disp_mode = $(this).val(); + }) + + /** + * Attach the {@link appendInlineAnchor} function to a custom event, which + * will be triggered manually everytime the table of results is reloaded + * @memberOf jQuery + * @name sqlqueryresults_live + */ + $("#sqlqueryresults").live('appendAnchor',function() { + appendInlineAnchor(disp_mode); + }) + + /** + * Trigger the appendAnchor event to prepare the first table for inline edit + * + * @memberOf jQuery + * @name sqlqueryresults_trigger + */ + $("#sqlqueryresults").trigger('appendAnchor'); + + /** + * Append the Toggle Query Box message to the query input form + * + * @memberOf jQuery + * @name appendToggleSpan + */ + $('<span id="togglequerybox"></span>') + .html(PMA_messages['strToggleQueryBox']) + .appendTo("#sqlqueryform"); + + // Attach the toggling of the query box visibility to a click + $("#togglequerybox").live('click', function() { + $(this).siblings().slideToggle("medium"); + }) + + /** + * Ajax Event handler for 'SQL Query Submit' + * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name sqlqueryform_submit + */ + $("#sqlqueryform").live('submit', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(this).attr('action'), $(this).serialize() , function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + } + else if (data.success == false ) { + PMA_ajaxShowMessage(data.error); + } + else { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + if($("#togglequerybox").siblings(":visible").length > 0) { + $("#togglequerybox").trigger('click'); + } + } + }) // end $.post() + }) // end SQL Query submit + + /** + * Ajax Event handlers for Paginating the results table + */ + + /** + * Paginate when we click any of the navigation buttons + * @memberOf jQuery + * @name paginate_nav_button_click + * @uses PMA_ajaxShowMessage() + */ + $("input[name=navig]").live('click', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + PMA_ajaxShowMessage(); + + /** + * @var the_form Object referring to the form element that paginates the results table + */ + var the_form = $(this).parent("form"); + + $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.post() + })// end Paginate results table + + /** + * Paginate results with Page Selector dropdown + * @memberOf jQuery + * @name paginate_dropdown_change + */ + $("#pageselector").live('change', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.get() + })// end Paginate results with Page Selector + + /** + * Ajax Event handler for sorting the results table + * @memberOf jQuery + * @name table_results_sort_click + */ + $("#table_results").find("a[title=Sort]").live('click', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.get() + })//end Sort results table + + /** + * Ajax Event handler for the display options + * @memberOf jQuery + * @name displayOptionsForm_submit + */ + $("#displayOptionsForm").live('submit', function(event) { + event.preventDefault(); + + $.post($(this).attr('action'), $(this).serialize() + '&ajax_request=true' , function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.post() + }) + //end displayOptionsForm handler + + /** + * Ajax Event handlers for Inline Editing + */ + + /** + * On click, replace the current field with an input/textarea + * @memberOf jQuery + * @name inline_edit_start + * @see PMA_ajaxShowMessage() + * @see getFieldName() + */ + $(".edit_row_anchor").live('click', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + $(this).removeClass('edit_row_anchor').addClass('edit_row_anchor_active'); + + // Initialize some variables + if(disp_mode == 'vertical') { + /** + * @var this_row_index Index of the current <td> in the parent <tr> + * Current <td> is the inline edit anchor. + */ + var this_row_index = $(this).index(); + /** + * @var input_siblings Object referring to all inline editable events from same row + */ + var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); + /** + * @var where_clause String containing the WHERE clause to select this row + */ + var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val(); + } + else { + var input_siblings = $(this).parent('tr').find('.data_inline_edit'); + var where_clause = $(this).parent('tr').find('.where_clause').val(); + } + + $(input_siblings).each(function() { + /** @lends jQuery */ + /** + * @var data_value Current value of this field + */ + var data_value = $(this).html(); + + // We need to retrieve the value from the server for truncated/relation fields + // Find the field name + + /** + * @var this_field Object referring to this field (<td>) + */ + var this_field = $(this); + /** + * @var field_name String containing the name of this field. + * @see getFieldName() + */ + var field_name = getFieldName($(this), disp_mode); + + // In each input sibling, wrap the current value in a textarea + // and store the current value in a hidden span + if($(this).is(':not(.truncated, .transformed, .relation, .enum, .null)')) { + // handle non-truncated, non-transformed, non-relation values + // We don't need to get any more data, just wrap the value + $(this).html('<textarea>'+data_value+'</textarea>') + .append('<span class="original_data">'+data_value+'</span>'); + $(".original_data").hide(); + } + else if($(this).is('.truncated, .transformed')) { + /** @lends jQuery */ + //handle truncated/transformed values values + + /** + * @var sql_query String containing the SQL query used to retrieve value of truncated/transformed data + */ + var sql_query = 'SELECT ' + field_name + ' FROM ' + window.parent.table + ' WHERE ' + where_clause; + + // Make the Ajax call and get the data, wrap it and insert it + $.post('sql.php', { + 'token' : window.parent.token, + 'db' : window.parent.db, + 'ajax_request' : true, + 'sql_query' : sql_query, + 'inline_edit' : true + }, function(data) { + if(data.success == true) { + $(this_field).html('<textarea>'+data.value+'</textarea>') + .append('<span class="original_data">'+data_value+'</span>'); + $(".original_data").hide(); + } + else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + } + else if($(this).is('.relation')) { + /** @lends jQuery */ + //handle relations + + /** + * @var curr_value String containing the current value of this relational field + */ + var curr_value = $(this).find('a').text(); + + /** + * @var post_params Object containing parameters for the POST request + */ + var post_params = { + 'ajax_request' : true, + 'get_relational_values' : true, + 'db' : window.parent.db, + 'table' : window.parent.table, + 'column' : field_name, + 'token' : window.parent.token, + 'curr_value' : curr_value + } + + $.post('sql.php', post_params, function(data) { + $(this_field).html(data.dropdown) + .append('<span class="original_data">'+data_value+'</span>'); + $(".original_data").hide(); + }) // end $.post() + } + else if($(this).is('.enum')) { + /** @lends jQuery */ + //handle enum fields + /** + * @var curr_value String containing the current value of this relational field + */ + var curr_value = $(this).text(); + + /** + * @var post_params Object containing parameters for the POST request + */ + var post_params = { + 'ajax_request' : true, + 'get_enum_values' : true, + 'db' : window.parent.db, + 'table' : window.parent.table, + 'column' : field_name, + 'token' : window.parent.token, + 'curr_value' : curr_value + } + + $.post('sql.php', post_params, function(data) { + $(this_field).html(data.dropdown) + .append('<span class="original_data">'+data_value+'</span>'); + $(".original_data").hide(); + }) // end $.post() + } + else if($(this).is('.null')) { + //handle null fields + $(this_field).html('<textarea></textarea>') + .append('<span class="original_data">NULL</span>'); + $(".original_data").hide(); + } + }) + }) // End On click, replace the current field with an input/textarea + + /** + * After editing, clicking again should post data + * + * @memberOf jQuery + * @name inline_edit_save + * @see PMA_ajaxShowMessage() + * @see getFieldName() + */ + $(".edit_row_anchor_active").live('click', function(event) { + /** @lends jQuery */ + event.preventDefault(); + + /** + * @var this_row Object referring to current row that is being edited + */ + var this_row = $(this); + + // Initialize variables + if(disp_mode == 'vertical') { + /** + * @var this_row_index Index of the current <td> in the parent <tr> + * Current <td> is the inline edit anchor. + */ + var this_row_index = $(this).index(); + /** + * @var input_siblings Object referring to all inline editable events from same row + */ + var input_siblings = $(this).parents('tbody').find('tr').find('.data_inline_edit:nth('+this_row_index+')'); + /** + * @var where_clause String containing the WHERE clause to select this row + */ + var where_clause = $(this).parents('tbody').find('tr').find('.where_clause:nth('+this_row_index+')').val(); + } + else { + var input_siblings = $(this).parent('tr').find('.data_inline_edit'); + var where_clause = $(this).parent('tr').find('.where_clause').val(); + } + + /** + * @var nonunique Boolean, whether this row is unique or not + */ + if($(this).is('.nonunique')) { + var nonunique = 0; + } + else { + var nonunique = 1; + } + + // Collect values of all fields to submit, we don't know which changed + /** + * @var params_to_submit Array containing the name/value pairs of all fields + */ + var params_to_submit = {}; + /** + * @var relation_fields Array containing the name/value pairs of relational fields + */ + var relation_fields = {}; + /** + * @var transform_fields Array containing the name/value pairs for transformed fields + */ + var transform_fields = {}; + /** + * @var transformation_fields Boolean, if there are any transformed fields in this row + */ + var transformation_fields = false; + + $(input_siblings).each(function() { + /** @lends jQuery */ + /** + * @var this_field Object referring to this field (<td>) + */ + var this_field = $(this); + /** + * @var field_name String containing the name of this field. + * @see getFieldName() + */ + var field_name = getFieldName($(this), disp_mode); + + /** + * @var this_field_params Array temporary storage for the name/value of current field + */ + var this_field_params = {}; + + if($(this).is('.transformed')) { + transformation_fields = true; + } + + if($(this).is(":not(.relation, .enum)")) { + this_field_params[field_name] = $(this).find('textarea').val(); + if($(this).is('.transformed')) { + $.extend(transform_fields, this_field_params); + } + } + else { + this_field_params[field_name] = $(this).find('select').val(); + + if($(this).is('.relation')) { + $.extend(relation_fields, this_field_params); + } + } + + $.extend(params_to_submit, this_field_params); + }) + + /** + * @var sql_query String containing the SQL query to update this row + */ + var sql_query = 'UPDATE ' + window.parent.table + ' SET '; + + $.each(params_to_submit, function(key, value) { + if(value.length == 0) { + value = 'NULL' + } + sql_query += ' ' + key + "='" + value + "' , "; + }) + //Remove the last ',' appended in the above loop + sql_query = sql_query.replace(/,\s$/, ''); + sql_query += ' WHERE ' + where_clause; + + /** + * @var rel_fields_list String, url encoded representation of {@link relations_fields} + */ + var rel_fields_list = $.param(relation_fields); + + /** + * @var transform_fields_list String, url encoded representation of {@link transform_fields} + */ + var transform_fields_list = $.param(transform_fields); + + // Make the Ajax post after setting all parameters + /** + * @var post_params Object containing parameters for the POST request + */ + var post_params = {'ajax_request' : true, + 'sql_query' : sql_query, + 'disp_direction' : disp_mode, + 'token' : window.parent.token, + 'db' : window.parent.db, + 'table' : window.parent.table, + 'clause_is_unique' : nonunique, + 'where_clause' : where_clause, + 'rel_fields_list' : rel_fields_list, + 'do_transformations' : transformation_fields, + 'transform_fields_list' : transform_fields_list, + 'goto' : 'sql.php' + }; + + $.post('tbl_replace.php', post_params, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(this_row).removeClass('edit_row_anchor_active').addClass('edit_row_anchor'); + + $(input_siblings).each(function() { + // Inline edit post has been successful. + if($(this).is(':not(.relation, .enum)')) { + /** + * @var new_html String containing value of the data field after edit + */ + var new_html = $(this).find('textarea').val(); + + if($(this).is('.transformed')) { + var field_name = getFieldName($(this), disp_mode); + var this_field = $(this); + + $.each(data.transformations, function(key, value) { + if(key == field_name) { + if($(this_field).is('.text_plain, .application_octetstream')) { + new_html = value; + return false; + } + else { + var new_value = $(this_field).find('textarea').val(); + new_html = $(value).append(new_value); + return false; + } + } + }) + } + } + else { + var new_html = $(this).find('select').val(); + if($(this).is('.relation')) { + var field_name = getFieldName($(this), disp_mode); + var this_field = $(this); + + $.each(data.relations, function(key, value) { + if(key == field_name) { + var new_value = $(this_field).find('select').val(); + new_html = $(value).append(new_value); + return false; + } + }) + } + } + $(this).html(new_html); + }) + } + else { + PMA_ajaxShowMessage(data.error); + }; + }) // end $.post() + }) // End After editing, clicking again should post data +}, 'top.frame_content') // end $(document).ready() + +/**#@- */ diff --git a/js/tbl_change.js b/js/tbl_change.js old mode 100644 new mode 100755 index 36c4303..a092171 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -1,6 +1,10 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * function used in table data manipulation pages + * @fileoverview function used in table data manipulation pages + * + * @requires jQuery + * @requires jQueryUI + * @requires js/functions.js * * @version $Id$ */ @@ -247,3 +251,151 @@ function unNullify(urlField, multi_edit)
return true; } // end of the 'unNullify()' function + +/** + * Ajax handlers for Change Table page + * + * Actions Ajaxified here: + * Submit Data to be inserted into the table + * Restart insertion with 'N' rows. + */ +$(document).ready(function() { + + /** + * Submission of data to be inserted into table + * + * @uses PMA_ajaxShowMessage() + */ + $("#insertForm").live('submit', function(event) { + + /** + * @var the_form Object referring to the insertion form + */ + var the_form = $(this); + event.preventDefault(); + + PMA_ajaxShowMessage(); + $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + + $("#topmenucontainer") + .next('div') + .remove() + .end() + .after(data.sql_query); + + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($(notice_class).text() == '') { + $(notice_class).remove(); + } + + //Clear the data in the forms + $(the_form).find('input:reset').trigger('click'); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + } + }) + }) // end submission of data to be inserted into table + + /** + * Restart Insertion form + */ + $("#insert_rows").live('change', function(event) { + event.preventDefault(); + + /** + * @var curr_rows Number of current insert rows already on page + */ + var curr_rows = $(".insertRowTable").length; + /** + * @var target_rows Number of rows the user wants + */ + var target_rows = $("#insert_rows").val(); + + if(curr_rows < target_rows ) { + while( curr_rows < target_rows ) { + + /** + * @var last_row Object referring to the last row + */ + var last_row = $("#insertForm").find(".insertRowTable:last"); + + //Clone the insert tables + $(last_row) + .clone() + .insertBefore("#insertForm > fieldset") + .find('input[name*=multi_edit],select[name*=multi_edit]') + .each(function() { + + /** + * Extract the index from the name attribute for all input/select fields and increment it + * name is of format funcs[multi_edit][10][<long random string of alphanum chars>] + */ + + /** + * @var this_name String containing name of the input/select elements + */ + var this_name = $(this).attr('name'); + /** split {@link this_name} at [10], so we have the parts that can be concatenated later */ + var name_parts = this_name.split(/[\d+]/); + /** extract the [10] from {@link name_parts} */ + var old_row_index_string = this_name.match(/[\d+]/)[0]; + /** extract 10 - had to split into two steps to accomodate double digits */ + var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0]); + + /** calculate next index i.e. 11 */ + var new_row_index = old_row_index + 1; + /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */ + var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1]; + + $(this).attr('name', new_name); + }); + + //Insert/Clone the ignore checkboxes + if(curr_rows == 1 ) { + $('<input id="insert_ignore_check_1" type="checkbox" name="insert_ignore_check_1" checked="checked" />') + .insertBefore(".insertRowTable:last") + .after('<label for="insert_ignore_check_1">' + PMA_messages['strIgnore'] + '</label>'); + } + else { + + /** + * @var last_checkbox Object reference to the last checkbox in #insertForm + */ + var last_checkbox = $("#insertForm").children('input:checkbox:last'); + + /** name of {@link last_checkbox} */ + var last_checkbox_name = $(last_checkbox).attr('name'); + /** index of {@link last_checkbox} */ + var last_checkbox_index = parseInt(last_checkbox_name.match(/\d+/)); + /** name of new {@link last_checkbox} */ + var new_name = last_checkbox_name.replace(/\d+/,last_checkbox_index+1); + + $(last_checkbox) + .clone() + .attr({'id':new_name, 'name': new_name}) + .add('label[for^=insert_ignore_check]:last') + .clone() + .attr('for', new_name) + .before('<br />') + .insertBefore(".insertRowTable:last"); + } + curr_rows++; + } + } + else if( curr_rows > target_rows) { + while(curr_rows > target_rows) { + $("input[id^=insert_ignore_check]:last") + .nextUntil("fieldset") + .andSelf() + .remove(); + curr_rows--; + } + } + }) +}, 'top.frame_content'); //end $(document).ready() \ No newline at end of file diff --git a/js/tbl_operations.js b/js/tbl_operations.js new file mode 100644 index 0000000..c74cc60 --- /dev/null +++ b/js/tbl_operations.js @@ -0,0 +1,21 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * function used in server privilege pages + * + * @version $Id$ + */ + +/** + * Add all AJAX scripts for tbl_operations.php page here. + * + * Alter table order - #div_table_order form + * Move Table - #div_table_rename form + * Table Options - #div_table_options form + * Copy Table - #div_table_copy form + * Table Maintenance - #div_table_maintenance (need to id each anchor) + * Check + * Repair + * Analyze + * Flush + * Optimize + */ \ No newline at end of file diff --git a/js/tbl_relation.js b/js/tbl_relation.js old mode 100644 new mode 100755 diff --git a/js/tbl_select.js b/js/tbl_select.js new file mode 100644 index 0000000..88796bc --- /dev/null +++ b/js/tbl_select.js @@ -0,0 +1,32 @@ +/** + * @fileoverview JavaScript functions used on tbl_select.php + * + * @requires jQuery + * @requires js/functions.js + */ + +/** + * Ajax event handlers for this page + * + * Actions ajaxified here: + * Table Search + */ +$(document).ready(function() { + + /** + * Ajax event handler for Table Search + * + * @uses PMA_ajaxShowMessage() + */ + $("#tbl_search_form").live('submit', function(event) { + event.preventDefault(); + + PMA_ajaxShowMessage(PMA_messages['strSearching']); + + $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + + $.post($(this).attr('action'), $(this).serialize(), function(data) { + $("#searchresults").html(data); + }) + }) +}, 'top.frame_content'); // end $(document).ready() \ No newline at end of file diff --git a/js/tbl_structure.js b/js/tbl_structure.js new file mode 100644 index 0000000..693442e --- /dev/null +++ b/js/tbl_structure.js @@ -0,0 +1,133 @@ +/** + * @fileoverview functions used on the table structure page + * @name Table Structure + * + * @requires jQuery + * @requires jQueryUI + * @required js/functions.js + */ + +/** + * AJAX scripts for tbl_structure.php + * + * Actions ajaxified here: + * Drop Column + * Add Primary Key + * Drop Primary Key/Index + * + */ +$(document).ready(function() { + + /** + * Attach Event Handler for 'Drop Column' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $(".drop_column_anchor").live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_table_name String containing the name of the current table + */ + var curr_table_name = window.parent.table; + /** + * @var curr_row Object reference to the currently selected row (i.e. field in the table) + */ + var curr_row = $(this).parents('tr'); + /** + * @var curr_column_name String containing name of the field referred to by {@link curr_row} + */ + var curr_column_name = $(curr_row).children('th').children('label').text(); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`'; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strDroppingColumn']); + + $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(curr_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }); // end $.PMA_confirm() + }) ; //end of Drop Column Anchor action + + /** + * Ajax Event handler for 'Add Primary Key' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $(".action_primary a").live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_table_name String containing the name of the current table + */ + var curr_table_name = window.parent.table; + /** + * @var curr_column_name String containing name of the field referred to by {@link curr_row} + */ + var curr_column_name = $(this).parents('tr').children('th').children('label').text(); + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` ADD PRIMARY KEY(`' + curr_column_name + '`)'; + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey']); + + $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(this).remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + })//end Add Primary Key + + /** + * Ajax Event handler for 'Drop Primary Key/Index' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + */ + $('.drop_primary_key_index_anchor').live('click', function(event) { + event.preventDefault(); + + /** + * @var curr_row Object containing reference to the current field's row + */ + var curr_row = $(this).parents('tr'); + + var question = $(curr_row).children('.drop_primary_key_index_msg').val(); + + $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + + PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex']); + + $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { + if(data.success == true) { + PMA_ajaxShowMessage(data.message); + $(curr_row).hide("medium").remove(); + } + else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + } + }) // end $.get() + }) // end $.PMA_confirm() + }) //end Drop Primary Key/Index + +}) // end $(document).ready() \ No newline at end of file diff --git a/js/update-location.js b/js/update-location.js old mode 100644 new mode 100755 diff --git a/libraries/.htaccess b/libraries/.htaccess old mode 100644 new mode 100755 diff --git a/libraries/Config.class.php b/libraries/Config.class.php old mode 100644 new mode 100755 diff --git a/libraries/Error.class.php b/libraries/Error.class.php old mode 100644 new mode 100755 diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php old mode 100644 new mode 100755 diff --git a/libraries/File.class.php b/libraries/File.class.php old mode 100644 new mode 100755 diff --git a/libraries/Index.class.php b/libraries/Index.class.php old mode 100644 new mode 100755 index f203389..81ef590 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -477,10 +477,12 @@ class PMA_Index }
$r .= '<td ' . $row_span . '>' - . ' <a href="sql.php' . PMA_generate_common_url($this_params) - . '" onclick="return confirmLink(this, \'' . $js_msg . '\')">' + . ' <a class="drop_primary_key_index_anchor" href="sql.php' . PMA_generate_common_url($this_params) + . '" >' . PMA_getIcon('b_drop.png', __('Drop')) . '</a>' . '</td>' . "\n"; + + $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />'; }
$r .= '<th ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</th>'; diff --git a/libraries/List.class.php b/libraries/List.class.php old mode 100644 new mode 100755 diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php old mode 100644 new mode 100755 diff --git a/libraries/Message.class.php b/libraries/Message.class.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel.php b/libraries/PHPExcel/PHPExcel.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Autoloader.php b/libraries/PHPExcel/PHPExcel/Autoloader.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation.php b/libraries/PHPExcel/PHPExcel/Calculation.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Exception.php b/libraries/PHPExcel/PHPExcel/Calculation/Exception.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php b/libraries/PHPExcel/PHPExcel/Calculation/ExceptionHandler.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaParser.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php b/libraries/PHPExcel/PHPExcel/Calculation/FormulaToken.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Function.php b/libraries/PHPExcel/PHPExcel/Calculation/Function.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/Functions.php b/libraries/PHPExcel/PHPExcel/Calculation/Functions.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt b/libraries/PHPExcel/PHPExcel/Calculation/functionlist.txt old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell.php b/libraries/PHPExcel/PHPExcel/Cell.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/AdvancedValueBinder.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataType.php b/libraries/PHPExcel/PHPExcel/Cell/DataType.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php b/libraries/PHPExcel/PHPExcel/Cell/DataValidation.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/DefaultValueBinder.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php b/libraries/PHPExcel/PHPExcel/Cell/Hyperlink.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php b/libraries/PHPExcel/PHPExcel/Cell/IValueBinder.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Comment.php b/libraries/PHPExcel/PHPExcel/Comment.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/DocumentProperties.php b/libraries/PHPExcel/PHPExcel/DocumentProperties.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/DocumentSecurity.php b/libraries/PHPExcel/PHPExcel/DocumentSecurity.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/HashTable.php b/libraries/PHPExcel/PHPExcel/HashTable.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/IComparable.php b/libraries/PHPExcel/PHPExcel/IComparable.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/IOFactory.php b/libraries/PHPExcel/PHPExcel/IOFactory.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/NamedRange.php b/libraries/PHPExcel/PHPExcel/NamedRange.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/CSV.php b/libraries/PHPExcel/PHPExcel/Reader/CSV.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/DefaultReadFilter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php b/libraries/PHPExcel/PHPExcel/Reader/Excel2007.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Reader/Excel5/Escher.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php b/libraries/PHPExcel/PHPExcel/Reader/IReadFilter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/IReader.php b/libraries/PHPExcel/PHPExcel/Reader/IReader.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Reader/Serialized.php b/libraries/PHPExcel/PHPExcel/Reader/Serialized.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/ReferenceHelper.php b/libraries/PHPExcel/PHPExcel/ReferenceHelper.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/RichText.php b/libraries/PHPExcel/PHPExcel/RichText.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php b/libraries/PHPExcel/PHPExcel/RichText/ITextElement.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/RichText/Run.php b/libraries/PHPExcel/PHPExcel/RichText/Run.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/RichText/TextElement.php b/libraries/PHPExcel/PHPExcel/RichText/TextElement.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Date.php b/libraries/PHPExcel/PHPExcel/Shared/Date.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Drawing.php b/libraries/PHPExcel/PHPExcel/Shared/Drawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher.php b/libraries/PHPExcel/PHPExcel/Shared/Escher.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/libraries/PHPExcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Excel5.php b/libraries/PHPExcel/PHPExcel/Shared/Excel5.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/File.php b/libraries/PHPExcel/PHPExcel/Shared/File.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/Font.php b/libraries/PHPExcel/PHPExcel/Shared/Font.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CHANGELOG.TXT old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/LUDecomposition.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/Matrix.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/QRDecomposition.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Error.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php b/libraries/PHPExcel/PHPExcel/Shared/JAMA/utils/Maths.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE.php b/libraries/PHPExcel/PHPExcel/Shared/OLE.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/ChainedBlockStream.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/File.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php b/libraries/PHPExcel/PHPExcel/Shared/OLE/PPS/Root.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/OLERead.php b/libraries/PHPExcel/PHPExcel/Shared/OLERead.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php b/libraries/PHPExcel/PHPExcel/Shared/PasswordHasher.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php b/libraries/PHPExcel/PHPExcel/Shared/XMLWriter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php b/libraries/PHPExcel/PHPExcel/Shared/ZipStreamWrapper.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/bestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/exponentialBestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/linearBestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/polynomialBestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/powerBestFitClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php b/libraries/PHPExcel/PHPExcel/Shared/trend/trendClass.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style.php b/libraries/PHPExcel/PHPExcel/Style.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Alignment.php b/libraries/PHPExcel/PHPExcel/Style/Alignment.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Border.php b/libraries/PHPExcel/PHPExcel/Style/Border.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Borders.php b/libraries/PHPExcel/PHPExcel/Style/Borders.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Color.php b/libraries/PHPExcel/PHPExcel/Style/Color.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Conditional.php b/libraries/PHPExcel/PHPExcel/Style/Conditional.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Fill.php b/libraries/PHPExcel/PHPExcel/Style/Fill.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Font.php b/libraries/PHPExcel/PHPExcel/Style/Font.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php b/libraries/PHPExcel/PHPExcel/Style/NumberFormat.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Style/Protection.php b/libraries/PHPExcel/PHPExcel/Style/Protection.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet.php b/libraries/PHPExcel/PHPExcel/Worksheet.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/BaseDrawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/CellIterator.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/ColumnDimension.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php b/libraries/PHPExcel/PHPExcel/Worksheet/Drawing/Shadow.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/HeaderFooterDrawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php b/libraries/PHPExcel/PHPExcel/Worksheet/MemoryDrawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageMargins.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php b/libraries/PHPExcel/PHPExcel/Worksheet/PageSetup.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php b/libraries/PHPExcel/PHPExcel/Worksheet/Protection.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/Row.php b/libraries/PHPExcel/PHPExcel/Worksheet/Row.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowDimension.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php b/libraries/PHPExcel/PHPExcel/Worksheet/RowIterator.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php b/libraries/PHPExcel/PHPExcel/Worksheet/SheetView.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/WorksheetIterator.php b/libraries/PHPExcel/PHPExcel/WorksheetIterator.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/CSV.php b/libraries/PHPExcel/PHPExcel/Writer/CSV.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Comments.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/ContentTypes.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/DocProps.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Drawing.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Rels.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/StringTable.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Style.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php b/libraries/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Escher.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Font.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Parser.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Workbook.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Worksheet.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php b/libraries/PHPExcel/PHPExcel/Writer/Excel5/Xf.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/HTML.php b/libraries/PHPExcel/PHPExcel/Writer/HTML.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/IWriter.php b/libraries/PHPExcel/PHPExcel/Writer/IWriter.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/PDF.php b/libraries/PHPExcel/PHPExcel/Writer/PDF.php old mode 100644 new mode 100755 diff --git a/libraries/PHPExcel/PHPExcel/Writer/Serialized.php b/libraries/PHPExcel/PHPExcel/Writer/Serialized.php old mode 100644 new mode 100755 diff --git a/libraries/PMA.php b/libraries/PMA.php old mode 100644 new mode 100755 diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php old mode 100644 new mode 100755 diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php old mode 100644 new mode 100755 diff --git a/libraries/Table.class.php b/libraries/Table.class.php old mode 100644 new mode 100755 diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php old mode 100644 new mode 100755 diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php old mode 100644 new mode 100755 diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php old mode 100644 new mode 100755 diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php old mode 100644 new mode 100755 diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php old mode 100644 new mode 100755 diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php old mode 100644 new mode 100755 diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php old mode 100644 new mode 100755 diff --git a/libraries/auth/swekey/authentication.inc.php b/libraries/auth/swekey/authentication.inc.php old mode 100644 new mode 100755 diff --git a/libraries/auth/swekey/musbe-ca.crt b/libraries/auth/swekey/musbe-ca.crt old mode 100644 new mode 100755 diff --git a/libraries/auth/swekey/swekey.auth.lib.php b/libraries/auth/swekey/swekey.auth.lib.php old mode 100644 new mode 100755 diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php old mode 100644 new mode 100755 diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php old mode 100644 new mode 100755 diff --git a/libraries/blowfish.php b/libraries/blowfish.php old mode 100644 new mode 100755 diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php old mode 100644 new mode 100755 diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php old mode 100644 new mode 100755 diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php old mode 100644 new mode 100755 diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php old mode 100644 new mode 100755 diff --git a/libraries/common.inc.php b/libraries/common.inc.php old mode 100644 new mode 100755 index ab22f17..b01a6ee --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -540,6 +540,10 @@ $GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js'; $GLOBALS['js_include'][] = 'update-location.js';
/** + * Add common jQuery functions script here if necessary. + */ + +/** * JavaScript events that will be registered * @global array $js_events */ @@ -967,6 +971,33 @@ $GLOBALS['PMA_Config']->set('default_server', ''); /* Tell tracker that it can actually work */ PMA_Tracker::enable();
+/** + * @global boolean $GLOBALS['is_ajax_request'] + * @todo should this be moved to the variables init section above? + * + * Check if the current request is an AJAX request, and set is_ajax_request + * accordingly. Suppress headers, footers and unnecessary output if set to + * true + */ +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { + $GLOBALS['is_ajax_request'] = true; +} else { + $GLOBALS['is_ajax_request'] = false; +} + +/** + * @global boolean $GLOBALS['inline_edit'] + * + * Set to true if this is a request made during an inline edit process. This + * request is made to retrieve the non-truncated/transformed values. + */ +if(isset($_REQUEST['inline_edit']) && $_REQUEST['inline_edit'] == true) { + $GLOBALS['inline_edit'] = true; +} +else { + $GLOBALS['inline_edit'] = false; +} + if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { /** * include subform target page diff --git a/libraries/common.lib.php b/libraries/common.lib.php old mode 100644 new mode 100755 index dd7f40a..665298b --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -662,11 +662,16 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_msg_output .= '</fieldset>' . "\n\n"; }
- echo $error_msg_output; - /** - * display footer and exit - */ - + /** + * If in an Ajax request, don't just echo and exit. Use PMA_ajaxResponse() + */ + if($GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($error_msg_output, false); + } + echo $error_msg_output; + /** + * display footer and exit + */ require './libraries/footer.inc.php'; } else { echo $error_msg_output; @@ -937,6 +942,15 @@ if (!$jsonly) */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) { + /* + * PMA_ajaxResponse uses this function to collect the string of HTML generated + * for showing the message. Use output buffering to collect it and return it + * in a string. In some special cases on sql.php, buffering has to be disabled + * and hence we check with $GLOBALS['buffer_message'] + */ + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { + ob_start(); + } global $cfg;
if (null === $sql_query) { @@ -975,7 +989,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view } unset($tbl_status);
- echo '<div align="' . $GLOBALS['cell_align_left'] . '">' . "\n"; + // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence, + // check for it's presence before using it + echo '<div align="' . ( isset($GLOBALS['cell_align_left']) ? $GLOBALS['cell_align_left'] : '' ) . '">' . "\n";
if ($message instanceof PMA_Message) { if (isset($GLOBALS['special_message'])) { @@ -1211,9 +1227,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view }
// see in js/functions.js the jQuery code attached to id inline_edit + // document.write conflicts with jQuery, hence used $().append() $inline_edit = "<script type="text/javascript">\n" . "//<![CDATA[\n" . - "document.write('[<a href="#" title="" . + "$('.tools').append('[<a href="#" title="" . PMA_escapeJsString(__('Inline edit of this query')) . "" id="inline_edit">" . PMA_escapeJsString(__('Inline')) . @@ -1224,6 +1241,15 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view echo '</div>'; } echo '</div><br />' . "\n"; + + // If we are in an Ajax request, we have most probably been called in + // PMA_ajaxResponse(). Hence, collect the buffer contents and return it + // to PMA_ajaxResponse(), which will encode it for JSON. + if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) { + $buffer_contents = ob_get_contents(); + ob_end_clean(); + return $buffer_contents; + } } // end of the 'PMA_showMessage()' function
/** @@ -1595,6 +1621,7 @@ function PMA_generate_html_tab($tab, $url_params = array()) 'args' => '', 'warning' => '', 'fragment' => '', + 'id' => '', );
$tab = array_merge($defaults, $tab); @@ -1657,14 +1684,17 @@ function PMA_generate_html_tab($tab, $url_params = array()) E_USER_NOTICE); }
+ //Set the id for the tab, if set in the params + $id_string = ( empty($tab['id']) ? '' : ' id="'.$tab['id'].'" ' ); $out = '<li' . ($tab['class'] == 'active' ? ' class="active"' : '') . '>';
if (!empty($tab['link'])) { $out .= '<a class="tab' . htmlentities($tab['class']) . '"' + .$id_string .' href="' . $tab['link'] . '" ' . $tab['attr'] . '>' . $tab['text'] . '</a>'; } else { - $out .= '<span class="tab' . htmlentities($tab['class']) . '">' + $out .= '<span class="tab' . htmlentities($tab['class']) . '"'.$id_string.'>' . $tab['text'] . '</span>'; }
@@ -2170,8 +2200,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1, $pageNowPlusRange = ($pageNow + $range);
$gotopage = $prompt - . ' <select name="pos" onchange="goToUrl(this, \'' - . $url . '\');">' . "\n"; + . ' <select id="pageselector" name="pos" >' . "\n"; if ($nbTotalPage < $showAll) { $pages = range(1, $nbTotalPage); } else { @@ -2483,10 +2512,17 @@ function PMA_generate_slider_effect($id, $message) echo '<div id="' . $id . '">'; return; } + /** + * Bad hack on the next line. document.write() conflicts with jQuery, hence, + * opening the <div> with PHP itself instead of JavaScript. + * + * @todo find a better solution that uses $.append(), the recommended method + * maybe by using an additional param, the id of the div to append to + */ ?> +<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none; overflow:auto;"' : ''; ?>> <script type="text/javascript"> // <![CDATA[ - document.write('<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none; overflow:auto;"' : ''; ?>>');
function PMA_set_status_label_<?php echo $id; ?>() { if ($('#<?php echo $id; ?>').css('display') == 'none') { @@ -2856,6 +2892,52 @@ function PMA_expandUserString($string, $escape = NULL, $updates = array()) { }
/** + * function that generates a json output for an ajax request and ends script + * execution + * + * @param boolean success whether the ajax request was successfull + * @param string message string containing the html of the message + * @param array extra_data optional - any other data as part of the json request + * + * @uses header() + * @uses json_encode() + */ +function PMA_ajaxResponse($message, $success = true, $extra_data = array()) +{ + $response = array(); + if( $success == true ) { + $response['success'] = true; + if ($message instanceof PMA_Message) { + $response['message'] = $message->getDisplay(); + } + else { + $response['message'] = $message; + } + } + else { + $response['success'] = false; + if($message instanceof PMA_Message) { + $response['error'] = $message->getDisplay(); + } + else { + $response['error'] = $message; + } + } + + // If extra_data has been provided, append it to the response array + if( count($extra_data) > 0 ) { + $response = array_merge($response, $extra_data); + } + + // Set the Content-Type header to JSON so that jQuery parses the response correctly + if(!isset($GLOBALS['is_header_sent'])) { + header("Content-Type: application/json"); + } + echo json_encode($response); + exit; +} + +/** * Display the form used to browse anywhere on the local server for the file to import */ function PMA_browseUploadFile($max_upload_size) { diff --git a/libraries/config.default.php b/libraries/config.default.php old mode 100644 new mode 100755 diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php old mode 100644 new mode 100755 diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php old mode 100644 new mode 100755 diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php old mode 100644 new mode 100755 diff --git a/libraries/core.lib.php b/libraries/core.lib.php old mode 100644 new mode 100755 diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php old mode 100644 new mode 100755 diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php old mode 100644 new mode 100755 index ea019cb..4682122 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -63,6 +63,15 @@ if (isset($submitcollation) && !empty($db_collation)) { $result = PMA_DBI_query($sql_query); $message = PMA_Message::success(); unset($db_charset, $db_collation); + + /** + * If we are in an Ajax request, let us stop the execution here. Necessary for + * db charset change action on db_operations.php. If this causes a bug on + * other pages, we might have to move this to a different location. + */ + if( $GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($message, $message->isSuccess()); + }; }
require_once './libraries/header.inc.php'; diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php old mode 100644 new mode 100755 index a72c7eb..8204770 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -50,7 +50,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', + '<a class="drop_event_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php old mode 100644 new mode 100755 index c51b247..d8610f2 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -270,6 +270,9 @@ unset($each_table, $tbl_group_sql, $db_info_result);
/** * Displays top menu links + * If in an Ajax request, we do not need to show this */ -require './libraries/db_links.inc.php'; +if($GLOBALS['is_ajax_request'] != true) { + require './libraries/db_links.inc.php'; +} ?> diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php old mode 100644 new mode 100755 diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php old mode 100644 new mode 100755 index 8af2197..d523e2d --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -75,13 +75,15 @@ if ($routines) { <td>%s</td> <td>%s</td> <td>%s</td> + <input type="hidden" class="drop_procedure_sql" value="%s" /> </tr>', ($ct%2 == 0) ? 'even' : 'odd', $routine['ROUTINE_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDropProc, false) . '\')">' . $titles['Drop'] . '</a>', + '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', $routine['ROUTINE_TYPE'], - $routine['DTD_IDENTIFIER']); + $routine['DTD_IDENTIFIER'], + $sqlDropProc); $ct++; } echo '</table>'; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php old mode 100644 new mode 100755 diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php old mode 100644 new mode 100755 diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php old mode 100644 new mode 100755 diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php old mode 100644 new mode 100755 diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php old mode 100644 new mode 100755 diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php old mode 100644 new mode 100755 index 43a61f6..e7bdad2 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -19,7 +19,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
// Displays the form ?> -<form method="post" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)"> +<form method="post" id="change_password_form" action="<?php echo $GLOBALS['PMA_PHP_SELF']; ?>" name="chgPassword" onsubmit="return checkPassword(this)"> <?php echo PMA_generate_common_hidden_inputs(); if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) { echo '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n" diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php old mode 100644 new mode 100755 index f348f3c..e6caec5 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -17,7 +17,7 @@ require_once './libraries/check_user_privileges.lib.php'; if ($is_create_db_priv) { // The user is allowed to create a db ?> - <form method="post" action="db_create.php"><strong> + <form method="post" action="db_create.php" id="create_database_form" ><strong> <?php echo '<label for="text_create_db">' . __('Create new database') . '</label> ' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br /> <?php echo PMA_generate_common_hidden_inputs('', '', 5); ?> <input type="hidden" name="reload" value="1" /> diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php old mode 100644 new mode 100755 index 57a5606..962632c --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -36,8 +36,7 @@ require_once './libraries/check_user_privileges.lib.php'; $is_create_table_priv = true;
?> -<form method="post" action="tbl_create.php" - onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one column.')); ?>', 1))"> +<form id="create_table_form_minimal" method="post" action="tbl_create.php"> <fieldset> <legend> <?php diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php old mode 100644 new mode 100755 diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php old mode 100644 new mode 100755 diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php old mode 100644 new mode 100755 diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php old mode 100644 new mode 100755 diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php old mode 100644 new mode 100755 index 0deed6e..26144e0 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -339,9 +339,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
// prepare some options for the End button if ($is_innodb && $unlim_num_rows > $GLOBALS['cfg']['MaxExactCount']) { - $input_for_real_end = '<input type="hidden" name="find_real_end" value="1" />'; + $input_for_real_end = '<input id="real_end_input" type="hidden" name="find_real_end" value="1" />'; // no backquote around this message - $onclick = ' onclick="return confirmAction('' . PMA_jsFormat(__('This operation could take a long time. Proceed anyway?'), false) . '')"'; + $onclick = ''; } else { $input_for_real_end = $onclick = ''; } @@ -1031,6 +1031,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['delete'] = array(); $vertical_display['data'] = array(); $vertical_display['row_delete'] = array(); + // name of the class added to all inline editable elements + $data_inline_edit_class = 'data_inline_edit';
// Correction University of Virginia 19991216 in the while below // Previous code assumed that all tables have keys, specifically that @@ -1074,7 +1076,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { // pointer code part echo ' <tr class="' . $class . '">' . "\n"; - $class = ''; + $class = $data_inline_edit_class; }
@@ -1113,6 +1115,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $edit_url = 'tbl_change.php' . PMA_generate_common_url($_url_params);
$edit_str = PMA_getIcon('b_edit.png', __('Edit'), true); + + // Class definitions required for inline editing jQuery scripts + $edit_anchor_class = "edit_row_anchor"; + if( $clause_is_unique == 0) { + $edit_anchor_class .= ' nonunique'; + } } // end if (1.2.1)
if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) { @@ -1195,6 +1203,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { for ($i = 0; $i < $fields_cnt; ++$i) { $meta = $fields_meta[$i]; $pointer = $i; + $is_field_truncated = false; + //If this column's value is null, add the null class to it, needed + //for inline editing + if(is_null($row[$i])) { + $class .= ' null'; + } + // See if this column should get highlight because it's used in the // where-query. if (isset($highlight_columns) && (isset($highlight_columns[$meta->name]) || isset($highlight_columns[PMA_backquote($meta->name)]))) { @@ -1268,7 +1283,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $nowrap = ' nowrap'; $where_comparison = ' = ' . $row[$i];
- $vertical_display['data'][$row_no][$i] = '<td align="right"' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options); + $vertical_display['data'][$row_no][$i] = '<td align="right"' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); } else { $vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ' nowrap' . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; } @@ -1279,6 +1294,10 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // PMA_mysql_fetch_fields returns BLOB in place of // TEXT fields type so we have to ensure it's really a BLOB $field_flags = PMA_DBI_field_flags($dt_result, $i); + + // reset $class from $data_inline_edit_class to '' as we can't edit binary data + $class = ''; + if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; @@ -1302,6 +1321,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...'; + $is_field_truncated = true; } // displays all space characters, 4 space // characters for tabulations and <cr>/<lf> @@ -1324,6 +1344,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // (unless it's a link-type transformation) if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P' && !strpos($transform_function, 'link') === true) { $row[$i] = PMA_substr($row[$i], 0, $GLOBALS['cfg']['LimitChars']) . '...'; + $is_field_truncated = true; }
// displays special characters from binaries @@ -1356,7 +1377,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // do not wrap if date field type $nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : ''); $where_comparison = ' = '' . PMA_sqlAddslashes($row[$i]) . '''; - $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options); + $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated);
} else { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; @@ -1397,6 +1418,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['edit'][$row_no] = ''; $vertical_display['delete'][$row_no] = ''; $vertical_display['row_delete'][$row_no] = ''; + $vertical_display['where_clause'][$row_no] = ''; }
$column_style_vertical = ''; @@ -1420,7 +1442,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { }
if (isset($edit_url)) { - $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . '" ' . $column_style_vertical . '>' . "\n" + $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" . PMA_linkOrButton($edit_url, $edit_str, array(), false) . $bookmark_go . ' </td>' . "\n"; @@ -1436,6 +1458,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { unset($vertical_display['delete'][$row_no]); }
+ if( !empty($where_clause) ) { + $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; + } + else { + unset($vertical_display['where_clause'][$row_no]); + } + echo (($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') ? "\n" : ''); $row_no++; } // end while @@ -1515,6 +1544,22 @@ function PMA_displayVerticalTable() echo '</tr>' . "\n"; } // end if
+ // Generates the 'where_clause' hidden input field for inline ajax edit if required + if ( is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 ) ) { + echo '<tr>' . "\n"; + + $foo_counter = 0; + foreach ($vertical_display['where_clause'] as $val) { + if (($foo_counter != 0) && ($_SESSION['tmp_user_values']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['tmp_user_values']['repeat_cells'])) { + echo '<th></th>' . "\n"; + } + + echo $val; + $foo_counter++; + } // end while + echo '</tr>' . "\n"; + } // end if + // Displays data foreach ($vertical_display['desc'] AS $key => $val) {
@@ -2288,12 +2333,28 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct * @param string $default_function * @param string $nowrap * @param string $where_comparison + * @param bool $is_field_truncated * @return string formatted data */ -function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options) { +function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed_sql, $meta, $map, $data, $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated ) { + + // Define classes to be added to this data field based on the type of data + $enum_class = ''; + if(strpos($meta->flags, 'enum') !== false) { + $enum_class = ' enum'; + } + + $mime_type_class = ''; + if(isset($meta->mimetype)) { + $mime_type_class = ' ' . preg_replace('///', '_', $meta->mimetype); + }
// continue the <td> tag started before calling this function: - $result = $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap . '">'; + $result = $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . $nowrap + . ' ' . ($is_field_truncated ? ' truncated' : '') + . ($transform_function != $default_function ? ' transformed' : '') + . (isset($map[$meta->name]) ? ' relation' : '') + . $enum_class . $mime_type_class . '">';
if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { foreach ($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) { diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php old mode 100644 new mode 100755 index 442d53f..a8511fe --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -26,7 +26,7 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } if (!empty($edit_url)) { - echo ' <td align="center">' . "\n" + echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) . $bookmark_go . ' </td>' . "\n"; @@ -43,7 +43,7 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } if (!empty($edit_url)) { - echo ' <td align="center">' . "\n" + echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) . $bookmark_go . ' </td>' . "\n"; @@ -56,4 +56,11 @@ if ($doWriteModifyAt == 'left') { . ' </td>' . "\n"; } } +/* + * Where clause for selecting this row uniquely is provided as a hidden input. + * Used by jQuery scripts for handling inline editing + */ +if( !empty($where_clause)) { + echo '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; +} ?> diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php old mode 100644 new mode 100755 diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php old mode 100644 new mode 100755 diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php old mode 100644 new mode 100755 diff --git a/libraries/export/csv.php b/libraries/export/csv.php old mode 100644 new mode 100755 diff --git a/libraries/export/excel.php b/libraries/export/excel.php old mode 100644 new mode 100755 diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php old mode 100644 new mode 100755 diff --git a/libraries/export/latex.php b/libraries/export/latex.php old mode 100644 new mode 100755 diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php old mode 100644 new mode 100755 diff --git a/libraries/export/ods.php b/libraries/export/ods.php old mode 100644 new mode 100755 diff --git a/libraries/export/odt.php b/libraries/export/odt.php old mode 100644 new mode 100755 diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php old mode 100644 new mode 100755 diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php old mode 100644 new mode 100755 diff --git a/libraries/export/sql.php b/libraries/export/sql.php old mode 100644 new mode 100755 diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php old mode 100644 new mode 100755 diff --git a/libraries/export/xls.php b/libraries/export/xls.php old mode 100644 new mode 100755 diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php old mode 100644 new mode 100755 diff --git a/libraries/export/xml.php b/libraries/export/xml.php old mode 100644 new mode 100755 diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php old mode 100644 new mode 100755 diff --git a/libraries/file_listing.php b/libraries/file_listing.php old mode 100644 new mode 100755 diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php old mode 100644 new mode 100755 index dfa7ab9..781154d --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -229,10 +229,16 @@ if (! empty($GLOBALS['cfg']['DBG']['php']) */ }
+/** + * If we are in an AJAX request, we do not need to generate the closing tags for + * body and html. + */ +if (! $GLOBALS['is_ajax_request']) { ?> </body> </html> <?php +} /** * Stops the script execution */ diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php old mode 100644 new mode 100755 diff --git a/libraries/header.inc.php b/libraries/header.inc.php old mode 100644 new mode 100755 index ea159a3..448f1c0 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -13,177 +13,173 @@ if (! defined('PHPMYADMIN')) { */ require_once './libraries/common.inc.php';
-if (empty($GLOBALS['is_header_sent'])) { - - /** - * Gets a core script and starts output buffering work - */ - require_once './libraries/ob.lib.php'; - PMA_outBufferPre(); - - // if database storage for user preferences is transient, offer to load - // exported settings from localStorage (detection will be done in JavaScript) - $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session' - && !isset($_SESSION['userprefs_autoload']); - if ($userprefs_offer_import) { - $GLOBALS['js_include'][] = 'config.js'; - } - - // For re-usability, moved http-headers and stylesheets - // to a seperate file. It can now be included by header.inc.php, - // querywindow.php. - - require_once './libraries/header_http.inc.php'; - require_once './libraries/header_meta_style.inc.php'; - require_once './libraries/header_scripts.inc.php'; - ?> - <meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" /> - <?php /* remove vertical scroll bar bug in ie */ ?> - <!--[if IE 6]> - <style type="text/css"> - /* <![CDATA[ */ - html { - overflow-y: scroll; - } - /* ]]> */ - </style> - <![endif]--> -</head> - -<body> - <?php - - // Include possible custom headers - if (file_exists(CUSTOM_HEADER_FILE)) { - require CUSTOM_HEADER_FILE; - } - - - // message of "Cookies required" displayed for auth_type http or config - // note: here, the decoration won't work because without cookies, - // our standard CSS is not operational - if (empty($_COOKIE)) { - PMA_Message::notice(__('Cookies must be enabled past this point.'))->display(); - } - - // offer to load user preferences from localStorage - if ($userprefs_offer_import) { - require_once './libraries/user_preferences.lib.php'; - PMA_userprefs_autoload_header(); - } - - if (!defined('PMA_DISPLAY_HEADING')) { - define('PMA_DISPLAY_HEADING', 1); - } - - /** - * Display heading if needed. Design can be set in css file. - */ - - if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) { - $server_info = (!empty($GLOBALS['cfg']['Server']['verbose']) - ? $GLOBALS['cfg']['Server']['verbose'] - : $GLOBALS['cfg']['Server']['host'] . (empty($GLOBALS['cfg']['Server']['port']) - ? '' - : ':' . $GLOBALS['cfg']['Server']['port'] - ) - ); - $item = '<a href="%1$s?%2$s" class="item">'; - if ($GLOBALS['cfg']['NavigationBarIconic']) { - $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png" width="5" height="9" alt="-" /></span>' . "\n"; - $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n"; - } else { - $separator = ' <span class="separator"> - </span>' . "\n"; + +/** + * If this is an Ajax request, we do not need to generate all this output. + */ +if (!$GLOBALS['is_ajax_request']) { + + if (empty($GLOBALS['is_header_sent'])) { + + /** + * Gets a core script and starts output buffering work + */ + require_once './libraries/ob.lib.php'; + PMA_outBufferPre(); + + // if database storage for user preferences is transient, offer to load + // exported settings from localStorage (detection will be done in JavaScript) + $userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session' + && !isset($_SESSION['userprefs_autoload']); + if ($userprefs_offer_import) { + $GLOBALS['js_include'][] = 'config.js'; }
- if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) { - $item .= '%4$s: '; + // For re-usability, moved http-headers and stylesheets + // to a seperate file. It can now be included by header.inc.php, + // querywindow.php. + + require_once './libraries/header_http.inc.php'; + require_once './libraries/header_meta_style.inc.php'; + require_once './libraries/header_scripts.inc.php'; + ?> + <meta name="OBGZip" content="<?php echo ($GLOBALS['cfg']['OBGzip'] ? 'true' : 'false'); ?>" /> + <?php /* remove vertical scroll bar bug in ie */ ?> + <!--[if IE 6]> + <style type="text/css"> + /* <![CDATA[ */ + html { + overflow-y: scroll; } - $item .= '%3$s</a>' . "\n"; - - echo '<div id="serverinfo">' . "\n"; - printf($item, - $GLOBALS['cfg']['DefaultTabServer'], - PMA_generate_common_url(), - htmlspecialchars($server_info), - __('Server'), - 's_host.png'); - - if (strlen($GLOBALS['db'])) { - - echo $separator; - printf($item, - $GLOBALS['cfg']['DefaultTabDatabase'], - PMA_generate_common_url($GLOBALS['db']), - htmlspecialchars($GLOBALS['db']), - __('Database'), - 's_db.png'); - - if (isset($GLOBALS['action']) && $GLOBALS['action'] == 'tbl_create.php') { - /* We're creating a new table */ - echo $separator; - printf($item, - $action, - PMA_generate_common_url($GLOBALS['db']), - __('New table'), - '', - 's_tbl.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") - // so do not display the table name in upper div - } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { - require_once './libraries/tbl_info.inc.php'; - - echo $separator; - printf($item, - $GLOBALS['cfg']['DefaultTabTable'], - PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']), - str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])), - (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')), - (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png'); - - /** - * Displays table comment - * @uses $show_comment from libraries/tbl_info.inc.php - * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php - */ - if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { - if (strstr($show_comment, '; InnoDB free')) { - $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); - } - echo '<span class="table_comment" id="span_table_comment">' - .'"' . htmlspecialchars($show_comment) - .'"</span>' . "\n"; - } // end if + /* ]]> */ + </style> + <![endif]--> + </head> + + <body> + <?php + + // Include possible custom headers + if (file_exists(CUSTOM_HEADER_FILE)) { + require CUSTOM_HEADER_FILE; + } + + + // message of "Cookies required" displayed for auth_type http or config + // note: here, the decoration won't work because without cookies, + // our standard CSS is not operational + if (empty($_COOKIE)) { + PMA_Message::notice(__('Cookies must be enabled past this point.'))->display(); + } + + // offer to load user preferences from localStorage + if ($userprefs_offer_import) { + require_once './libraries/user_preferences.lib.php'; + PMA_userprefs_autoload_header(); + } + + if (!defined('PMA_DISPLAY_HEADING')) { + define('PMA_DISPLAY_HEADING', 1); + } + + /** + * Display heading if needed. Design can be set in css file. + */ + + if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) { + $server_info = (!empty($GLOBALS['cfg']['Server']['verbose']) + ? $GLOBALS['cfg']['Server']['verbose'] + : $GLOBALS['cfg']['Server']['host'] . (empty($GLOBALS['cfg']['Server']['port']) + ? '' + : ':' . $GLOBALS['cfg']['Server']['port'] + ) + ); + $item = '<a href="%1$s?%2$s" class="item">'; + if ($GLOBALS['cfg']['NavigationBarIconic']) { + $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png" width="5" height="9" alt="-" /></span>' . "\n"; + $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n"; } else { - // no table selected, display database comment if present - /** - * Settings for relations stuff - */ - $cfgRelation = PMA_getRelationsParam(); - - // Get additional information about tables for tooltip is done - // in libraries/db_info.inc.php only once - if ($cfgRelation['commwork']) { - $comment = PMA_getDbComment($GLOBALS['db']); + $separator = ' <span class="separator"> - </span>' . "\n"; + } + + if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) { + $item .= '%4$s: '; + } + $item .= '%3$s</a>' . "\n"; + + echo '<div id="serverinfo">' . "\n"; + printf($item, + $GLOBALS['cfg']['DefaultTabServer'], + PMA_generate_common_url(), + htmlspecialchars($server_info), + __('Server'), + 's_host.png'); + + if (strlen($GLOBALS['db'])) { + + echo $separator; + printf($item, + $GLOBALS['cfg']['DefaultTabDatabase'], + PMA_generate_common_url($GLOBALS['db']), + $GLOBALS['db'], + '', + 's_tbl.png'); + // if the table is being dropped, $_REQUEST['purge'] is set + // (it always contains "1") + // so do not display the table name in upper div + } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + require_once './libraries/tbl_info.inc.php'; + + echo $separator; + printf($item, + $GLOBALS['cfg']['DefaultTabTable'], + PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']), + str_replace(' ', ' ', htmlspecialchars($GLOBALS['table'])), + (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')), + (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png'); + /** * Displays table comment + * @uses $show_comment from libraries/tbl_info.inc.php + * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ - if (! empty($comment)) { - echo '<span class="table_comment"' - . ' id="span_table_comment">"' - . htmlspecialchars($comment) - . '"</span>' . "\n"; + if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { + if (strstr($show_comment, '; InnoDB free')) { + $show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment); + } + echo '<span class="table_comment" id="span_table_comment">' + .'"' . htmlspecialchars($show_comment) + .'"</span>' . "\n"; } // end if + } else { + // no table selected, display database comment if present + /** + * Settings for relations stuff + */ + require_once './libraries/relation.lib.php'; + $cfgRelation = PMA_getRelationsParam(); + + // Get additional information about tables for tooltip is done + // in libraries/db_info.inc.php only once + if ($cfgRelation['commwork']) { + $comment = PMA_getDbComment($GLOBALS['db']); + /** + * Displays table comment + */ + if (! empty($comment)) { + echo '<span class="table_comment"' + . ' id="span_table_comment">"' + . htmlspecialchars($comment) + . '"</span>' . "\n"; + } // end if + } } } + echo '</div>'; } - echo '</div>'; - - } - /** - * Sets a variable to remember headers have been sent - */ - $GLOBALS['is_header_sent'] = true; -} + /** + * Sets a variable to remember headers have been sent + */ + $GLOBALS['is_header_sent'] = true; +} //end if(!$GLOBALS['is_ajax_request']) ?> diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php old mode 100644 new mode 100755 diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php old mode 100644 new mode 100755 diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php old mode 100644 new mode 100755 diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php old mode 100644 new mode 100755 diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php old mode 100644 new mode 100755 diff --git a/libraries/import.lib.php b/libraries/import.lib.php old mode 100644 new mode 100755 diff --git a/libraries/import/README b/libraries/import/README old mode 100644 new mode 100755 diff --git a/libraries/import/csv.php b/libraries/import/csv.php old mode 100644 new mode 100755 diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php old mode 100644 new mode 100755 diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php old mode 100644 new mode 100755 diff --git a/libraries/import/ods.php b/libraries/import/ods.php old mode 100644 new mode 100755 diff --git a/libraries/import/sql.php b/libraries/import/sql.php old mode 100644 new mode 100755 diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php old mode 100644 new mode 100755 diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php old mode 100644 new mode 100755 diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php old mode 100644 new mode 100755 diff --git a/libraries/import/xls.php b/libraries/import/xls.php old mode 100644 new mode 100755 diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php old mode 100644 new mode 100755 diff --git a/libraries/import/xml.php b/libraries/import/xml.php old mode 100644 new mode 100755 diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php old mode 100644 new mode 100755 diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php old mode 100644 new mode 100755 diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php old mode 100644 new mode 100755 diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php old mode 100644 new mode 100755 diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php old mode 100644 new mode 100755 diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php old mode 100644 new mode 100755 diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php old mode 100644 new mode 100755 diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php old mode 100644 new mode 100755 diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php old mode 100644 new mode 100755 diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php old mode 100644 new mode 100755 diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php old mode 100644 new mode 100755 diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php old mode 100644 new mode 100755 diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc old mode 100644 new mode 100755 diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100644 new mode 100755 diff --git a/libraries/php-gettext/streams.php b/libraries/php-gettext/streams.php old mode 100644 new mode 100755 diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php old mode 100644 new mode 100755 diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php old mode 100644 new mode 100755 diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php old mode 100644 new mode 100755 diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php old mode 100644 new mode 100755 diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php old mode 100644 new mode 100755 diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php old mode 100644 new mode 100755 diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php old mode 100644 new mode 100755 diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php old mode 100644 new mode 100755 diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php old mode 100644 new mode 100755 diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php old mode 100644 new mode 100755 index 5cd7a67..8196269 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -16,98 +16,101 @@ require_once './libraries/server_common.inc.php';
PMA_checkParameters(array('is_superuser', 'url_query'), TRUE, FALSE);
-/** - * Counts amount of navigation tabs - */ -$server_links_count_tabs = 0; - - -/** - * Put something in $sub_part - */ -if (!isset($sub_part)) { - $sub_part = ''; -} - - -/** - * Displays tab links - */ -$tabs = array(); - -$tabs['databases']['icon'] = 's_db.png'; -$tabs['databases']['link'] = 'server_databases.php'; -$tabs['databases']['text'] = __('Databases'); - -$tabs['sql']['icon'] = 'b_sql.png'; -$tabs['sql']['link'] = 'server_sql.php'; -$tabs['sql']['text'] = __('SQL'); - -$tabs['status']['icon'] = 's_status.png'; -$tabs['status']['link'] = 'server_status.php'; -$tabs['status']['text'] = __('Status'); - -if (! empty($binary_logs)) { - $tabs['binlog']['icon'] = 's_tbl.png'; - $tabs['binlog']['link'] = 'server_binlog.php'; - $tabs['binlog']['text'] = __('Binary log'); -} -$tabs['process']['icon'] = 's_process.png'; -$tabs['process']['link'] = 'server_processlist.php'; -$tabs['process']['text'] = __('Processes'); - -if ($is_superuser) { - $tabs['rights']['icon'] = 's_rights.png'; - $tabs['rights']['link'] = 'server_privileges.php'; - $tabs['rights']['text'] = __('Privileges'); -} - -$tabs['export']['icon'] = 'b_export.png'; -$tabs['export']['link'] = 'server_export.php'; -$tabs['export']['text'] = __('Export'); - -$tabs['import']['icon'] = 'b_import.png'; -$tabs['import']['link'] = 'server_import.php'; -$tabs['import']['text'] = __('Import'); - -$tabs['vars']['icon'] = 's_vars.png'; -$tabs['vars']['link'] = 'server_variables.php'; -$tabs['vars']['text'] = __('Variables'); - -$tabs['charset']['icon'] = 's_asci.png'; -$tabs['charset']['link'] = 'server_collations.php'; -$tabs['charset']['text'] = __('Charsets'); - -$tabs['engine']['icon'] = 'b_engine.png'; -$tabs['engine']['link'] = 'server_engines.php'; -$tabs['engine']['text'] = __('Engines'); - -if ($is_superuser) { - $tabs['replication']['icon'] = 's_replication.png'; - $tabs['replication']['link'] = 'server_replication.php'; - $tabs['replication']['text'] = __('Replication'); -} - -$tabs['synchronize']['icon'] = 's_sync.png'; -$tabs['synchronize']['link'] = 'server_synchronize.php'; -$tabs['synchronize']['text'] = __('Synchronize'); - -$tabs['settings']['icon'] = 'b_tblops.png'; -$tabs['settings']['link'] = 'prefs_manage.php'; -$tabs['settings']['text'] = __('Settings'); -$tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), - array('prefs_forms.php', 'prefs_manage.php')); - -echo PMA_generate_html_tabs($tabs, array()); -unset($tabs); - - -/** - * Displays a message - */ -if (!empty($message)) { - PMA_showMessage($message); - unset($message); -} - +// Don't print all these links if in an Ajax request +if (!$GLOBALS['is_ajax_request']) { + /** + * Counts amount of navigation tabs + */ + $server_links_count_tabs = 0; + + + /** + * Put something in $sub_part + */ + if (!isset($sub_part)) { + $sub_part = ''; + } + + + /** + * Displays tab links + */ + $tabs = array(); + + $tabs['databases']['icon'] = 's_db.png'; + $tabs['databases']['link'] = 'server_databases.php'; + $tabs['databases']['text'] = __('Databases'); + + $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['link'] = 'server_sql.php'; + $tabs['sql']['text'] = __('SQL'); + + $tabs['status']['icon'] = 's_status.png'; + $tabs['status']['link'] = 'server_status.php'; + $tabs['status']['text'] = __('Status'); + + if (! empty($binary_logs)) { + $tabs['binlog']['icon'] = 's_tbl.png'; + $tabs['binlog']['link'] = 'server_binlog.php'; + $tabs['binlog']['text'] = __('Binary log'); + } + $tabs['process']['icon'] = 's_process.png'; + $tabs['process']['link'] = 'server_processlist.php'; + $tabs['process']['text'] = __('Processes'); + + if ($is_superuser) { + $tabs['rights']['icon'] = 's_rights.png'; + $tabs['rights']['link'] = 'server_privileges.php'; + $tabs['rights']['text'] = __('Privileges'); + } + + $tabs['export']['icon'] = 'b_export.png'; + $tabs['export']['link'] = 'server_export.php'; + $tabs['export']['text'] = __('Export'); + + $tabs['import']['icon'] = 'b_import.png'; + $tabs['import']['link'] = 'server_import.php'; + $tabs['import']['text'] = __('Import'); + + $tabs['vars']['icon'] = 's_vars.png'; + $tabs['vars']['link'] = 'server_variables.php'; + $tabs['vars']['text'] = __('Variables'); + + $tabs['charset']['icon'] = 's_asci.png'; + $tabs['charset']['link'] = 'server_collations.php'; + $tabs['charset']['text'] = __('Charsets'); + + $tabs['engine']['icon'] = 'b_engine.png'; + $tabs['engine']['link'] = 'server_engines.php'; + $tabs['engine']['text'] = __('Engines'); + + if ($is_superuser) { + $tabs['replication']['icon'] = 's_replication.png'; + $tabs['replication']['link'] = 'server_replication.php'; + $tabs['replication']['text'] = __('Replication'); + } + + $tabs['synchronize']['icon'] = 's_sync.png'; + $tabs['synchronize']['link'] = 'server_synchronize.php'; + $tabs['synchronize']['text'] = __('Synchronize'); + + $tabs['settings']['icon'] = 'b_tblops.png'; + $tabs['settings']['link'] = 'prefs_manage.php'; + $tabs['settings']['text'] = __('Settings'); + $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), + array('prefs_forms.php', 'prefs_manage.php')); + + echo PMA_generate_html_tabs($tabs, array()); + unset($tabs); + + + + /** + * Displays a message + */ + if (!empty($message)) { + PMA_showMessage($message); + unset($message); + } +}// end if($GLOBALS['is_ajax_request'] == true) ?> diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php old mode 100644 new mode 100755 diff --git a/libraries/session.inc.php b/libraries/session.inc.php old mode 100644 new mode 100755 diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php old mode 100644 new mode 100755 index d938699..8ac7c1c --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -171,6 +171,9 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') </script> <?php } + + // print an empty div, which will be later filled with the sql query results by ajax + echo '<div id="sqlqueryresults"></div>'; }
/** diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php old mode 100644 new mode 100755 diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php old mode 100644 new mode 100755 diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php old mode 100644 new mode 100755 diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php old mode 100644 new mode 100755 diff --git a/libraries/string.lib.php b/libraries/string.lib.php old mode 100644 new mode 100755 diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php old mode 100644 new mode 100755 diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php old mode 100644 new mode 100755 diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php old mode 100644 new mode 100755 diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php old mode 100644 new mode 100755 diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php old mode 100644 new mode 100755 diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php old mode 100644 new mode 100755 diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php old mode 100644 new mode 100755 diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php old mode 100644 new mode 100755 index 845f752..8a7b9ea --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -610,7 +610,7 @@ document.onkeydown = onKeyDownArrowsHandler; } ?>
-<form method="post" action="<?php echo $action; ?>"> +<form id="create_table_form" method="post" action="<?php echo $action; ?>"> <?php echo PMA_generate_common_hidden_inputs($_form_params); unset($_form_params); diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php old mode 100644 new mode 100755 diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php old mode 100644 new mode 100755 index da2ee1d..43ba18e --- a/libraries/tbl_triggers.lib.php +++ b/libraries/tbl_triggers.lib.php @@ -41,7 +41,7 @@ if ($triggers) { ($ct%2 == 0) ? 'even' : 'odd', $trigger['name'], PMA_linkOrButton('tbl_sql.php?' . $url_query . '&sql_query=' . urlencode($drop_and_create) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Change']), - '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($trigger['drop'], false) . '\')">' . $titles['Drop'] . '</a>', + '<a class="drop_trigger_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" >' . $titles['Drop'] . '</a>', $trigger['action_timing'], $trigger['event_manipulation']); $ct++; diff --git a/libraries/tcpdf/LICENSE.TXT b/libraries/tcpdf/LICENSE.TXT old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/LICENSE b/libraries/tcpdf/font/LICENSE old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusans-bold.ctg.z b/libraries/tcpdf/font/dejavusans-bold.ctg.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusans-bold.z b/libraries/tcpdf/font/dejavusans-bold.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusans.ctg.z b/libraries/tcpdf/font/dejavusans.ctg.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusans.php b/libraries/tcpdf/font/dejavusans.php old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusans.z b/libraries/tcpdf/font/dejavusans.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavusansb.php b/libraries/tcpdf/font/dejavusansb.php old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserif-bold.ctg.z b/libraries/tcpdf/font/dejavuserif-bold.ctg.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserif-bold.z b/libraries/tcpdf/font/dejavuserif-bold.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserif.ctg.z b/libraries/tcpdf/font/dejavuserif.ctg.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserif.php b/libraries/tcpdf/font/dejavuserif.php old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserif.z b/libraries/tcpdf/font/dejavuserif.z old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/font/dejavuserifb.php b/libraries/tcpdf/font/dejavuserifb.php old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php old mode 100644 new mode 100755 diff --git a/libraries/tcpdf/unicode_data.php b/libraries/tcpdf/unicode_data.php old mode 100644 new mode 100755 diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/README b/libraries/transformations/README old mode 100644 new mode 100755 diff --git a/libraries/transformations/TEMPLATE b/libraries/transformations/TEMPLATE old mode 100644 new mode 100755 diff --git a/libraries/transformations/TEMPLATE_MIMETYPE b/libraries/transformations/TEMPLATE_MIMETYPE old mode 100644 new mode 100755 diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php old mode 100644 new mode 100755 diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php old mode 100644 new mode 100755 diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php old mode 100644 new mode 100755 diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php old mode 100644 new mode 100755 diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php old mode 100644 new mode 100755 diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php old mode 100644 new mode 100755 diff --git a/license.php b/license.php old mode 100644 new mode 100755 diff --git a/main.php b/main.php old mode 100644 new mode 100755 index 3feefe5..627b1de --- a/main.php +++ b/main.php @@ -13,6 +13,7 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; $GLOBALS['js_include'][] = 'main_custom_color.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
// Handles some variables that may have been sent by the calling script $GLOBALS['db'] = ''; @@ -87,7 +88,7 @@ if ($server > 0 if ($cfg['Server']['auth_type'] != 'config') { if ($cfg['ShowChgPassword']) { PMA_printListItem(__('Change password'), 'li_change_password', - './user_password.php?' . $common_url_query); + './user_password.php?' . $common_url_query, null, null, 'change_password_anchor'); } } // end if echo ' <li id="li_select_mysql_collation">'; @@ -345,8 +346,9 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu * @param string $url make item as link with $url as target * @param string $mysql_help_page display a link to MySQL's manual * @param string $target special target for $url + * @param string $a_id id for the anchor, used for jQuery to hook in functions */ -function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null) +function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null) { echo '<li id="' . $id . '">'; if (null !== $url) { @@ -354,6 +356,9 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu if (null !== $target) { echo ' target="' . $target . '"'; } + if (null != $a_id) { + echo ' id="' . $a_id .'"'; + } echo '>'; }
diff --git a/navigation.php b/navigation.php old mode 100644 new mode 100755 diff --git a/phpdoctor.ini b/phpdoctor.ini old mode 100644 new mode 100755 diff --git a/phpinfo.php b/phpinfo.php old mode 100644 new mode 100755 diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php old mode 100644 new mode 100755 diff --git a/pmd/images/2leftarrow.png b/pmd/images/2leftarrow.png old mode 100644 new mode 100755 diff --git a/pmd/images/2leftarrow_m.png b/pmd/images/2leftarrow_m.png old mode 100644 new mode 100755 diff --git a/pmd/images/2rightarrow.png b/pmd/images/2rightarrow.png old mode 100644 new mode 100755 diff --git a/pmd/images/2rightarrow_m.png b/pmd/images/2rightarrow_m.png old mode 100644 new mode 100755 diff --git a/pmd/images/ang_direct.png b/pmd/images/ang_direct.png old mode 100644 new mode 100755 diff --git a/pmd/images/bord.png b/pmd/images/bord.png old mode 100644 new mode 100755 diff --git a/pmd/images/bottom.png b/pmd/images/bottom.png old mode 100644 new mode 100755 diff --git a/pmd/images/def.png b/pmd/images/def.png old mode 100644 new mode 100755 diff --git a/pmd/images/display_field.png b/pmd/images/display_field.png old mode 100644 new mode 100755 diff --git a/pmd/images/downarrow1.png b/pmd/images/downarrow1.png old mode 100644 new mode 100755 diff --git a/pmd/images/downarrow2.png b/pmd/images/downarrow2.png old mode 100644 new mode 100755 diff --git a/pmd/images/downarrow2_m.png b/pmd/images/downarrow2_m.png old mode 100644 new mode 100755 diff --git a/pmd/images/exec.png b/pmd/images/exec.png old mode 100644 new mode 100755 diff --git a/pmd/images/exec_small.png b/pmd/images/exec_small.png old mode 100644 new mode 100755 diff --git a/pmd/images/favicon.ico b/pmd/images/favicon.ico old mode 100644 new mode 100755 diff --git a/pmd/images/grid.png b/pmd/images/grid.png old mode 100644 new mode 100755 diff --git a/pmd/images/help.png b/pmd/images/help.png old mode 100644 new mode 100755 diff --git a/pmd/images/help_relation.png b/pmd/images/help_relation.png old mode 100644 new mode 100755 diff --git a/pmd/images/pdf.png b/pmd/images/pdf.png old mode 100644 new mode 100755 diff --git a/pmd/images/relation.png b/pmd/images/relation.png old mode 100644 new mode 100755 diff --git a/pmd/images/reload.png b/pmd/images/reload.png old mode 100644 new mode 100755 diff --git a/pmd/images/resize.png b/pmd/images/resize.png old mode 100644 new mode 100755 diff --git a/pmd/images/rightarrow1.png b/pmd/images/rightarrow1.png old mode 100644 new mode 100755 diff --git a/pmd/images/rightarrow2.png b/pmd/images/rightarrow2.png old mode 100644 new mode 100755 diff --git a/pmd/images/save.png b/pmd/images/save.png old mode 100644 new mode 100755 diff --git a/pmd/images/table.png b/pmd/images/table.png old mode 100644 new mode 100755 diff --git a/pmd/images/uparrow2_m.png b/pmd/images/uparrow2_m.png old mode 100644 new mode 100755 diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js old mode 100644 new mode 100755 diff --git a/pmd/scripts/iecanvas.js b/pmd/scripts/iecanvas.js old mode 100644 new mode 100755 diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/1.png b/pmd/styles/default/images/1.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/2.png b/pmd/styles/default/images/2.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/3.png b/pmd/styles/default/images/3.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/4.png b/pmd/styles/default/images/4.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/5.png b/pmd/styles/default/images/5.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/6.png b/pmd/styles/default/images/6.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/7.png b/pmd/styles/default/images/7.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/8.png b/pmd/styles/default/images/8.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/FieldKey_small.png b/pmd/styles/default/images/FieldKey_small.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Field_small.png b/pmd/styles/default/images/Field_small.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Field_small_char.png b/pmd/styles/default/images/Field_small_char.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Field_small_date.png b/pmd/styles/default/images/Field_small_date.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Field_small_int.png b/pmd/styles/default/images/Field_small_int.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Header.png b/pmd/styles/default/images/Header.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/Header_Linked.png b/pmd/styles/default/images/Header_Linked.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/left_panel_butt.png b/pmd/styles/default/images/left_panel_butt.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/left_panel_tab.png b/pmd/styles/default/images/left_panel_tab.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/small_tab.png b/pmd/styles/default/images/small_tab.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/images/top_panel.png b/pmd/styles/default/images/top_panel.png old mode 100644 new mode 100755 diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css old mode 100644 new mode 100755 diff --git a/pmd_common.php b/pmd_common.php old mode 100644 new mode 100755 diff --git a/pmd_display_field.php b/pmd_display_field.php old mode 100644 new mode 100755 diff --git a/pmd_general.php b/pmd_general.php old mode 100644 new mode 100755 diff --git a/pmd_help.php b/pmd_help.php old mode 100644 new mode 100755 diff --git a/pmd_pdf.php b/pmd_pdf.php old mode 100644 new mode 100755 diff --git a/pmd_relation_new.php b/pmd_relation_new.php old mode 100644 new mode 100755 diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php old mode 100644 new mode 100755 diff --git a/pmd_save_pos.php b/pmd_save_pos.php old mode 100644 new mode 100755 diff --git a/po/.gitignore b/po/.gitignore old mode 100644 new mode 100755 diff --git a/print.css b/print.css old mode 100644 new mode 100755 diff --git a/querywindow.php b/querywindow.php old mode 100644 new mode 100755 diff --git a/robots.txt b/robots.txt old mode 100644 new mode 100755 diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql old mode 100644 new mode 100755 diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php old mode 100644 new mode 100755 diff --git a/scripts/google-javascript-compiler/COPYING b/scripts/google-javascript-compiler/COPYING old mode 100644 new mode 100755 diff --git a/scripts/google-javascript-compiler/README b/scripts/google-javascript-compiler/README old mode 100644 new mode 100755 diff --git a/scripts/google-javascript-compiler/compiler.jar b/scripts/google-javascript-compiler/compiler.jar old mode 100644 new mode 100755 diff --git a/scripts/signon.php b/scripts/signon.php old mode 100644 new mode 100755 diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql old mode 100644 new mode 100755 diff --git a/server_binlog.php b/server_binlog.php old mode 100644 new mode 100755 diff --git a/server_collations.php b/server_collations.php old mode 100644 new mode 100755 diff --git a/server_databases.php b/server_databases.php old mode 100644 new mode 100755 index d054aca..8ce1f8e --- a/server_databases.php +++ b/server_databases.php @@ -309,7 +309,7 @@ if ($databases_count > 0) { } // end foreach ($databases as $key => $current) unset($current, $odd_row);
- echo '<tr>' . "\n"; + echo '<tr id="db_summary_row">' . "\n"; if ($is_superuser || $cfg['AllowUserDropDatabase']) { echo ' <th></th>' . "\n"; } diff --git a/server_engines.php b/server_engines.php old mode 100644 new mode 100755 diff --git a/server_export.php b/server_export.php old mode 100644 new mode 100755 diff --git a/server_import.php b/server_import.php old mode 100644 new mode 100755 diff --git a/server_privileges.php b/server_privileges.php old mode 100644 new mode 100755 index 33483d2..567a44c --- a/server_privileges.php +++ b/server_privileges.php @@ -14,6 +14,9 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; +$GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; + $GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php';
@@ -564,10 +567,10 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE) ? __('Database-specific privileges') : __('Table-specific privileges'))) . "\n" . ' (<a href="server_privileges.php?' - . $GLOBALS['url_query'] . '&checkall=1" onclick="setCheckboxes(\'usersForm\', true); return false;">' + . $GLOBALS['url_query'] . '&checkall=1" onclick="setCheckboxes('addUsersForm', true); return false;">' . __('Check All') . '</a> /' . "\n" . ' <a href="server_privileges.php?' - . $GLOBALS['url_query'] . '" onclick="setCheckboxes(\'usersForm\', false); return false;">' + . $GLOBALS['url_query'] . '" onclick="setCheckboxes('addUsersForm', false); return false;">' . __('Uncheck All') . '</a>)' . "\n" . ' </legend>' . "\n" . ' <p><small><i>' . __(' Note: MySQL privilege names are expressed in English ') . '</i></small></p>' . "\n" @@ -971,10 +974,17 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { $message = PMA_Message::rawError(PMA_DBI_getError()); break; } - // this is needed in case tracking is on: - $GLOBALS['db'] = $username; - $GLOBALS['reload'] = TRUE; - PMA_reloadNavigation(); + + + /** + * If we are not in an Ajax request, we can't reload navigation now + */ + if($GLOBALS['is_ajax_request'] != true) { + // this is needed in case tracking is on: + $GLOBALS['db'] = $username; + $GLOBALS['reload'] = TRUE; + PMA_reloadNavigation(); + }
$q = 'GRANT ALL PRIVILEGES ON ' . PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO '' @@ -1267,7 +1277,10 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ if (isset($_REQUEST['drop_users_db'])) { $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; $GLOBALS['reload'] = TRUE; - PMA_reloadNavigation(); + + if($GLOBALS['is_ajax_request'] != true) { + PMA_reloadNavigation(); + } } } if (empty($_REQUEST['change_copy'])) { @@ -1331,27 +1344,10 @@ if (isset($_REQUEST['flush_privileges'])) { $message = PMA_Message::success(__('The privileges were reloaded successfully.')); }
- -/** - * Displays the links - */ -if (isset($viewing_mode) && $viewing_mode == 'db') { - $db = $checkprivs; - $url_query .= '&goto=db_operations.php'; - - // Gets the database structure - $sub_part = '_structure'; - require './libraries/db_info.inc.php'; - echo "\n"; -} else { - require './libraries/server_links.inc.php'; -} - - /** * defines some standard links */ -$link_edit = '<a href="server_privileges.php?' . $GLOBALS['url_query'] +$link_edit = '<a class="edit_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query'] . '&username=%s' . '&hostname=%s' . '&dbname=%s' @@ -1368,7 +1364,7 @@ $link_revoke = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . PMA_getIcon('b_usrdrop.png', __('Revoke')) . '</a>';
-$link_export = '<a href="server_privileges.php?' . $GLOBALS['url_query'] +$link_export = '<a class="export_user_anchor" href="server_privileges.php?' . $GLOBALS['url_query'] . '&username=%s' . '&hostname=%s' . '&initial=%s' @@ -1377,6 +1373,89 @@ $link_export = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '</a>';
/** + * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, + * show $message and exit. + */ +if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && !isset($_REQUEST['adduser']) && !isset($_REQUEST['initial']) && !isset($_REQUEST['showall']) && !isset($_REQUEST['edit_user_dialog'])) { + + if(isset($sql_query)) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + } + + if(isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) { + /** + * generate html on the fly for the new user that was just created. + */ + $new_user_string = '<tr>'."\n" + .'<td> <input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_" value="' . htmlspecialchars($username) . '&#27;' . htmlspecialchars($hostname) . '" /> </td>'."\n" + .'<td><label for="checkbox_sel_users_">' . (empty($username) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($username) ) . '</label></td>' . "\n" + .'<td>' . htmlspecialchars($hostname) . '</td>' . "\n"; + $new_user_string .= '<td>'; + + if(!empty($password) || isset($pma_pw)) { + $new_user_string .= __('Yes'); + } + else { + $new_user_string .= '<span style="color: #FF0000">' . __('No') . '</span>'; + }; + + $new_user_string .= '</td>'."\n"; + $new_user_string .= '<td><tt>' . join(', ', PMA_extractPrivInfo('', true)) . '</tt></td>'; //Fill in privileges here + $new_user_string .= '<td>'; + + if((isset($Grant_priv) && $Grant_priv == 'Y')) { + $new_user_string .= __('Yes'); + } + else { + $new_user_string .= __('No'); + } + + $new_user_string .='</td>'; + + $new_user_string .= '<td>'.sprintf($link_edit, urlencode($username), urlencode($host), '', '' ).'</td>'."\n"; + $new_user_string .= '<td>'.sprintf($link_export, urlencode($username), urlencode($hostname), (isset($initial) ? $initial : '')).'</td>'."\n"; + + $new_user_string .= '</tr>'; + + $extra_data['new_user_string'] = $new_user_string; + + /** + * Generate the string for this alphabet's initial, to update the user + * pagination + */ + $new_user_initial = strtoupper(substr($username, 0, 1)); + $new_user_initial_string = '<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . $new_user_initial + .'>' . $new_user_initial . '</a>'; + $extra_data['new_user_initial'] = $new_user_initial; + $extra_data['new_user_initial_string'] = $new_user_initial_string; + } + + if(isset($update_privs)) { + $new_privileges = join(', ', PMA_extractPrivInfo('', true)); + + $extra_data['new_privileges'] = $new_privileges; + } + + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); +} + +/** + * Displays the links + */ +if (isset($viewing_mode) && $viewing_mode == 'db') { + $db = $checkprivs; + $url_query .= '&goto=db_operations.php'; + + // Gets the database structure + $sub_part = '_structure'; + require './libraries/db_info.inc.php'; + echo "\n"; +} else { + require './libraries/server_links.inc.php'; +} + + +/** * Displays the page */
@@ -1390,6 +1469,9 @@ if (isset($_REQUEST['export'])) { } echo '</textarea>'; unset($username, $hostname, $grants, $one_grant); + if( $GLOBALS['is_ajax_request']) { + exit; + } }
if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs))) { @@ -1479,36 +1561,40 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
/** * Displays the initials + * In an Ajax request, we don't need to show this */
- // initialize to FALSE the letters A-Z - for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) { - if (! isset($array_initials[chr($letter_counter + 64)])) { - $array_initials[chr($letter_counter + 64)] = FALSE; + if( $GLOBALS['is_ajax_request'] != true ) { + + // initialize to FALSE the letters A-Z + for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) { + if (! isset($array_initials[chr($letter_counter + 64)])) { + $array_initials[chr($letter_counter + 64)] = FALSE; + } } - }
- $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE); - while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) { - $array_initials[$tmp_initial] = TRUE; - } + $initials = PMA_DBI_try_query('SELECT DISTINCT UPPER(LEFT(`User`,1)) FROM `user` ORDER BY `User` ASC', null, PMA_DBI_QUERY_STORE); + while (list($tmp_initial) = PMA_DBI_fetch_row($initials)) { + $array_initials[$tmp_initial] = TRUE; + }
- // Display the initials, which can be any characters, not - // just letters. For letters A-Z, we add the non-used letters - // as greyed out. + // Display the initials, which can be any characters, not + // just letters. For letters A-Z, we add the non-used letters + // as greyed out.
- uksort($array_initials, "strnatcasecmp"); + uksort($array_initials, "strnatcasecmp");
- echo '<table cellspacing="5"><tr>'; - foreach ($array_initials as $tmp_initial => $initial_was_found) { - if ($initial_was_found) { - echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n"; - } else { - echo '<td>' . $tmp_initial . '</td>'; + echo '<table id="initials_table" cellspacing="5"><tr>'; + foreach ($array_initials as $tmp_initial => $initial_was_found) { + if ($initial_was_found) { + echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&initial=' . urlencode($tmp_initial) . '">' . $tmp_initial . '</a></td>' . "\n"; + } else { + echo '<td>' . $tmp_initial . '</td>'; + } } + echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n"; + echo '</tr></table>'; } - echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n"; - echo '</tr></table>';
/** * Display the user overview @@ -1629,8 +1715,13 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . __('Add a new User') . '</a>' . "\n" . ' </fieldset>' . "\n"; } // end if (display overview) + + if( $GLOBALS['is_ajax_request'] ) { + exit; + } + $flushnote = new PMA_Message(__('Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.'), PMA_Message::NOTICE); - $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1">', false); + $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&flush_privileges=1" id="reload_privileges_anchor">', false); $flushnote->addParam('</a>', false); $flushnote->display(); } @@ -1682,7 +1773,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs //require './libraries/footer.inc.php'; }
- echo '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post">' . "\n"; + echo '<form name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">' . "\n"; $_params = array( 'username' => $username, 'hostname' => $hostname, @@ -2017,12 +2108,13 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } } } elseif (isset($_REQUEST['adduser'])) { + // Add a new user $GLOBALS['url_query'] .= '&adduser=1'; echo '<h2>' . "\n" . PMA_getIcon('b_usradd.png') . __('Add a new User') . "\n" . '</h2>' . "\n" - . '<form name="usersForm" id="usersForm" action="server_privileges.php" method="post" onsubmit="return checkAddUser(this);">' . "\n" + . '<form name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">' . "\n" . PMA_generate_common_hidden_inputs('', ''); PMA_displayLoginInformationFields('new'); echo '<fieldset id="fieldset_add_user_database">' . "\n" diff --git a/server_processlist.php b/server_processlist.php old mode 100644 new mode 100755 diff --git a/server_replication.php b/server_replication.php old mode 100644 new mode 100755 diff --git a/server_sql.php b/server_sql.php old mode 100644 new mode 100755 index 6a4fc68..243d0bf --- a/server_sql.php +++ b/server_sql.php @@ -13,6 +13,9 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ +$GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'sql.js'; + require_once './libraries/server_common.inc.php'; require_once './libraries/sql_query_form.lib.php';
diff --git a/server_status.php b/server_status.php old mode 100644 new mode 100755 diff --git a/server_synchronize.php b/server_synchronize.php old mode 100644 new mode 100755 diff --git a/server_variables.php b/server_variables.php old mode 100644 new mode 100755 diff --git a/setup/config.php b/setup/config.php old mode 100644 new mode 100755 diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php old mode 100644 new mode 100755 diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php old mode 100644 new mode 100755 diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php old mode 100644 new mode 100755 diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php old mode 100644 new mode 100755 diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php old mode 100644 new mode 100755 diff --git a/setup/index.php b/setup/index.php old mode 100644 new mode 100755 diff --git a/setup/lib/.htaccess b/setup/lib/.htaccess old mode 100644 new mode 100755 diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php old mode 100644 new mode 100755 diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php old mode 100644 new mode 100755 diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php old mode 100644 new mode 100755 diff --git a/setup/scripts.js b/setup/scripts.js old mode 100644 new mode 100755 diff --git a/setup/styles.css b/setup/styles.css old mode 100644 new mode 100755 diff --git a/setup/validate.php b/setup/validate.php old mode 100644 new mode 100755 diff --git a/show_config_errors.php b/show_config_errors.php old mode 100644 new mode 100755 diff --git a/sql.php b/sql.php old mode 100644 new mode 100755 index 9a370d8..1a2853f --- a/sql.php +++ b/sql.php @@ -10,6 +10,7 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; +require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php';
@@ -48,6 +49,73 @@ if (isset($fields['dbase'])) { $db = $fields['dbase']; }
+/** + * During inline edit, if we have a relational field, show the dropdown for it + * + * Logic taken from libraries/display_tbl_lib.php + * + * This doesn't seem to be the right place to do this, but I can't think of any + * better place either. + */ +if(isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_values'] == true) { + require_once 'libraries/relation.lib.php'; + + $column = $_REQUEST['column']; + $foreigners = PMA_getForeigners($db, $table, $column); + + $foreignData = PMA_getForeignData($foreigners, $column, false, '', ''); + + $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); + + if( $dropdown == '<option value=""> </option>'."\n" ) { + //Handle the case when number of values is more than $cfg['ForeignKeyMaxLimit'] + $_url_params = array( + 'db' => $db, + 'table' => $table, + 'field' => $column + ); + + $dropdown = '<a href="browse_foreigners.php' . PMA_generate_common_url($_url_params) . '"' + . ' target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false"' + .'>Search Foreign Data</a>'; + } + else { + $dropdown = '<select>' . $dropdown . '</select>'; + } + + $extra_data['dropdown'] = $dropdown; + PMA_ajaxResponse(NULL, true, $extra_data); +} + +/** + * Just like above, find possible values for enum fields during inline edit. + * + * Logic taken from libraries/display_tbl_lib.php + */ +if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true) { + $field_info_query = 'SHOW FIELDS FROM `' . $db . '`.`' . $table . '` LIKE '' . $_REQUEST['column'] . '' ;'; + + $field_info_result = PMA_DBI_fetch_result($field_info_query, null, null, null, PMA_DBI_QUERY_STORE); + + $search = array('enum', '(', ')', "'"); + + $values = explode(',', str_replace($search, '', $field_info_result[0]['Type'])); + + $dropdown = ''; + foreach($values as $value) { + $dropdown .= '<option value="' . htmlspecialchars($value) . '"'; + if($value == $_REQUEST['curr_value']) { + $dropdown .= ' selected="selected"'; + } + $dropdown .= '>' . $value . '</option>'; + } + + $dropdown = '<select>' . $dropdown . '</select>'; + + $extra_data['dropdown'] = $dropdown; + PMA_ajaxResponse(NULL, true, $extra_data); +} + // Default to browse if no query set and we have table // (needed for browsing from DefaultTabTable) if (empty($sql_query) && strlen($table) && strlen($db)) { @@ -310,6 +378,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } $active_page = $goto; $message = htmlspecialchars(PMA_Message::rawError($error)); + + if( $GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($message, false); + } + /** * Go to target path. */ @@ -318,7 +391,10 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { /** * HTML header. */ - require_once './libraries/header.inc.php'; + + if($GLOBALS['is_ajax_request'] != true) { + require_once './libraries/header.inc.php'; + } $full_err_url = (preg_match('@^(db|tbl)_@', $err_url)) ? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query) : $err_url; @@ -524,6 +600,86 @@ if (0 == $num_rows || $is_affected) { $message->addMessage($_querytime); $message->addMessage(')'); } + + if( $GLOBALS['is_ajax_request'] == true) { + + /** + * If we are in inline editing, we need to process the relational and + * transformed fields, if they were edited. After that, output the correct + * link/transformed value and exit + * + * Logic taken from libraries/display_tbl.lib.php + */ + + if(isset($_REQUEST['rel_fields_list']) && $_REQUEST['rel_fields_list'] != '') { + //handle relations work here for updated row. + require_once './libraries/relation.lib.php'; + + $map = PMA_getForeigners($db, $table, '', 'both'); + + $rel_fields = array(); + parse_str($_REQUEST['rel_fields_list'], $rel_fields); + + foreach( $rel_fields as $rel_field => $rel_field_value) { + + $where_comparison = '=' . $rel_field_value; + $_url_params = array( + 'db' => $map[$rel_field]['foreign_db'], + 'table' => $map[$rel_field]['foreign_table'], + 'pos' => '0', + 'sql_query' => 'SELECT * FROM ' + . PMA_backquote($map[$rel_field]['foreign_db']) . '.' . PMA_backquote($map[$rel_field]['foreign_table']) + . ' WHERE ' . PMA_backquote($map[$rel_field]['foreign_field']) + . $where_comparison + ); + + $extra_data['relations'][$rel_field] = '<a href="sql.php' . PMA_generate_common_url($_url_params) . '">'; + $extra_data['relations'][$rel_field] .= '</a>'; + } + } + + if(isset($_REQUEST['do_transformations']) && $_REQUEST['do_transformations'] == true ) { + require_once './libraries/transformations.lib.php'; + //if some posted fields need to be transformed, generate them here. + $mime_map = PMA_getMIME($db, $table); + + $edited_values = array(); + parse_str($_REQUEST['transform_fields_list'], $edited_values); + + foreach($mime_map as $transformation) { + $include_file = $transformation['transformation']; + $column_name = $transformation['column_name']; + $column_data = $edited_values[$column_name]; + + $_url_params = array( + 'db' => $db, + 'table' => $table, + 'where_clause' => $_REQUEST['where_clause'], + 'transform_key' => $column_name, + ); + + if (file_exists('./libraries/transformations/' . $include_file)) { + $transformfunction_name = str_replace('.inc.php', '', $transformation['transformation']); + + require_once './libraries/transformations/' . $include_file; + + if (function_exists('PMA_transformation_' . $transformfunction_name)) { + $transform_function = 'PMA_transformation_' . $transformfunction_name; + $transform_options = PMA_transformation_getOptions((isset($transformation['transformation_options']) ? $transformation['transformation_options'] : '')); + $transform_options['wrapper_link'] = PMA_generate_common_url($_url_params); + } + } + + $extra_data['transformations'][$column_name] = $transform_function($column_data, $transform_options); + } + } + + if(isset($GLOBALS['display_query'])) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); + } + + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + }
if ($is_gotofile) { $goto = PMA_securePath($goto); @@ -565,6 +721,15 @@ if (0 == $num_rows || $is_affected) {
// At least one row is returned -> displays a table with results else { + //If we are retrieving the full value of a truncated field or the original + // value of a transformed field, show it here and exit + if( $GLOBALS['inline_edit'] == true) { + $row = PMA_DBI_fetch_row($result); + $extra_data = array(); + $extra_data['value'] = $row[0]; + PMA_ajaxResponse(NULL, true, $extra_data); + } + // Displays the headers if (isset($show_query)) { unset($show_query); @@ -572,18 +737,30 @@ else { if (isset($printview) && $printview == '1') { require_once './libraries/header_printview.inc.php'; } else { + + $GLOBALS['js_include'][] = 'functions.js'; + $GLOBALS['js_include'][] = 'sql.js'; + unset($message); - if (strlen($table)) { - require './libraries/tbl_common.php'; - $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; - require './libraries/tbl_info.inc.php'; - require './libraries/tbl_links.inc.php'; - } elseif (strlen($db)) { - require './libraries/db_common.inc.php'; - require './libraries/db_info.inc.php'; - } else { - require './libraries/server_common.inc.php'; - require './libraries/server_links.inc.php'; + + if( $GLOBALS['is_ajax_request'] != true) { + if (strlen($table)) { + require './libraries/tbl_common.php'; + $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; + require './libraries/tbl_info.inc.php'; + require './libraries/tbl_links.inc.php'; + } elseif (strlen($db)) { + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; + } else { + require './libraries/server_common.inc.php'; + require './libraries/server_links.inc.php'; + } + } + else { + //we don't need to buffer the output in PMA_showMessage here. + //set a global variable and check against it in the function + $GLOBALS['buffer_message'] = false; } }
@@ -596,12 +773,17 @@ else { $fields_meta = PMA_DBI_get_fields_meta($result); $fields_cnt = count($fields_meta); } + + if( $GLOBALS['is_ajax_request'] != true ) { + //begin the sqlqueryresults div here. container div + echo '<div id="sqlqueryresults">'; + }
// Display previous update query (from tbl_replace) if (isset($disp_query) && $cfg['ShowSQL'] == true) { PMA_showMessage($disp_message, $disp_query, 'success'); } - + if (isset($profiling_results)) { PMA_profilingResults($profiling_results, true); } @@ -698,6 +880,10 @@ window.onload = function() </script> <?php } // end print case + + if( $GLOBALS['is_ajax_request'] != true) { + echo '</div>'; // end sqlqueryresults div + } } // end rows returned
/** diff --git a/tbl_addfield.php b/tbl_addfield.php old mode 100644 new mode 100755 diff --git a/tbl_alter.php b/tbl_alter.php old mode 100644 new mode 100755 index 4c00acd..ba8c048 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -131,6 +131,10 @@ if (isset($_REQUEST['do_save_data'])) { } }
+ if( $GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($message, $message->isSuccess()); + } + $active_page = 'tbl_structure.php'; require './tbl_structure.php'; } else { diff --git a/tbl_change.php b/tbl_change.php old mode 100644 new mode 100755 index 8ec78f5..eb38d6c --- a/tbl_change.php +++ b/tbl_change.php @@ -107,6 +107,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) { /** * used in ./libraries/header.inc.php to load JavaScript library file */ +$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; @@ -238,7 +239,7 @@ if (isset($clause_is_unique)) { ?>
<!-- Insert/Edit form --> -<form method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) { echo ' enctype="multipart/form-data"'; } ?>> +<form id="insertForm" method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) { echo ' enctype="multipart/form-data"'; } ?>> <?php echo PMA_generate_common_hidden_inputs($_form_params);
@@ -295,7 +296,7 @@ foreach ($rows as $row_id => $vrow) { echo '<label for="insert_ignore_check_' . $row_id . '">' . __('Ignore') . '</label><br />' . "\n"; } ?> - <table> + <table class="insertRowTable"> <thead> <tr> <th><?php echo __('Column'); ?></th> @@ -1081,7 +1082,7 @@ if (isset($where_clause)) { if ($insert_mode) { ?> <!-- Restart insertion form --> -<form method="post" action="tbl_replace.php" name="restartForm" > +<form id="restartForm" method="post" action="tbl_replace.php" name="restartForm" > <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo htmlspecialchars($GLOBALS['goto']); ?>" /> <input type="hidden" name="err_url" value="<?php echo htmlspecialchars($err_url); ?>" /> @@ -1092,7 +1093,7 @@ if ($insert_mode) { echo '<input type="hidden" name="where_clause[' . $key_id . ']" value="' . htmlspecialchars(trim($where_clause)) . '" />'. "\n"; } } - $tmp = '<select name="insert_rows" id="insert_rows" onchange="this.form.submit();" >' . "\n"; + $tmp = '<select name="insert_rows" id="insert_rows">' . "\n"; $option_values = array(1,2,5,10,15,20,30,40); foreach ($option_values as $value) { $tmp .= '<option value="' . $value . '"'; diff --git a/tbl_create.php b/tbl_create.php old mode 100644 new mode 100755 index 4f6b56f..0d15822 --- a/tbl_create.php +++ b/tbl_create.php @@ -241,6 +241,102 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been created.')); $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table));
+ if($GLOBALS['is_ajax_request'] == true) { + + /** + * construct the html for the newly created table's row to be appended + * to the list of tables. + * + * Logic taken from db_structure.php + */ + + $tbl_url_params = array(); + $tbl_url_params['db'] = $db; + $tbl_url_params['table'] = $table; + $is_show_stats = $cfg['ShowStats']; + + $tbl_stats_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' + . PMA_backquote($db) . ' LIKE '' . addslashes($table) . '';'); + $tbl_stats = PMA_DBI_fetch_assoc($tbl_stats_result); + PMA_DBI_free_result($tbl_stats_result); + unset($tbl_stats_result); + + if ($is_show_stats) { + $sum_size = (double) 0; + $overhead_size = (double) 0; + $overhead_check = ''; + + $tblsize = doubleval($tbl_stats['Data_length']) + doubleval($tbl_stats['Index_length']); + $sum_size += $tblsize; + list($formatted_size, $unit) = PMA_formatByteDown($tblsize, 3, ($tblsize > 0) ? 1 : 0); + if (isset($tbl_stats['Data_free']) && $tbl_stats['Data_free'] > 0) { + list($formatted_overhead, $overhead_unit) = PMA_formatByteDown($tbl_stats['Data_free'], 3, ($tbl_stats['Data_free'] > 0) ? 1 : 0); + $overhead_size += $tbl_stats['Data_free']; + } + + if (isset($formatted_overhead)) { + $overhead = $formatted_overhead . ' ' . $overhead_unit; + unset($formatted_overhead); + } else { + $overhead = '-'; + } + } + + $new_table_string = '<tr>' . "\n"; + $new_table_string .= '<td align="center"> <input type="checkbox" id="checkbox_tbl_" name="selected_tbl[]" value="'.htmlspecialchars($table).'" /> </td>' . "\n"; + + $new_table_string .= '<th>'; + $new_table_string .= '<a href="sql.php' . PMA_generate_common_url($tbl_url_params) . '">'. $table . '</a>'; + + if (PMA_Tracker::isActive()) { + $truename = str_replace(' ', ' ', htmlspecialchars($table)); + if (PMA_Tracker::isTracked($db, $truename)) { + $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye.png" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>'; + } elseif (PMA_Tracker::getVersion($db, $truename) > 0) { + $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye_grey.png" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>'; + } + unset($truename); + } + $new_table_string .= '</th>' . "\n"; + + $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_browse.png" alt="' . __('Browse') . '" title="' . __('Browse') . '" /> </td>' . "\n"; + + $new_table_string .= '<td> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '"> '; + $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_props.png" alt="' . __('Structure') . '" title="' . __('Structure') . '" />'; + $new_table_string .= '</a> </td>' . "\n"; + + $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_select.png" alt="' . __('Search') . '" title="' . __('Search') . '" /> </td>' . "\n"; + + $new_table_string .= '<td> <a href="tbl_change.php' . PMA_generate_common_url($tbl_url_params) . '"> '; + $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_insrow.png" alt="' . __('Insert') . '" title="' . __('Insert') . '" />'; + $new_table_string .= '</a> </td>' . "\n"; + + $new_table_string .= '<td> <img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'bd_empty.png" alt="' . __('Empty') . '" title="' . __('Empty') . '" /> </td>' . "\n"; + + $new_table_string .= '<td> <a class="drop_table_anchor" href="sql.php' . PMA_generate_common_url($tbl_url_params) . '&sql_query='; + $new_table_string .= urlencode('DROP TABLE ' . PMA_backquote($table)); + $new_table_string .= '">'; + $new_table_string .= '<img class="icon" width="16" height="16" src="' .$pmaThemeImage . 'b_drop.png" alt="' . __('Drop') . '" title="' . __('Drop') . '" />'; + $new_table_string .= '</a> </td>' . "\n"; + + $new_table_string .= '<td class="value">' . $tbl_stats['Rows'] . '</td>' . "\n"; + + $new_table_string .= '<td nowrap="nowrap">' . $tbl_stats['Engine'] . '</td>' . "\n"; + + $new_table_string .= '<td> <dfn title="' . PMA_getCollationDescr($tbl_stats['Collation']) . '">'. $tbl_stats['Collation'] .'</dfn></td>' . "\n"; + + if($is_show_stats) { + $new_table_string .= '<td class="value"> <a href="tbl_structure.php' . PMA_generate_common_url($tbl_url_params) . '#show usage" >' . $formatted_size . ' ' . $unit . '</a> </td>' . "\n" ; + $new_table_string .= '<td class="value">' . $overhead . '</td>' . "\n" ; + } + + $new_table_string .= '</tr>' . "\n"; + + $extra_data['new_table_string'] = $new_table_string; + + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } + $display_query = $sql_query; $sql_query = '';
diff --git a/tbl_export.php b/tbl_export.php old mode 100644 new mode 100755 diff --git a/tbl_get_field.php b/tbl_get_field.php old mode 100644 new mode 100755 diff --git a/tbl_import.php b/tbl_import.php old mode 100644 new mode 100755 diff --git a/tbl_indexes.php b/tbl_indexes.php old mode 100644 new mode 100755 diff --git a/tbl_move_copy.php b/tbl_move_copy.php old mode 100644 new mode 100755 diff --git a/tbl_operations.php b/tbl_operations.php old mode 100644 new mode 100755 diff --git a/tbl_printview.php b/tbl_printview.php old mode 100644 new mode 100755 diff --git a/tbl_relation.php b/tbl_relation.php old mode 100644 new mode 100755 diff --git a/tbl_replace.php b/tbl_replace.php old mode 100644 new mode 100755 index e372bd0..7a6ff26 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -415,6 +415,12 @@ if (! empty($error_messages)) { } unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message);
+if($GLOBALS['is_ajax_request'] == true) { + + $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); +} + if (isset($return_to_sql_query)) { $disp_query = $GLOBALS['sql_query']; $disp_message = $message; diff --git a/tbl_row_action.php b/tbl_row_action.php old mode 100644 new mode 100755 diff --git a/tbl_select.php b/tbl_select.php old mode 100644 new mode 100755 index d47baf7..1542dba --- a/tbl_select.php +++ b/tbl_select.php @@ -16,7 +16,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php';
-$GLOBALS['js_include'][] = 'tbl_change.js'; +$GLOBALS['js_include'][] = 'tbl_select.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { @@ -118,7 +118,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { } // ]]> </script> -<form method="post" action="tbl_select.php" name="insertForm"> +<form method="post" action="tbl_select.php" name="insertForm" id="tbl_search_form"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_select.php" /> @@ -323,6 +323,7 @@ $(function() { <input type="submit" name="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> +<div id="searchresults"></div> <?php require './libraries/footer.inc.php'; } diff --git a/tbl_sql.php b/tbl_sql.php old mode 100644 new mode 100755 index aa0af4d..70fafc1 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -13,6 +13,9 @@ require_once './libraries/common.inc.php'; /** * Runs common work */ +$GLOBALS['js_include'][] = 'functions.js'; +$GLOBALS['js_include'][] = 'sql.js'; + require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
diff --git a/tbl_structure.php b/tbl_structure.php old mode 100644 new mode 100755 index e1b29f9..c8e59d8 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -13,6 +13,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'tbl_structure.js';
/** * handle multiple field commands if required @@ -392,8 +393,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $titles['Change']; ?></a> </td> <td align="center" class="drop"> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" - onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')"> + <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Drop']; ?></a> </td> <td align="center" class="primary"> @@ -404,8 +404,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" - onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')"> + <a class="add_primary_key_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Primary']; ?></a> <?php $primary_enabled = true; } @@ -480,8 +479,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php if(isset($primary_enabled)) { if($primary_enabled) { ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" - onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Primary']; ?> </a> <?php diff --git a/tbl_tracking.php b/tbl_tracking.php old mode 100644 new mode 100755 diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php old mode 100644 new mode 100755 diff --git a/test/AllTests.php b/test/AllTests.php old mode 100644 new mode 100755 diff --git a/test/Environment_test.php b/test/Environment_test.php old mode 100644 new mode 100755 diff --git a/test/FailTest.php b/test/FailTest.php old mode 100644 new mode 100755 diff --git a/test/PMA_Message_test.php b/test/PMA_Message_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_blowfish_test.php b/test/PMA_blowfish_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_cache_test.php b/test/PMA_cache_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_escapeJsString_test.php b/test/PMA_escapeJsString_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_escapeMySqlWildcards_test.php b/test/PMA_escapeMySqlWildcards_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_foreignKeySupported_test.php b/test/PMA_foreignKeySupported_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_formatNumberByteDown_test.php b/test/PMA_formatNumberByteDown_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_get_real_size_test.php b/test/PMA_get_real_size_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_ifSetOr_test.php b/test/PMA_ifSetOr_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_isValid_test.php b/test/PMA_isValid_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_localisedDateTimespan_test.php b/test/PMA_localisedDateTimespan_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_pow_test.php b/test/PMA_pow_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_printableBitValue_test.php b/test/PMA_printableBitValue_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_quoting_slashing_test.php b/test/PMA_quoting_slashing_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_sanitize_test.php b/test/PMA_sanitize_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_showHint_test.php b/test/PMA_showHint_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_stringOperations_test.php b/test/PMA_stringOperations_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_transformation_getOptions_test.php b/test/PMA_transformation_getOptions_test.php old mode 100644 new mode 100755 diff --git a/test/PMA_whichCrlf_test.php b/test/PMA_whichCrlf_test.php old mode 100644 new mode 100755 diff --git a/test/PmaSeleniumLoginTest.php b/test/PmaSeleniumLoginTest.php old mode 100644 new mode 100755 diff --git a/test/PmaSeleniumPrivilegesTest.php b/test/PmaSeleniumPrivilegesTest.php old mode 100644 new mode 100755 diff --git a/test/PmaSeleniumTestCase.php b/test/PmaSeleniumTestCase.php old mode 100644 new mode 100755 diff --git a/test/PmaSeleniumXssTest.php b/test/PmaSeleniumXssTest.php old mode 100644 new mode 100755 diff --git a/test/theme.php b/test/theme.php old mode 100644 new mode 100755 diff --git a/test/wui.php b/test/wui.php old mode 100644 new mode 100755 diff --git a/themes.php b/themes.php old mode 100644 new mode 100755 diff --git a/themes/.gitignore b/themes/.gitignore old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php old mode 100644 new mode 100755 index 73f1c37..7062089 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1413,6 +1413,35 @@ table#serverconnection_trg_local { {background:#F00;}
/** + * Ajax notification styling + */ + .ajax_notification { + top: 0px; + position: fixed; + margin-top: 0; + margin-right: auto; + margin-bottom: 0; + margin-left: auto; + padding: 3px 5px; + min-width: 70px; + max-width: 350px; + background-color: #FF9900; + z-index: 1100; + text-align: center; + display: block; + left: 0; + right: 0; + background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif); + background-repeat: no-repeat; + background-position: 2%; + } + + #loading_parent { + position: relative; + width: 100%; + } + + /** * Export and Import styles */ .exportoptions h3, .importoptions h3 { diff --git a/themes/darkblue_orange/img/ajax_clock_small.gif b/themes/darkblue_orange/img/ajax_clock_small.gif old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/arrow_ltr.png b/themes/darkblue_orange/img/arrow_ltr.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/arrow_rtl.png b/themes/darkblue_orange/img/arrow_rtl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/asc_order.png b/themes/darkblue_orange/img/asc_order.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_bookmark.png b/themes/darkblue_orange/img/b_bookmark.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_browse.png b/themes/darkblue_orange/img/b_browse.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_calendar.png b/themes/darkblue_orange/img/b_calendar.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_comment.png b/themes/darkblue_orange/img/b_comment.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_dbstatistics.png b/themes/darkblue_orange/img/b_dbstatistics.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_deltbl.png b/themes/darkblue_orange/img/b_deltbl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_docs.png b/themes/darkblue_orange/img/b_docs.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_docsql.png b/themes/darkblue_orange/img/b_docsql.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_drop.png b/themes/darkblue_orange/img/b_drop.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_edit.png b/themes/darkblue_orange/img/b_edit.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_empty.png b/themes/darkblue_orange/img/b_empty.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_engine.png b/themes/darkblue_orange/img/b_engine.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_export.png b/themes/darkblue_orange/img/b_export.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_firstpage.png b/themes/darkblue_orange/img/b_firstpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_ftext.png b/themes/darkblue_orange/img/b_ftext.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_help.png b/themes/darkblue_orange/img/b_help.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_home.png b/themes/darkblue_orange/img/b_home.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_import.png b/themes/darkblue_orange/img/b_import.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_index.png b/themes/darkblue_orange/img/b_index.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_info.png b/themes/darkblue_orange/img/b_info.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_insrow.png b/themes/darkblue_orange/img/b_insrow.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_lastpage.png b/themes/darkblue_orange/img/b_lastpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_minus.png b/themes/darkblue_orange/img/b_minus.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_newdb.png b/themes/darkblue_orange/img/b_newdb.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_newtbl.png b/themes/darkblue_orange/img/b_newtbl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_nextpage.png b/themes/darkblue_orange/img/b_nextpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_pdfdoc.png b/themes/darkblue_orange/img/b_pdfdoc.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_plus.png b/themes/darkblue_orange/img/b_plus.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_prevpage.png b/themes/darkblue_orange/img/b_prevpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_primary.png b/themes/darkblue_orange/img/b_primary.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_print.png b/themes/darkblue_orange/img/b_print.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_props.png b/themes/darkblue_orange/img/b_props.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_relations.png b/themes/darkblue_orange/img/b_relations.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_save.png b/themes/darkblue_orange/img/b_save.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_sbrowse.png b/themes/darkblue_orange/img/b_sbrowse.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_sdb.png b/themes/darkblue_orange/img/b_sdb.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_search.png b/themes/darkblue_orange/img/b_search.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_selboard.png b/themes/darkblue_orange/img/b_selboard.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_select.png b/themes/darkblue_orange/img/b_select.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_snewtbl.png b/themes/darkblue_orange/img/b_snewtbl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_sql.png b/themes/darkblue_orange/img/b_sql.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_sqldoc.png b/themes/darkblue_orange/img/b_sqldoc.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_sqlhelp.png b/themes/darkblue_orange/img/b_sqlhelp.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tblanalyse.png b/themes/darkblue_orange/img/b_tblanalyse.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tblexport.png b/themes/darkblue_orange/img/b_tblexport.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tblimport.png b/themes/darkblue_orange/img/b_tblimport.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tblops.png b/themes/darkblue_orange/img/b_tblops.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tbloptimize.png b/themes/darkblue_orange/img/b_tbloptimize.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_tipp.png b/themes/darkblue_orange/img/b_tipp.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_unique.png b/themes/darkblue_orange/img/b_unique.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_usradd.png b/themes/darkblue_orange/img/b_usradd.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_usrcheck.png b/themes/darkblue_orange/img/b_usrcheck.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_usrdrop.png b/themes/darkblue_orange/img/b_usrdrop.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_usredit.png b/themes/darkblue_orange/img/b_usredit.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_usrlist.png b/themes/darkblue_orange/img/b_usrlist.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_view.png b/themes/darkblue_orange/img/b_view.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/b_views.png b/themes/darkblue_orange/img/b_views.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_browse.png b/themes/darkblue_orange/img/bd_browse.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_deltbl.png b/themes/darkblue_orange/img/bd_deltbl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_drop.png b/themes/darkblue_orange/img/bd_drop.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_empty.png b/themes/darkblue_orange/img/bd_empty.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_firstpage.png b/themes/darkblue_orange/img/bd_firstpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_ftext.png b/themes/darkblue_orange/img/bd_ftext.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_index.png b/themes/darkblue_orange/img/bd_index.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_insrow.png b/themes/darkblue_orange/img/bd_insrow.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_lastpage.png b/themes/darkblue_orange/img/bd_lastpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_nextpage.png b/themes/darkblue_orange/img/bd_nextpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_prevpage.png b/themes/darkblue_orange/img/bd_prevpage.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_primary.png b/themes/darkblue_orange/img/bd_primary.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_sbrowse.png b/themes/darkblue_orange/img/bd_sbrowse.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_select.png b/themes/darkblue_orange/img/bd_select.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/bd_unique.png b/themes/darkblue_orange/img/bd_unique.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/error.ico b/themes/darkblue_orange/img/error.ico old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/eye.png b/themes/darkblue_orange/img/eye.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/item.png b/themes/darkblue_orange/img/item.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/item_ltr.png b/themes/darkblue_orange/img/item_ltr.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/item_rtl.png b/themes/darkblue_orange/img/item_rtl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/logo_left.png b/themes/darkblue_orange/img/logo_left.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/logo_right.png b/themes/darkblue_orange/img/logo_right.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_data.jpg b/themes/darkblue_orange/img/new_data.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_data_hovered.jpg b/themes/darkblue_orange/img/new_data_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_data_selected.jpg b/themes/darkblue_orange/img/new_data_selected.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_data_selected_hovered.jpg b/themes/darkblue_orange/img/new_data_selected_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_struct.jpg b/themes/darkblue_orange/img/new_struct.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_struct_hovered.jpg b/themes/darkblue_orange/img/new_struct_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_struct_selected.jpg b/themes/darkblue_orange/img/new_struct_selected.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/new_struct_selected_hovered.jpg b/themes/darkblue_orange/img/new_struct_selected_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/php_sym.png b/themes/darkblue_orange/img/php_sym.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/pma_logo2.png b/themes/darkblue_orange/img/pma_logo2.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_asc.png b/themes/darkblue_orange/img/s_asc.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_asci.png b/themes/darkblue_orange/img/s_asci.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_attention.png b/themes/darkblue_orange/img/s_attention.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_cancel.png b/themes/darkblue_orange/img/s_cancel.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_cancel2.png b/themes/darkblue_orange/img/s_cancel2.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_db.png b/themes/darkblue_orange/img/s_db.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_desc.png b/themes/darkblue_orange/img/s_desc.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_error.png b/themes/darkblue_orange/img/s_error.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_error2.png b/themes/darkblue_orange/img/s_error2.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_fulltext.png b/themes/darkblue_orange/img/s_fulltext.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_host.png b/themes/darkblue_orange/img/s_host.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_info.png b/themes/darkblue_orange/img/s_info.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_lang.png b/themes/darkblue_orange/img/s_lang.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_loggoff.png b/themes/darkblue_orange/img/s_loggoff.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_notice.png b/themes/darkblue_orange/img/s_notice.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_okay.png b/themes/darkblue_orange/img/s_okay.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_partialtext.png b/themes/darkblue_orange/img/s_partialtext.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_passwd.png b/themes/darkblue_orange/img/s_passwd.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_process.png b/themes/darkblue_orange/img/s_process.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_really.png b/themes/darkblue_orange/img/s_really.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_reload.png b/themes/darkblue_orange/img/s_reload.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_replication.png b/themes/darkblue_orange/img/s_replication.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_rights.png b/themes/darkblue_orange/img/s_rights.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_status.png b/themes/darkblue_orange/img/s_status.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_success.png b/themes/darkblue_orange/img/s_success.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_sync.png b/themes/darkblue_orange/img/s_sync.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_tbl.png b/themes/darkblue_orange/img/s_tbl.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_theme.png b/themes/darkblue_orange/img/s_theme.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_vars.png b/themes/darkblue_orange/img/s_vars.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_views.png b/themes/darkblue_orange/img/s_views.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/s_warn.png b/themes/darkblue_orange/img/s_warn.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/spacer.png b/themes/darkblue_orange/img/spacer.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/tbl_header.png b/themes/darkblue_orange/img/tbl_header.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/tbl_th.png b/themes/darkblue_orange/img/tbl_th.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/img/window-new.png b/themes/darkblue_orange/img/window-new.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/darkblue_orange/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/themes/darkblue_orange/jquery/images/ui-bg_flat_75_ffffff_40x100.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_65_ffffff_1x400.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_75_dadada_1x400.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/darkblue_orange/jquery/images/ui-bg_glass_95_fef1ec_1x400.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/darkblue_orange/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_222222_256x240.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_2e83ff_256x240.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_454545_256x240.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_888888_256x240.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png b/themes/darkblue_orange/jquery/images/ui-icons_cd0a0a_256x240.png old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css b/themes/darkblue_orange/jquery/jquery-ui-1.8.custom.css old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php old mode 100644 new mode 100755 diff --git a/themes/darkblue_orange/screen.png b/themes/darkblue_orange/screen.png old mode 100644 new mode 100755 diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php old mode 100644 new mode 100755 diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php old mode 100644 new mode 100755 diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php old mode 100644 new mode 100755 index 1d6da61..15cf293 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1348,6 +1348,35 @@ table#serverconnection_trg_local { {background:#F00;}
/** + * Ajax notification styling + */ + .ajax_notification { + top: 0px; /** The notification needs to be shown on the top of the page */ + position: fixed; + margin-top: 0; + margin-right: auto; + margin-bottom: 0; + margin-left: auto; + padding: 3px 5px; /** Keep a little space on the sides of the text */ + min-width: 70px; + max-width: 350px; /** This value might have to be changed */ + background-color: #FFD700; + z-index: 1100; /** If this is not kept at a high z-index, the jQueryUI modal dialogs (z-index:1000) might hide this */ + text-align: center; + display: block; + left: 0; + right: 0; + background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif); + background-repeat: no-repeat; + background-position: 2%; + } + + #loading_parent { + /** Need this parent to properly center the notification division */ + position: relative; + width: 100%; + } +/** * Export and Import styles */
diff --git a/themes/original/img/ajax_clock_small.gif b/themes/original/img/ajax_clock_small.gif old mode 100644 new mode 100755 diff --git a/themes/original/img/arrow_ltr.png b/themes/original/img/arrow_ltr.png old mode 100644 new mode 100755 diff --git a/themes/original/img/arrow_rtl.png b/themes/original/img/arrow_rtl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/asc_order.png b/themes/original/img/asc_order.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_bookmark.png b/themes/original/img/b_bookmark.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_browse.png b/themes/original/img/b_browse.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_calendar.png b/themes/original/img/b_calendar.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_comment.png b/themes/original/img/b_comment.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_dbstatistics.png b/themes/original/img/b_dbstatistics.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_deltbl.png b/themes/original/img/b_deltbl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_docs.png b/themes/original/img/b_docs.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_docsql.png b/themes/original/img/b_docsql.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_drop.png b/themes/original/img/b_drop.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_edit.png b/themes/original/img/b_edit.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_empty.png b/themes/original/img/b_empty.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_engine.png b/themes/original/img/b_engine.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_export.png b/themes/original/img/b_export.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_firstpage.png b/themes/original/img/b_firstpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_ftext.png b/themes/original/img/b_ftext.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_help.png b/themes/original/img/b_help.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_home.png b/themes/original/img/b_home.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_import.png b/themes/original/img/b_import.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_index.png b/themes/original/img/b_index.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_info.png b/themes/original/img/b_info.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_insrow.png b/themes/original/img/b_insrow.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_lastpage.png b/themes/original/img/b_lastpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_minus.png b/themes/original/img/b_minus.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_newdb.png b/themes/original/img/b_newdb.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_newtbl.png b/themes/original/img/b_newtbl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_nextpage.png b/themes/original/img/b_nextpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_pdfdoc.png b/themes/original/img/b_pdfdoc.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_plus.png b/themes/original/img/b_plus.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_prevpage.png b/themes/original/img/b_prevpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_primary.png b/themes/original/img/b_primary.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_print.png b/themes/original/img/b_print.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_props.png b/themes/original/img/b_props.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_relations.png b/themes/original/img/b_relations.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_save.png b/themes/original/img/b_save.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_sbrowse.png b/themes/original/img/b_sbrowse.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_sdb.png b/themes/original/img/b_sdb.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_search.png b/themes/original/img/b_search.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_selboard.png b/themes/original/img/b_selboard.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_select.png b/themes/original/img/b_select.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_snewtbl.png b/themes/original/img/b_snewtbl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_sql.png b/themes/original/img/b_sql.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_sqldoc.png b/themes/original/img/b_sqldoc.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_sqlhelp.png b/themes/original/img/b_sqlhelp.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tblanalyse.png b/themes/original/img/b_tblanalyse.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tblexport.png b/themes/original/img/b_tblexport.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tblimport.png b/themes/original/img/b_tblimport.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tblops.png b/themes/original/img/b_tblops.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tbloptimize.png b/themes/original/img/b_tbloptimize.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_tipp.png b/themes/original/img/b_tipp.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_unique.png b/themes/original/img/b_unique.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_usradd.png b/themes/original/img/b_usradd.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_usrcheck.png b/themes/original/img/b_usrcheck.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_usrdrop.png b/themes/original/img/b_usrdrop.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_usredit.png b/themes/original/img/b_usredit.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_usrlist.png b/themes/original/img/b_usrlist.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_view.png b/themes/original/img/b_view.png old mode 100644 new mode 100755 diff --git a/themes/original/img/b_views.png b/themes/original/img/b_views.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_browse.png b/themes/original/img/bd_browse.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_deltbl.png b/themes/original/img/bd_deltbl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_drop.png b/themes/original/img/bd_drop.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_empty.png b/themes/original/img/bd_empty.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_firstpage.png b/themes/original/img/bd_firstpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_ftext.png b/themes/original/img/bd_ftext.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_index.png b/themes/original/img/bd_index.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_insrow.png b/themes/original/img/bd_insrow.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_lastpage.png b/themes/original/img/bd_lastpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_nextpage.png b/themes/original/img/bd_nextpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_prevpage.png b/themes/original/img/bd_prevpage.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_primary.png b/themes/original/img/bd_primary.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_sbrowse.png b/themes/original/img/bd_sbrowse.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_select.png b/themes/original/img/bd_select.png old mode 100644 new mode 100755 diff --git a/themes/original/img/bd_unique.png b/themes/original/img/bd_unique.png old mode 100644 new mode 100755 diff --git a/themes/original/img/docs_menu_bg.png b/themes/original/img/docs_menu_bg.png old mode 100644 new mode 100755 diff --git a/themes/original/img/error.ico b/themes/original/img/error.ico old mode 100644 new mode 100755 diff --git a/themes/original/img/eye.png b/themes/original/img/eye.png old mode 100644 new mode 100755 diff --git a/themes/original/img/eye_grey.png b/themes/original/img/eye_grey.png old mode 100644 new mode 100755 diff --git a/themes/original/img/item.png b/themes/original/img/item.png old mode 100644 new mode 100755 diff --git a/themes/original/img/item_ltr.png b/themes/original/img/item_ltr.png old mode 100644 new mode 100755 diff --git a/themes/original/img/item_rtl.png b/themes/original/img/item_rtl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/logo_left.png b/themes/original/img/logo_left.png old mode 100644 new mode 100755 diff --git a/themes/original/img/logo_right.png b/themes/original/img/logo_right.png old mode 100644 new mode 100755 diff --git a/themes/original/img/new_data.jpg b/themes/original/img/new_data.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_data_hovered.jpg b/themes/original/img/new_data_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_data_selected.jpg b/themes/original/img/new_data_selected.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_data_selected_hovered.jpg b/themes/original/img/new_data_selected_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_struct.jpg b/themes/original/img/new_struct.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_struct_hovered.jpg b/themes/original/img/new_struct_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_struct_selected.jpg b/themes/original/img/new_struct_selected.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/new_struct_selected_hovered.jpg b/themes/original/img/new_struct_selected_hovered.jpg old mode 100644 new mode 100755 diff --git a/themes/original/img/php_sym.png b/themes/original/img/php_sym.png old mode 100644 new mode 100755 diff --git a/themes/original/img/pma_logo2.png b/themes/original/img/pma_logo2.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_asc.png b/themes/original/img/s_asc.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_asci.png b/themes/original/img/s_asci.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_attention.png b/themes/original/img/s_attention.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_cancel.png b/themes/original/img/s_cancel.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_cancel2.png b/themes/original/img/s_cancel2.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_db.png b/themes/original/img/s_db.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_desc.png b/themes/original/img/s_desc.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_error.png b/themes/original/img/s_error.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_error2.png b/themes/original/img/s_error2.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_fulltext.png b/themes/original/img/s_fulltext.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_host.png b/themes/original/img/s_host.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_info.png b/themes/original/img/s_info.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_lang.png b/themes/original/img/s_lang.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_loggoff.png b/themes/original/img/s_loggoff.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_notice.png b/themes/original/img/s_notice.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_okay.png b/themes/original/img/s_okay.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_partialtext.png b/themes/original/img/s_partialtext.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_passwd.png b/themes/original/img/s_passwd.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_process.png b/themes/original/img/s_process.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_really.png b/themes/original/img/s_really.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_reload.png b/themes/original/img/s_reload.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_replication.png b/themes/original/img/s_replication.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_rights.png b/themes/original/img/s_rights.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_status.png b/themes/original/img/s_status.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_success.png b/themes/original/img/s_success.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_sync.png b/themes/original/img/s_sync.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_tbl.png b/themes/original/img/s_tbl.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_theme.png b/themes/original/img/s_theme.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_vars.png b/themes/original/img/s_vars.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_views.png b/themes/original/img/s_views.png old mode 100644 new mode 100755 diff --git a/themes/original/img/s_warn.png b/themes/original/img/s_warn.png old mode 100644 new mode 100755 diff --git a/themes/original/img/spacer.png b/themes/original/img/spacer.png old mode 100644 new mode 100755 diff --git a/themes/original/img/vertical_line.png b/themes/original/img/vertical_line.png old mode 100644 new mode 100755 diff --git a/themes/original/img/window-new.png b/themes/original/img/window-new.png old mode 100644 new mode 100755 diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/original/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/themes/original/jquery/images/ui-bg_flat_75_ffffff_40x100.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png b/themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-icons_222222_256x240.png b/themes/original/jquery/images/ui-icons_222222_256x240.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-icons_2e83ff_256x240.png b/themes/original/jquery/images/ui-icons_2e83ff_256x240.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-icons_454545_256x240.png b/themes/original/jquery/images/ui-icons_454545_256x240.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-icons_888888_256x240.png b/themes/original/jquery/images/ui-icons_888888_256x240.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png b/themes/original/jquery/images/ui-icons_cd0a0a_256x240.png old mode 100644 new mode 100755 diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.custom.css old mode 100644 new mode 100755 diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php old mode 100644 new mode 100755 diff --git a/themes/original/screen.png b/themes/original/screen.png old mode 100644 new mode 100755 diff --git a/transformation_overview.php b/transformation_overview.php old mode 100644 new mode 100755 diff --git a/transformation_wrapper.php b/transformation_wrapper.php old mode 100644 new mode 100755 diff --git a/translators.html b/translators.html old mode 100644 new mode 100755 diff --git a/user_password.php b/user_password.php old mode 100644 new mode 100755 index cd84b79..58f9cfc --- a/user_password.php +++ b/user_password.php @@ -71,6 +71,13 @@ if (isset($_REQUEST['nopass'])) { $password = $_REQUEST['pma_pw']; }
+ if($GLOBALS['is_ajax_request'] == true && $_error == true) { + /** + * If in an Ajax request, we don't need to show the rest of the page + */ + PMA_ajaxResponse($message, false); + } + if (! $_error) {
// Defines the url to return to in case of error in the sql statement @@ -101,10 +108,17 @@ if (isset($_REQUEST['nopass'])) { $_url_params['old_usr'] = 'relog'; }
+ $message = PMA_Message::success(__('The profile has been updated.')); + + if($GLOBALS['is_ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query, 'success'); + PMA_ajaxResponse($message, true, $extra_data); + } + // Displays the page require_once './libraries/header.inc.php'; echo '<h1>' . __('Change password') . '</h1>' . "\n\n"; - PMA_showMessage(__('The profile has been updated.'), $sql_query, 'success'); + PMA_showMessage($message, $sql_query, 'success'); ?> <a href="index.php<?php echo PMA_generate_common_url($_url_params); ?>" target="_parent"> <strong><?php echo __('Back'); ?></strong></a> diff --git a/view_create.php b/view_create.php old mode 100644 new mode 100755 diff --git a/view_operations.php b/view_operations.php old mode 100644 new mode 100755 diff --git a/webapp.php b/webapp.php old mode 100644 new mode 100755
hooks/post-receive