From 30d244571492fb8053b4ae3b26f1927b016cf47c Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 20 May 2014 11:47:18 +0000 Subject: [PATCH] silence debug messages --- mail/inc/class.mail_ui.inc.php | 13 ++++++++++--- mail/js/app.js | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 518f160ea9..baad185b98 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -165,7 +165,7 @@ class mail_ui */ static function callWizard($message, $exit=true) { - error_log(__METHOD__."('$message', $exit) ".function_backtrace()); + //error_log(__METHOD__."('$message', $exit) ".function_backtrace()); $linkData=(self::$icServerID ? array( 'menuaction' => 'mail.mail_wizard.edit', 'acc_id' => self::$icServerID, @@ -1115,7 +1115,7 @@ class mail_ui $moveactions = array(); $lastFoldersUsedForMoveCont = egw_cache::getCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*1); //error_log(__METHOD__.__LINE__." StoredFolders->".array2string($lastFoldersUsedForMoveCont)); - error_log(__METHOD__.__LINE__.' ProfileId:'.$this->mail_bo->profileID." StoredFolders->(".count($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]).") ".array2string($lastFoldersUsedForMoveCont[$this->mail_bo->profileID])); + //error_log(__METHOD__.__LINE__.' ProfileId:'.$this->mail_bo->profileID." StoredFolders->(".count($lastFoldersUsedForMoveCont[$this->mail_bo->profileID]).") ".array2string($lastFoldersUsedForMoveCont[$this->mail_bo->profileID])); if (is_null($accArray)) { foreach(emailadmin_account::search($only_current_user=true, $just_name=false) as $acc_id => $accountObj) @@ -4456,7 +4456,14 @@ $this->partID = $partID; if ($changeFolderActions == true) { egw_cache::setCache(egw_cache::INSTANCE,'email','lastFolderUsedForMove'.trim($GLOBALS['egw_info']['user']['account_id']),$lastFoldersUsedForMoveCont, $expiration=60*60*1); - $actionsnew = etemplate_widget_nextmatch::egw_actions(self::get_actions()); + $actionsnew = self::get_actions(); +/* + $actionsWithoutMoveTo = $actionsnew; + unset($actionsWithoutMoveTo['moveto']); + $actionsWithoutMoveTo = etemplate_widget_nextmatch::egw_actions($actionsWithoutMoveTo); + $response->call('app.mail.mail_rebuildActionsOnList',$actionsWithoutMoveTo); +*/ + $actionsnew = etemplate_widget_nextmatch::egw_actions($actionsnew); $response->call('app.mail.mail_rebuildActionsOnList',$actionsnew); } } diff --git a/mail/js/app.js b/mail/js/app.js index 81b399b163..6e60c8855e 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -182,7 +182,7 @@ app.classes.mail = AppJS.extend( */ mail_rebuildActionsOnList: function(_actions) { - console.log("mail_rebuildActionsOnList",_actions); + //console.log("mail_rebuildActionsOnList",_actions); this.et2.getWidgetById(this.nm_index).set_actions(_actions); },