2011-06-08

osTube v2.6…為了PHP v5.3修正

之前分析了官方修正的部份…
大至上可以知道有那一些要注意…

我修正的檔案【fix_on_20110607.7z
以下是2011/06/07,我修正的資訊…(基本上,應該現有的檔只有剩passing by reference...
****** 以下是2011/06/07 修正******



swift/lib/Swift.php

     84 -> function Swift(&$conn, $domain=false, $options=null) => function Swift($conn, $domain=false, $options=null)

     94 -> $log =& Swift_LogContainer::getLog(); => $log =Swift_LogContainer::getLog();

    104 -> $this->connection =& $conn; => $this->connection =$conn;

    129 -> function attachPlugin(&$plugin, $id) => function attachPlugin($plugin, $id)

    138 -> if ($plugin->implementing($key)) $this->listeners[$key][$id] =& $plugin; => if ($plugin->implementing($key)) $this->listeners[$key][$id] = $plugin;

    146 -> function &getPlugin($id) => function getPlugin($id)

    174 -> function notifyListeners(&$e, $type) => function notifyListeners($e, $type)

    193 -> return ($this->options & $option); ??

    226 -> $greeting =& $this->command("", 220); => $greeting = $this->command("", 220);

    251 -> function assertCorrectResponse(&$response, $codes) => function assertCorrectResponse($response, $codes)

    261 -> $log =& Swift_LogContainer::getLog(); => $log = Swift_LogContainer::getLog();

    274 -> function handshake(&$greeting) => function handshake($greeting)

    291 -> function setConnectionExtensions(&$list) => function setConnectionExtensions($list)

    314 -> function &command($command, $code=null) => function command($command, $code=null)

    317 -> $log =& Swift_LogContainer::getLog(); => $log = Swift_LogContainer::getLog();

    323 -> $command_event =& new Swift_Events_CommandEvent($command, $code); => $command_event = new Swift_Events_CommandEvent($command, $code);

    335 -> $response_event =& new Swift_Events_ResponseEvent($this->connection->read()); => $response_event = new Swift_Events_ResponseEvent($this->connection->read());

    360 -> function send(&$message, $recipients, $from) => function send($message, $recipients, $from)

    363 -> $encoder =& Swift_Message_Encoder::instance(); => $encoder = Swift_Message_Encoder::instance();

    373 -> $recipients =& new Swift_Address($recipients); => $recipients = new Swift_Address($recipients);

    384 -> $from =& new Swift_Address($from); => $from = new Swift_Address($from);

    393 -> $log =& Swift_LogContainer::getLog(); => $log = Swift_LogContainer::getLog();

    400 -> $list =& $recipients; => $list = $recipients;

    403 -> $list =& new Swift_RecipientList(); => $list = new Swift_RecipientList();

    408 -> $send_event =& new Swift_Events_SendEvent($message, $list, $from, 0); => $send_event = new Swift_Events_SendEvent($message, $list, $from, 0);

    423 -> $it =& $list->getIterator("to"); => $it = $list->getIterator("to");

    442 -> $it =& $list->getIterator("cc"); => $it = $list->getIterator("cc");

    473 -> $data =& $message->build(); => $data = $message->build();

    489 -> $it =& $list->getIterator("bcc"); => $it = $list->getIterator("bcc");

    502 -> $data =& $message->build(); => $data = $message->build();

    544 -> function batchSend(&$message, &$to, $from) => function batchSend($message, $to, $from)

    556 -> $batch =& new Swift_BatchMailer($this); => $batch = new Swift_BatchMailer($this);



swift/lib/Swift/Cache.php

     49 -> function &getOutputStream($key) => function getOutputStream($key)

     52 -> $os =& new Swift_Cache_OutputStream($this, $key); => $os = new Swift_Cache_OutputStream($this, $key);



swift/lib/Swift/CacheFactory.php

     36 -> function &getCache() => function getCache()

     40 -> $instance =& new $className(); => $instance = new $className();



swift/lib/Swift/Message.php

    114 -> function setReference($where, $key, &$ref) => function setReference($where, $key, $ref)

    117 -> else $this->references[$where][$key] =& $ref; => else $this->references[$where][$key] = $ref;

    125 -> function &getReference($where, $key) => function getReference($where, $key)

    481 -> function &getBody() => function getBody()

    483 -> $data =& $this->getData(); => $data = $this->getData();

    509 -> function attach(&$child, $id=null) => function attach($child, $id=null)

    525 -> $parentRef =& $this->getReference("parent", "alternative"); => $parentRef = $this->getReference("parent", "alternative");

    531 -> $parentRef =& $this->getReference("parent", "related"); => $parentRef = $this->getReference("parent", "related");

    536 -> $parentRef =& $this->getReference("parent", "mixed"); => $parentRef = $this->getReference("parent", "mixed");

    567 -> $parentRef =& $this->getReference("parent", "alternative"); => $parentRef = $this->getReference("parent", "alternative");

    572 -> $parentRef =& $this->getReference("parent", "related"); => $parentRef = $this->getReference("parent", "related");

    577 -> $parentRef =& $this->getReference("parent", "mixed"); => $parentRef = $this->getReference("parent", "mixed");

    614 -> function moveBranchIn($type, $nested_type, &$from, $old_branch, $new_branch, $tag) => function moveBranchIn($type, $nested_type, $from, $old_branch, $new_branch, $tag)

    616 -> $new =& new Swift_Message_Part(); => $new = new Swift_Message_Part();

    618 -> $parentRef =& $this->getReference("parent", $new_branch); => $parentRef = $this->getReference("parent", $new_branch);

    635 -> if (!$ref) $ref =& $this; => if (!$ref) $ref = $this;

    641 -> $relRef =& $this->getReference("related", $tag); => $relRef = $this->getReference("related", $tag);

    645 -> $mixRef =& $this->getReference("mixed", $tag); => $mixRef = $this->getReference("mixed", $tag);

    649 -> $parentRef =& $this->getReference("parent", $old_branch); => $parentRef = $this->getReference("parent", $old_branch);

    706 -> function moveBranchOut(&$from, $old_branch, $new_branch, $tag) => function moveBranchOut($from, $old_branch, $new_branch, $tag)

    710 -> if (!$ref) $ref =& $this; => if (!$ref) $ref = $this;

    713 -> $parentRef =& $this->getReference("parent", $new_branch); => $parentRef = $this->getReference("parent", $new_branch);

    719 -> $relRef =& $this->getReference("related", $tag); => $relRef = $this->getReference("related", $tag);

    723 -> $parentRef =& $this->getReference("parent", $old_branch); => $parentRef = $this->getReference("parent", $old_branch);

    729 -> $parentRef =& $this->getReference("parent", $new_branch); => $parentRef = $this->getReference("parent", $new_branch);

    731 -> $mixed =& $this->getReference("parent", $new_branch); => $mixed = $this->getReference("parent", $new_branch);

    753 -> $parentRef =& $this->getReference("parent", "related"); => $parentRef = $this->getReference("parent", "related");

    754 -> $alt =& $parentRef->getChild("_alternative"); => $alt = $parentRef->getChild("_alternative");

    756 -> $parentRef =& $this->getReference("parent", "mixed"); => $parentRef = $this->getReference("parent", "mixed");

    760 -> $parentRef =& $this->getReference("parent", "related"); => $parentRef = $this->getReference("parent", "related");

    764 -> $parentRef =& $this->getReference("parent", "mixed"); => $parentRef = $this->getReference("parent", "mixed");

    810 -> $data =& $this->getData(); => $data = $this->getData();



swift/lib/Swift/Message/Mime.php

    102 -> $this->_encoder =& Swift_Message_Encoder::instance(); => $this->_encoder = Swift_Message_Encoder::instance();

    104 -> $headers =& new Swift_Message_Headers(); => $headers = new Swift_Message_Headers();

    107 -> $this->cache =& Swift_CacheFactory::getCache(); => $this->cache = Swift_CacheFactory::getCache();

    130 -> function setHeaders(&$headers) => function setHeaders($headers)

    132 -> $this->headers =& $headers; => $this->headers = $headers;

    218 -> $data =& $this->getData(); => $data = $this->getData();

    260 -> function &getData() => function getData()

    270 -> function &buildData() => function buildData()

    273 -> $encoder =& $this->_encoder; => $encoder = $this->_encoder;

    296 -> $body =& $this->cache->getOutputStream("body"); => $body = $this->cache->getOutputStream("body");

    298 -> $append =& $this->cache->getOutputStream("append"); => $append = $this->cache->getOutputStream("append");

    303 -> $data =& $this->getData(); => $data = $this->getData();

    369 -> $body =& $this->cache->getOutputStream("body"); => $body = $this->cache->getOutputStream("body");

    371 -> $append =& $this->cache->getOutputStream("append"); => $append = $this->cache->getOutputStream("append");

    391 -> function addChild(&$mime, $id=null, $after=1) => function addChild($mime, $id=null, $after=1)

    410 -> $new[$id] =& $mime; => $new[$id] = $mime;

    413 -> $new[$k] =& $this->children[$k]; => $new[$k] = $this->children[$k];

    415 -> $this->children =& $new; => $this->children = $new;

    417 -> else $this->children[$id] =& $mime; => else $this->children[$id] = $mime;

    436 -> function &getChild($id) => function getChild($id)

    484 -> function &build() => function build()

    487 -> $data =& $this->buildData(); => $data = $this->buildData();

    489 -> $joint_os =& new Swift_Cache_JointOutputStream($i); => $joint_os = new Swift_Cache_JointOutputStream($i);

    492 -> $headers =& $this->cache->getOutputStream("headers"); => $headers = $this->cache->getOutputStream("headers");

    496 -> $dbl_le =& $this->cache->getOutputStream("dbl_le"); => $dbl_le = $this->cache->getOutputStream("dbl_le");



swift/lib/Swift/RecipientList.php

     67 -> $address =& new Swift_Address($address_str, $name); => $address = new Swift_Address($address_str, $name);

     72 -> $container =& $this->$where; => $container = $this->$where;

     73 -> $container[$address_str] =& $address; => $container[$address_str] = $address;

     99 -> function &getIterator($where) => function getIterator($where)

    108 -> $it =& new Swift_Iterator_Array($this->$where); => $it = new Swift_Iterator_Array($this->$where);

    117 -> function setIterator(&$it, $where) => function setIterator($it, $where)

    121 -> $this->iterators[$where] =& $it; => $this->iterators[$where] = $it;

    138 -> function &getTo() => function getTo()

    172 -> function &getCc() => function getCc()

    206 -> function &getBcc() => function getBcc()



swift/lib/Swift/Connection/NativeMail.php

     51 -> function postConnect(&$instance) => function postConnect($instance)

     53 -> $this->plugin =& new Swift_Plugin_MailSend($this->getAdditionalMailParams()); => $this->plugin = new Swift_Plugin_MailSend($this->getAdditionalMailParams());

沒有留言: