holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin_cmd_change_account_id changes to get nice command history

Browse Source
This commit is contained in:
nathangray 2019-05-09 11:47:17 -06:00
parent 84e4a6d1ce
commit 2d6807f2b5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/inc/class.admin_cmd_change_account_id.inc.php
View File

@ -27,7 +27,7 @@ class admin_cmd_change_account_id extends admin_cmd
*/ */
function __construct(array $change) function __construct(array $change)
{ {
if (!isset($change['change'])) if (!isset($change['change']) && !($change['data'] && $change['id']))
{ {
$change = array( $change = array(
'change' => $change, 'change' => $change,
@ -161,7 +161,7 @@ class admin_cmd_change_account_id extends admin_cmd
$db->column_definitions = $db->column_definitions['fd']; $db->column_definitions = $db->column_definitions['fd'];
if (!$columns) if (!$columns)
{ {
echo "$app: $table no columns with account-id's\n"; $this->value .= "$app: $table no columns with account-id's\n";
continue; // noting to do for this table continue; // noting to do for this table
} }
if (!is_array($columns)) $columns = array($columns); if (!is_array($columns)) $columns = array($columns);
@ -185,7 +185,7 @@ class admin_cmd_change_account_id extends admin_cmd
$where[] = "acl_appname != 'phpgw_group'"; $where[] = "acl_appname != 'phpgw_group'";
} }
$total += ($changed = self::_update_account_id($this->change,$db,$table,$column,$where,$type)); $total += ($changed = self::_update_account_id($this->change,$db,$table,$column,$where,$type));
if (!$check_only && $changed) echo "$app:\t$table.$column $changed id's changed\n"; if (!$check_only && $changed) $this->value .= "$app:\t$table.$column $changed id's changed\n";
} }
} }
} }
@ -194,7 +194,7 @@ class admin_cmd_change_account_id extends admin_cmd
foreach($GLOBALS['egw_info']['apps'] as $app => $data) foreach($GLOBALS['egw_info']['apps'] as $app => $data)
{ {
$total += ($changed = Api\Framework\Favorites::change_account_ids($app, $this->change)); $total += ($changed = Api\Framework\Favorites::change_account_ids($app, $this->change));
if ($changed) echo "$app:\t$changed id's in favorites or index-state changed\n"; if ($changed) $this->value .= "$app:\t$changed id's in favorites or index-state changed\n";
} }
// call hooks, in case apps need additional changes // call hooks, in case apps need additional changes
@ -203,9 +203,10 @@ class admin_cmd_change_account_id extends admin_cmd
foreach(Api\Hooks::process($args, array(), true) as $app => $changed) foreach(Api\Hooks::process($args, array(), true) as $app => $changed)
{ {
$total += $changed; $total += $changed;
if ($changed) echo "$app:\t$changed id's changed by application hook\n"; if ($changed) $this->value .= "$app:\t$changed id's changed by application hook\n";
} }
} }
echo $this->value;
if ($total) Api\Cache::flush(Api\Cache::INSTANCE); if ($total) Api\Cache::flush(Api\Cache::INSTANCE);
return lang("Total of %1 id's changed.",$total)."\n"; return lang("Total of %1 id's changed.",$total)."\n";