Many interface improvements, optimizations

This commit is contained in:
RainLoop Team 2014-05-07 20:04:32 +04:00
parent 40d2548a53
commit 53dc509d79
42 changed files with 686 additions and 461 deletions

View file

@ -14,11 +14,6 @@ abstract class PdoAbstract
*/
protected $bExplain = false;
/**
* @var int
*/
protected $iResetTimer = 0;
/**
* @var \MailSo\Log\Logger
*/

View file

@ -252,14 +252,12 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
public function ImportCsvArray($sEmail, $aCsvData)
{
$iCount = 0;
$iResetTimer = 0;
if ($this->IsActive() && \is_array($aCsvData) && 0 < \count($aCsvData))
{
$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
foreach ($aCsvData as $aItem)
{
\MailSo\Base\Utils::ResetTimeLimit($iResetTimer);
\MailSo\Base\Utils::ResetTimeLimit();
foreach ($aItem as $sItemName => $sItemValue)
{
@ -309,8 +307,6 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
public function ImportVcfFile($sEmail, $sVcfData)
{
$iCount = 0;
$iResetTimer = 0;
if ($this->IsActive() && \is_string($sVcfData))
{
$sVcfData = \trim($sVcfData);
@ -339,7 +335,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
{
if ($oVCard instanceof \Sabre\VObject\Component\VCard)
{
\MailSo\Base\Utils::ResetTimeLimit($iResetTimer);
\MailSo\Base\Utils::ResetTimeLimit();
if (empty($oVCard->UID))
{

View file

@ -158,7 +158,7 @@ class PdoAddressBook
private function davClientRequest($oClient, $sCmd, $sUrl, $mData = null)
{
\MailSo\Base\Utils::ResetTimeLimit($this->iResetTimer);
\MailSo\Base\Utils::ResetTimeLimit();
$this->oLogger->Write($sCmd.' '.$sUrl.('PUT' === $sCmd && null !== $mData ? ' ('.\strlen($mData).')' : ''),
\MailSo\Log\Enumerations\Type::INFO, 'DAV');

View file

@ -320,7 +320,7 @@ class Utils
'facebook.com' => 'facebook.png',
'facebookmail.com' => 'facebook.png',
'cnet.online.com' => 'cnet.jpg',
'cnet.online.com' => 'cnet.jpg',
'github.com' => 'github.png',
'steampowered.com' => 'steam.png',
'myspace.com' => 'myspace.png',
@ -328,7 +328,6 @@ class Utils
'youtube.com' => 'youtube.gif',
'amazon.com' => 'amazon.png',
'ted.com' => 'ted.png',
'icloud.com' => 'icloud.jpg',
'google.com' => 'google.png',
'plus.google.com' => 'google-plus.png',