Merge pull request #1002 from SmoKE585/alpha

Уменьшено в 20 раз количество запросов к БД

Author: sergejey

modules/panel.class.php

@@ -11,6 +11,8 @@ class panel extends module
 {
 
     var $action;
+    var $print;
+    var $ajax;
 
 // --------------------------------------------------------------------
     function __construct()
@@ -126,7 +128,7 @@ function run()
             include_once(DIR_MODULES . 'inc_panel_ajax.php');
         }
 
-        if ($this->print || $_GET['print']) {
+        if ($this->print || (isset($_GET['print']) && $_GET['print'])) {
             $this->print = 1;
             $out['PRINT'] = 1;
         }
@@ -156,7 +158,9 @@ function run()
             $modules = SQLSelect($sqlQuery);
             $old_cat = 'some_never_should_be_category_name';
             $modulesCnt = count($modules);
-
+			
+			$getNOTY = SQLSelect("select pln.*, pl.MODULE_NAME from plugins_noty pln join plugins pl on pln.PLUGINS_ID=pl.id WHERE pln.READ = '0'");
+			
             for ($i = 0; $i < $modulesCnt; $i++) {
                 if ($modules[$i]['NAME'] == $this->action) {
                     $modules[$i]['SELECTED'] = 1;
@@ -177,29 +181,29 @@ function run()
                     $last_allow = $i;
                 }
 
-				if(preg_match('|<#(.*?)#>|si', $modules[$i]['TITLE'], $arr)) {
-					$titleSearchNoty = constant($arr[1]);
-				} else {
-					$titleSearchNoty = $modules[$i]['NAME'];
-				}
-			
-				$getNOTY = SQLSelect("SELECT * FROM `plugins_noty` WHERE `PLUGINS_ID` = (SELECT ID FROM `plugins` WHERE `MODULE_NAME` = '".$titleSearchNoty."') AND `READ` = 0 ORDER BY `ADD` DESC LIMIT 10");
+				foreach($getNOTY as $keyNoty => $notyValue) {
+					if($notyValue['MODULE_NAME'] == $modules[$i]["NAME"]) {
 
-				if(!empty($getNOTY)) {
-					$modules[$i]['PLUGINS_NOTY_COUNT'] = count($getNOTY);
-					$modules[$i]['PLUGINS_NOTY_COLOR'] = $getNOTY[0]['TYPE'];
-					$modules[$i]['PLUGINS_ID'] = $getNOTY[0]['PLUGINS_ID'];
+						if(preg_match('|<#(.*?)#>|si', $notyValue['MODULE_NAME'], $arr)) {
+							$titleSearchNoty = constant($arr[1]);
+						} else {
+							$titleSearchNoty = $notyValue['MODULE_NAME'];
+						}
 
-					foreach($getNOTY as $keyNoty => $noty) {
-						$getNOTY[$keyNoty]['ADD_HUMAN'] = date('d.m.Y H:i', $noty['ADD']);
+						$modules[$i]['PLUGINS_NOTY_COUNT'] = $modules[$i]['PLUGINS_NOTY_COUNT']+1;
+						$modules[$i]['PLUGINS_NOTY_COLOR'] = $notyValue['TYPE'];
+						$modules[$i]['PLUGINS_ID'] = $notyValue['PLUGINS_ID'];
+						
+						$getNOTY[$keyNoty]['ADD_HUMAN'] = date('d.m.Y H:i', $notyValue['ADD']);
+						
+						$modules[$i]['PLUGINS_NOTY'][] = $getNOTY[$keyNoty];
+
+						unset($getNOTY[$keyNoty]);
+					} else {
+						$modules[$i]['PLUGINS_ID'] = $notyValue['PLUGINS_ID'] ?? null;
 					}
-					
-					$modules[$i]['PLUGINS_NOTY'] = $getNOTY;
-				} else {
-					$modules[$i]['PLUGINS_NOTY_COUNT'] = 0;
-					$modules[$i]['PLUGINS_ID'] = $getNOTY[0]['PLUGINS_ID'];
 				}
-				
+	
                 if (file_exists(ROOT . 'img/modules/' . $modules[$i]['NAME'] . '.png')) {
                     $modules[$i]['ICON_SM'] = ROOTHTML . 'img/modules/' . $modules[$i]['NAME'] . '.png';
                 } else {