The branch, master has been updated
via b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 (commit)
via 9a3120d185442e1389c642798253b10e32fc0d4d (commit)
via 48c9d0a8eec66b0140c9c926bf4710f751e16402 (commit)
via da0039bb445406a957dbe96d9d9f20798bb2f3c4 (commit)
from bbe9bb7a76f297277dbb042e8cd7b2849620f045 (commit)
- Log -----------------------------------------------------------------
commit b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676
Author: Crack <piotrprz(a)gmail.com>
Date: Tue Oct 5 13:53:56 2010 +0200
Warn if LoginCookieStore < LoginCookieValidity
commit 9a3120d185442e1389c642798253b10e32fc0d4d
Merge: 48c9d0a8eec66b0140c9c926bf4710f751e16402 bbe9bb7a76f297277dbb042e8cd7b2849620f045
Author: Crack <piotrprz(a)gmail.com>
Date: Tue Oct 5 13:43:50 2010 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 48c9d0a8eec66b0140c9c926bf4710f751e16402
Merge: da0039bb445406a957dbe96d9d9f20798bb2f3c4 2fef94a4e50d5f7d3e0e7cc608f65bbf72d8689d
Author: Crack <piotrprz(a)gmail.com>
Date: Tue Sep 21 15:47:20 2010 +0200
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit da0039bb445406a957dbe96d9d9f20798bb2f3c4
Author: Crack <piotrprz(a)gmail.com>
Date: Tue Sep 21 14:09:57 2010 +0200
fix message
-----------------------------------------------------------------------
Summary of changes:
main.php | 7 +++++++
setup/lib/index.lib.php | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/main.php b/main.php
index dbf1da3..0cd46f5 100644
--- a/main.php
+++ b/main.php
@@ -271,6 +271,13 @@ if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
}
/**
+ * Check whether LoginCookieValidity is limited by LoginCookieStore.
+ */
+if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']) {
+ trigger_error(PMA_Message::decodeBB(__('Login cookie store is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.')), E_USER_WARNING);
+}
+
+/**
* Check if user does not have defined blowfish secret and it is being used.
*/
if (!empty($_SESSION['auto_blowfish_secret']) &&
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index b5df478..c8e7fbb 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -261,7 +261,7 @@ function perform_config_checks()
$strLoginCookieValidityWarning = sprintf($strLoginCookieValidityWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime]', '[/a]', ini_get('session.gc_maxlifetime'));
$strLoginCookieValidityWarning2 = __('%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.');
$strLoginCookieValidityWarning2 = sprintf($strLoginCookieValidityWarning2, '[a@?page=form&formset=Features#tab_Security]', '[/a]');
- $strLoginCookieValidityWarning3 = __('%sLogin cookie validity%s must be set to a value less or equal to %sLogin cookie store%s.');
+ $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.');
$strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]');
$strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
$strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s');
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 38334e4f9183d94d987f89140be115a678e0a9ba (commit)
from 04f1307a45e4a1088c28458d5bb58dfea72f20b5 (commit)
- Log -----------------------------------------------------------------
commit 38334e4f9183d94d987f89140be115a678e0a9ba
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon Oct 4 08:07:48 2010 -0400
CtrlArrowsMoving not really needed as an option, now always active
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 9 +--------
libraries/config.default.php | 7 -------
libraries/config/messages.inc.php | 1 -
libraries/config/user_preferences.forms.php | 1 -
libraries/tbl_properties.inc.php | 4 ----
tbl_change.php | 2 --
6 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 71cd175..5910cc3 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1868,11 +1868,6 @@ $cfg['TrustedProxies'] =
</dt>
<dd>Defines if the whole textarea of the query box will be selected on
click.</dd>
- <dt id="CtrlArrowsMoving">
- <span id="cfg_CtrlArrowsMoving">$cfg['CtrlArrowsMoving'] </span>boolean
- </dt>
- <dd>Enable Ctrl+Arrows (Option+Arrows in Safari) moving between fields when
- editing.</dd>
<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
<dd>Maximum number of characters shown in any non-numeric field on browse view.
@@ -4082,9 +4077,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
editing fields?</a></h4>
<p> You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages
- with many editing fields (table structure changes, row editing, etc.)
- (must be enabled in configuration - see.
- <a href="#CtrlArrowsMoving" class="configrule">$cfg['CtrlArrowsMoving']</a>).
+ with many editing fields (table structure changes, row editing, etc.).
You can also have a look at the directive
<a href="#DefaultPropDisplay" class="configrule">$cfg['DefaultPropDisplay']</a>
('vertical') and see if this eases up editing for you.</p>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 339a40d..cc23cee 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2199,13 +2199,6 @@ $cfg['CharTextareaCols'] = 40;
$cfg['CharTextareaRows'] = 2;
/**
- * Enable Ctrl+Arrows moving between fields when editing?
- *
- * @global boolean $cfg['CtrlArrowsMoving']
- */
-$cfg['CtrlArrowsMoving'] = true;
-
-/**
* Max field data length in browse mode for all non-numeric fields
*
* @global integer $cfg['LimitChars']
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 26d5a78..65545b7 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -39,7 +39,6 @@ $strConfigCompressOnFly_name = __('Compress on the fly');
$strConfigConfigurationFile = __('Configuration file');
$strConfigConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data');
$strConfigConfirm_name = __('Confirm DROP queries');
-$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
$strConfigDBG_sql_name = __('Debug SQL');
$strConfigDefaultDisplay_name = __('Default display direction');
$strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 025c021..cd9e673 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -115,7 +115,6 @@ $forms['Main_frame']['Edit'] = array(
'InsertRows',
'ForeignKeyDropdownOrder',
'ForeignKeyMaxLimit',
- 'CtrlArrowsMoving',
'DefaultPropDisplay');
$forms['Main_frame']['Tabs'] = array(
'LightTabs',
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 001fea6..a00a164 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -597,7 +597,6 @@ for ($i = 0; $i < $num_fields; $i++) {
}
} // end for
-if ($cfg['CtrlArrowsMoving']) {
?>
<script src="./js/keyhandler.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -606,9 +605,6 @@ var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>;
document.onkeydown = onKeyDownArrowsHandler;
// ]]>
</script>
- <?php
-}
-?>
<form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>">
<?php
diff --git a/tbl_change.php b/tbl_change.php
index bcc0b76..41e8230 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -207,7 +207,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 &&
// Had to put the URI because when hosted on an https server,
// some browsers send wrongly this form to the http server.
-if ($cfg['CtrlArrowsMoving']) {
?>
<!-- Set on key handler for moving using by Ctrl+arrows -->
<script src="./js/keyhandler.js" type="text/javascript"></script>
@@ -218,7 +217,6 @@ document.onkeydown = onKeyDownArrowsHandler;
//]]>
</script>
<?php
-}
$_form_params = array(
'db' => $db,
hooks/post-receive
--
phpMyAdmin