Changeset 873 for trunk/Modules/System/System.php

Timestamp:

Apr 6, 2020, 11:17:40 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

• trunk/Modules/System/System.php (modified) (13 diffs)

trunk/Modules/System/System.php

@@ -39 +39 @@
 
     $DbResult = $this->Database->query($Query);
-    while($Module = $DbResult->fetch_assoc())
-    {
-      if($Module['Dependencies'] != '') $Dependencies = $Module['Dependencies'];
+    while ($Module = $DbResult->fetch_assoc())
+    {
+      if ($Module['Dependencies'] != '') $Dependencies = $Module['Dependencies'];
       else $Dependencies = ' ';
-      if($Module['Installed'] == 1) $Installed = 'Ano';
+      if ($Module['Installed'] == 1) $Installed = 'Ano';
       else $Installed = 'Ne';
-      if($Module['Installed'] == 1) $Actions = '<a href="?A=Uninstall&amp;Id='.$Module['Id'].'">Odinstalovat</a>';
+      if ($Module['Installed'] == 1) $Actions = '<a href="?A=Uninstall&amp;Id='.$Module['Id'].'">Odinstalovat</a>';
       else $Actions = '<a href="?A=Install&amp;Id='.$Module['Id'].'">Instalovat</a>';
       $Output .= '<tr><td>'.$Module['Name'].'</td>'.
@@ -59 +59 @@
     $Output .= $PageList['Output'];
     $Output .= '<p><a href="?A=SaveToDb">Uložit do databáze</a></p>';
-    return($Output);
+    return ($Output);
   }
 
@@ -65 +65 @@
   {
     $Output = '';
-    if(array_key_exists('A', $_GET))
-    {
-      if($_GET['A'] == 'SaveToDb')
+    if (array_key_exists('A', $_GET))
+    {
+      if ($_GET['A'] == 'SaveToDb')
       {
         $Output .= $this->System->ModuleManager->Modules['System']->SaveToDatabase();
         $Output .= $this->SystemMessage('Načtení modulů', 'Seznam modulů v databázi zaktualizován');
       } else
-      if($_GET['A'] == 'Install')
+      if ($_GET['A'] == 'Install')
       {
         $this->System->ModuleManager->LoadModules(false);
         $ModuleName = $this->System->ModuleManager->SearchModuleById($_GET['Id']);
-        if($ModuleName != '')
+        if ($ModuleName != '')
         {
           $this->System->Modules[$ModuleName]->Install();
@@ -83 +83 @@
 
       } else
-      if($_GET['A'] == 'Uninstall')
+      if ($_GET['A'] == 'Uninstall')
       {
         $ModuleName = $this->System->ModuleManager->SearchModuleById($_GET['Id']);
-        if($ModuleName != '')
+        if ($ModuleName != '')
         {
           $this->System->ModuleManager->Modules[$ModuleName]->UnInstall();
@@ -94 +94 @@
     }
     $Output .= $this->ShowList();
-    return($Output);
+    return ($Output);
   }
 }
@@ -408 +408 @@
   function IsInstalled()
   {
-    if($this->InstalledChecked == false)
+    if ($this->InstalledChecked == false)
     {
       $DbResult = $this->Database->query('SELECT table_name FROM information_schema.tables
 WHERE table_schema = "'.$this->Database->Database.'" AND table_name = "SystemVersion";');
-      if($DbResult->num_rows > 0) $this->Installed = true;
+      if ($DbResult->num_rows > 0) $this->Installed = true;
         else $this->Installed = false;
       $this->InstalledChecked = true;
     }
-    return($this->Installed);
+    return ($this->Installed);
   }
 
   function ModuleChange($Module)
   {
-    //if($this->IsInstalled())
-    {
-
-      if($Module->IsInstalled()) $Installed = 1;
+    //if ($this->IsInstalled())
+    {
+
+      if ($Module->IsInstalled()) $Installed = 1;
         else $Installed = 0;
       $this->Database->query('UPDATE `Module` SET `Installed`=1 WHERE `Name`="'.$Module->Name.'"');
@@ -436 +436 @@
     $Query = 'SELECT `Id`, `Name`,`Installed` FROM `Module`';
     $DbResult = $this->Database->query($Query);
-    while($Module = $DbResult->fetch_array())
+    while ($Module = $DbResult->fetch_array())
     {
       //echo($Module['Name'].',');
@@ -453 +453 @@
     $Modules = array();
     $DbResult = $this->Database->query('SELECT * FROM `Module`');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Modules[$DbRow['Name']] = $DbRow;
-      if($this->System->ModuleManager->ModulePresent($DbRow['Name']))
+      if ($this->System->ModuleManager->ModulePresent($DbRow['Name']))
         $this->System->ModuleManager->Modules[$DbRow['Name']]->Id = $DbRow['Id'];
     }
 
     // Add missing
-    foreach($this->System->ModuleManager->Modules as $Module)
-    {
-      if(!array_key_exists($Module->Name, $Modules))
+    foreach ($this->System->ModuleManager->Modules as $Module)
+    {
+      if (!array_key_exists($Module->Name, $Modules))
       {
         $this->Database->insert('Module', array('Name' => $Module->Name,
@@ -480 +480 @@
 
     // Remove exceeding
-    foreach($Modules as $Module)
-    if(!$this->System->ModuleManager->ModulePresent($Module['Name']))
+    foreach ($Modules as $Module)
+    if (!$this->System->ModuleManager->ModulePresent($Module['Name']))
     {
       $Output .= 'Removing module '.$Module['Name'].' from list</br/>';
@@ -487 +487 @@
       $this->Database->query('DELETE FROM `ModuleLink` WHERE `LinkedModule` = '.$Module['Id']);
       $DbResult = $this->Database->query('SELECT Id FROM `PermissionOperation` WHERE `Module` = '.$Module['Id']);
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
       {
         $this->Database->query('DELETE FROM `PermissionGroupAssignment` WHERE `AssignedOperation` = '.$DbRow['Id']);
@@ -495 +495 @@
       $this->Database->query('DELETE FROM `Model` WHERE `Module` = '.$Module['Id']);
       $DbResult = $this->Database->query('SELECT Id FROM `Model` WHERE `Module` = '.$Module['Id']);
-      while($DbRow = $DbResult->fetch_assoc())
+      while ($DbRow = $DbResult->fetch_assoc())
         $this->Database->query('DELETE FROM `ModelField` WHERE `Model` = '.$DbRow['Id']);
       $this->Database->query('DELETE FROM `Module` WHERE `Id` = '.$Module['Id']);
@@ -503 +503 @@
     $DbDependency = array();
     $DbResult = $this->Database->query('SELECT * FROM `ModuleLink`');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $DbDependency[$DbRow['Module']][] = $DbRow['LinkedModule'];
 
-    foreach($this->System->ModuleManager->Modules as $Module)
+    foreach ($this->System->ModuleManager->Modules as $Module)
     {
       // Add missing
-      foreach($Module->Dependencies as $Dependency)
-      {
-        if(!array_key_exists($Module->Id, $DbDependency) or
+      foreach ($Module->Dependencies as $Dependency)
+      {
+        if (!array_key_exists($Module->Id, $DbDependency) or
         !in_array($this->System->ModuleManager->Modules[$Dependency]->Id, $DbDependency[$Module->Id]))
         {
-          if(array_key_exists($Dependency, $this->System->ModuleManager->Modules))
+          if (array_key_exists($Dependency, $this->System->ModuleManager->Modules))
             $DependencyId = $this->System->ModuleManager->Modules[$Dependency]->Id;
             else throw new Exception('Dependent module '.$Dependency.' not found');
@@ -523 +523 @@
 
       // Remove exceeding
-      if(array_key_exists($Module->Id, $DbDependency))
-      foreach($DbDependency[$Module->Id] as $Dep)
+      if (array_key_exists($Module->Id, $DbDependency))
+      foreach ($DbDependency[$Module->Id] as $Dep)
       {
         $DepModName = $this->System->ModuleManager->SearchModuleById($Dep);
-        if(!in_array($DepModName, $Module->Dependencies))
+        if (!in_array($DepModName, $Module->Dependencies))
         $this->Database->query('DELETE FROM `ModuleLink` WHERE `Module` = '.
           $Module->Id.' AND LinkedModule='.$Dep);
       }
     }
-    return($Output);
+    return ($Output);
   }
 }