Only show signatures if the user has at least one

horde · Oct 15, 2013 · 80ba2f7 · 80ba2f7
1 parent 9c182f7
commit 80ba2f7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -817,7 +817,7 @@ protected function _init()
                     $view->identity_text = $select_list[0];
                 }
             }
-            $view->signature = $prefs->getValue('signature_show_compose');
+            $view->signature = $identity->hasSignature(true);
 
             $addr_array = array(
                 'to' => _("_To"),

diff --git a/imp/lib/Compose/Ui.php b/imp/lib/Compose/Ui.php
@@ -123,12 +123,14 @@ public function passphraseDialog($type, $cacheid = null)
      */
     public function addIdentityJs()
     {
-        global $injector, $page_output, $prefs;
+        global $injector, $page_output;
 
         $identities = array();
         $identity = $injector->getInstance('IMP_Identity');
         $filter = $injector->getInstance('Horde_Core_Factory_TextFilter');
 
+        $sigs = $identity->hasSignature(true);
+
         foreach (array_keys($identity->getAll('id')) as $ident) {
             $sm = $identity->getValue(IMP_Mailbox::MBOX_SENT, $ident);
 
@@ -143,7 +145,7 @@ public function addIdentityJs()
                 'bcc' => strval($identity->getBccAddresses($ident))
             );
 
-            if ($prefs->getValue('signature_show_compose')) {
+            if ($sigs) {
                 $sig = $identity->getSignature('text', $ident);
                 $html_sig = $identity->getSignature('html', $ident);
                 if (!strlen($html_sig) && strlen($sig)) {

diff --git a/imp/lib/Dynamic/Compose/Common.php b/imp/lib/Dynamic/Compose/Common.php
@@ -146,7 +146,7 @@ protected function _compose($base, $view, $args)
         }
         $view->select_list = $select_list;
 
-        $view->signature = $prefs->getValue('signature_show_compose');
+        $view->signature = $identity->hasSignature(true);
     }
 
     /**

diff --git a/imp/lib/Prefs/Identity.php b/imp/lib/Prefs/Identity.php
@@ -454,6 +454,30 @@ public function getAllSignatures($type = 'text')
         return $list;
     }
 
+    /**
+     * Does the user have any signatures (either text or HTML)?
+     *
+     * @param boolean $compose_page  If true, checks for signatures as used on
+     *                               the compose pages.
+     *
+     * @return boolean  True if the user has at least one signature.
+     */
+    public function hasSignature($compose_page = false)
+    {
+        global $prefs;
+
+        if (!$compose_page || $prefs->getValue('signature_show_compose')) {
+            foreach (array_keys($this->_identities) as $key) {
+                if (strlen(trim($this->getValue('signature_html', $key))) ||
+                    strlen(trim($this->getValue('signature', $key)))) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Returns a property from one of the identities.
      *