diff options
| author | Jannik Schönartz | 2018-02-06 13:45:54 +0100 |
|---|---|---|
| committer | Jannik Schönartz | 2018-02-06 13:45:54 +0100 |
| commit | 3d801dcde21c8166e3281a180ef21ff05b175fd6 (patch) | |
| tree | f8508e11bc6df5a27f0417ad8098c4ed013a691c /modules-available/runmode/inc/runmode.inc.php | |
| parent | [usb-lock-off] Reworked config chooser. Switched from the dropdown config sel... (diff) | |
| parent | [statistics_reporting] Translation for 'settings' (diff) | |
| download | slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.tar.gz slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.tar.xz slx-admin-3d801dcde21c8166e3281a180ef21ff05b175fd6.zip | |
Merge branch 'origin/master' into usb-lock-off
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) { |