Minor updates

Author: sergejey

modules/linkedobject/linkedobject.class.php

@@ -140,7 +140,7 @@ function run()
         if ($op == 'redirect') {
             $device_id = gr('device_id', 'int');
             if ($device_id) {
-                redirect(ROOTHTML . 'panel/devices/' . $device_id . '.html?tab=settings');
+                redirect(ROOTHTML . 'panel/devices/' . $device_id . '.html?tab=settings','',1);
             }
 
             $object = gr('object');

modules/objects/objects.class.php

@@ -297,28 +297,22 @@ function delete_objects($id)
         $rec = SQLSelectOne("SELECT * FROM objects WHERE ID='$id'");
 
         // DELETE LINKED OBJECT FROM ALL TABLES
-        if (function_exists('array_key_first')) {
-            $tables = SQLSelect("SHOW TABLES;");
-            $total = count($tables);
-            for ($i = 0; $i < $total; $i++) {
-                $table_name = $tables[$i][array_key_first($tables[$i])];
-                $row = SQLSelectOne("SELECT * FROM " . $table_name);
-                if (!isset($row['LINKED_OBJECT'])) continue;
-                $rows = SQLSelect("SELECT * FROM $table_name WHERE LINKED_OBJECT = '" . DBSafe($rec['TITLE']) . "'");
-                if (isset($rows[0]['ID'])) {
-                    $total_rows = count($rows);
-                    for ($ir = 0; $ir < $total_rows; $ir++) {
-                        $rows[$ir]['LINKED_OBJECT'] = '';
-                        if (isset($rows[$ir]['LINKED_PROPERTY'])) {
-                            $rows[$ir]['LINKED_PROPERTY'] = '';
-                        }
-                        if (isset($rows[$ir]['LINKED_METHOD'])) {
-                            $rows[$ir]['LINKED_METHOD'] = '';
-                        }
-                        if (isset($rows[$ir]['ID'])) {
-                            SQLUpdate($table_name, $rows[$ir]);
-                        }
+        $tables = SQLSelect("SELECT DISTINCT TABLE_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE COLUMN_NAME IN ('LINKED_OBJECT') AND TABLE_SCHEMA='" . DB_NAME . "';");
+        $total = count($tables);
+        for ($i = 0; $i < $total; $i++) {
+            $table_name = $tables[$i]['TABLE_NAME'];
+            $rows = SQLSelect("SELECT * FROM $table_name WHERE LINKED_OBJECT = '" . DBSafe($rec['TITLE']) . "'");
+            if (isset($rows[0]['ID'])) {
+                $total_rows = count($rows);
+                for ($ir = 0; $ir < $total_rows; $ir++) {
+                    $rows[$ir]['LINKED_OBJECT'] = '';
+                    if (isset($rows[$ir]['LINKED_PROPERTY'])) {
+                        $rows[$ir]['LINKED_PROPERTY'] = '';
+                    }
+                    if (isset($rows[$ir]['LINKED_METHOD'])) {
+                        $rows[$ir]['LINKED_METHOD'] = '';
                     }
+                    SQLUpdate($table_name, $rows[$ir]);
                 }
             }
         }

templates/panel.html

@@ -97,7 +97,7 @@
 						<li><a href="<#ROOTHTML#>pages.html" target="_blank"><i class="glyphicon glyphicon-th-list"></i> <#LANG_MODULE_LAYOUTS#></a></li>
 						<li><a href="<#ROOTHTML#>apps.html" target="_blank"><i class="glyphicon glyphicon-th-list"></i> <#LANG_SECTION_APPLICATIONS#></a></li>
 						<li><a href="<#ROOTHTML#>menu.html" target="_blank"><i class="glyphicon glyphicon-th-list"></i> <#LANG_CONTROL_MENU#></a></li>
-						<li><a href="<#ROOTHTML#>devices.html" target="_blank"><i class="glyphicon glyphicon-th-list"></i> <#LANG_DEVICES#></a></li>
+						<li><a href="<#ROOTHTML#>apps/devices.html" target="_blank"><i class="glyphicon glyphicon-th-list"></i> <#LANG_DEVICES#></a></li>
 					</ul>
 				</li>
 				[#if HIDE_LEFT_PANEL="1"#]