githubFork/roundcubemail.git

parent: fcbf7a12 | patch | commit | ignore whitespace

alecpl

2011-06-02 187833dff94146a9b176a1ca4a5c9996809fd4a7

- Apply fixes from trunk

6 files modified

	CHANGELOG	1 ●●●●● patch \| view \| raw \| blame \| history
	installer/config.php	4 ●●●●● patch \| view \| raw \| blame \| history
	program/include/main.inc	4 ●●●●● patch \| view \| raw \| blame \| history
	program/lib/washtml.php	2 ●●●●● patch \| view \| raw \| blame \| history
	program/steps/mail/func.inc	2 ●●●●● patch \| view \| raw \| blame \| history
	program/steps/settings/save_identity.inc	11 ●●●●● patch \| view \| raw \| blame \| history

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900)
- Fix some CSS issues in Settings for Internet Explorer
- Fixed handling of folder with name "0" in folder selector

 installer/config.php

@@ -81,7 +81,7 @@
?>
<label for="cfgipcheck">Check client IP in session authorization</label><br />

<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changeing IPs.</p>
<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p>
</dd>

<dt class="propname">des_key</dt>
@@ -93,7 +93,7 @@

?>
<div>This key is used to encrypt the users imap password before storing in the session record</div>
<p class="hint">It's a random generated string to ensure that every installation has it's own key.
<p class="hint">It's a random generated string to ensure that every installation has its own key.
If you enter it manually please provide a string of exactly 24 chars.</p>
</dd>


 program/include/main.inc

@@ -1916,6 +1916,10 @@

  $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);

  if ($domain === false) {
    return '';
  }

  return $at ? $user . '@' . $domain : $domain;
}


 program/lib/washtml.php

@@ -274,7 +274,7 @@

    // Remove invalid HTML comments (#1487759)
    // Don't remove valid conditional comments
    $html = preg_replace('/<!--[^->[]*>/', '', $html);
    $html = preg_replace('/<!--[^->[\n]*>/', '', $html);

    @$node->loadHTML($html);
    return $this->dumpHtml($node);

 program/steps/mail/func.inc

@@ -575,7 +575,7 @@
    '',
    '<html>',
  );
  $html = preg_replace($html_search, $html_replace, $html);
  $html = preg_replace($html_search, $html_replace, trim($html));

  // PCRE errors handling (#1486856), should we use something like for every preg_* use?
  if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {

 program/steps/settings/save_identity.inc

@@ -116,9 +116,12 @@
  $plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data));
  $save_data = $plugin['record'];

  $save_data['email']    = rcube_idn_to_ascii($save_data['email']);
  $save_data['bcc']      = rcube_idn_to_ascii($save_data['bcc']);
  $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);
  if ($save_data['email'])
    $save_data['email']    = rcube_idn_to_ascii($save_data['email']);
  if ($save_data['bcc'])
    $save_data['bcc']      = rcube_idn_to_ascii($save_data['bcc']);
  if ($save_data['reply-to'])
    $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);

  if (!$plugin['abort'])
    $insert_id = $save_data['email'] ? $USER->insert_identity($save_data) : null;
@@ -127,7 +130,7 @@

  if ($insert_id) {
    $OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
    

    $_GET['_iid'] = $insert_id;

    if (!empty($_POST['_standard']))

			@@ -1,6 +1,7 @@
			CHANGELOG Roundcube Webmail
			===========================

			- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
			- Fix issue which cases IMAP disconnection when encrypt() method was used (#1487900)
			- Fix some CSS issues in Settings for Internet Explorer
			- Fixed handling of folder with name "0" in folder selector

			@@ -81,7 +81,7 @@
			?>
			<label for="cfgipcheck">Check client IP in session authorization</label><br />

			<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changeing IPs.</p>
			<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p>
			</dd>

			<dt class="propname">des_key</dt>
			@@ -93,7 +93,7 @@

			?>
			<div>This key is used to encrypt the users imap password before storing in the session record</div>
			<p class="hint">It's a random generated string to ensure that every installation has it's own key.
			<p class="hint">It's a random generated string to ensure that every installation has its own key.
			If you enter it manually please provide a string of exactly 24 chars.</p>
			</dd>

			@@ -1916,6 +1916,10 @@

			$domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);

			if ($domain === false) {
			return '';
			}

			return $at ? $user . '@' . $domain : $domain;
			}

			@@ -274,7 +274,7 @@

			// Remove invalid HTML comments (#1487759)
			// Don't remove valid conditional comments
			$html = preg_replace('/<!--[^->[]*>/', '', $html);
			$html = preg_replace('/<!--[^->[\n]*>/', '', $html);

			@$node->loadHTML($html);
			return $this->dumpHtml($node);

			@@ -575,7 +575,7 @@
			'',
			'<html>',
			);
			$html = preg_replace($html_search, $html_replace, $html);
			$html = preg_replace($html_search, $html_replace, trim($html));

			// PCRE errors handling (#1486856), should we use something like for every preg_* use?
			if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {

			@@ -116,9 +116,12 @@
			$plugin = $RCMAIL->plugins->exec_hook('identity_create', array('record' => $save_data));
			$save_data = $plugin['record'];

			$save_data['email'] = rcube_idn_to_ascii($save_data['email']);
			$save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']);
			$save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);
			if ($save_data['email'])
			$save_data['email'] = rcube_idn_to_ascii($save_data['email']);
			if ($save_data['bcc'])
			$save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']);
			if ($save_data['reply-to'])
			$save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']);

			if (!$plugin['abort'])
			$insert_id = $save_data['email'] ? $USER->insert_identity($save_data) : null;
			@@ -127,7 +130,7 @@

			if ($insert_id) {
			$OUTPUT->show_message('successfullysaved', 'confirmation', null, false);


			$_GET['_iid'] = $insert_id;

			if (!empty($_POST['_standard']))