Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop'

Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353

pandora_console/godmode/um_client/lib/UpdateManager/Client.php

@@ -666,6 +666,7 @@ class Client
             $target = __('console update %d', $request['version']);
         }
 
+        // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found
         curl_setopt(
             $ch,
             CURLOPT_PROGRESSFUNCTION,

pandora_console/include/class/ConsoleSupervisor.php

@@ -2359,12 +2359,17 @@ class ConsoleSupervisor
                 $message_conf_cron .= __('Please, make sure process is not locked.');
             }
 
+            $url = '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist';
+            if (is_metaconsole() === true) {
+                $url = '__url__index.php?sec=extensions&sec2=enterprise/extensions/cron';
+            }
+
             $this->notify(
                 [
                     'type'    => 'NOTIF.CRON.CONFIGURED',
                     'title'   => __('DiscoveryConsoleTasks is not configured.'),
                     'message' => __($message_conf_cron),
-                    'url'     => '__url__/index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist',
+                    'url'     => $url,
                 ]
             );
         } else {

pandora_console/include/functions_ui.php

@@ -4438,19 +4438,27 @@ function ui_print_standard_header(
         true
     );
     // Create the header.
-    $output = ui_print_page_header(
+    if (is_metaconsole() === true) {
-        $title,
+        $output = ui_meta_print_header(
-        $icon,
+            $title,
-        true,
+            false,
-        $help,
+            $options
-        $godmode,
+        );
-        $options,
+    } else {
-        false,
+        $output = ui_print_page_header(
-        '',
+            $title,
-        GENERIC_SIZE_TEXT,
+            $icon,
-        '',
+            true,
-        $headerInformation->printHeader(true)
+            $help,
-    );
+            $godmode,
+            $options,
+            false,
+            '',
+            GENERIC_SIZE_TEXT,
+            '',
+            $headerInformation->printHeader(true)
+        );
+    }
 
     if ($return !== true) {
         echo $output;

pandora_console/include/styles/notifications.css

@@ -0,0 +1,178 @@
+/*
+ * ---------------------------------------------------------------------
+ * - Notifications
+ * ---------------------------------------------------------------------
+ */
+
+#meta_total_container #header_discovery {
+  padding-left: 10px;
+}
+
+.notification-ball {
+  border-radius: 50%;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  color: #fff;
+  font-weight: bold;
+}
+
+.notification-ball.notification-ball-new-messages:hover {
+  box-shadow: 0 0 3px #888;
+}
+
+.notification-ball-no-messages {
+  background-color: #82b92e;
+  cursor: pointer;
+}
+.notification-ball-new-messages {
+  background-color: #e63c52;
+}
+
+#notification-wrapper {
+  background: white;
+  border: #a5a5a5 solid 1px;
+  z-index: 900000;
+  position: absolute;
+  width: 550px;
+  margin-top: -5px;
+  border-radius: 5px;
+}
+#notification-wrapper::before {
+  content: "";
+  display: block;
+  position: absolute;
+  width: 0px;
+  height: 0;
+  border-color: transparent;
+  border-width: 12px;
+  border-style: solid;
+  bottom: 100%;
+  left: calc(58% - 7px);
+  margin-left: -12px;
+  border-bottom-color: white;
+}
+#notification-wrapper-inner {
+  max-height: 400px;
+  overflow: auto;
+}
+#notification-wrapper-shadow {
+  height: 100%;
+  width: 100%;
+  background: #111;
+  position: fixed;
+  z-index: 9009;
+  top: 0;
+  opacity: 0.3;
+}
+.notification-item {
+  background: whitesmoke;
+  height: 100px;
+  margin: 7px;
+  border: #e4e4e4 solid 1px;
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  padding: 5px;
+}
+.notification-item:hover {
+  border: #ccc solid 1px;
+  text-decoration: none;
+}
+.notification-item > * {
+  padding-left: 15px;
+  pointer-events: none;
+}
+.notification-item > img {
+  width: 75px;
+}
+
+.notification-info {
+  width: 87%;
+  display: flex;
+  flex-flow: column nowrap;
+  overflow: hidden;
+  max-height: 83px;
+  line-height: 1.4em;
+}
+.notification-item img {
+  max-width: 100%;
+  max-height: 100%;
+}
+.notification-title {
+  margin: 0;
+}
+
+h4.notification-title {
+  font-size: 13px;
+  color: #3f3f3f;
+  text-transform: none;
+}
+
+.notification-subtitle,
+.color-black-grey {
+  color: #373737;
+}
+
+.global-config-notification-title {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.global-config-notification-title h2 {
+  margin-left: 10px;
+}
+
+.global-config-notification-checkboxes :first-child {
+  font-weight: bold;
+}
+
+.global-config-notification-selectors {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+}
+
+.global-config-notification-selectors h4 {
+  margin: 0;
+}
+
+.global-config-notification-single-selector,
+.global_config_notifications_dialog_add select {
+  display: flex;
+  width: 100%;
+  padding: 0 10px;
+}
+
+.global-config-notification-single-selector :first-child,
+.global-config-notification-single-selector :first-child select {
+  width: 99%;
+}
+
+.global-config-notification-single-selector :last-child,
+.global_config_notifications_dialog_add_wrapper {
+  flex-direction: column;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.global_config_notifications_dialog_add {
+  display: flex;
+  flex-direction: row;
+  margin: 8px;
+}
+
+.global_config_notifications_two_ways_form_arrows {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  margin: 0 5px;
+}
+
+.global_config_notifications_two_ways_form_arrows img {
+  margin: 15px 0;
+}

pandora_console/operation/messages/message_edit.php

@@ -29,9 +29,9 @@
 // Begin.
 global $config;
 
-require_once 'include/functions_users.php';
+require_once $config['homedir'].'/include/functions_users.php';
-require_once 'include/functions_groups.php';
+require_once $config['homedir'].'/include/functions_groups.php';
-require_once 'include/functions_io.php';
+require_once $config['homedir'].'/include/functions_io.php';
 
 // Parse parameters.
 $send_mes     = (bool) get_parameter('send_mes', false);
@@ -82,6 +82,10 @@ $buttons['create_message'] = [
 ];
 
 // Header.
+if (is_metaconsole() === true) {
+    enterprise_hook('open_meta_frame');
+}
+
 ui_print_standard_header(
     __('Compose message'),
     'images/email_mc.png',
@@ -400,3 +404,6 @@ html_print_div(
 
 echo '</form>';
 echo $jsOutput;
+if (is_metaconsole() === true) {
+    enterprise_hook('close_meta_frame');
+}

pandora_console/operation/messages/message_list.php

@@ -27,10 +27,10 @@
  */
 
 // Begin.
-require_once 'include/functions_messages.php';
-
 global $config;
 
+require_once $config['homedir'].'/include/functions_messages.php';
+
 $delete_msg = get_parameter('delete_message', 0);
 $multiple_delete = get_parameter('multiple_delete', 0);
 $show_sent = (bool) get_parameter('show_sent', false);
@@ -68,6 +68,10 @@ $buttons['create_message'] = [
 ];
 
 if (is_ajax() === false) {
+    if (is_metaconsole() === true) {
+        enterprise_hook('open_meta_frame');
+    }
+
     // Header.
     ui_print_standard_header(
         $tabSelectedMessage,
@@ -300,6 +304,10 @@ echo "<div class='float-right'>";
         html_print_submit_button(__('Create message'), 'create', false, 'class="sub next mrgn_right_5px"');
     echo '</form>';
 echo '</div>';
+
+if (is_ajax() !== true && is_metaconsole() === true) {
+    enterprise_hook('close_meta_frame');
+}
 ?>
 
 <script type="text/javascript">