Permalink
Browse files

Merged changes to skin folders

  • Loading branch information...
2 parents 9f1652e + 6d12536 commit 6843acc9fced3dc1261e019ad4552b6e4c340ec7 @thomascube thomascube committed Jul 30, 2012
Showing with 4,837 additions and 4,255 deletions.
  1. +3 −0 CHANGELOG
  2. +19 −15 config/main.inc.php.dist
  3. +1 −1 plugins/enigma/lib/enigma_ui.php
  4. +1 −1 plugins/enigma/skins/default/templates/keys.html
  5. +1 −1 plugins/managesieve/managesieve.php
  6. +1 −1 program/.htaccess
  7. BIN program/blank.gif
  8. +9 −3 program/include/rcube.php
  9. +5 −3 program/include/rcube_utils.php
  10. +3 −3 program/js/app.js
  11. +1 −1 program/js/editor.js
  12. +1 −1 program/js/tiny_mce/langs/ru.js
  13. +5 −3 program/js/tiny_mce/plugins/advimage/js/image.js
  14. +1 −1 program/js/tiny_mce/plugins/autolink/editor_plugin.js
  15. +184 −181 program/js/tiny_mce/plugins/autolink/editor_plugin_src.js
  16. +119 −119 program/js/tiny_mce/plugins/autoresize/editor_plugin_src.js
  17. +1 −1 program/js/tiny_mce/plugins/directionality/editor_plugin.js
  18. +22 −19 program/js/tiny_mce/plugins/directionality/editor_plugin_src.js
  19. +50 −50 program/js/tiny_mce/plugins/example_dependency/editor_plugin_src.js
  20. +1 −1 program/js/tiny_mce/plugins/fullpage/langs/he_dlg.js
  21. +1 −1 program/js/tiny_mce/plugins/fullscreen/editor_plugin.js
  22. +4 −4 program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
  23. +1 −1 program/js/tiny_mce/plugins/lists/editor_plugin.js
  24. +955 −952 program/js/tiny_mce/plugins/lists/editor_plugin_src.js
  25. +1 −1 program/js/tiny_mce/plugins/media/editor_plugin_src.js
  26. +34 −1 program/js/tiny_mce/plugins/media/js/media.js
  27. +1 −1 program/js/tiny_mce/plugins/noneditable/editor_plugin.js
  28. +1 −4 program/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
  29. +1 −1 program/js/tiny_mce/plugins/style/langs/es_dlg.js
  30. +845 −845 program/js/tiny_mce/plugins/style/props.htm
  31. +19 −19 program/js/tiny_mce/plugins/style/readme.txt
  32. +122 −122 program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
  33. +1,449 −1,449 program/js/tiny_mce/plugins/table/editor_plugin_src.js
  34. +1 −1 program/js/tiny_mce/themes/advanced/editor_template.js
  35. +5 −2 program/js/tiny_mce/themes/advanced/editor_template_src.js
  36. +345 −345 program/js/tiny_mce/themes/advanced/js/color_picker.js
  37. +1 −1 program/js/tiny_mce/themes/advanced/langs/he_dlg.js
  38. +1 −1 program/js/tiny_mce/themes/advanced/langs/nb_dlg.js
  39. +1 −1 program/js/tiny_mce/themes/advanced/langs/ru.js
  40. +1 −1 program/js/tiny_mce/tiny_mce.js
  41. +300 −83 program/js/tiny_mce/tiny_mce_src.js
  42. +306 −0 program/lib/Auth/SASL/SCRAM.php
  43. BIN {skins/classic/images → program/resources}/blank.gif
  44. BIN program/{ → resources}/blank.tif
  45. BIN program/{ → resources}/blocked.gif
  46. +2 −2 program/steps/addressbook/func.inc
  47. +1 −1 program/steps/addressbook/show.inc
  48. +4 −4 program/steps/mail/compose.inc
  49. +2 −2 program/steps/mail/func.inc
  50. +1 −1 program/steps/mail/show.inc
  51. +1 −1 program/steps/settings/folders.inc
  52. +1 −1 program/steps/settings/func.inc
  53. +1 −1 skins/classic/pngbehavior.htc
  54. +1 −1 tests/mailfunc.php
View
@@ -1,6 +1,9 @@
CHANGELOG Roundcube Webmail
===========================
+- Support connections to memcached socket file (#1488577)
+- Enable TinyMCE inlinepopups plugin
+- Update to TinyMCE 3.5.6
- Correctly escape localized labels in javascript variable (#1488567)
- Update Net_SMTP/Auth_SASL packages to fix Digest-MD5/Cram-MD5 authentication (#1488571)
- Don't add attachments content into reply/forward/draft message body (#1488557)
View
@@ -68,10 +68,11 @@ $rcmail_config['smtp_debug'] = false;
// to display a pulldown menu or set one host as string.
// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
// Supported replacement variables:
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %s - domain name after the '@' from e-mail address provided at login screen
-// For example %n = mail.domain.tld, %d = domain.tld
+// For example %n = mail.domain.tld, %t = domain.tld
$rcmail_config['default_host'] = '';
// TCP port used for IMAP connections
@@ -135,10 +136,11 @@ $rcmail_config['messages_cache'] = false;
// If left blank, the PHP mail() function is used
// Supported replacement variables:
// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
+// For example %n = mail.domain.tld, %t = domain.tld
$rcmail_config['smtp_server'] = '';
// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
@@ -244,8 +246,8 @@ $rcmail_config['session_name'] = null;
$rcmail_config['session_storage'] = 'db';
// Use these hosts for accessing memcached
-// Define any number of hosts in the form hostname:port
-$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' );
+// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
+$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
// check client IP in session athorization
$rcmail_config['ip_check'] = false;
@@ -267,10 +269,11 @@ $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';
// Specify an array with 'host' => 'domain' values to support multiple hosts
// Supported replacement variables:
// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
+// For example %n = mail.domain.tld, %t = domain.tld
$rcmail_config['username_domain'] = '';
// This domain will be used to form e-mail addresses of new users
@@ -280,7 +283,7 @@ $rcmail_config['username_domain'] = '';
// %n - http hostname ($_SERVER['SERVER_NAME'])
// %d - domain (http hostname without the first part)
// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
+// For example %n = mail.domain.tld, %t = domain.tld
$rcmail_config['mail_domain'] = '';
// Password charset.
@@ -532,10 +535,11 @@ $rcmail_config['ldap_public']['Verisign'] = array(
'name' => 'Verisign.com',
// Replacement variables supported in host names:
// %h - user's IMAP hostname
- // %n - http hostname ($_SERVER['SERVER_NAME'])
- // %d - domain (http hostname without the first part)
+ // %n - hostname ($_SERVER['SERVER_NAME'])
+ // %t - hostname without the first part
+ // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %z - IMAP domain (IMAP hostname without the first part)
- // For example %n = mail.domain.tld, %d = domain.tld
+ // For example %n = mail.domain.tld, %t = domain.tld
'hosts' => array('directory.verisign.com'),
'port' => 389,
'use_tls' => false,
@@ -129,7 +129,7 @@ function tpl_key_frame($attrib)
$this->rc->output->set_env('contentframe', $attrib['name']);
$this->rc->output->set_env('blankpage', $attrib['src'] ?
- $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
+ $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
return html::tag('iframe', $attrib);
}
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="/this/enigma.css" />
<script type="text/javascript" src="/functions.js"></script>
<script type="text/javascript" src="/splitter.js"></script>
-<style type="text/css">
+<style type="text/css">
#enigmakeyslist { width: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter-5 : 210" />px; }
#enigmacontent-box { left: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter+5 : 220" />px;
<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:enigmaeviewsplitter) ? cookie:enigmaviewsplitter+5 : 220).')+\\'px\\');') : ''" />
@@ -1026,7 +1026,7 @@ function filter_frame($attrib)
$this->rc->output->set_env('contentframe', $attrib['name']);
$this->rc->output->set_env('blankpage', $attrib['src'] ?
- $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
+ $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
return html::tag('iframe', $attrib);
}
View
@@ -1,4 +1,4 @@
<IfModule mod_rewrite.c>
RewriteEngine On
-RewriteRule !^js|.*\.[gt]if$ - [F]
+RewriteRule !^js|resources$ - [F]
</IfModule>
View
Deleted file not rendered
View
@@ -193,11 +193,17 @@ public function get_memcache()
$this->memcache = new Memcache;
$this->mc_available = 0;
- // add alll configured hosts to pool
+ // add all configured hosts to pool
$pconnect = $this->config->get('memcache_pconnect', true);
foreach ($this->config->get('memcache_hosts', array()) as $host) {
- list($host, $port) = explode(':', $host);
- if (!$port) $port = 11211;
+ if (substr($host, 0, 7) != 'unix://') {
+ list($host, $port) = explode(':', $host);
+ if (!$port) $port = 11211;
+ }
+ else {
+ $port = 0;
+ }
+
$this->mc_available += intval($this->memcache->addServer($host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
}
@@ -616,8 +616,10 @@ public static function parse_host($name, $host = '')
{
// %n - host
$n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
- // %d - domain name without first part, e.g. %n=mail.domain.tld, %d=domain.tld
- $d = preg_replace('/^[^\.]+\./', '', $n);
+ // %t - host name without first part, e.g. %n=mail.domain.tld, %t=domain.tld
+ $t = preg_replace('/^[^\.]+\./', '', $n);
+ // %d - domain name without first part
+ $d = preg_replace('/^[^\.]+\./', '', $_SERVER['HTTP_HOST']);
// %h - IMAP host
$h = $_SESSION['storage_host'] ? $_SESSION['storage_host'] : $host;
// %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
@@ -632,7 +634,7 @@ public static function parse_host($name, $host = '')
}
}
- $name = str_replace(array('%n', '%d', '%h', '%z', '%s'), array($n, $d, $h, $z, $s[2]), $name);
+ $name = str_replace(array('%n', '%t', '%d', '%h', '%z', '%s'), array($n, $t, $d, $h, $z, $s[2]), $name);
return $name;
}
View
@@ -48,7 +48,7 @@ function rcube_webmail()
this.env.request_timeout = 180; // seconds
this.env.draft_autosave = 0; // seconds
this.env.comm_path = './';
- this.env.blankpage = 'program/blank.gif';
+ this.env.blankpage = 'program/resources/blank.gif';
// set jQuery ajax options
$.ajaxSetup({
@@ -6210,7 +6210,7 @@ function rcube_webmail()
// have to do it this way for IE
// otherwise the form will be posted to a new window
if (document.all) {
- var html = '<iframe name="'+frame_name+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+ var html = '<iframe name="'+frame_name+'" src="program/resources/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
document.body.insertAdjacentHTML('BeforeEnd', html);
}
else { // for standards-compilant browsers
@@ -6548,7 +6548,7 @@ function rcube_webmail()
img.onload = function() { rcmail.env.browser_capabilities.tif = 1; };
img.onerror = function() { rcmail.env.browser_capabilities.tif = 0; };
- img.src = 'program/blank.tif';
+ img.src = 'program/resources/blank.tif';
};
this.pdf_support_check = function()
View
@@ -45,7 +45,7 @@ function rcmail_editor_init(config)
});
else { // mail compose
$.extend(conf, {
- plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,tabfocus' + (config.spellcheck ? ',spellchecker' : ''),
+ plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,inlinepopups,tabfocus' + (config.spellcheck ? ',spellchecker' : ''),
theme_advanced_buttons1: 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect',
theme_advanced_buttons2: 'link,unlink,table,|,emotions,charmap,image,media,|,code,search,undo,redo',
spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -395,12 +395,14 @@ var ImageDialog = {
if (v == '0')
img.style.border = isIE ? '0' : '0 none none';
else {
- if (b.length == 3 && b[isIE ? 2 : 1])
- bStyle = b[isIE ? 2 : 1];
+ var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);
+
+ if (b.length == 3 && b[isOldIE ? 2 : 1])
+ bStyle = b[isOldIE ? 2 : 1];
else if (!bStyle || bStyle == 'none')
bStyle = 'solid';
if (b.length == 3 && b[isIE ? 0 : 2])
- bColor = b[isIE ? 0 : 2];
+ bColor = b[isOldIE ? 0 : 2];
else if (!bColor || bColor == 'none')
bColor = 'black';
img.style.border = v + 'px ' + bStyle + ' ' + bColor;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 6843acc

Please sign in to comment.