Ticket #1484177: patch_for_svn.diff

File patch_for_svn.diff, 5.7 KB (added by alexey_dv, 6 years ago)

second diff file

Line 
1diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/config/main.inc.php.dist ./config/main.inc.php.dist
2--- ../svn/config/main.inc.php.dist     2006-12-20 19:59:07.000000000 +0300
3+++ ./config/main.inc.php.dist  2006-12-21 13:13:17.000000000 +0300
4@@ -146,2 +146,26 @@
5 
6+// examples of other names in default_imap_folders
7+//
8+// default_imap_folders for compatible with russian microsoft outlook express
9+// $rcmail_config['default_imap_folders'] = array('INBOX', '&BCcENQRABD0EPgQyBDgEOgQ4-', '&BB4EQgQ,BEAEMAQyBDsENQQ9BD0ESwQ1-', 'Junk', 'Trash');
10+//
11+// default_imap_folders for compatible with the bat!
12+// $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent Items', 'Junk E-mail', 'Trash');
13+
14+// add link between name of box and translating labels
15+// default rcube labels
16+$rcmail_config['label_INBOX'] = 'inbox'; // it's simple for using
17+$rcmail_config['label_Drafts'] = 'drafts';
18+$rcmail_config['label_Junk'] = 'junk';
19+$rcmail_config['label_Trash'] = 'trash';
20+$rcmail_config['label_Sent'] = 'sent';
21+
22+// examples of other name
23+$rcmail_config['label_&BB4EQgQ,BEAEMAQyBDsENQQ9BD0ESwQ1-'] = 'sent';
24+$rcmail_config['label_&BCcENQRABD0EPgQyBDgEOgQ4-'] = 'drafts';
25+$rcmail_config['label_&BB0ENQQ2BDUEOwQwBEIENQQ7BEwEPQQwBE8-\ &BD8EPgRHBEIEMA-'] = 'junk';
26+
27+$rcmail_config['label_Sent Items'] = 'sent';
28+$rcmail_config['label_Junk E-mail'] = 'junk';
29+
30 // protect the default folders from renames, deletes, and subscription changes
31diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/program/include/main.inc ./program/include/main.inc
32--- ../svn/program/include/main.inc     2006-12-20 20:02:38.000000000 +0300
33+++ ./program/include/main.inc  2006-12-21 12:29:00.000000000 +0300
34@@ -910,3 +910,3 @@
35   {
36-  global $MBSTRING;
37+  global $MBSTRING, $CHARSET;
38 
39@@ -1375,8 +1375,6 @@
40                else if ($task=='mail' && ($mbox_name = $IMAP->get_mailbox_name())) {
41-                       $mbox_label_name = rcube_label(strtolower($mbox_name)); // for print Label in Title
42-                       if ( "[".strtolower($mbox_name)."]" != $mbox_label_name) {
43-                               $title .= $mbox_label_name;
44-                       } else {               
45-          $title .= rcube_charset_convert($mbox_name, 'UTF-7', 'UTF-8');
46-                       }
47+                       if ( $CONFIG['label_'.$mbox_name] )
48+                               $title .= rcube_label($CONFIG['label_'.$mbox_name]);
49+                       else           
50+                   $title .= preg_replace("/.*\/(.*)$/", "$1", rcube_charset_convert($mbox_name, 'UTF-7', 'UTF-8')); // change for subfolders = 'INBOX/name_of_folder'
51                }
52diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/program/js/app.js ./program/js/app.js
53--- ../svn/program/js/app.js    2006-12-20 18:24:33.000000000 +0300
54+++ ./program/js/app.js 2006-12-21 12:17:36.000000000 +0300
55@@ -3065,3 +3065,3 @@
56 
57-    if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
58+    if (item && item.className /*&& item.className.indexOf('mailbox '+mbox)>=0*/ ) // it's not correct, since class <> mbox
59       {
60diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/program/steps/mail/func.inc ./program/steps/mail/func.inc
61--- ../svn/program/steps/mail/func.inc  2006-12-20 21:29:59.000000000 +0300
62+++ ./program/steps/mail/func.inc       2006-12-21 11:15:45.000000000 +0300
63@@ -188,4 +188,4 @@
64     $folder_lc = strtolower($folder['id']);
65-    if (in_array($folder_lc, $special))
66-      $foldername = rcube_label($folder_lc);
67+    if ($CONFIG['label_'.$folder['id']])
68+      $foldername = rcube_label($CONFIG['label_'.$folder['id']]);
69     else
70diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/program/steps/mail/sendmail.inc ./program/steps/mail/sendmail.inc
71--- ../svn/program/steps/mail/sendmail.inc      2006-12-21 13:13:41.000000000 +0300
72+++ ./program/steps/mail/sendmail.inc   2006-12-20 22:42:11.000000000 +0300
73@@ -279,3 +279,3 @@
74   foreach ($_SESSION['compose']['attachments'] as $attachment)
75-    $MAIL_MIME->addAttachment($attachment['path'], $attachment['mimetype'], $attachment['name'], TRUE);
76+    $MAIL_MIME->addAttachment($attachment['path'], $attachment['mimetype'], rcube_charset_convert($attachment['name'], $CHARSET, $message_charset), TRUE);
77 
78diff -d -B --exclude=error --exclude='*.diff' --exclude=db.inc.php --exclude=main.inc.php --exclude='.*' --exclude=CHANGELOG --exclude=labels.inc --exclude=messages.inc --exclude='*.css' -w --exclude='*~' -b -E -r -U 1 ../svn/program/steps/settings/manage_folders.inc ./program/steps/settings/manage_folders.inc
79--- ../svn/program/steps/settings/manage_folders.inc    2006-12-20 17:52:33.000000000 +0300
80+++ ./program/steps/settings/manage_folders.inc 2006-12-21 11:20:39.000000000 +0300
81@@ -169,3 +169,3 @@
82     $folder_js_enc = JQ(rcube_charset_convert($folder, 'UTF-7'));
83-    $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcube_label(strtolower($folder)) : rcube_charset_convert($folder, 'UTF-7');
84+    $folder_html = $CONFIG['label_'.$folder] ? rcube_label($CONFIG['label_'.$folder]) : rcube_charset_convert($folder, 'UTF-7');
85