From fe5adf6ba2ed31dccba7b25f7caf577e67c4ee0c Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Tue, 27 Oct 2009 09:08:48 +0000
Subject: [PATCH]     * Prevent password autocompletion for user passwords to
 prevent       possible mismatch. In media manager popup, fix bug that did    
   not properly forward to image selection after upload (onli)

---
 docs/NEWS                           |  4 ++++
 include/admin/images.inc.php        | 10 +++++++++-
 include/tpl/config_local.inc.php    |  2 +-
 include/tpl/config_personal.inc.php |  4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index d6e032a8..28bcbc49 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,10 @@
 Version 1.5 ()
 ------------------------------------------------------------------------
 
+    * Prevent password autocompletion for user passwords to prevent
+      possible mismatch. In media manager popup, fix bug that did
+      not properly forward to image selection after upload (onli)
+      
     * Fix a bug in statistics output, when statistics for single-number
       months is created. (Andreas Bilke)
 
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index eee62d64..5b4d1a3b 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -825,7 +825,7 @@ switch ($serendipity['GET']['adminAction']) {
 function showMediaLibrary($messages=false) {
     if (!serendipity_checkPermission('adminImagesView')) {
             return;
-        }
+    }
 
     if(!empty($messages)) {
         echo '<div class="imageMessage"><ul>';
@@ -835,6 +835,14 @@ function showMediaLibrary($messages=false) {
         echo '</ul></div>';
     }
 
+    global $image_selector_addvars;
+    #if $image_selector_addvars is not empty, this was called by 
+    #serendipity_admin_image_selector.php and the library shall not be displayed (yet).
+    if (!empty($image_selector_addvars)) {
+    	return;
+	}
+
+
 ?>
 <script type="text/javascript" language="javascript">
     <!--
diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index 8bfd5460..7bc3fe7d 100644
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -290,7 +290,7 @@
                                     array('var'         => 'pass',
                                           'title'       => INSTALL_PASSWORD,
                                           'description' => INSTALL_PASSWORD_DESC,
-                                          'type'        => 'protected',
+                                          'type'        => 'fullprotected',
                                           'default'     => 'john',
                                           'permission'  => 'siteConfiguration',
                                           'flags'       => array('installOnly', 'local', 'simpleInstall')),
diff --git a/include/tpl/config_personal.inc.php b/include/tpl/config_personal.inc.php
index ac51544e..3efce450 100644
--- a/include/tpl/config_personal.inc.php
+++ b/include/tpl/config_personal.inc.php
@@ -18,14 +18,14 @@
                                     array('var'         => 'password',
                                           'title'       => USERCONF_PASSWORD,
                                           'description' => USERCONF_PASSWORD_DESC,
-                                          'type'        => 'protected',
+                                          'type'        => 'fullprotected',
                                           'default'     => '',
                                           'permission'  => 'personalConfiguration'),
 
                                     array('var'         => 'check_password',
                                           'title'       => USERCONF_CHECK_PASSWORD,
                                           'description' => USERCONF_CHECK_PASSWORD_DESC,
-                                          'type'        => 'protected',
+                                          'type'        => 'fullprotected',
                                           'default'     => '',
                                           'permission'  => 'personalConfiguration'),