Mainenance change and link to module site

* Maintenance script update to clear incorrect values/history * Link to module site in Control Panel
sergejey · Oct 1, 2021 · 95b34ff · 95b34ff
1 parent 60f8e14
commit 95b34ff
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/languages/default.php b/languages/default.php
@@ -1373,6 +1373,7 @@
     'DID_YOU_KNOW' => 'Did you know that...',
     'NEWS' => 'MajorDoMo News',
     'KNOWLEDGE_BASE' => 'Knowledge Base',
+    'MODULE_SUPPORT' => 'Support for',
     'ACTIVITIES' => 'Activities',
     'COMMANDS' => 'Commands',
     'ADDON_FILE' => 'Addon package',

diff --git a/languages/ru.php b/languages/ru.php
@@ -1369,6 +1369,7 @@
     'DID_YOU_KNOW' => 'А знаете ли вы что...',
     'NEWS' => 'Новости MajorDoMo',
     'KNOWLEDGE_BASE' => 'База знаний',
+    'MODULE_SUPPORT' => 'Сайт модуля',
     'ACTIVITIES' => 'Поведение',
     'COMMANDS' => 'Команды',
     'ADDON_FILE' => 'Файл дополнения',

diff --git a/scripts/startup_maintenance.php b/scripts/startup_maintenance.php
@@ -13,6 +13,13 @@
  * @version 0.1 (auto-set)
  */
 
+if (!function_exists('DebMes')) {
+    chdir(dirname(__FILE__) . '/../');
+    include_once("./config.php");
+    include_once("./lib/loader.php");
+    include_once("./load_settings.php");
+}
+
 echo "<pre>\n";
 
 DebMes("Running maintenance script");
@@ -52,7 +59,7 @@
 echo "Target: " . $target_dir . PHP_EOL;
 echo "Full backup: " . $full_backup . PHP_EOL;
 
-sleep(5);
+sleep(2);
 
 //removing old log files
 if (defined('SETTINGS_SYSTEM_DEBMES_PATH') && SETTINGS_SYSTEM_DEBMES_PATH != '') {
@@ -149,12 +156,9 @@
 // CHECK/REPAIR/OPTIMIZE TABLES
 $tables = SQLSelect("SHOW TABLES FROM `" . DB_NAME . "`");
 $total = count($tables);
-
 for ($i = 0; $i < $total; $i++) {
     $table = $tables[$i]['Tables_in_' . DB_NAME];
-
     echo 'Checking table [' . $table . '] ...';
-
     if ($result = SQLExec("CHECK TABLE " . $table . ";")) {
         echo "OK\n";
     } else {
@@ -176,13 +180,22 @@
 
 
 // removing incorrect pvalues
-$sqlQuery = "SELECT pvalues.*, properties.ID AS PROP_ID  FROM `pvalues` LEFT JOIN properties ON pvalues.PROPERTY_ID=properties.ID WHERE IsNull(properties.ID)";
+$sqlQuery = "SELECT pvalues.*, properties.ID AS PROP_ID, objects.ID as OBJ_ID  FROM `pvalues` LEFT JOIN properties ON pvalues.PROPERTY_ID=properties.ID LEFT JOIN objects ON pvalues.OBJECT_ID=objects.ID";
 $data = SQLSelect($sqlQuery);
 $total = count($data);
+$found_pvalues=array();
 for ($i = 0; $i < $total; $i++) {
-    echo "Removing incorrect property value: " . $data[$i]['PROPERTY_NAME'] . PHP_EOL;
-    SQLExec("DELETE FROM phistory WHERE VALUE_ID=" . $data[$i]['ID']);
-    SQLExec("DELETE FROM pvalues WHERE ID=" . $data[$i]['ID']);
+    if (!$data[$i]['PROP_ID'] || !$data[$i]['OBJ_ID']) {
+     echo "Removing incorrect property value: " . $data[$i]['PROPERTY_NAME'] . PHP_EOL;
+     SQLExec("DELETE FROM phistory WHERE VALUE_ID=" . $data[$i]['ID']);
+     SQLExec("DELETE FROM pvalues WHERE ID=" . $data[$i]['ID']);
+    } else {
+        $found_pvalues[]=$data[$i]['ID'];
+    }
+}
+if (isset($found_pvalues[0])) {
+    $sqlQuery = "DELETE FROM phistory WHERE VALUE_ID NOT IN (".implode(',',$found_pvalues).")";
+    $data=SQLExec($sqlQuery);
 }
 
 // fixing property names

diff --git a/templates/panel.html b/templates/panel.html
@@ -1122,8 +1122,9 @@ <h4 class="panel-title">
 									<button style="vertical-align: super;" type="button" onclick="window.open('<#LANG_KB_URL#><#ACTION#>_help/?utm_source=system&utm_medium=help&utm_campaign=<#ACTION#>Help', '_blank');" class="btn btn-default"><#LANG_KNOWLEDGE_BASE#></button>
 								</div>
 								--->
-								<a href="javascript://" onclick="consoleDebugToggle();" style="text-decoration: none;margin-right: 15px;color: #d74b4b;"><i class="glyphicon glyphicon-screenshot" style="vertical-align: top;"></i> Debug</a>
-								<a href="<#LANG_KB_URL#><#ACTION#>_help/?utm_source=system&utm_medium=help&utm_campaign=<#ACTION#>Help" target="_blank"><i class="glyphicon glyphicon-question-sign" style="vertical-align: top;"></i> <#LANG_KNOWLEDGE_BASE#></a>
+								<a href="javascript://" onclick="consoleDebugToggle();" style="text-decoration: none;margin-right: 15px;color: #d74b4b;"><i class="glyphicon glyphicon-screenshot"></i> Debug</a>
+								<a href="<#LANG_KB_URL#><#ACTION#>_help/?utm_source=system&utm_medium=help&utm_campaign=<#ACTION#>Help" target="_blank"><i class="glyphicon glyphicon-question-sign"></i> <#LANG_KNOWLEDGE_BASE#></a>
+								<a href="https://connect.smartliving.ru/addons/name/<#ACTION#>.html?utm_source=system&utm_medium=help&utm_campaign=<#ACTION#>Help" target="_blank"><i class="glyphicon glyphicon-info-sign"></i> <#LANG_MODULE_SUPPORT#> [#NAV_MODULE_NAME#]</a>
 							</li>
 							[#else#]
 							<li>