diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php index 81f2561a81..65ce937e20 100644 --- a/admin/inc/class.admin_cmd.inc.php +++ b/admin/inc/class.admin_cmd.inc.php @@ -1131,7 +1131,7 @@ abstract class admin_cmd _egw_log_exception($ex); error_log(__METHOD__."(".array2string($data).") periodic execution failed: ".$ex->getMessage()); } - $periodic->value = $value; + $periodic->result = $value; $periodic->save(); } diff --git a/admin/inc/class.admin_cmd_account_app.inc.php b/admin/inc/class.admin_cmd_account_app.inc.php index dd5e33f578..930241bd81 100644 --- a/admin/inc/class.admin_cmd_account_app.inc.php +++ b/admin/inc/class.admin_cmd_account_app.inc.php @@ -68,8 +68,8 @@ class admin_cmd_account_app extends admin_cmd $old_rights + array($apps) : array_diff($old_rights, $apps); - $this->set = $new_rights; - $this->old = $old_rights; + $this->set = Array('app' => $new_rights); + $this->old = Array('app' => $old_rights); if ($check_only) return true; //echo "account=$this->account, account_id=$account_id, apps: ".implode(', ',$apps)."\n"; @@ -103,4 +103,33 @@ class admin_cmd_account_app extends admin_cmd return lang('%1 rights for %2 and applications %3',$this->allow ? lang('Grant') : lang('Remove'), admin_cmd::display_account($this->account),implode(', ',$apps)); } + + /** + * Return (human readable) labels for keys of changes + * + * Reading them from admin.account template + * + * @return array + */ + function get_change_labels() + { + $labels = parent::get_change_labels(); + + $labels['app'] = 'Applications'; + + return $labels; + } + /** + * Return widget types (indexed by field key) for changes + * + * Used by historylog widget to show the changes the command recorded. + */ + function get_change_widgets() + { + $widgets = parent::get_change_widgets(); + + $widgets['app'] = 'select-app'; + + return $widgets; + } } diff --git a/admin/inc/class.admin_cmd_edit_group.inc.php b/admin/inc/class.admin_cmd_edit_group.inc.php index bc83c4ec11..4021a69a6f 100644 --- a/admin/inc/class.admin_cmd_edit_group.inc.php +++ b/admin/inc/class.admin_cmd_edit_group.inc.php @@ -157,6 +157,7 @@ class admin_cmd_edit_group extends admin_cmd unset($labels['${row}[run]']); $labels['account_members'] = 'Members'; + $labels['account_email'] = 'Email'; return $labels; }