Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Mar 2013 13:36:00 +0000 (14:36 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 12 Mar 2013 13:36:00 +0000 (14:36 +0100)
Conflicts:
tine20/ActiveSync/Setup/Update/Release6.php
tine20/ActiveSync/Setup/setup.xml

1  2 
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/ActiveSync/Setup/Update/Release6.php
tine20/ActiveSync/Setup/Update/Release7.php
tine20/ActiveSync/Setup/setup.xml
tine20/Felamimail/js/GridPanel.js
tine20/Felamimail/js/Model.js
tine20/Tinebase/Config.php

@@@ -1308,49 -1309,18 +1309,60 @@@ class Felamimail_Controller_MessageTes
          $message = $this->_controller->getCompleteMessage($cachedMessage);
          $this->assertContains('some body contentsome body contentsome body content', $message->body);
      }
+     /**
+      * testNoAttachement
+      * 
+      * @see 0008014: js client shows wrong attachment icon in grid
+      */
+     public function testNoAttachement()
+     {
+         $cachedMessage = $this->messageTestHelper('noattachment.eml');
+         $this->assertEquals(0, $cachedMessage->has_attachment);
+     }
      
 +    /**
 +     * testHtmlPurify
 +     * 
 +     * @see 0007726: show inline images of multipart/related message parts
 +     * 
 +     * @todo allow external resources
 +     * @todo remove $_SERVER stuff?
 +     */
 +    public function testHtmlPurify()
 +    {
 +//         $_SERVER['SERVER_NAME'] = 'localhost';
 +//         $_SERVER['REQUEST_URI'] = '/tine20';
 +        $cachedMessage = $this->messageTestHelper('text_html_urls.eml');
 +        $message = $this->_controller->getCompleteMessage($cachedMessage);
 +        
 +//         unset($_SERVER['SERVER_NAME']);
 +//         unset($_SERVER['REQUEST_URI']);
 +        
 +//         $this->assertContains('<div></div>
 +//     <img src="http://localhost/tine20/index.php?Felamimail.getResource&amp;uri=aHR0cDovL3d3dy50aW5lMjAub3JnL2ZpbGVhZG1pbi90ZW1wbGF0ZXMvaW1hZ2VzL3RpbmUyMC5wbmc=&amp;type=img" alt="tine20.png" /><img src="http://localhost/tine20.png" alt="tine20.png" />
 +    
 +//     <p>text</p>', $message->body);
 +        $this->assertContains('<div></div>
 +    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="w38GIAXDIBKE0DHxgljNBAAO 9TXL0Y4OHwAAAAB" />
 +    
 +    <p>text</p>', $message->body);
 +    }
 +
 +    /**
 +     * testNewsletterMultipartRelated
 +     * 
 +     * @see 0007726: show inline images of multipart/related message parts
 +     * 
 +     * @todo implement
 +     */
 +    public function testNewsletterMultipartRelatedWithImages()
 +    {
 +        $this->markTestIncomplete('implement');
 +        $cachedMessage = $this->messageTestHelper('mw_newsletter_multipart_related.eml');
 +    }
 +    
 +    
      /********************************* protected helper funcs *************************************/
      
      /**
@@@ -487,14 -487,16 +487,27 @@@ class ActiveSync_Setup_Update_Release6 
          
          return preg_replace_callback('/_([a-z])/', function ($string) {return strtoupper($string[1]);}, $string);
      }
 -
 -    /**
 -     * update to 6.5
 -     * 
 -     * @see 0007942: reset device pingfolder in update script
 -     */
 +    
-     /**
-     * update to 7.0
-     *
-     * @return void
++   /**
++    * update to 6.5
++    * 
++    * @see 0007942: reset device pingfolder in update script
++    * 
 +    */
      public function update_4()
      {
+         $sql = "update " . SQL_TABLE_PREFIX . "acsync_device set pingfolder = null where pingfolder like '%Syncope%'";
+         $this->_db->query($sql);
+         $this->setApplicationVersion('ActiveSync', '6.5');
+     }
++    
++    /**
++     * update to 7.0
++     *
++     * @return void
++     */
++    public function update_5()
++    {
 +        $this->setApplicationVersion('ActiveSync', '7.0');
 +    }
  }
index ef1dd44,0000000..a164eff
mode 100644,000000..100644
--- /dev/null
@@@ -1,36 -1,0 +1,51 @@@
 +<?php
 +/**
 + * Tine 2.0
 + *
 + * @package     ActiveSync
 + * @subpackage  Setup
 + * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
 + * @copyright   Copyright (c) 2013 Metaways Infosystems GmbH (http://www.metaways.de)
 + * @author      Philipp Schüle <p.schuele@metaways.de>
 + */
 +
 +/**
 + * updates for major release 7
 + *
 + * @package     ActiveSync
 + * @subpackage  Setup
 + */
 +class ActiveSync_Setup_Update_Release7 extends Setup_Update_Abstract
 +{
 +    /**
 +     * update to 7.1
 +     * 
 +     * @see 0007452: use json encoded array for saving of policy settings
 +     * 
 +     * @return void
 +     */
 +    public function update_0()
 +    {
 +        if ($this->getTableVersion('acsync_policy') != 3) {
 +            $release6 = new ActiveSync_Setup_Update_Release6($this->_backend);
 +            $release6->update_3();
 +        }
 +        
 +        $this->setApplicationVersion('ActiveSync', '7.1');
 +    }
++
++    /**
++     * update to 7.2
++     * 
++     * @see 0007942: reset device pingfolder in update script
++     * 
++     * @return void
++     */
++    public function update_1()
++    {
++        $release6 = new ActiveSync_Setup_Update_Release6($this->_backend);
++        $release6->update_4();
++        
++        $this->setApplicationVersion('ActiveSync', '7.2');
++    }
 +}
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <application>
      <name>ActiveSync</name>
-     <version>7.1</version>
 -    <version>6.5</version>
++    <version>7.2</version>
      <order>90</order>
      <depends>
          <application>Tinebase</application>
Simple merge
Simple merge
Simple merge