<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2319] 2013/codebykat/post-by-email/trunk: various shenanigans to fix up PHP 5.2 support</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2319">2319</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-16 02:12:11 +0000 (Mon, 16 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>various shenanigans to fix up PHP 5.2 support</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkincludeHordeImapClientSocketphp">2013/codebykat/post-by-email/trunk/include/Horde/Imap/Client/Socket.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkpostbyemailphp">2013/codebykat/post-by-email/trunk/post-by-email.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkincludearray_replace_recursivephp">2013/codebykat/post-by-email/trunk/include/array_replace_recursive.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkincludeHordeImapClientSocketphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/include/Horde/Imap/Client/Socket.php (2318 => 2319)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/include/Horde/Imap/Client/Socket.php 2013-09-16 02:11:57 UTC (rev 2318)
+++ 2013/codebykat/post-by-email/trunk/include/Horde/Imap/Client/Socket.php 2013-09-16 02:12:11 UTC (rev 2319)
</span><span class="lines">@@ -1603,15 +1603,15 @@
</span><span class="cx"> ));
</span><span class="cx"> } catch (Horde_Imap_Client_Exception $e) {
</span><span class="cx"> switch ($e->getCode()) {
</span><del>- case $e::CATENATE_BADURL:
- case $e::CATENATE_TOOBIG:
</del><ins>+ case Horde_Imap_Client_Exception::CATENATE_BADURL:
+ case Horde_Imap_Client_Exception::CATENATE_TOOBIG:
</ins><span class="cx"> /* Cyrus 2.4 (at least as of .14) has a broken CATENATE (see
</span><span class="cx"> * Bug #11111). Regardless, if CATENATE is broken, we can try
</span><span class="cx"> * to fallback to APPEND. */
</span><span class="cx"> $this->_unsetCapability('CATENATE');
</span><span class="cx"> return $this->_append($mailbox, $data, $options);
</span><span class="cx">
</span><del>- case $e::DISCONNECT:
</del><ins>+ case Horde_Imap_Client_Exception::DISCONNECT:
</ins><span class="cx"> /* Workaround broken literal8 on Cyrus. */
</span><span class="cx"> if ($this->queryCapability('BINARY')) {
</span><span class="cx"> // Need to re-login first before removing capability.
</span><span class="lines">@@ -3898,7 +3898,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch ($server->status) {
</span><del>- case $server::BAD:
</del><ins>+ case Horde_Imap_Client_Interaction_Server::BAD:
</ins><span class="cx"> /* A tagged BAD response indicates that the tagged command caused
</span><span class="cx"> * the error. This information is unknown if untagged. (RFC 3501
</span><span class="cx"> * [7.1.3]) */
</span><span class="lines">@@ -3914,7 +3914,7 @@
</span><span class="cx"> $cmd
</span><span class="cx"> );
</span><span class="cx">
</span><del>- case $server::BYE:
</del><ins>+ case Horde_Imap_Client_Interaction_Server::BYE:
</ins><span class="cx"> /* A BYE response received as part of a logout command should be
</span><span class="cx"> * be treated like a regular command: a client MUST process the
</span><span class="cx"> * entire command until logging out (RFC 3501 [3.4; 7.1.5]). */
</span><span class="lines">@@ -3930,7 +3930,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case $server::NO:
</del><ins>+ case Horde_Imap_Client_Interaction_Server::NO:
</ins><span class="cx"> /* An untagged NO response indicates a warning; ignore and assume
</span><span class="cx"> * that it also included response text code that is handled
</span><span class="cx"> * elsewhere. Throw exception if tagged; command handlers can
</span><span class="lines">@@ -3946,7 +3946,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case $server::PREAUTH:
</del><ins>+ case Horde_Imap_Client_Interaction_Server::PREAUTH:
</ins><span class="cx"> /* The user was pre-authenticated. (RFC 3501 [7.1.4]) */
</span><span class="cx"> $this->_temp['preauth'] = true;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkincludearray_replace_recursivephp"></a>
<div class="addfile"><h4>Added: 2013/codebykat/post-by-email/trunk/include/array_replace_recursive.php (0 => 2319)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/include/array_replace_recursive.php (rev 0)
+++ 2013/codebykat/post-by-email/trunk/include/array_replace_recursive.php 2013-09-16 02:12:11 UTC (rev 2319)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<?php
+/* array_replace_recursive only exists in PHP 5.3 */
+// this function is from the comments here: http://php.net/manual/en/function.array-replace-recursive.php
+if ( ! function_exists( 'array_replace_recursive' ) ) {
+ function array_replace_recursive( $array, $array1 ) {
+ if ( ! function_exists( 'recurse' ) ) {
+ function recurse( $array, $array1 ) {
+ foreach ( $array1 as $key => $value ) {
+ // create new key in $array, if it is empty or not an array
+ if ( ! isset( $array[ $key ] ) || ( isset( $array[ $key ] ) && ! is_array( $array[ $key ] ) ) ) {
+ $array[ $key ] = array();
+ }
+
+ // overwrite the value in the base array
+ if ( is_array( $value ) ) {
+ $value = recurse( $array[ $key ], $value);
+ }
+ $array[ $key ] = $value;
+ }
+ return $array;
+ }
+ }
+
+ // handle the arguments, merge one by one
+ $args = func_get_args();
+ $array = $args[0];
+ if ( ! is_array( $array ) ) {
+ return $array;
+ }
+ for ( $i = 1; $i < count( $args ); $i++ ) {
+ if ( is_array( $args[ $i ] ) ) {
+ $array = recurse( $array, $args[ $i ] );
+ }
+ }
+ return $array;
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkpostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/post-by-email.php (2318 => 2319)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-09-16 02:11:57 UTC (rev 2318)
+++ 2013/codebykat/post-by-email/trunk/post-by-email.php 2013-09-16 02:12:11 UTC (rev 2319)
</span><span class="lines">@@ -47,4 +47,6 @@
</span><span class="cx"> Post_By_Email_Admin::get_instance();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+require_once( plugin_dir_path( __FILE__ ) . 'include/array_replace_recursive.php' );
+
</ins><span class="cx"> Post_By_Email::get_instance();
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>