Changeset 729

Timestamp:

Jan 12, 2015, 12:20:30 AM (10 years ago)

Author:

chronos

Message:

• Added: Generic Scheduler module for running tasks on specified time and with specified period.
• Added: System execution from command line using cmd.php entry point.

Location:

trunk

Files:

• Application/System.php (modified) (5 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Common/Page.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (4 diffs)
• Modules/Scheduler (added)
• Modules/Scheduler/Scheduler.php (added)
• Modules/User/User.php (modified) (2 diffs)
• cmd.php (added)

trunk/Application/System.php

@@ -24 +24 @@
   var $ShowPage;
   var $Setup;
+  var $CommandLine;
 
   function __construct()
@@ -38 +39 @@
     if(substr($this->RootURLFolder, -10, 10) == '/index.php')
       $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
+    $this->CommandLine = array();
   }
 
@@ -132 +134 @@
   }
 
-  function Run()
+  function RunCommon()
   {
         global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
@@ -177 +179 @@
     if($this->Setup->CheckState())
     {
-      $this->ModuleManager->Start();
-    }
+      $this->ModuleManager->Start();    
+    }
+  }
+  
+  function Run()
+  {
+    $this->RunCommon();
     if($this->ShowPage)
     {
@@ -186 +193 @@
   }
 
+  function RunCommandLine()
+  {
+        global $argv;
+        
+        $this->RunCommon();
+        if(count($argv) > 1) 
+        {
+      if(array_key_exists($argv[1], $this->CommandLine))
+      {
+        $Command = $this->CommandLine[$argv[1]];
+        if(is_string($Command['Callback'][0]))
+              {
+                $Class = new $Command['Callback'][0]($this);
+                $Output = $Class->$Command['Callback'][1]();            
+              } else $Output = call_user_func($Command['Callback']);
+              echo($Output);
+      } else echo('Command "'.$argv[1].'" not supported.'."\n");        
+        }
+        //print_r($argv);
+  }
+  
+  function RegisterCommandLine($Name, $Callback)
+  {
+        $this->CommandLine[$Name] = array('Name' => $Name, 'Callback' => $Callback);
+  }
+  
   function RegisterPageBar($Name)
   {

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 728; // Subversion revision
-$DatabaseRevision = 726; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-05');
+$Revision = 729; // Subversion revision
+$DatabaseRevision = 729; // SQL structure revision
+$ReleaseTime = strtotime('2015-01-11');

trunk/Common/Global.php

@@ -443 +443 @@
   if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
   $PathItems = explode('/', $PathString);
-  if(strpos($_SERVER['REQUEST_URI'], '?') !== false)
+  if(array_key_exists('REQUEST_URI', $_SERVER) and (strpos($_SERVER['REQUEST_URI'], '?') !== false))
     $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
     else $_SERVER['QUERY_STRING'] = '';

trunk/Common/Page.php

@@ -50 +50 @@
   function ShowHeader($Title, $Path)
   {
-    $ScriptName = $_SERVER['REQUEST_URI'];
+        if(array_key_exists('REQUEST_URI', $_SERVER))
+      $ScriptName = $_SERVER['REQUEST_URI'];
+          else $ScriptName = '';
     while(strpos($ScriptName, '//') !== false)
       $ScriptName = str_replace('//', '/', $ScriptName);

trunk/Common/Setup/Updates.php

@@ -1170 +1170 @@
         
         $Manager->Execute('ALTER TABLE `MemberPayment` DROP `NetworkDevice`;');
+}
+
+function UpdateTo729($Manager)
+{
+ $Manager->Execute('ALTER TABLE `FinanceBankAccount` ADD `AutoImport` INT NOT NULL ;');
+  
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `Scheduler` (
+  `Id` int(11) NOT NULL,
+  `Name` varchar(255) NOT NULL,
+  `Enabled` int(11) NOT NULL,
+  `Class` varchar(255) NOT NULL,
+  `Log` mediumtext NOT NULL,
+  `LastExecutedTime` datetime DEFAULT NULL,
+  `ScheduledTime` datetime NOT NULL,
+  `Period` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `Scheduler`
+ ADD PRIMARY KEY (`Id`);');
+  
+  $Manager->Execute('ALTER TABLE `Scheduler`
+MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;');
+
+  // IS menu item
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Plánovač", "1", "/is/?t=Scheduler&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Systém"');
+  if($DbResult->num_rows > 0)
+  {
+        $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+      "VALUES (NULL , 'Plánovač', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
+  
+  $Manager->Execute('INSERT INTO `Module` (`Id`, `Name`, `Title`) VALUES (NULL, "Plánovač", "Scheduler");');
 }
 
@@ -1233 +1270 @@
         722 => array('Revision' => 725, 'Function' => 'UpdateTo725'),
         725 => array('Revision' => 726, 'Function' => 'UpdateTo726'),
+        726 => array('Revision' => 729, 'Function' => 'UpdateTo729'),
     ));
   }

trunk/Modules/Finance/Finance.php

@@ -380 +380 @@
           'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
+        'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
       ),
       'ItemActions' => array(

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -4 +4 @@
 include_once(dirname(__FILE__).'/ImportPS.php');
 include_once(dirname(__FILE__).'/ImportFio.php');
+include_once(dirname(__FILE__).'/../Scheduler/Scheduler.php');
 
 class ModuleFinanceBankAPI extends AppModule
@@ -15 +16 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Communication through API to various banks, manual file import';
-    $this->Dependencies = array('Finance');
+    $this->Dependencies = array('Finance', 'Scheduler');
   }
 
@@ -58 +59 @@
 
     $this->System->RegisterPage(array('finance', 'import-api'), 'PageImportAPI');
-    $this->System->RegisterPage(array('finance', 'import-soubor'), 'PageImportFile');
+    $this->System->RegisterPage(array('finance', 'import-soubor'), 'PageImportFile');    
   }
 
@@ -81 +82 @@
   }
 }
+
+class ScheduleBankImport extends SchedulerTask
+{
+        function Execute()
+        {
+                $Output = '';
+                $DbResult = $this->Database->select('FinanceBankAccount', 'Id', '(AutoImport=1) AND ((TimeEnd IS NULL) OR (TimeEnd > NOW()))');
+                while($DbRow = $DbResult->fetch_assoc())
+                {                       
+                        $Page = new PageImportAPI($this->System);
+                        $Output .= $Page->Show();
+                }
+                return($Output);
+        }
+}

trunk/Modules/User/User.php

@@ -66 +66 @@
     $this->OnlineStateTimeout = 600; // in seconds
     $this->PasswordHash = new PasswordHash();
+    $this->User = array('Id' => null, 'Member' => null);
   }
 
@@ -694 +695 @@
   function TopBarCallback()
   {
-    if($this->System->User->User['Id'] == null)
+    if($this->System->User->User['Id'] == null) 
+    {
       $Output = '<a href="'.$this->System->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
         '<a href="'.$this->System->Link('/user/?Action=UserRegister').'">Registrace</a>';
-      else $Output = $this->System->User->User['Name'].
+    } else 
+    {
+        $Output = $this->System->User->User['Name'].
         ' <a href="'.$this->System->Link('/user/?Action=UserMenu').'">Nabídka</a>'.
         ' <a href="'.$this->System->Link('/user/?Action=Logout').'">Odhlásit</a>';
-//   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
+        //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
+    }
     return($Output);
   }