Merge remote branch 'origin/master'

ChangeLog

@@ -84,6 +84,8 @@ $Id$
 - bug #3004216 [CSS] Field attributes use inline CSS
 - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
 - [core] Update library PHPExcel to version 1.7.3c
+- patch #3025161 [core] Prevent sending of unnecessary cookies, 
+  thanks to Piotr Przybylski  - crackpl
 
 3.3.5.0 (not yet released)
 - patch #2932113 [information_schema] Slow export when having lots of
@@ -93,6 +95,7 @@ $Id$
 - bug [replication] Do not offer information_schema in the list of databases
 - bug [js] Avoid loading twice a js file
 - bug #3024344 [setup] Setup forces numeric MemoryLimit
+- bug #3025975 [auth] Odd LoginCookieValidity default value
 
 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value

libraries/Config.class.php

@@ -1086,10 +1086,13 @@ class PMA_Config
         if ($validity == null) {
             $validity = 2592000;
         }
-        if (strlen($value) && null !== $default && $value === $default
+        if (strlen($value) && null !== $default && $value === $default) {
-         && isset($_COOKIE[$cookie])) {
+            // default value is used
-            // remove cookie, default value is used
+            if (isset($_COOKIE[$cookie])) {
-            return $this->removeCookie($cookie);
+                // remove cookie
+                return $this->removeCookie($cookie);
+            }
+            return false;
         }
 
         if (! strlen($value) && isset($_COOKIE[$cookie])) {

libraries/config.default.php

@@ -587,11 +587,11 @@ $cfg['Confirm'] = true;
 $cfg['LoginCookieRecall'] = true;
 
 /**
- * validity of cookie login (in seconds)
+ * validity of cookie login (in seconds; 1800 seconds is 30 minutes)
  *
  * @global integer $cfg['LoginCookieValidity']
  */
-$cfg['LoginCookieValidity'] = 1440;
+$cfg['LoginCookieValidity'] = 1800;
 
 /**
  * how long login cookie should be stored (in seconds)

tbl_change.php

@@ -1080,6 +1080,7 @@ foreach ($rows as $row_id => $vrow) {
                 if ($field['pma_type'] == 'date' || $field['pma_type'] == 'datetime' || substr($field['pma_type'], 0, 9) == 'timestamp') {
                     // the _3 suffix points to the date field
                     // the _2 suffix points to the corresponding NULL checkbox
+                    // in dateFormat, 'yy' means the year with 4 digits
                     ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -1090,6 +1091,7 @@ $(function() {
 		 stepMinutes: 1,
         stepHours: 1,
         <?php echo ($field['pma_type'] == 'date' ? "showTime: false,":"showTime: true,"); ?>
+        dateFormat: 'yy-mm-dd',
 		altTimeField: '',
         constrainInput: false
      });