diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index 2cdd0659..8f72a8fa 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,11 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.71.23 + +Updated `.location.buildingid ` to allow non-validated building IDs +by specifying `nv:` at the beginning of ``; e.g., `nv:Building X' sets the building ID to `Building X`. + ### 6.71.12 Added option `showmimetype category ` to `gam print|show filecounts|filelist|filetree` diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 4b413f0f..b9c78ef4 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1006,7 +1006,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Gmail-Messages-Threads.md b/docs/Users-Gmail-Messages-Threads.md index e68e5589..5a911012 100644 --- a/docs/Users-Gmail-Messages-Threads.md +++ b/docs/Users-Gmail-Messages-Threads.md @@ -1,4 +1,5 @@ # Users - Gmail - Messages/Threads +_ [Notes](#notes) - [API documentation](#api-documentation) - [Query documentation](#query-documentation) - [Definitions](#definitions) @@ -25,6 +26,13 @@ - [Display messages sent by delegates for delegator](#display-messages-sent-by-delegates-for-delegator) - [User attribute `replace ` processing](Tag-Replace) +## Notes +Restrict email messages to authorized addresses or domains only +* https://support.google.com/a/answer/2640542 + +Block emails between specific user groups +* https://support.google.com/a/answer/9175444 + ## API documentation * https://developers.google.com/gmail/api/v1/reference/users/messages * https://developers.google.com/gmail/api/v1/reference/users/threads diff --git a/docs/Users.md b/docs/Users.md index 9bf86d55..6e412d56 100644 --- a/docs/Users.md +++ b/docs/Users.md @@ -338,6 +338,10 @@ relation manager manageremail@domain.com externalid organization "Employee ID" ``` +`.location.buildingid ` allows non-validated building IDs +by specifying `nv:` at the beginning of ``; e.g., `nv:Building X' sets the building ID to `Building X`. + + ## Passwords To set a user's password, you specify a `` string and a hash method that specifies how to interpret the string * `password random|uniquerandom` - A 25 character plain text string of ASCII uppercase/lowecase letters, digits and punctuation diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 4d1448a2..1ef53e8d 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.71.12 + Latest: 6.71.13 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.71.12 +6.71.13 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.71.12 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.71.13 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index f611fe6f..c253aeca 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,11 @@ Merged GAM-Team version +6.71.23 + +Updated `.location.buildingid ` to allow non-validated building IDs +by specifying `nv:` at the beginning of ``; e.g., `nv:Building X' sets the building ID to `Building X`. + 6.71.12 Added option `showmimetype category ` to `gam print|show filecounts|filelist|filetree` diff --git a/src/gam/__init__.py b/src/gam/__init__.py index f3bfe8dd..9942a000 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -34822,13 +34822,15 @@ def _makeBuildingIdNameMap(cd=None): GM.Globals[GM.MAP_BUILDING_ID_TO_NAME][building['buildingId']] = building['buildingName'] GM.Globals[GM.MAP_BUILDING_NAME_TO_ID][building['buildingName']] = building['buildingId'] -def _getBuildingByNameOrId(cd, minLen=1): +def _getBuildingByNameOrId(cd, minLen=1, allowNV=False): which_building = getString(Cmd.OB_BUILDING_ID, minLen=minLen) if not which_building or (minLen == 0 and which_building in {'id:', 'uid:'}): return '' cg = UID_PATTERN.match(which_building) if cg: return cg.group(1) + if allowNV and which_building.startswith('nv:'): + return which_building[3:] if GM.Globals[GM.MAKE_BUILDING_ID_NAME_MAP]: _makeBuildingIdNameMap(cd) # Exact name match, return ID @@ -34867,7 +34869,7 @@ def _getBuildingByNameOrId(cd, minLen=1): def _getBuildingNameById(cd, buildingId): if GM.Globals[GM.MAKE_BUILDING_ID_NAME_MAP]: _makeBuildingIdNameMap(cd) - return GM.Globals[GM.MAP_BUILDING_ID_TO_NAME].get(buildingId, 'UNKNOWN') + return GM.Globals[GM.MAP_BUILDING_ID_TO_NAME].get(buildingId, buildingId) # gam update building * def doUpdateBuilding(): @@ -41354,7 +41356,7 @@ def getUserAttributes(cd, updateCmd, noUid=False): elif argument == 'area': entry['area'] = getString(Cmd.OB_STRING) elif argument in {'building', 'buildingid'}: - entry['buildingId'] = _getBuildingByNameOrId(cd) + entry['buildingId'] = _getBuildingByNameOrId(cd, allowNV=True) elif argument in {'floor', 'floorname'}: entry['floorName'] = getString(Cmd.OB_STRING, minLen=0) elif argument in {'section', 'floorsection'}: