Commit Graph

76 Commits

Author SHA1 Message Date
Michal Čihař
f2dcdfff50 Do not hardcode secure flag in examples
We can not assume that setup will be https by default, so having false
as default is safer.

Fixes #13758

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-20 11:24:00 +02:00
Michal Čihař
1b7914a4e5 Remove connect_type setting
It is really not necessary as MySQL decides connection type rather based
on hostname than on anything else.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-02 16:08:44 +01:00
Michal Čihař
aebbb31aad Merge branch 'master' into master-security 2016-07-29 14:08:23 +02:00
Michal Čihař
c328697e39 Do not use mb_strlen result for string indexes
The string indexes are in bytes, while mb_strlen counts chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 13:54:04 +02:00
Michal Čihař
8095b837fa Hide session error messages to avoid FPD
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-12 12:38:32 +02:00
Michal Čihař
fc6ef261eb Remove Swekey support
It is buggy and their servers are no longer working.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-11 09:02:58 +02:00
Isaac Bennetch
c4a595357f Add Secure and HttpOnly flags for session cookie setup in examples
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-07-10 22:35:38 -04:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
418aeea3d8 Add error handling to constructing openid message
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 14:34:50 +02:00
Michal Čihař
94cf386425 Escape error messages from OpenID
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 14:30:36 +02:00
Michal Čihař
27664605b9 Improve error handling in OpenID example
- properly check parameter types
- catch all exceptions (eg. network error)

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 14:26:59 +02:00
Michal Čihař
95f2d15b4f Merge branch 'QA_4_6' 2016-05-17 10:12:04 +02:00
Michal Čihař
3771852471 Use https when linking to php.net
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:10:13 +02:00
chintan zaveri
2b74163914 Removal of Swekey
Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>

master rebased

Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>
2016-02-20 21:41:07 +05:30
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-04 16:35:28 +01:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-06 08:01:07 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-04 09:05:42 -05:00
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:06:28 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 21:03:57 +05:30
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-07-02 13:39:10 +02:00
Deven Bansod
54a480e8eb Designer settings saved in a new table in configuration storage
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-21 15:44:39 +05:30
Marc Delisle
775d1dca70 Best practice: remove PHP closing tag
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-24 11:33:29 -04:00
Madhura Jayaratne
1b87db5724 bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-30 22:55:33 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Chirayu Chiripal
0906f78fab Suggest ALTER rights on phpmyadmin for controluser
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-14 18:20:24 +05:30
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1
Complete multipages functionality in designer
2014-06-16 15:22:13 +05:30
Bimal Yashodha
48dd4f354d Remove references to designer_coords and designerwork
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
2014-06-16 11:39:39 +05:30
Smita Kumari
abdb92e290 fiixed Typs plus remove default from text field
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 21:00:17 +05:30
Smita Kumari
175b69b72b central columns management page basic
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

central columns management page edit/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added column length to central columns table

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix edit issu

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove logging and alert statement

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

delete an entry fixed

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

col_length default to 0 + filter rows

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix menu tab test case

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix col_length datatype plus menu tst case fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added cancel button

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprite regenerate for adding cntral columns icon

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing default value from col_length of type text

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

message format

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

search fix plus uitablfilter plugin modify to take elements to limit search to

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring db_cntral_columns.php plus file description in db_cntral_columns.js

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added table sorting

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix js error for empty central columns

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring of code plus adding option to add a column to central list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

removing trailing white spaces

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

handle condition if central list is empty

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-06-02 01:57:50 +05:30
Marc Delisle
1fb3ae27cf A TEXT column cannot have a default value
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-05-26 15:15:31 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check if central columns storage is configured, if not configured don't show the option to sync/remove

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove columns to central list of columns from tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added icon image for central columns add/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

documentation added for central_columns configuration

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

regenerated sprite

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove notices

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprintf for variable message

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix unit test failure errors

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed whitespace issues plus function definition

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-05-26 23:13:03 +05:30
Michal Čihař
3eccb9eb26 Improve signon-script example
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-09 18:07:39 +02:00
Michal Čihař
064e45c878 Correct params to session_set_cookie_params
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-08 10:48:09 +02:00
Marc Delisle
8d43cedeff bug #4364 examples/signon.php does not support the SessionSavePath directive
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-30 08:30:11 -04:00
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only
Feature request: #1476 Favorite tables select box.
2014-03-26 17:01:18 -04:00
Ashutosh Dhundhara
8bc21b7876 Feature request: #1476 Favourite tables select box.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changes in "create_tables.sql".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped Trailing White spaces.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed irrelevant comments from "FavouriteTable.class.php".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed Table Summary colspan.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changed Favourite to Favorite

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Feature request: #1476 Favourite tables select box. (Icon only)

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Gray and Golden Icons.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed unwanted icon from "img".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in PMA_buildActionTitles_test.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Re-positioned star icon and added tooltip to it.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped trailing spaces from "structure.lib.php" and "db_structure.js".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-03-26 23:37:19 +05:30
Marc Delisle
3811fc4070 Incorrect coding style fix
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-03-20 06:47:11 -04:00
Marc Delisle
2eab950ae8 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-03-20 06:38:21 -04:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-20 09:36:48 +01:00
Hugues Peccatte
8b84cf0d91 Feature #569 Load/Save Query By Example
Implement possibility to save/load/delete a QBE on a DB.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-23 14:52:48 +01:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info>
Added warning about the mysql extension being deprecated
and removed the extension directive
2013-12-14 14:26:12 -05:00
Marc Delisle
8c3e33d043 Fix coding style 2013-10-19 06:01:50 -07:00
Kasun Chathuranga
f7bf216e28 Change the structure of pma__usergroups table 2013-09-08 22:58:47 +05:30
Kasun Chathuranga
04c2e88d67 Change tables name from 'navigation' to 'navigationhiding' 2013-07-25 21:26:23 +05:30
Kasun Chathuranga
d0522a779c Revert half done commit 2013-07-25 07:22:40 +05:30
Kasun Chathuranga
1ae59ad063 Merge branch 'hideTables' of github.com:kasunchathuranga/phpmyadmin into hideTables
Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php
	libraries/relation.lib.php
2013-07-25 07:08:04 +05:30
Kasun Chathuranga
66d01fcffb Hide tables in navigation tree 2013-07-20 23:13:25 +05:30