Hi
with SVN it is less painful to rename files, so I'd like to make file naming in top level directory a bit systematic. I really don't see reason why SQL tab on database should lead to db_details.php :-).
So what to change?
Shorten tbl_properties_ and db_details_ to tbl_ and db_ and rename tbl_properties.php and db_details.php to *_sql.
Any other ideas, comments, refusals? :-)
If no objections will appear, I'm going to change this sometimes next week (probably weekend, but I'll maybe find time sooner to do that).
Michal Čihař a écrit :
Hi
with SVN it is less painful to rename files, so I'd like to make file naming in top level directory a bit systematic. I really don't see reason why SQL tab on database should lead to db_details.php :-).
So what to change?
Shorten tbl_properties_ and db_details_ to tbl_ and db_ and rename tbl_properties.php and db_details.php to *_sql.
Any other ideas, comments, refusals? :-)
Good idea, but,
1. I assume you'll do this only in trunk :)
2. Watch out, some logic is based on the script names.
If no objections will appear, I'm going to change this sometimes next week (probably weekend, but I'll maybe find time sooner to do that).
On Fri, 13 Oct 2006 07:41:00 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
Good idea, but,
- I assume you'll do this only in trunk :)
Of course.
- Watch out, some logic is based on the script names.
I will use grep, don't be afraid :-).
Michal Čihař a écrit :
On Fri, 13 Oct 2006 07:41:00 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
Good idea, but,
- I assume you'll do this only in trunk :)
Of course.
- Watch out, some logic is based on the script names.
I will use grep, don't be afraid :-).
I meant partial script names like
preg_match('@^(tbl_properties|tbl_select)@', $goto))
(strpos(' ' . $action, 'tbl_properties') == 1
On Fri, 13 Oct 2006 08:36:49 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
I meant partial script names like
preg_match('@^(tbl_properties|tbl_select)@', $goto))
(strpos(' ' . $action, 'tbl_properties') == 1
I know, I will try to handle that, thanks for reminder.
Hi all
On Fri, 13 Oct 2006 09:34:05 +0200 Michal Čihař michal@cihar.com wrote:
Shorten tbl_properties_ and db_details_ to tbl_ and db_ and rename tbl_properties.php and db_details.php to *_sql.
I just commited those changes. Please test carefully, I might have missed some piece of code.
Michal Čihař a écrit :
Hi all
On Fri, 13 Oct 2006 09:34:05 +0200 Michal Čihař michal@cihar.com wrote:
Shorten tbl_properties_ and db_details_ to tbl_ and db_ and rename tbl_properties.php and db_details.php to *_sql.
I just commited those changes. Please test carefully, I might have missed some piece of code.
There will be a problem for upgrading since we tell users: "Simply copy ./config.inc.php from your previous installation into the newly unpacked one."
In older config.inc.php, these directives might be present and if so, contain the old script name:
$cfg['DefaultTabDatabase'] $cfg['DefaultTabTable']
Do we just warn users about this?
Marc
On Wed, 25 Oct 2006 09:39:16 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
There will be a problem for upgrading since we tell users: "Simply copy ./config.inc.php from your previous installation into the newly unpacked one."
In older config.inc.php, these directives might be present and if so, contain the old script name:
$cfg['DefaultTabDatabase'] $cfg['DefaultTabTable']
Do we just warn users about this?
We could add a translation for those...
On Wed, 25 Oct 2006 15:41:37 +0200 Michal Čihař michal@cihar.com wrote:
On Wed, 25 Oct 2006 09:39:16 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
There will be a problem for upgrading since we tell users: "Simply copy ./config.inc.php from your previous installation into the newly unpacked one."
In older config.inc.php, these directives might be present and if so, contain the old script name:
$cfg['DefaultTabDatabase'] $cfg['DefaultTabTable']
Do we just warn users about this?
We could add a translation for those...
What about something like attached patch? Anyway do we somewhere check content of those configuration settings?
Michal Čihař a écrit :
On Wed, 25 Oct 2006 15:41:37 +0200 Michal Čihař michal@cihar.com wrote:
On Wed, 25 Oct 2006 09:39:16 -0400 Marc Delisle Marc.Delisle@cegepsherbrooke.qc.ca wrote:
There will be a problem for upgrading since we tell users: "Simply copy ./config.inc.php from your previous installation into the newly unpacked one."
In older config.inc.php, these directives might be present and if so, contain the old script name:
$cfg['DefaultTabDatabase'] $cfg['DefaultTabTable']
Do we just warn users about this?
We could add a translation for those...
What about something like attached patch? Anyway do we somewhere check content of those configuration settings?
Index: libraries/Config.class.php
--- libraries/Config.class.php (revision 9597) +++ libraries/Config.class.php (working copy) @@ -384,6 +384,16 @@ }
/**
* Backward compatibility code*/if (!empty($cfg['DefaultTabTable'])) {$cfg['DefaultTabTable'] = str_replace('_properties', '', str_replace('tbl_properties.php', 'tbl_sql.php', $cfg['DefaultTabTable']));}if (!empty($cfg['DefaultTabDatabase'])) {$cfg['DefaultTabDatabase'] = str_replace('_details', '', str_replace('db_details.php', 'db_sql.php', $cfg['DefaultTabDatabase']));}/** * @todo check validity of $_COOKIE['pma_collation_connection'] */ if (! empty($_COOKIE['pma_collation_connection'])) {
Ok for me. But our initial mistake was to use script names there instead of a content that describes the functionality needed, and to map parameter to a script name somewhere in the code, not in the config.
For your other question, we don't check the contents of these directives but we still need BC.
Marc
Michal Čihař a écrit :
Hi all
On Fri, 13 Oct 2006 09:34:05 +0200 Michal Čihař michal@cihar.com wrote:
Shorten tbl_properties_ and db_details_ to tbl_ and db_ and rename tbl_properties.php and db_details.php to *_sql.
I just commited those changes. Please test carefully, I might have missed some piece of code.
By the way, testing looks good :)
Marc
-
Marc Delisle -
Michal Čihař -
Sebastian Mendel