Changeset 3095910

Timestamp:

05/31/2024 10:34:44 PM (2 months ago)

Author:

knutsp

Message:

5.3.2

• May 31, 2024
• Replaced very static 'Virtual' dashboard widget gauge with 'Database' (DB Threads_connected) with a logaritmic scale 1% to 100% relative to max_connections variable
• Add title attributes (tooltips) to resource usage widget gauges with the actually retrieved values
• Add Name Servers to Site Health Info
• Add SPF record validation to Site Health Info
• Add PTR record validation to Site Health Info

Location:

wf-cpanel-email-accounts/tags

Files:

• 5.1 (deleted)
• 5.3/assets/dashboardwidget.js (modified) (5 diffs)
• 5.3/assets/index.php (modified) (1 diff)
• 5.3/includes/DashboardWidget.php (modified) (1 diff)
• 5.3/includes/Main.php (modified) (1 diff)
• 5.3/includes/SiteHealth.php (modified) (28 diffs)
• 5.3/includes/UAPI.php (modified) (2 diffs)
• 5.3/index.php (modified) (2 diffs)
• 5.3/readme.txt (modified) (10 diffs)

wf-cpanel-email-accounts/tags/5.3/assets/dashboardwidget.js

@@ -5 +5 @@
 function wfGetData() {
     var xmlHttp = new XMLHttpRequest;
-    xmlHttp.open( "GET", encodeURI( wFcPanelSettings.dataURI + '?secret=' + wFcPanelSettings.secret + '&token=' + wFcPanelSettings.token + '&host=' + wFcPanelSettings.host + '&abs=' + wFcPanelSettings.abs + '&inc=' + wFcPanelSettings.inc ), false );
+    console.log( wFcPanelSettings.abs );
+//  xmlHttp.open( "GET", encodeURI( wFcPanelSettings.dataURI + '?secret=' + wFcPanelSettings.secret + '&token=' + wFcPanelSettings.token + '&host=' + wFcPanelSettings.host + '&abs=' + wFcPanelSettings.abs + '&inc=' + wFcPanelSettings.inc ), false );
+    xmlHttp.open( "GET", encodeURI( wFcPanelSettings.dataURI + '?secret=' + wFcPanelSettings.secret + '&token=' + wFcPanelSettings.token + '&host=' + wFcPanelSettings.host + ( wFcPanelSettings.abs == null || wFcPanelSettings.abs.trim().length === 0 ? '' : '&abs=' + wFcPanelSettings.abs ) ), false );
     xmlHttp.send();
     
     if ( xmlHttp.status >= 200 && xmlHttp.status < 300 ) {
 //      console.log( xmlHttp.responseText );
+
+
         var jsondata = JSON.parse( xmlHttp.responseText );
         var cpdata = jsondata.hasOwnProperty( 'result' ) ? jsondata.result.data : jsondata.data;
@@ -15 +19 @@
         if ( cpdata.hasOwnProperty( 'errors' ) && cpdata.errors != null && cpdata.errors.lenght > 0 ) {
             return '{ sts: 406 }';
-        } else {
+        } else {
             mu = cpdata.findIndex( obj => obj.name === 'Memory Used' );
-            sw = cpdata.findIndex( obj => obj.name === 'Swap'        );
+          sw = cpdata.findIndex( obj => obj.name === 'Swap'        );
             sl = cpdata.findIndex( obj => obj.name === 'Server Load' );
             cc = cpdata.findIndex( obj => obj.name === 'CPU Count'   );
             return {
                 mem: Math.ceil( cpdata[ mu ].value.substring( 0, cpdata[ mu ].value.length - 1 ) ),
-                swa: Math.ceil( cpdata[ sw ].value.substring( 0, cpdata[ sw ].value.length - 1 ) ),
-                loa: Math.ceil( 100 * cpdata[ sl ].value.substring( 0, cpdata[ sl ].value.length - 1 ) / cpdata[ cc ].value ),
+                cos: cos,
+//              swa: Math.ceil( cpdata[ sw ].value.substring( 0, cpdata[ sw ].value.length - 1 ) ),
+//              loa: Math.ceil( 100 * cpdata[ sl ].value.substring( 0, cpdata[ sl ].value.length - 1 ) / cpdata[ cc ].value ),
+                loa: Math.ceil( 100 * cpdata[ sl ].value / cpdata[ cc ].value ),
+                sel: cpdata[ sl ].value,
+                cps: cpdata[ cc ].value,
             };
         }
@@ -40 +48 @@
             [ 'Label', 'Value' ],
             [ wFcPanelSettings.labels.mem, values.mem ],
-            [ wFcPanelSettings.labels.swa, values.swa ],
+//          [ wFcPanelSettings.labels.swa, values.swa ],
+            [ wFcPanelSettings.labels.con, values.cos.co ],
             [ wFcPanelSettings.labels.loa, values.loa ],
         ] );
@@ -53 +62 @@
         var chart = new google.visualization.Gauge( document.getElementById( wFcPanelSettings.chartID ) );
         chart.draw( data, options );
+
+
+
 
         setInterval( function() {
@@ -62 +74 @@
             if ( ! element.classList.contains( 'closed' ) && element.offsetParent !== null ) {
                 data.setValue( 0, 1, values.mem );
-                data.setValue( 1, 1, values.swa );
+                data.setValue( 1, 1, values.cos.co );
+//              data.setValue( 1, 1, values.swa );
                 data.setValue( 2, 1, values.loa );
                 chart.draw( data, options );
+
+
             }
         }, 1000 * wFcPanelSettings.interval );

wf-cpanel-email-accounts/tags/5.3/assets/index.php

@@ -2 +2 @@
 declare( strict_types=1 );
 namespace WebFacing\cPanel;
+
+
+
 
-\date_default_timezone_set( 'UTC' );
-\header( 'Content-Type: application/json' );
-\header( 'Expires: Sat, 21 Apr 2024 12:34:56 GMT' );
-\header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-
-$secret = \intval( \filter_input( \INPUT_GET, 'secret', \FILTER_SANITIZE_NUMBER_INT ) );
-$token  = \filter_input( \INPUT_GET, 'token', \FILTER_SANITIZE_SPECIAL_CHARS );
-$host   = \filter_input( \INPUT_GET, 'host',  \FILTER_VALIDATE_DOMAIN, \FILTER_FLAG_HOSTNAME );
-$wpabs  = \urldecode( \filter_input( \INPUT_GET, 'abs',   \FILTER_SANITIZE_SPECIAL_CHARS ) );
-//$wpinc  = \filter_input( \INPUT_GET, 'inc',   \FILTER_SANITIZE_SPECIAL_CHARS );
-//\error_log( 'uri: ' . $_SERVER['REQUEST_URI'] . '?' . $_SERVER['QUERY_STRING'] . ', secret:' . $secret . ', token: ' . $token . ', host: ' . $host . ', abs: ' . $wpabs/*, ', inc: ' . $wpinc*/ );
-$module   = 'Variables';
-$function = 'get_user_information';
-
-if ( $wpabs && $host && $token ) {
+if ( $wpabs ) {
+    \date_default_timezone_set( 'UTC' );
     \define( 'ABSPATH', $wpabs );
     \define( 'SHORTINIT', true );
+
     require_once \ABSPATH . '/wp-load.php';
-//  \defined( 'WPINC' ) || \define( 'WPINC', $wpinc );
-    require_once \ABSPATH . \WPINC . '/general-template.php';
-    require_once \ABSPATH . \WPINC . '/link-template.php';
-    require_once \ABSPATH . \WPINC . '/class-wp-http.php';
-    require_once \ABSPATH . \WPINC . '/class-wp-http-response.php';
-    require_once \ABSPATH . \WPINC . '/class-wp-http-requests-response.php';
-    require_once \ABSPATH . \WPINC . '/class-wp-http-proxy.php';
-    require_once \ABSPATH . \WPINC . '/class-wp-http-requests-hooks.php';
-    require_once \ABSPATH . \WPINC . '/http.php';
-    $url  = 'https://' . $host . ':2083/execute/' . $module . '/' . $function;
-    $args = [ 'headers' => [ 'Authorization' => 'cpanel ' . $token ] ];
-    $response = \wp_remote_get( $url, $args );
-    $data = \json_decode( \wp_remote_retrieve_body( $response ) );
-    $data = (object) ( \property_exists( $data, 'result' ) ? $data->result->data ?? null : $data->data ?? null );
-//  \error_log( \var_export( $data, true ) );
-} else {
-    $data = (object) ( \json_decode( \shell_exec( 'uapi --output=json ' . $module .' ' . $function ) )?->result?->data ?? null );
-}
-$time  = \strtotime( 'first day of last month 00:00:00' );
-$c_sec = ( ( ( $data->last_modified ?? 0 ) ?: $time ) - ( ( $data->created ?? 0 ) ?: $time ) ) + $time + ( ( $data->uid ?? 0 ) ?:\idate( 'Y' ) ) + ( ( $data->gid ?? 0 ) ?: \idate( 'Y' ) );
+    $result = $wpdb->get_row(
+        $wpdb->prepare( 'SHOW VARIABLES LIKE %s', 'max_connections'),
+        \ARRAY_A
+    );
+    $mc = $result['Value'] ?? 1;
+    $result = $wpdb->get_row(
+        $wpdb->prepare( 'SHOW STATUS LIKE %s', 'Threads_connected'),
+        \ARRAY_A
+    );
+    $tc = $result['Value'] ?? 0;
+    $di = \log( \floatval( $mc ) ** ( 1. / 99. ) );
+    $co = \min( \intval( \round( \log( \floatval( $tc ) ) / $di ) ) + 1, 100 );
 
-if ( $c_sec === $secret ) {
-    $module   = 'ServerInformation';
-    $function = 'get_information';
+    \header( 'Content-Type: application/json' );
+    \header( 'Expires: Sat, 21 Apr 2024 12:34:56 GMT' );
+    \header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
+    \header( 'X-Threads_connected: ' . \json_encode( [ 'co' => $co, 'mc' => $mc, 'tc' => $tc ] ) );
 
-    if ( $wpabs && $host && $token ) {
+    $secret   = \intval( \filter_input( \INPUT_GET, 'secret', \FILTER_SANITIZE_NUMBER_INT  ) );
+    $token    =          \filter_input( \INPUT_GET, 'token',  \FILTER_SANITIZE_SPECIAL_CHARS );
+    $host     =          \filter_input( \INPUT_GET, 'host',   \FILTER_VALIDATE_DOMAIN, \FILTER_FLAG_HOSTNAME );
+    $module   = 'Variables';
+    $function = 'get_user_information';
+
+    if ( $host && $token ) {
+        require_once \ABSPATH . \WPINC . '/link-template.php';
+        require_once \ABSPATH . \WPINC . '/general-template.php';
+        require_once \ABSPATH . \WPINC . '/class-wp-http.php';
+        require_once \ABSPATH . \WPINC . '/class-wp-http-proxy.php';
+        require_once \ABSPATH . \WPINC . '/class-wp-http-response.php';
+        require_once \ABSPATH . \WPINC . '/class-wp-http-requests-response.php';
+        require_once \ABSPATH . \WPINC . '/class-wp-http-requests-hooks.php';
+        require_once \ABSPATH . \WPINC . '/http.php';
         $url  = 'https://' . $host . ':2083/execute/' . $module . '/' . $function;
         $args = [ 'headers' => [ 'Authorization' => 'cpanel ' . $token ] ];
         $response = \wp_remote_get( $url, $args );
-        echo \wp_remote_retrieve_body( $response );
+        $data = \json_decode( \wp_remote_retrieve_body( $response ) );
+        $data = (object) ( \property_exists( $data, 'result' ) ? $data->result->data ?? null : $data->data ?? null );
     } else {
-        echo \shell_exec( 'uapi --output=json ' . $module .' ' . $function );
+         );
     }
-} else {
-    \header( $_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden' );
-    echo '{ "result": { "data": { "errors": [ "Secrets mismatch" ] } } }';
+    $time  = \strtotime( 'first day of last month 00:00:00' );
+    $c_sec = ( ( ( $data->last_modified ?? 0 ) ?: $time ) - ( ( $data->created ?? 0 ) ?: $time ) ) + $time + ( ( $data->uid ?? 0 ) ?:\idate( 'Y' ) ) + ( ( $data->gid ?? 0 ) ?: \idate( 'Y' ) );
+
+    if ( $c_sec === $secret ) {
+        $module   = 'ServerInformation';
+        $function = 'get_information';
+
+        if ( $wpabs && $host && $token ) {
+            $url  = 'https://' . $host . ':2083/execute/' . $module . '/' . $function;
+            $args = [ 'headers' => [ 'Authorization' => 'cpanel ' . $token ] ];
+            $response = \wp_remote_get( $url, $args );
+            echo \wp_remote_retrieve_body( $response );
+        } else {
+            echo \shell_exec( 'uapi --output=json ' . $module .' ' . $function );
+        }
+    } else {
+        \header( $_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden' );
+        echo '{ "result": { "data": { "errors": [ "Secrets mismatch" ] } } }';
+    }
 }

wf-cpanel-email-accounts/tags/5.3/includes/DashboardWidget.php

@@ -73 +73 @@
                     'token'    => self::$has_http && ! self::$use_exec ? UAPI::$api_token : '',
                     'host'     => self::$host_name,
-                    'abs'      => \urlencode( \ABSPATH ),
+                    'abs'      => \urlencode( \ABSPATH ),
                     'interval' => (int) \apply_filters( self::pf . 'gauges_interval', $beat ),
                     'labels'   => [
-                        'mem' => _x( 'Memory',      'Gauge Label' ),
-                        'swa' => _x( 'Swap',        'Gauge Label' ),
-                        'loa' => _x( 'Load',        'Gauge Label' ),
+                        'mem' => _x( 'Memory',   'Gauge Label' ),
+//                      'swa' => _x( 'Swap',     'Gauge Label' ),
+                        'con' => _x( 'Database', 'Gauge Label' ),
+                        'loa' => _x( 'Load',     'Gauge Label' ),
                     ],
                 ] );

wf-cpanel-email-accounts/tags/5.3/includes/Main.php

@@ -195 +195 @@
                 $num_f    = \count( $host_ids );
                 $host_id  = $num_f > 1 && \array_key_exists( $num_f - 1, $host_ids ) ? $host_ids[ $num_f - 2] . '.' . $host_ids[ $num_f - 1] : null;
-//              self::$is_proisp     = \in_array( $host_id, [ 'proisp.no', 'proisp.eu', 'proisp.com' ], true );
-//              self::$package     = self::$is_proisp ? ( self::proisp_packages[ self::$plan ] ?? '' ) : \ucfirst( self::$plan );
-                self::$package     = \ucfirst( self::$plan );
+                $package = \explode( '_', self::$plan );
+                self::$package = \ucfirst( \end( $package ) );
             }
         }

wf-cpanel-email-accounts/tags/5.3/includes/SiteHealth.php

@@ -52 +52 @@
 
         \add_filter( 'debug_information', static function( array $debug_info ): array {
-
+            global $wpdb, $table_prefix;
             $cpanel_path = UAPI::home_path();
             $emails_disk = UAPI::email_disk_usage();
@@ -110 +110 @@
             $x = _x( 'Apache SpamAssassin™',                  'Site Health cPanel® Feature Name' );
             $x = _x( 'Apache SpamAssassin™ Spam Box',         'Site Health cPanel® Feature Name' );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             foreach ( [
@@ -155 +172 @@
             }
 
+
+
+
+
+
+
+
+
+
+
+
+
             if ( ! \str_contains( $debug_info['wp-constants']['label'], __( 'WebFacing™' ) ) ) {
                 $debug_info['wp-constants']['label'] = \str_replace( ' ', ' & ' . __( 'WebFacing™' ) . ' ', $debug_info['wp-constants']['label'] );
@@ -191 +220 @@
             ];
 
+
+
+
+
+
+
+
+
+
             $debug_info['wp-constants']['fields']['WP_PLUGIN_URL' ] = [
                 'label'   => 'WP_PLUGIN_URL',
@@ -198 +236 @@
                 'debug'   => \defined( 'WP_PLUGIN_URL' ) ? \WP_PLUGIN_URL : 'undefined',
             ];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             $default = \is_ssl();
@@ -295 +415 @@
             ];
 
-            if ( ! ( \defined( 'DISALLOW_FILE_MODS' ) && \DISALLOW_FILE_MODS ) ) {
+//          if ( ! ( \defined( 'DISALLOW_FILE_MODS' ) && \DISALLOW_FILE_MODS ) ) {
+            if ( \wp_is_file_mod_allowed( self::$screen->id ) ) {
 
                 $debug_info['wp-constants']['fields']['AUTOMATIC_UPDATER_DISABLED' ] = [
@@ -347 +468 @@
 
             if ( \defined( 'WP_DISABLE_FATAL_ERROR_HANDLER' ) && \WP_DISABLE_FATAL_ERROR_HANDLER ) {
-
-                $debug_info['wp-constants']['fields']['WP_SANDBOX_SCRAPING' ] = [
-                    'label'   => 'WP_SANDBOX_SCRAPING',
-                    'value'   => \defined( 'WP_SANDBOX_SCRAPING' ) ?
-                        ( self::is_bool( \WP_SANDBOX_SCRAPING ) ?
-                            ( \WP_SANDBOX_SCRAPING ?
-                                _x(  'Enabled', 'Site Health Info' ) :
-                                _x( 'Disabled', 'Site Health Info' )
-                            ) :
-                            \WP_SANDBOX_SCRAPING . ' ▮'
-                        ) :
-                        _x( 'Undefined', 'Site Health Info' ) . ' (' . __( 'not disabled' ) . ')',
-                    'debug'   => \defined( 'WP_SANDBOX_SCRAPING' ) ? \WP_SANDBOX_SCRAPING : 'undefined',
-                    'private' => false,
-                ];
+//
+              $debug_info['wp-constants']['fields']['WP_SANDBOX_SCRAPING' ] = [
+                  'label'   => 'WP_SANDBOX_SCRAPING',
+                  'value'   => \defined( 'WP_SANDBOX_SCRAPING' ) ?
+                      ( self::is_bool( \WP_SANDBOX_SCRAPING ) ?
+                          ( \WP_SANDBOX_SCRAPING ?
+                              _x(  'Enabled', 'Site Health Info' ) :
+                              _x( 'Disabled', 'Site Health Info' )
+                          ) :
+                          \WP_SANDBOX_SCRAPING . ' ▮'
+                      ) :
+                      _x( 'Undefined', 'Site Health Info' ) . ' (' . __( 'not disabled' ) . ')',
+                  'debug'   => \defined( 'WP_SANDBOX_SCRAPING' ) ? \WP_SANDBOX_SCRAPING : 'undefined',
+                  'private' => false,
+              ];
             } else {
 
@@ -374 +495 @@
             }
 
-            $debug_info['wp-constants']['fields']['DISALLOW_FILE_MODS'] = [
-                'label'   => 'DISALLOW_FILE_MODS',
-                'value'   => \defined( 'DISALLOW_FILE_MODS' ) ?
-                    ( self::is_bool( \DISALLOW_FILE_MODS ) ?
-                        ( \DISALLOW_FILE_MODS ?
-                            _x( 'Disallowed', 'Site Health Info' ) . ' ▮' :
-                            _x(    'Allowed', 'Site Health Info' )
-                        ) :
-                        \DISALLOW_FILE_MODS . ( \DISALLOW_FILE_MODS ? ' ▮' : '' )
+            $default = \MINUTE_IN_SECONDS;
+            $debug_info['wp-constants']['fields']['AUTOSAVE_INTERVAL' ] = [
+                'label'   => 'AUTOSAVE_INTERVAL',
+                'value'   => \defined( 'AUTOSAVE_INTERVAL' ) ?
+                    ( \is_bool( \AUTOSAVE_INTERVAL ) && ! \AUTOSAVE_INTERVAL ?
+                        _x( 'Disabled', 'Site Health Info' ) . ' (' . __( 'none' ) . ' )' :
+                        ( \is_numeric( \AUTOSAVE_INTERVAL ) ?
+                            ( \AUTOSAVE_INTERVAL . ' (s)' .
+                                ( \AUTOSAVE_INTERVAL === $default ?
+                                    '' :
+                                    ' (' . __( 'default:' ) . ' ' . $default . ')'
+                                )
+                            ) :
+                            \AUTOSAVE_INTERVAL . ' ▮'
+                        )
                     ) :
-                    _x( 'Undefined', 'Site Health Info' ) . ' (' . _x( 'allowed', 'Site Health Info' ) . ')',
-                'debug'   => \defined( 'DISALLOW_FILE_MODS' ) ? \DISALLOW_FILE_MODS : 'undefined',
-                'private' => false,
-            ];
-
-            $default = \trailingslashit( \get_option( 'siteurl' ) ) . 'wp-content';
-            $debug_info['wp-constants']['fields']['WP_CONTENT_URL'] = [
-                'label'   => 'WP_CONTENT_URL',
-                'value'   => \defined( 'WP_CONTENT_URL' ) ?
-                    \WP_CONTENT_URL :
-                    _x( 'Undefined', 'Site Health Info' ) . ' (' . $default . ')',
-                'debug'   => \defined( 'WP_CONTENT_URL' ) ? \WP_CONTENT_URL : 'undefined',
-            ];
+                    _x( 'Undefined', 'Site Health Info' ) . ' (' . \MINUTE_IN_SECONDS . 's)',
+                'debug'   => \defined( 'AUTOSAVE_INTERVAL' ) ? \AUTOSAVE_INTERVAL : 'undefined',
+            ];
+
             $debug_info['wp-constants']['fields']['WF_CPANEL_API_TOKEN'] = [
                 'label'   => 'WF_CPANEL_API_TOKEN',
@@ -420 +538 @@
             ];
 
-            if ( self::$is_debug || \defined( 'WF_CPANEL_HOST' ) ) {
+            if ( self::$is_debug ||  ) ) {
 
                 $debug_info['wp-constants']['fields']['WF_CPANEL_HOST'] = [
@@ -488 +606 @@
             $user_updated   = UAPI::user_updated();
             $two_factor     = UAPI::two_factor();
+
+
             $max_emails     = UAPI::maximum_emails();
+
             $held_mails     = UAPI::all_queued_emails();
             $contacts       = UAPI::get_user_info();
@@ -498 +619 @@
 
             foreach ( UAPI::subaccounts() as $name => $subaccount ) {
-                $subaccounts[] = '● ' . $name . ( \property_exists( $subaccount, 'services' ) ? ' {' . \implode( ',', (array) $subaccount->services ) . '} ' : '' );
+                $subaccounts[] = '● ' . $name . ( \property_exists( $subaccount, 'services' ) ? ' {' . \implode( ',', (array) $subaccount->services ) . '} ' : '' );
             }
             $subaccounts  = \implode( ', ', $subaccounts );
@@ -553 +674 @@
                                 }
                             }
-                            return \implode( ', ', $vals );
+                            return \ );
                         } )(),
-                        'debug'    => \print_r( self::$usage, true ),
+                        'debug'    => \print_r( self::$license, true ),
+                        'private'  => ! self::$is_debug,
                     ],
                     'plugin_license'        => [
@@ -596 +718 @@
                             return \implode( '; ', $vals );
                         } )(),
-                        'debug'    => \print_r( self::$usage, true ),
+                        'debug'    => ( self::$class::$usage == ( (object) '' ) ) ? null : \print_r( self::$class::$usage, true ),
+                        'private'  => ! self::$is_debug,
                     ],
                     'cpanel_version'      => [
                         'label'    => _x( 'cPanel® version', 'Site Health Info' ),
-                        'value'    => \substr_replace( \number_format( 111.47 - ( 49. * \floatval( self::$cpanel_version ?: 8 ) / 115. ), 2, '.', '' ), ' (build ', -1, 0 ) . ')',
+                        'value'    => \substr_replace( \number_format( 1 ), 2, '.', '' ), ' (build ', -1, 0 ) . ')',
                         'debug'    => self::$cpanel_version,
                         'private'  => false,
@@ -628 +751 @@
                         'private'  => false,
                     ],
-//                  'proisp'                => [
-//                      'label' => _x( 'At PRO ISP?', 'Site Health Info' ),
-//                      'value'    => ( self::$is_proisp ? __( 'Yes' ) : __( 'No' ) ) . ', ' . self::$package,
-//                      'debug'    => self::$is_proisp,
-//                      'private'  => ! self::$is_debug,
-//                  ],
                     'features'            => [
                         'label'    => _x( 'Features', 'Site Health Info' ),
                         'value'    => \implode( ', ', $features ),
-                        'debug'    => \implode( ',', \array_keys( $features ) ),
+                        'debug'    => \implode( ',', \array_keys( $features ) ),
                         'private'  => false,
                     ],
                     'cpanel_host'         => [
-                        'label' => _x( 'Host', 'Site Health Info' ),
+                        'label' => _x( 'Host', 'Site Health Info' ),
                         'value'    => self::$host_name,
                         'debug'    => self::$host_name,
@@ -647 +764 @@
                     ],
                     'cpanel_user'         => [
-                        'label' => _x( 'User', 'Site Health Info' ),
+                        'label' => _x( 'User', 'Site Health Info' ),
                         'value'    => self::$cpanel_user,
                         'debug'    => self::$cpanel_user,
@@ -654 +771 @@
                     'user_created'        => [
                         'label' => \sprintf(
-                            _x( ' — User %1$s created',
-                                'Site Health Info, %1$s = user'
+                            /* translators: %1$s = user */
+                            _x( ' — User `%1$s` created',
+                                'Site Health Info',
                             ),
-                            self::$cpanel_user
+                            self::$cpanel_user
                         ),
                         'value'    => $user_created ? \wp_date( \get_option( 'date_format' ), $user_created ) : '',
@@ -664 +782 @@
                     ],
                     'user_updated'        => [
-                        'label' => \sprintf(
-                            _x( ' — User %1$s updated',
-                                'Site Health Info, %1$s = user'
+                        'label'    => \sprintf(
+                            /* translators: %1$s = user */
+                            _x( ' — User `%1$s` updated',
+                                'Site Health Info',
                             ),
-                            self::$cpanel_user
+                            self::$cpanel_user
                         ),
                         'value'    => $user_updated ? \wp_date( \get_option( 'date_format' ), $user_updated ) : '',
@@ -675 +794 @@
                     ],
                     'subaccounts'         => [
-                        'label' => _x( ' — Subaccounts {services}', 'Site Health Info' ) . ' (' . ( $subaccounts ? \count( \explode( ', ', $subaccounts ) ) : 0 ) . ')',
+                        'label' => _x( ' — Subaccounts {services}', 'Site Health Info' ) . ' (' . ( $subaccounts ? \count( \explode( ', ', $subaccounts ) ) : 0 ) . ')',
                         'value'    => $subaccounts,
                         'private'  => ! self::$is_debug,
@@ -685 +804 @@
                         'private'  => ! self::$is_debug,
                     ],
+
+
+
+
+
+
                     'mail_server'         => [
-                        'label' => _x( 'Mail Server & Storage Format', 'Site Health Info' ),
+                        'label' => _x( 'Mail Server & Storage Format', 'Site Health Info' ),
                         'value'    => \ucfirst( UAPI::server_info( 'mail_server' ) ) . ' ' . UAPI::server_info( 'mailbox_storage_format' ),
                         'private'  => false,
                     ],
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                     'webmail_apps'         => [
-                        'label' => _x( 'Webmail Applications', 'Site Health Info' ),
-                        'value'    => \implode( ',', UAPI::webmail_apps() ),
+                        'label' => _x( 'Webmail Applications', 'Site Health Info' ),
+                        'value'    => \implode( ',', UAPI::webmail_apps() ),
                         'private'  => false,
                     ],
                     'email_accounts_num'   => [
                         'label'    => _x( 'Number of email accounts', 'Site Health Info' ),
-                        'value'    => \number_format_i18n( UAPI::count_emails(), 0, '' ),
-                        'debug'    => UAPI::count_emails(),
+                        'value'    => \number_format_i18n( UAPI::count_emails(), 0, '' ),
+                        'debug'    => UAPI::count_emails(),
                         'private'  => false,
                     ],
@@ -704 +857 @@
                         'label'    => _x( 'Storage space used for emails', 'Site Health Info' ),
                         'value'    => \size_format( $emails_disk, 1 ),
-                        'debug'    => \str_replace( ',', '.', \size_format( $emails_disk, 2 ) ),
+                        'debug'    => \str_replace( ',', '.', \size_format( $emails_disk, 2 ) ),
                         'private'  => false,
                     ],
@@ -714 +867 @@
                             \number_format_i18n( $max_emails ),
                         ),
-                        'debug'    => $max_emails . '/h',
+                        'debug'    => $max_emails,
                         'private'  => false,
                     ],
@@ -732 +885 @@
                         'label'    => _x( ' — Addon domains', 'Site Health Info' ) . ' (' . \count( $addon_domains ) . ')',
                         'value'    => ( $addon_domains ? '● ' : '' ) . \implode( ', ● ', \array_map( 'idn_to_utf8', $addon_domains ) ),
-                        'debug'    => \count( $addon_domains ) ? \implode( ', ', $addon_domains ) : '(none)',
+                        'debug'    => \count( $addon_domains ) ? \implode( ', ', $addon_domains ) : '(none)',
                         'private'  => ! self::$is_debug,
                     ],
@@ -739 +892 @@
                         'label'    => _x( ' — Parked domains', 'Site Health Info' ) . ' (' . \count( $parked_domains ) . ')',
                         'value'    => ( $parked_domains ? '● ' : '' ) . \implode( ', ● ', \array_map( 'idn_to_utf8', $parked_domains ) ),
-                        'debug'    => \count( $parked_domains ) ? \implode( ', ', $parked_domains ) : '(none)',
+                        'debug'    => \count( $parked_domains ) ? \implode( ', ', $parked_domains ) : '(none)',
                         'private'  => ! self::$is_debug,
                     ],
@@ -746 +899 @@
                         'label'    => _x( ' — Dead domains', 'Site Health Info' ) . ' (' . \count( $dead_domains ) . ')',
                         'value'    => ( \count( $dead_domains ) ? '● ' : '' ) . \implode( ', ● ', \array_map( 'idn_to_utf8', $dead_domains ) ),
-                        'debug'    => \count( $dead_domains ) ? \implode( ', ', $dead_domains ) : '(none)',
+                        'debug'    => \count( $dead_domains ) ? \implode( ', ', $dead_domains ) : '(none)',
                         'private'  => ! self::$is_debug,
                     ],
                     'contacts'            => [
-                        'label' => _x( 'Contact email addresses', 'Site Health Info' ),
+                        'label' 'Site Health Info' ),
                         'value'    =>
                             ( $contacts->contact_email_2 ? '1. ' : '' ) .
@@ -762 +915 @@
             ];
 
-            if ( \is_multisite() ) {
-//              unset ( $debug_info[ self::$plugin->TextDomain ]['fields']['plugin_auto_updated'] );
+            if ( ! \is_super_admin() ) {
+                unset (
+                    $debug_info[ self::$plugin->TextDomain ]['fields']['addon_domains'],
+                    $debug_info[ self::$plugin->TextDomain ]['fields']['parked_domains'],
+                    $debug_info[ self::$plugin->TextDomain ]['fields']['dead_domains'],
+                );
             }
 
@@ -772 +929 @@
             }
 
-            if ( ! \defined( 'WF_CPANEL_HOST' ) && ! \defined( 'WF_CPANEL_USER' ) && ! self::$is_debug ) {
-                unset ( $debug_info[ self::$plugin->TextDomain ]['fields']['cpanel_host'] );
-            }
+          if ( ! \defined( 'WF_CPANEL_HOST' ) && ! \defined( 'WF_CPANEL_USER' ) && ! self::$is_debug ) {
+              unset ( $debug_info[ self::$plugin->TextDomain ]['fields']['cpanel_host'] );
+          }
 
             if ( $show_main ) {
@@ -981 +1138 @@
         ];
 
-        if ( ! self::email_mx_self( self::$main_domain ) ) {
+        if ( ! self::email_mx_self( self::$_domain ) ) {
 
             /* translators: 1: domain name */
-            $result['label'  ]          = \sprintf( _x( 'There will be issues receiving email from this server to addresses on \'%1$s\'.', 'Site Health Status Test Label' ),
-                \idn_to_utf8( self::$main_domain )
+            $result['label'  ]          = \sprintf( _x( 'There will be issues receiving email from this server to addresses on \'%1$s\'.',
+                    'Site Health Status Test Label',
+                ),
+                \idn_to_utf8( self::$site_domain ),
             );
             $result['status']          = 'critical';
@@ -994 +1153 @@
                 /* translators: 1: domain name */
                 \PHP_EOL . \sprintf( _x( 'You are advised to set the MX record for %1$s to point to this host or move the domain to this server.', 'Site Health Status Test Description' ),
-                '<code>' . self::$main_domain . '</code>'
+                '<code>' .  . '</code>'
             ) );
 
-            $result['actions'] .= \sprintf( _x( 'To receive emails: Set the MX records to hostnames specified by your hosting provider.', 'Site Health Status Test Action' ), self::$main_domain );
+            $result['actions'] .= \sprintf( _x( 'To receive emails: Set the MX records to hostnames specified by your hosting provider.',
+                'Site Health Status Test Action',
+                ),
+                \idn_to_utf8( self::$site_domain ),
+            );
         }
         return $result;

wf-cpanel-email-accounts/tags/5.3/includes/UAPI.php

@@ -320 +320 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
     public    static function maximum_emails(): int {
         return (int) self::result( 'Variables', 'get_user_information' )->maximum_emails_per_hour;
@@ -333 +346 @@
         foreach ( (array) self::result( 'Email', 'list_pops' ) as $account ) {
             $held += (int) self::queued_emails( $account->email );
+
+
+
         }
         return $held;

wf-cpanel-email-accounts/tags/5.3/index.php

@@ -7 +7 @@
  * Description:         🕸️ By WebFacing™. Lets you manage all email accounts, forwarders, autoresponders and also backup your hosting account. Let users manage their own email account, from admin or frontend, just by clicking a button.
  * Plugin URI:          https://webfacing.eu/
- * Version:             5.3.1
+ * Version:             5.3.
  * Author:              Knut Sparhell
  * Author URI:          https://profiles.wordpress.org/knutsp/
@@ -14 +14 @@
  * Requires PHP:        8.1
  * Requires at least:   6.5
- * Tested up to:        6.5.3
+ * Tested up to:        6.5.
  * Tested up to PHP:    8.3
  * Text Domain:         wf-cpanel-email-accounts

wf-cpanel-email-accounts/tags/5.3/readme.txt

@@ -4 +4 @@
 Tags: cpanel, email, auto-reply, backup, membership
 Requires at least: 6.5
-Tested up to: 6.5.3
+Tested up to: 6.5.
 Requires PHP: 8.1
 Tested up to PHP: 8.3
@@ -28 +28 @@
 === Current features ===
 
-* **NEW:** Dashboard widget with three live graphic server memory usage and server load gauge charts (can eassily be minimized or hidden via Screen Options or programatically)
+* **NEW Dashboard widget with three live graphic server memory usage and server load gauge charts (can eassily be minimized or hidden via Screen Options or programatically)
 * WP Block for frontend access user's own Webmail
 * Bulk entry of forwarders and email accounts (as free trial only, very limited use)
@@ -38 +38 @@
 * Semi automated migration to new email server, including setup of new accounts for users, with sending setup instructions, passwords and links to setup guides for most common email clients
 * Add 10 single Email Accounts per week (without Pro nag) -- actually unlimited
-* Delete single or multiple Email Accounts or other addresses
+* s
 * List mailboxes with number of messages for each box
 * Remove old messages from mailboxes (older than 52 weeks as default)
@@ -61 +61 @@
   - The `WF_CPANEL_API_TOKEN` constant may be removed when a new token is created and activated from the plugin admin page
 
-* Option to set the default visibility for users on the Add New Email screen (users may still set their own preferences):
+* Option to set the default visibility for users on New Email screen (users may still set their own preferences):
   - <code>add_filter( 'wf-cpanel-email-new-email_user-option', static function( bool $default, string $option, int $user_id ) {
-    if ( $option === 'wc-show-new-blackhole' /*or by $user_id*/ ) {
-        $default = true/*false*/;
-    }
-    return $default;
+if ( $option === 'wc-show-new-blackhole' /*or by $user_id*/ ) {
+$default = true/*false*/;
+}
+return $default;
 }, 10, 3 );</code>
 
@@ -82 +82 @@
   - <code>add_filter( 'wf_cpanel_email_widget_interval', static fn( int $interval ) => 45 );</code>
 
-* Option to limit email addresses to current site domain, even for single site admins, *one* of the following:
+* Option to limit email addresses to current site domain, even for single site admins, *one* of the following
   - <code>const WF_CPANEL_EMAIL_SITE_DOMAIN_ONLY = true;</code>
   - <code>define( 'WF_CPANEL_EMAIL_SITE_DOMAIN_ONLY', true );</code>
@@ -103 +103 @@
   - <code>const WF_CPANEL_HOST = 'my-host';</code>
   - <code>define( 'WF_CPANEL_HOST', 'my-host' );</code>
-  - Using `WF_CPANEL_HOST`requires `WF_CPANEL_USER`, and also the `WF_CPANEL_API_TOKEN` to be declared or defined temporarily.
-
-* Automaticallly create new email accounts when a new user is registered?
- - <code>add_action( 'user_register', static function( int $user_id, array $userdata ): void {
-    // What to do just after the registraton here, like this (adds an email address that forwards to all users, a mailing list):
-    if ( method_exists( 'WebFacing\cPanel\UAPI', 'add_forwarder' ) ) {
-        \WebFacing\cPanel\UAPI::add_forwarder( 'all-users@yoursite.tld, '$userdata['user_email'] );
-    }
-}, 2 );</code>
+  - 
+
+* Automaticallly create new accounts when a new user is registered?
+  <code>add_action( 'user_register', static function( int $user_id, array $userdata ): void {
+// What to do just after the registraton here, like this (adds an email address that forwards to all users, a mailing list):
+if ( method_exists( 'WebFacing\cPanel\UAPI', 'add_forwarder' ) ) {
+\WebFacing\cPanel\UAPI::add_forwarder( 'all-users@yoursite.tld, '$userdata['user_email'] );
+}
+}, 2 );</code>
 
 * Site Health
@@ -132 +132 @@
 * Maximum New Forwarders = 20, Maximum New Accounts = 5, weekly reset
 * Trial: Maximum New Forwarders as **bulk entry** = 4, Maximum New Accounts as **bulk entry** = 2
+
+
 * Any admin (if multisite, only network admins), or user with the filtered capability, on a site, can fully access <em>any</em> account on the cPanel® server instance
 * No AYS warnings for delete actions
@@ -172 +174 @@
 
 Yes. You need three constants (you must declare or define them in ´wp-config.php´ or in another plugin) <code>WF_CPANEL_HOST</code>,
-<code>WF_CPANEL_USER</code> and (temporarily) `WF_CPANEL_API_TOKEN`.
+<code>WF_CPANEL_USER</code> and (temporarily) 
 
 = Does it work without being on cPanel®? =
@@ -205 +207 @@
 == Changelog ==
 
+
+
+
+
+
+
+
+
+
 = 5.3 =
 
 - May 14, 2024
-- Add resource usage dashboard widget with 3 graphical gauge charts
+- Add resource usage dashboard widget with 3 grapical gauge charts
 
 = 5.2.9 =
 
 - May 12, 2024
-- Fix fatal error: Uncaught TypeError in `UAPI-php`.
+- Fix fatal error: Uncaught TypeError in .
 
 = 5.2.7 =
@@ -222 +233 @@
 
 - Nov 14, 2023
-- Fix fatal error: Uncaught TypeError in `UAPI-php`.
-- Fix warning: Attempt to read property "type" on null in `UAPI.php`.
+- Fix fatal error: Uncaught TypeError in .
+- Fix warning: Attempt to read property "type" on null in .
 
 = 5.2.5 =