Changeset 579

Timestamp:

Oct 11, 2013, 11:28:10 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Vylepšena třída Config. Měla by později umět ukládat jak do souborů tak do databáze.

Location:

trunk

Files:

• Common/AppModule.php (modified) (3 diffs)
• Common/Config.php (modified) (2 diffs)
• Common/Mail.php (modified) (1 diff)
• Modules/WebCam/WebCam.php (modified) (1 diff)
• Modules/WebCam/webcam_refresh.php (modified) (1 diff)

trunk/Common/AppModule.php

@@ -42 +42 @@
   function Install()
   {
+        $this->Installed = true;
   }
   
   function Uninstall()
   {
+        $this->Installed = false;
   }
   
   function Start()
   {
+        $this->Running = true;
   }
   
   function Stop()
   {
+        $this->Running = false;
   } 
 }
@@ -74 +78 @@
     {
       //DebugLog('Init module '.$Module->Name);
-      $this->Modules[$Index]->Start();
+      if($this->Modules[$Index]->Running == false)
+        $this->Modules[$Index]->Start();
     }
   }
@@ -83 +88 @@
     {
       //DebugLog('Init module '.$Module->Name);
-      $this->Modules[$Index]->Stop();
+      if($this->Modules[$Index]->Running == true)
+        $this->Modules[$Index]->Stop();
     }
   }

trunk/Common/Config.php

@@ -7 +7 @@
   function ReadValue($Name)
   {
-    return($this->Data[$Name]);  
+        if(!is_array($Name)) $Name = explode('/', $Name);
+        $Last = array_pop($Name);
+        $Data = &$this->Data;
+        foreach($Name as $Item)
+        {
+                $Data = &$Data[$Item];
+        }
+    return($Data[$Last]);  
   }
   
   function WriteValue($Name, $Value)
   {
-    $this->Data[$Name] = $Value;
+        if(!is_array($Name)) $Name = explode('/', $Name);
+        $Last = array_pop($Name);
+        $Data = &$this->Data;
+        foreach($Name as $Item)
+        {
+                $Data = &$Data[$Item];
+        }
+    $Data[$Item] = $Value;
   }
   
   function OpenFile($FileName)
   {
+        $ConfigData = array();
     include $FileName;
-    $this->Data = $ConfigData;
+    foreach($this->Data as $Index => $Item)
+    {
+        if(array_key_exits($Index, $ConfigData))
+        $this->Data[$Index] = $ConfigData[$Index];
+    }
   } 
   
@@ -25 +44 @@
     file_put_content("<?php \n\n\$ConfigData = ".var_export($this->Data).";\n");
   }
+  
+  function GetAsArray()
+  {
+        return($this->Data);
+  }
 }

trunk/Common/Mail.php

@@ -56 +56 @@
   }
 
-  function AddBcc($bcc)
+  function AddBcc($Address, $Name)
   {
     $this->Recipients[] = array('Address' => $Address, 'Name' => $Name, 'Type' => 'HiddenCopy');

trunk/Modules/WebCam/WebCam.php

@@ -28 +28 @@
 
         // Reload the image every defined period
-        theTimer = setTimeout("reloadImage()", '.($Config['Web']['WebcamRefresh'] * 1000).');
+        theTimer = setTimeout("reloadImage()", '.($this->System->Config['Web']['WebcamRefresh'] * 1000).');
       }
       </script>';
 
-      $Output .= '<br /><div align="center"><img name="theImage" src="" idth="640" height="480" alt="Webcam image"><br>Poslední aktualizace: '.date('j.n.Y G:i', filemtime($this->System->Modules['Webcam']->ImageFileName)).'<br>Obnovování po '.$Config['Web']['WebcamRefresh'].' sekundách</div><br />';
+      $Output .= '<br /><div align="center"><img name="theImage" src="" idth="640" height="480" alt="Webcam image"><br>Poslední aktualizace: '.date('j.n.Y G:i', filemtime($this->System->Modules['Webcam']->ImageFileName)).'<br>Obnovování po '.$this->System->Config['Web']['WebcamRefresh'].' sekundách</div><br />';
     } else $Output = '<br />Obrázek nenalezen.<br /><br />';
 

trunk/Modules/WebCam/webcam_refresh.php

@@ -1 +1 @@
 <?php
-include('../global.php');
+include('../../Common/Global.php');
 
 $Config['Web']['ShowPHPError'] = true;