extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add error message to subscription folder

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-17 16:36:16 +00:00
parent 0d458c8119
commit 0a10203058
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mail/inc/class.mail_ui.inc.php
View File

@ -190,6 +190,7 @@ class mail_ui
function setSubscribe ($folderName,$status=true) function setSubscribe ($folderName,$status=true)
{ {
$validFolder = true; $validFolder = true;
$result = true;
$nameSpaces = $this->mail_bo->_getNameSpaces(); $nameSpaces = $this->mail_bo->_getNameSpaces();
foreach($nameSpaces as $key => $value ) foreach($nameSpaces as $key => $value )
@ -208,6 +209,7 @@ class mail_ui
$this->mail_bo->subscribe($folderName, $status); $this->mail_bo->subscribe($folderName, $status);
} catch (Exception $ex) } catch (Exception $ex)
{ {
$result = false;
error_log(__METHOD__.__LINE__."() error ".$ex."happend while subscribing to folder ". $folderName ); error_log(__METHOD__.__LINE__."() error ".$ex."happend while subscribing to folder ". $folderName );
} }
@ -219,9 +221,11 @@ class mail_ui
$this->mail_bo->subscribe($folderName, $status); $this->mail_bo->subscribe($folderName, $status);
} catch (Exception $ex) } catch (Exception $ex)
{ {
$result = false;
error_log(__METHOD__.__LINE__."() error ".$ex."happend while unsubscribing of folder ". $folderName ); error_log(__METHOD__.__LINE__."() error ".$ex."happend while unsubscribing of folder ". $folderName );
} }
} }
return $result;
} }
/** /**
* Subscription popup window * Subscription popup window
@ -270,13 +274,29 @@ class mail_ui
$folderName = $content['profileId'] . self::$delimiter . $folder->folderName; $folderName = $content['profileId'] . self::$delimiter . $folder->folderName;
if (!in_array($folderName, $content['foldertree'])) if (!in_array($folderName, $content['foldertree']))
{ {
$this->setSubscribe($folder->folderName, false); if($this->setSubscribe($folder->folderName, false))
{
$msg = lang('Subscription successfully saved!');
} }
else else
{ {
$this->setSubscribe($folder->folderName, true); $msg = lang('Subscription faild!');
} }
} }
else
{
if($this->setSubscribe($folder->folderName, true))
{
$msg = lang('Subscription successfully saved!');
}
else
{
$msg = lang('Subscription faild!');
}
}
}
egw_framework::refresh_opener($msg, 'mail');
if ($button == 'apply') break; if ($button == 'apply') break;
} }
case 'cancel': case 'cancel':