diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index bba8284267..004c947af4 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -1013,12 +1013,11 @@ ui_require_jquery_file('bgiframe');
         });
 
         paint_qrcode(
-            "
-    <?php
-    echo ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente);
-    ?>
-   ",
-            "#qr_code_agent_view", 128, 128);
+            "<?php echo ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente); ?>",
+            "#qr_code_agent_view",
+            128,
+            128
+        );
         $("#text-agente").prop('disabled', true);
 
     });
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 3e876a448f..c29cda623b 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -292,24 +292,17 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 
 <script type="text/javascript">
 $(document).ready (function () {
-    <?php
-    if ($id_command) {
-        ?>
-        original_command = "
-        <?php
-        $command = alerts_get_alert_command_command($id_command);
-            $command = io_safe_output($command);
-            echo addslashes($command);
-        ?>
-   ";
-        render_command_preview (original_command);
+    var original_command;
+    var origicommand_descriptionnal_command;
+
+    if (<?php echo (int) $id_command; ?>) {
+        original_command = "<?php echo addslashes(io_safe_output(alerts_get_alert_command_command($id_command))); ?>";
+        render_command_preview(original_command);
         command_description = "<?php echo str_replace("\r\n", '<br>', addslashes(io_safe_output(alerts_get_alert_command_description($id_command)))); ?>";
         
         render_command_description(command_description);
-        <?php
     }
-    ?>
-    
+
     $("#id_command").change (function () {
         values = Array ();
         values.push({
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 484ff23dab..38584d6b6a 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3737,11 +3737,7 @@ function set_last_value_period() {
     if (checked) {
         $("#row_period").hide();
         period_set_value($("#hidden-period").attr('class'), 0);
-        alert("
-    <?php
-    echo __('Warning: period 0 reports cannot be used to show information back in time. Information contained in this kind of reports will be always reporting the most recent information');
-    ?>
-   ");
+        alert("<?php echo __('Warning: period 0 reports cannot be used to show information back in time. Information contained in this kind of reports will be always reporting the most recent information'); ?>");
     }
     else {
         $("#row_period").show();
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 4beaba6e44..07d4a083fa 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -682,13 +682,7 @@ function toggleFormFilter() {
 function message_check_sort_items() {
     var return_value = false;
     
-    return_value = confirm("
-    <?php
-    echo __(
-        "Are you sure to sort the items into the report?\\n".'This action change the sorting of items into data base.'
-    );
-    ?>
-  ");
+    return_value = confirm('<?php echo __("Are you sure to sort the items into the report?\\n. This action change the sorting of items into data base."); ?>');
     
     return return_value;
 }
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index a0c2fe60f5..2d6d58c439 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1460,77 +1460,52 @@ $(".logo_preview").click (function(e) {
         title: "<?php echo __('Logo preview'); ?>"
     };
 
+    var homeUrl = "<?php echo $config['homeurl']; ?>";
+    var homeUrlEnt = homeUrl + "<?php echo enterprise_installed() ? 'enterprise/' : ''; ?>";
+
     // Fill it seing the target has been clicked
     switch (e.target.id) {
         case 'button-custom_logo_preview':
             icon_name = $("select#custom_logo option:selected").val();
-            icon_path = "
-            <?php
-            echo $config['homeurl'];
-            if (enterprise_installed()) {
-                echo 'enterprise/';
-            }
-            ?>
-            images/custom_logo/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_logo/" + icon_name;
             options.grayed = true;
             break;
         case 'button-custom_logo_white_bg_preview':
             icon_name = $("select#custom_logo_white_bg option:selected").val();
-            icon_path = "
-            <?php
-            echo $config['homeurl'];
-            if (enterprise_installed()) {
-                echo 'enterprise/';
-            }
-            ?>
-            images/custom_logo/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_logo/" + icon_name;
             break;
         case 'button-custom_logo_login_preview':
             icon_name = $("select#custom_logo_login option:selected").val();
-            icon_path = "
-            <?php
-            echo $config['homeurl'];
-            if (enterprise_installed()) {
-                echo 'enterprise/';
-            }
-            ?>
-            images/custom_logo_login/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_logo_login/" + icon_name;
             options.grayed = true;
             break;
         case 'button-custom_splash_login_preview':
             icon_name = $("select#custom_splash_login option:selected").val();
-            icon_path = "
-            <?php
-            echo $config['homeurl'];
-            if (enterprise_installed()) {
-                echo 'enterprise/';
-            }
-            ?>
-            images/custom_splash_login/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_splash_login/" + icon_name;
             options.title = "<?php echo __('Splash Preview'); ?>";
             break;
         case 'button-custom_docs_logo_preview':
             icon_name = $("select#custom_docs_logo option:selected").val();
-            icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_general_logos/" + icon_name;
             options.grayed = true;
             break;
         case 'button-custom_support_logo_preview':
             icon_name = $("select#custom_support_logo option:selected").val();
-            icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_general_logos/" + icon_name;
             options.grayed = true;
             break;
         case 'button-custom_network_center_logo_preview':
             icon_name = $("select#custom_network_center_logo option:selected").val();
-            icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_general_logos/" + icon_name;
             break;
         case 'button-custom_mobile_console_logo_preview':
             icon_name = $("select#custom_mobile_console_logo option:selected").val();
-            icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+            icon_path = homeUrlEnt + "images/custom_general_logos/" + icon_name;
             options.title = "<?php echo __('Mobile console logo preview'); ?>";
             break;
         case 'button-login_background_preview':
             icon_name = $("select#login_background option:selected").val();
-            icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
+            icon_path = homeUrl + "images/backgrounds/" + icon_name;
             options.title = "<?php echo __('Background preview'); ?>";
             break;
     }
@@ -1541,7 +1516,7 @@ $(".logo_preview").click (function(e) {
 
 $("#button-gis_icon_preview").click (function (e) {
     var icon_prefix = $("select#gis_default_icon option:selected").val();
-    var icon_path = "<?php echo $config['homeurl']; ?>/images/gis_map/icons/" + icon_prefix;
+    var icon_path = homeUrl + "images/gis_map/icons/" + icon_prefix;
 
     if (icon_prefix == "")
         return;
diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 9df713145a..79f9a72d2e 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -55,15 +55,17 @@ $baseurl = ui_get_full_url(false, false, false, false);
     var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
     var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
     var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-    var text4_mr_file = "
-    <?php
-    if ($config['language'] == 'es') {
-        echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
-    } else {
-        echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
-    }
-    ?>
- ";
+
+    var language = "<?php echo $config['language']; ?>";
+    var docsUrl = (language === "es")
+        ? "http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29"
+        : "http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29";
+    var text4_mr_file = "<?php echo __(' to this process'); ?>";
+    text4_mr_file += "<br><br>";
+    text4_mr_file += "<a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"" + docsUrl + "\">";
+    text4_mr_file += "<?php echo __('About minor release update'); ?>";
+    text4_mr_file += "</a>";
+
     var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
     var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
     var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";
@@ -86,4 +88,4 @@ $baseurl = ui_get_full_url(false, false, false, false);
 
 <script type="text/javascript">
     form_upload("<?php echo $baseurl; ?>");
-</script>
\ No newline at end of file
+</script>
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 47e70bb5fd..74522175b8 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -364,15 +364,18 @@ function update_manager_check_online_free_packages($is_ajax=true)
                     var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
                     var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
                     var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
-                    var text4_mr_file = "
-                <?php
-                if ($config['language'] == 'es') {
-                    echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
-                } else {
-                    echo __(' to this process').'<br><br><a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29\">'.__('About minor release update').'</a>';
-                }
-                ?>
-     ";
+
+                    var language = "<?php echo $config['language']; ?>";
+                    var docsUrl = (language === "es")
+                        ? "http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29"
+                        : "http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29";
+
+                    var text4_mr_file = "<?php echo __(' to this process'); ?>";
+                    text4_mr_file += "<br><br>";
+                    text4_mr_file += "<a style=\"font-size:10pt;font-style:italic;\" target=\"blank\" href=\"" + docsUrl + "\">";
+                    text4_mr_file += "<?php echo __('About minor release update'); ?>";
+                    text4_mr_file += "</a>";
+
                     var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
                     var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
                     var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";
@@ -995,4 +998,3 @@ function update_manger_set_deleted_message($message_id)
     // Mark as read too
     update_manger_set_read_message($message_id, 1);
 }
-
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 94ffbd4739..47c83f2dd1 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -481,12 +481,7 @@ if ($config['pure'] == 0 || $meta) {
     ?>
     <script type="text/javascript">
         function openSoundEventWindow() {
-            url = '
-    <?php
-    echo ui_get_full_url('operation/events/sound_events.php');
-    ?>
-    ';
-            
+            url = "<?php echo ui_get_full_url('operation/events/sound_events.php'); ?>";
             window.open(url, '<?php __('Sound Alerts'); ?>','width=600, height=450, toolbar=no, location=no, directories=no, status=no, menubar=no, resizable=no'); 
         }
     </script>
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 1763b624bc..45a436a127 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -350,15 +350,13 @@ if (check_acl($config['id_user'], 0, 'ER')
     ?>
     <script type="text/javascript">
     function openSoundEventWindow() {
-        url = '
-    <?php
-    echo ui_get_full_url('operation/events/sound_events.php');
-    ?>
-   ';
+        url = '<?php echo ui_get_full_url('operation/events/sound_events.php'); ?>';
         
-        window.open(url,
+        window.open(
+            url,
             '<?php __('Sound Alerts'); ?>',
-            'width=600, height=450, resizable=no, toolbar=no, location=no, directories=no, status=no, menubar=no');
+            'width=600, height=450, resizable=no, toolbar=no, location=no, directories=no, status=no, menubar=no'
+        );
     }
     </script>
     <?php
@@ -535,4 +533,3 @@ $operation_menu_array = $menu_operation;
 if (!$config['pure']) {
     menu_print_menu($menu_operation, true);
 }
-