Merge pull request #4696 from crazyserver/MOBILE-4983

dpalou · web-flow · commit c588e4659cb4 · 2026-01-28T14:28:42.000+01:00
Mobile 4983 is admin / is manager
diff --git a/src/core/classes/sites/authenticated-site.ts b/src/core/classes/sites/authenticated-site.ts
@@ -232,12 +232,25 @@ export class CoreAuthenticatedSite extends CoreUnauthenticatedSite {
 
     /**
      * Check if current user is Admin.
-     * Works properly since v3.8. See more in: {@link https://moodle.atlassian.net/browse/MDL-65550}
+     * Works properly since Moodle 3.8. See more in: {@link https://moodle.atlassian.net/browse/MDL-65550}
      *
      * @returns Whether the user is Admin.
      */
     isAdmin(): boolean {
-        return this.getInfo()?.userissiteadmin ?? false;
+        const info = this.getInfo();
+
+        return (info?.userissiteadmin || info?.usercanchangeconfig) ?? false;
+    }
+
+    /**
+     * Check if current user is Manager.
+     * Works properly since Moodle 5.2. See more in: {@link https://moodle.atlassian.net/browse/MDL-87034}
+     *
+     * @returns Whether the user is Manager. Will return false if cannot be determined.
+     * @since 5.2
+     */
+    isManager(): boolean {
+        return this.getInfo()?.usercanviewconfig ?? false;
     }
 
     /**
diff --git a/src/core/classes/sites/unauthenticated-site.ts b/src/core/classes/sites/unauthenticated-site.ts
@@ -253,6 +253,7 @@ export class CoreUnauthenticatedSite {
      * Get the public config of this site.
      *
      * @param options Options.
+     * @param options.readingStrategy Reading strategy to use.
      * @returns Promise resolved with public config. Rejected with an object if error, see CoreWS.callAjax.
      */
     async getPublicConfig(options: { readingStrategy?: CoreSitesReadingStrategy } = {}): Promise<CoreSitePublicConfigResponse> {
@@ -571,7 +572,9 @@ export class CoreUnauthenticatedSite {
 }
 
 /**
- * Result of WS core_webservice_get_site_info.
+ * Data returned by core_webservice_get_site_info WS.
+ *
+ * WS Description: Return some site info / user info / list web service functions
  */
 export type CoreSiteInfoResponse = {
     sitename: string; // Site name.
@@ -583,6 +586,11 @@ export type CoreSiteInfoResponse = {
     userid: number; // User id.
     siteurl: string; // Site url.
     userpictureurl: string; // The user profile picture.
+                // Warning: this url is the public URL that only works when forcelogin is set to NO and guestaccess is set to YES.
+                // In order to retrieve user profile pictures independently of the Moodle config, replace "pluginfile.php" by
+                // "webservice/pluginfile.php?token=WSTOKEN&file="
+                // Of course the user can only see profile picture depending
+                // on his/her permissions. Moreover it is recommended to use HTTPS too.
     functions: {
         name: string; // Function name.
         version: string; // The version number of the component to which the function belongs.
@@ -600,16 +608,20 @@ export type CoreSiteInfoResponse = {
     userquota?: number; // User quota (bytes). 0 means user can ignore the quota.
     usermaxuploadfilesize?: number; // User max upload file size (bytes). -1 means the user can ignore the upload file size.
     userhomepage?: CoreSiteInfoUserHomepage; // The default home page for the user.
-    userhomepageurl?: string; // @since 4.5. The URL of the custom user home page when using HOMEPAGE_URL.
+    userhomepageurl?: string; // @since 4.5. The URL of default home page when userhomepage is 4 (HOMEPAGE_URL).
     userprivateaccesskey?: string; // Private user access key for fetching files.
     siteid?: number; // Site course ID.
     sitecalendartype?: string; // Calendar type set in the site.
     usercalendartype?: string; // Calendar typed used by the user.
     userissiteadmin?: boolean; // Whether the user is a site admin or not.
     theme?: string; // Current theme for the user.
     limitconcurrentlogins?: number; // @since 4.0. Number of concurrent sessions allowed.
-    usersessionscount?: number; // @since 4.0. Number of active sessions for current user. Only if limitconcurrentlogins is used.
+    usersessionscount?: number; // @since 4.0. Number of active sessions for current user.
+                // Only returned when limitconcurrentlogins is used.
     policyagreed?: number; // @since 4.4. Whether user accepted all the policies.
+    usercanchangeconfig?: boolean; // @since 5.2. Whether the user can change the site configuration.
+    usercanviewconfig?: boolean; // @since 5.2. Whether the user can view the site administration tree.
+    sitesecret?: string; // @since 5.2. The site secret, only returned to users with moodle/site:config capability (usually admins).
 };
 
 /**
diff --git a/src/core/features/settings/pages/dev/dev.html b/src/core/features/settings/pages/dev/dev.html
@@ -97,6 +97,34 @@ <h1>{{ 'core.settings.developeroptions' | translate }}</h1>
 
         @if (siteId) {
 
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <p class="item-heading">Is admin</p>
+                    <p>
+                        @if (isAdmin) {
+                            {{ 'core.yes' | translate }}
+                        } @else {
+                            {{ 'core.no' | translate }}
+                        }
+                    </p>
+                </ion-label>
+            </ion-item>
+
+            @if (isManager !== undefined) {
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p class="item-heading">Is manager</p>
+                        <p>
+                            @if (isManager) {
+                                {{ 'core.yes' | translate }}
+                            } @else {
+                                {{ 'core.no' | translate }}
+                            }
+                        </p>
+                    </ion-label>
+                </ion-item>
+            }
+
             <ion-item class="ion-text-wrap">
                 <ion-label>
                     <p class="item-heading">WebService token</p>
@@ -151,16 +179,17 @@ <h1>{{ 'core.settings.developeroptions' | translate }}</h1>
                     <h2>Disabled features</h2>
                 </ion-label>
             </ion-item-divider>
-            @if (disabledFeatures.length === 0) {
+            @for (feature of disabledFeatures; track feature) {
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p class="item-heading">{{ feature }}</p>
+                    </ion-label>
+                </ion-item>
+            } @empty {
                 <ion-item>
                     <ion-label>There are no features disabled.</ion-label>
                 </ion-item>
             }
-            <ion-item class="ion-text-wrap" *ngFor="let feature of disabledFeatures">
-                <ion-label>
-                    <p class="item-heading">{{ feature }}</p>
-                </ion-label>
-            </ion-item>
 
             <ion-item-divider>
                 <ion-label>
@@ -191,17 +220,19 @@ <h2>WebService overrides</h2>
                     <h2>Site plugins</h2>
                 </ion-label>
             </ion-item-divider>
-            @if (sitePlugins.length === 0) {
+
+            @for (plugin of sitePlugins; track plugin) {
+                <ion-item class="ion-text-wrap">
+                    <ion-label>
+                        <p class="item-heading">{{ plugin.addon }} ({{plugin.component}})</p>
+                        <p>{{plugin.version}}</p>
+                    </ion-label>
+                </ion-item>
+            } @empty {
                 <ion-item>
                     <ion-label>There are no site plugins installed</ion-label>
                 </ion-item>
             }
-            <ion-item class="ion-text-wrap" *ngFor="let plugin of sitePlugins">
-                <ion-label>
-                    <p class="item-heading">{{ plugin.addon }} ({{plugin.component}})</p>
-                    <p>{{plugin.version}}</p>
-                </ion-label>
-            </ion-item>
 
         }
     </ion-list>
diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts
@@ -34,6 +34,7 @@ import { CoreText } from '@singletons/text';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { CoreSharedModule } from '@/core/shared.module';
+import { CoreSitePlugins } from '@features/siteplugins/services/siteplugins';
 
 /**
  * Page that displays the developer options.
@@ -61,6 +62,8 @@ export default class CoreSettingsDevPage implements OnInit {
     stagingSitesCount = 0;
     enableStagingSites?: boolean;
     previousEnableStagingSites?: boolean;
+    isAdmin = false;
+    isManager?: boolean;
 
     disabledFeatures: string[] = [];
 
@@ -115,23 +118,28 @@ export default class CoreSettingsDevPage implements OnInit {
         this.autoLoginTimeBetweenRequests = await currentSite.getAutoLoginMinTimeBetweenRequests();
         this.lastAutoLoginTime = currentSite.getLastAutoLoginTime();
 
+        this.isAdmin = currentSite.isAdmin();
+        // Check isManager only if LMS version is >= 5.2 because the function works properly since that version.
+        if (currentSite.isVersionGreaterEqualThan('5.2')) {
+            this.isManager = currentSite.isManager();
+        }
+
         document.head.querySelectorAll('style').forEach((style) => {
             if (this.siteId && style.id.endsWith(this.siteId)) {
                 if (style.innerHTML.length > 0) {
                     this.remoteStylesCount++;
                 }
-                this.remoteStyles = this.remoteStyles || style.getAttribute('media') != 'disabled';
+                this.remoteStyles = this.remoteStyles || style.getAttribute('media') !== 'disabled';
             }
 
             if (style.id.startsWith('siteplugin-')) {
                 if (style.innerHTML.length > 0) {
                     this.pluginStylesCount++;
                 }
-                this.pluginStyles = this.pluginStyles || style.getAttribute('media') != 'disabled';
+                this.pluginStyles = this.pluginStyles || style.getAttribute('media') !== 'disabled';
             }
         });
 
-        const { CoreSitePlugins } = await import('@features/siteplugins/services/siteplugins');
         this.sitePlugins = CoreSitePlugins.getCurrentSitePluginList().map((plugin) => ({
             addon: plugin.addon,
             component: plugin.component,
