Merge branch 'master' into imp_6_2

framework/Core/lib/Horde/Core/Factory/ThemesCache.php

@@ -49,11 +49,9 @@ public function create($app, $theme)
         $sig = implode('|', array($app, $theme));
 
         if (!isset($this->_instances[$sig])) {
-            if (!empty($GLOBALS['conf']['cachethemes'])) {
-                $cache = $this->_injector->getInstance('Horde_Cache');
-            } else {
-                $cache = null;
-            }
+            $cache = empty($GLOBALS['conf']['cachethemes'])
+                ? null
+                : $this->_injector->getInstance('Horde_Cache');
 
             if (!$cache || ($cache instanceof Horde_Cache_Null)) {
                 $instance = new Horde_Themes_Cache($app, $theme);

framework/Core/lib/Horde/Themes/Cache.php

@@ -253,14 +253,19 @@ public function getAll($item, $mask = 0)
      */
     public function getCacheId()
     {
+        global $conf, $registry;
+
         if (!isset($this->_cacheid)) {
-            $check = isset($GLOBALS['conf']['cachethemesparams']['check']) ? $GLOBALS['conf']['cachethemesparams']['check'] : null;
+            $check = isset($conf['cachethemesparams']['check'])
+                ? $conf['cachethemesparams']['check']
+                : null;
+
             switch ($check) {
             case 'appversion':
             default:
-                $id = array($GLOBALS['registry']->getVersion($this->_app));
+                $id = array($registry->getVersion($this->_app));
                 if ($this->_app != 'horde') {
-                    $id[] = $GLOBALS['registry']->getVersion('horde');
+                    $id[] = $registry->getVersion('horde');
                 }
                 $this->_cacheid = 'v:' . implode('|', $id);
                 break;

framework/Core/lib/Horde/Themes/Css.php

@@ -108,6 +108,12 @@ public function getStylesheetUrls(array $opts = array())
             return $css_out;
         }
 
+        if (!empty($conf['cachecssparams']['filemtime'])) {
+            foreach ($css as &$val) {
+                $val['mtime'] = @filemtime($val['fs']);
+            }
+        }
+
         $out = '';
         $sig = hash('md5', serialize($css) . $this->_cacheid);
 

framework/Core/package.xml

@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Add ability to expire CSS cache based on file modification time.
 * [mms] Allow disabling VFS via the configuration interface.
  </notes>
  <contents>
@@ -3176,6 +3177,7 @@
    <date>2013-10-08</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Add ability to expire CSS cache based on file modification time.
 * [mms] Allow disabling VFS via the configuration interface.
    </notes>
   </release>

horde/package.xml

@@ -28,7 +28,7 @@
   <email>mrubinsk@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2013-09-03</date>
+ <date>2013-10-09</date>
  <version>
   <release>5.1.5</release>
   <api>5.0.0</api>
@@ -1502,6 +1502,7 @@
       <file name="organizing.png" role="horde" />
       <file name="perms.png" role="horde" />
       <file name="phone.png" role="horde" />
+      <file name="php.png" role="horde" />
       <file name="plus-sidebar.png" role="horde" />
       <file name="plus.png" role="horde" />
       <file name="popdown.png" role="horde" />
@@ -2397,6 +2398,7 @@
    <install as="themes/default/graphics/organizing.png" name="themes/default/graphics/organizing.png" />
    <install as="themes/default/graphics/perms.png" name="themes/default/graphics/perms.png" />
    <install as="themes/default/graphics/phone.png" name="themes/default/graphics/phone.png" />
+   <install as="themes/default/graphics/php.png" name="themes/default/graphics/php.png" />
    <install as="themes/default/graphics/plus-sidebar.png" name="themes/default/graphics/plus-sidebar.png" />
    <install as="themes/default/graphics/plus.png" name="themes/default/graphics/plus.png" />
    <install as="themes/default/graphics/popdown.png" name="themes/default/graphics/popdown.png" />
@@ -3763,7 +3765,7 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2013-09-03</date>
+   <date>2013-10-09</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
 * 

horde/themes/default/screen.css

@@ -380,7 +380,7 @@ form[action^="https://"] input[type="submit"].horde-default {
     background-image: url("graphics/locked-inv.png"), url("graphics/button-default.png");
     background-position: 95% center, left top;
     background-repeat: no-repeat, repeat-x;
-    padding-right: 33px;
+    padding: 2px 33px 2px 4px;
 }
 input[disabled], input[disabled]:hover, textarea[disabled], option[disabled] {
     background-color: #e9e9e9;
@@ -2245,7 +2245,7 @@ left.horde-point-right {
     background-image: url("graphics/alerts/alarm.png");
 }
 .horde-admin-php {
-    background-image: url("graphics/mime/php.png");
+    background-image: url("graphics/php.png");
 }
 .horde-admin-sql {
     background-image: url("graphics/sql.png");

passwd/config/conf.xml

@@ -4,11 +4,10 @@
  <configsection name="backend">
   <configheader>Backend Settings</configheader>
   <configenum name="backend_list" desc="Should we display a list of backends
-  (defined in config/backends.php) for users to choose from? The options are
-  'shown', 'hidden'. If the backend list is hidden then you can use the
-  'preferred' mechanism to auto-select from it based on an HTTP virtualhost or
-  another piece of data. If it is shown, the user will be able to pick from
-  any of the options.">hidden
+  (defined in config/backends.php) for users to choose from? If 'hidden', then
+  you can use the 'preferred' mechanism in backends.local.php to auto-select
+  based on an HTTP virtualhost or another piece of data. If 'shown', the user
+  will be able to pick from any of the options.">hidden
    <values>
     <value>shown</value>
     <value>hidden</value>
@@ -20,13 +19,14 @@
   <configboolean name="change" desc="Should we allow the user to specify the
   username?" required="false">true</configboolean>
   <configlist name="refused" required="false" desc="Define usernames for which
-  we will refuse to change passwords.">
+  we will refuse to change passwords (usernames should be separated by a
+  comma).">
   root,bin,daemon,adm,lp,shutdown,halt,uucp,ftp,anonymous,nobody,httpd,operator,guest,diginext,bind,cyrus,courier,games,kmem,mailnull,man,mysql,news,postfix,sshd,tty,www
   </configlist>
  </configsection>
 
  <configsection name="password">
   <configboolean name="strengthtests" desc="Should strength tests be done on
-  the new password" required="false">true</configboolean>
+  the new password?" required="false">true</configboolean>
  </configsection>
 </configuration>