diff options
| author | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2018-02-09 12:12:31 +0100 |
| commit | d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4 (patch) | |
| tree | c1030efbdb837f53651272e015a3ab5562f145c8 /modules-available/runmode/inc/runmode.inc.php | |
| parent | [systemstatus] lang-descriptions for permissions (diff) | |
| parent | [inc/User] Add locationid 0 to allowed locations in fallback mode (diff) | |
| download | slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.gz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.tar.xz slx-admin-d57ee1cfdd99fb4e44f5ce6d92d6712c30ff0aa4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/runmode/inc/runmode.inc.php')
| -rw-r--r-- | modules-available/runmode/inc/runmode.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules-available/runmode/inc/runmode.inc.php b/modules-available/runmode/inc/runmode.inc.php index ad1f52bf..2c8083ca 100644 --- a/modules-available/runmode/inc/runmode.inc.php +++ b/modules-available/runmode/inc/runmode.inc.php @@ -72,7 +72,7 @@ class RunMode * @param string $machineuuid * @param int $returnData bitfield of data to return * @return false|array {'machineuuid', 'isclient', 'module', 'modeid', 'modedata', - * <'hostname', 'clientip', 'macaddr', 'locationid', 'lastseen'>} + * ('hostname', 'clientip', 'macaddr', 'locationid', 'lastseen'), ('moduleName', 'modeName')} */ public static function getRunMode($machineuuid, $returnData = self::DATA_MACHINE_DATA) { |