[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[13914]
From:       pdontthink () users ! sourceforge ! net
Date:       2010-02-16 20:14:19
Message-ID: E1NhToJ-00020L-4H () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13914
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13914&view=rev
Author:   pdontthink
Date:     2010-02-16 20:14:18 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Sync pref name with DEVEL

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/display.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2010-02-16 20:13:21 \
                UTC (rev 13913)
+++ branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2010-02-16 20:14:18 \
UTC (rev 13914) @@ -257,7 +257,7 @@
 $sig_first = getPref($data_dir, $username, 'sig_first', 0);
 
 /* strip signature from replies setting */
-$trim_signature_on_reply = getPref($data_dir, $username, 'trim_signature_on_reply', \
0); +$strip_sigs = getPref($data_dir, $username, 'strip_sigs', 0);
 
 /* use the internal date of the message for sorting instead of the supplied header \
date */  $internal_date_sort = getPref($data_dir, $username, 'internal_date_sort', \
SMPREF_ON);

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/display.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/display.php	2010-02-16 \
                20:13:21 UTC (rev 13913)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/display.php	2010-02-16 \
20:14:18 UTC (rev 13914) @@ -331,7 +331,7 @@
     );
 
     $optvals[SMOPT_GRP_MESSAGE][] = array(
-        'name'    => 'trim_signature_on_reply',
+        'name'    => 'strip_sigs',
         'caption' => _("Remove Original Signature when Replying"),
         'type'    => SMOPT_TYPE_BOOLEAN,
         'refresh' => SMOPT_REFRESH_NONE

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2010-02-16 20:13:21 UTC (rev \
                13913)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2010-02-16 20:14:18 UTC (rev \
13914) @@ -688,7 +688,7 @@
     global $editor_size, $default_use_priority, $body, $idents,
         $use_signature, $composesession, $data_dir, $username,
         $username, $key, $imapServerAddress, $imapPort, 
-        $composeMessage, $body_quote, $trim_signature_on_reply;
+        $composeMessage, $body_quote, $strip_sigs;
     global $languages, $squirrelmail_language, $default_charset;
 
     /*
@@ -895,7 +895,7 @@
 
                     // we could use a regular expression if we want to
                     // catch more possible signature indicators
-                    if ($trim_signature_on_reply
+                    if ($strip_sigs
                      && ($rewrap_body[$i] == '-- ' || $rewrap_body[$i] == '--')) {
                         break;
                     }


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]