Changeset 526

Timestamp:

Apr 21, 2013, 10:23:56 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka HyperLink přejmenována na obecnější název Action. Odkazy na názvy ikony přepracovány na samostatnou tabulku.
• Upraveno: Funkce týkající se fronty mailů odděleny do samostatného souboru.

Location:

trunk

Files:

• Common/EmailQueue.php (added)
• Common/System.php (modified) (4 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Network/Administration.php (modified) (2 diffs)
• Modules/Portal/Portal.php (modified) (3 diffs)
• ToDo.txt (modified) (2 diffs)
• admin/Updates.php (modified) (2 diffs)
• form_classes.php (modified) (2 diffs)

trunk/Common/System.php

@@ -1 +1 @@
 <?php
+
+include_once(dirname(__FILE__).'/EmailQueue.php');
 
 class System
@@ -13 +15 @@
   var $PathItems;
   var $RootURLFolder;
+  var $EmailQueue;
 
   function __construct()
@@ -21 +24 @@
     $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
+    $this->EmailQueue = new EmailQueue($this);
   }  
   
@@ -79 +83 @@
   }
   
-  function AddEmailToQueue($To, $Subject, $Content, $From, $AttachmentFileId = '')
-  {
-    $Values = array('To' => $To, 
-      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
-      'From' => $From);
-    if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
-    $this->Database->insert('EmailQueue', $Values);
-  }
-  
-  function ProcessEmailQueue()
-  {
-    $Output = '';
-    $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
-    while($DbRow = $DbResult->fetch_assoc())
-    {      
-      $Mail = new Mail();
-      $Mail->AddToCombined($DbRow['To']);
-      $Mail->Subject = $DbRow['Subject'];
-      $Mail->From = $DbRow['From'];
-      $Mail->AddBody(strip_tags($DbRow['Content']), 'text/plain');
-      $Mail->AddBody($DbRow['Content'], 'text/html');
-      if($DbRow['AttachmentFile'] != '')
-      {
-        $DbResult2 = $this->Database->select('File', '*', 'Id='.$DbRow['AttachmentFile']);
-        while($File = $DbResult2->fetch_assoc())
-          $Mail->AttachFile($this->Config['Web']['FileRootFolder'].$File['DrivePath'], $File['MimeType']);
-      }
-      $Mail->Send();
-      $this->Database->update('EmailQueue', 'Id='.$DbRow['Id'], array('Archive' => 1));
-      $this->ModuleManager->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
-      $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
-    }    
-    return($Output);
-  }
-  
   function HumanDate($Time)
   {

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 524; // Subversion revision
-$DatabaseRevision = 517; // SQL structure revision
-$ReleaseTime = '2013-04-20';
+$Revision = 526; // Subversion revision
+$DatabaseRevision = 526; // SQL structure revision
+$ReleaseTime = '2013-04-21';
 
 ?>

trunk/Modules/Finance/Manage.php

@@ -593 +593 @@
         
       $Content .= '<br />Tento email je generován automaticky. V případě zjištění nesrovnalostí napište zpět.';
-      $this->System->AddEmailToQueue($User['Name'].' <'.$User['Email'].'>', $Title, $Content, 
+      $this->System->EmailQueue->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content, 
          $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>');
       $Output = '';

trunk/Modules/Network/Administration.php

@@ -27 +27 @@
         $Form = new Form('Email');
         $Form->LoadValuesFromForm();
-        $Result = $this->System->AddEmailToQueue($Form->Values['Address'], 
+        $Result = $this->System->EmailQueue->AddItem($Form->Values['Address'], 
           $Form->Values['Subject'], $Form->Values['Content'], 
           $this->System->Config['Web']['Admin'].' <'.$this->System->Config['Web']['AdminEmail'].'>');
@@ -34 +34 @@
       if($_GET['Action'] == 'ProcessEmailQueue')
       {
-        $Output = $this->System->ProcessEmailQueue();
+        $Output = $this->System->EmailQueue->Process();
         $Output = $this->SystemMessage('Zpracování fronty emailů', 'Nové emaily byly odeslány').$Output;
       }

trunk/Modules/Portal/Portal.php

@@ -8 +8 @@
   var $ShortTitle = 'Rozcestník';
   
-  function ShowLinks($HyperlinkGroup)
+  function ShowActions($ActionGroup)
   {
     $Output = '';
-    $DbResult = $this->Database->query('SELECT * FROM `Hyperlink` WHERE (`Group`='.$HyperlinkGroup['Id'].') AND (`Enable` = 1)');
-    while($HyperLink = $DbResult->fetch_assoc())
-    {
-      if($HyperLink['IconFile'] == '') $HyperLink['IconFile'] = 'clear.png';
-        if(substr($HyperLink['URL'], 0, 4) != 'http') $HyperLink['URL'] = $this->System->Config['Web']['RootFolder'].$HyperLink['URL'];
-        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->User->User->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
-        $Output .= '<img alt="'.$HyperLink['Name'].'" src="images/favicons/'.$HyperLink['IconFile'].'" width="16" height="16" /> <a href="'.$HyperLink['URL'].'">'.$HyperLink['Name'].'</a><br />';
-    }
-    return($this->Panel($HyperlinkGroup['Name'], $Output));
+    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+      'WHERE (`Group`='.$ActionGroup['Id'].') AND (`Enable` = 1)');
+    while($Action = $DbResult->fetch_assoc())
+    {
+      if($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
+        if(substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->System->Link($Action['URL']);
+        if(($Action['PermissionModule'] == '') or (($Action['PermissionModule'] != '') and $this->System->User->User->CheckPermission($Action['PermissionModule'], $Action['PermissionOperation'])))        
+        $Output .= '<img alt="'.$Action['Title'].'" src="images/favicons/'.$Action['Icon'].'" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a><br />';
+    }
+    return($this->Panel($ActionGroup['Name'], $Output));
   }
 
@@ -305 +306 @@
     }
 
-    $DbResult = $this->Database->query('SELECT * FROM `HyperlinkGroup`');
+    $DbResult = $this->Database->query('SELECT * FROM `ActionGroup`');
     while($DbRow = $DbResult->fetch_assoc())
-      $HyperlinkGroups[$DbRow['Id']] = $DbRow;
+      $ActionGroups[$DbRow['Id']] = $DbRow;
 
     // Show pannels
@@ -322 +323 @@
       while($Panel = $DbResult2->fetch_assoc())
       {
-        if($Panel['Module'] == 'HyperlinkGroup') $Output .= $this->ShowLinks($HyperlinkGroups[$Panel['Parameters']]);
+        if($Panel['Module'] == 'ActionGroup') $Output .= $this->ShowActions($ActionGroups[$Panel['Parameters']]);
         else if($Panel['Module'] == 'OnlineHostList') $Output .= $this->Panel('Online počítače', $this->OnlineHostList());
         else if($Panel['Module'] == 'UserOptions') 

trunk/ToDo.txt

@@ -24 +24 @@
   * Ruční filtrování a vyhledávání v tabulkách
   * Předvolené sestavy filtrů, řazení, pořadí sloupců
-- Zprovoznit obsluhu stránek přes virtuální URL
+  * Inicializace a aktualizace struktury databáze přímo z modulů  
 - Udělat fond IP adres, zobrazit jejich užití, umožnit automatické přiřazení volných
 - Vytvořit třídy pro práci s Mikrotik RouterOS API
@@ -35 +35 @@
 ======
 
+- Zprovoznit obsluhu stránek přes virtuální URL
 - IS modul pro obecné datové manipulace s tabulkami
 - Vedení skladu a produktových karet

trunk/admin/Updates.php

@@ -239 +239 @@
 }
 
+function UpdateTo526($Manager)
+{
+  $Manager->Execute("ALTER TABLE `Hyperlink` CHANGE `Name` `Title` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_czech_ci NOT NULL");
+  $Manager->Execute("ALTER TABLE `Hyperlink` ADD `Name` VARCHAR( 255 ) NOT NULL AFTER `Id`");
+  //$Manager->Execute("ALTER TABLE `Hyperlink` ADD UNIQUE ( `Name` )");
+  $Manager->Execute("ALTER TABLE `Hyperlink` ADD `Type` INT NOT NULL AFTER `Title` , ADD INDEX ( `Type` )");
+  $Manager->Execute("RENAME TABLE `Hyperlink` TO `Action` ;");
+  $Manager->Execute("RENAME TABLE `HyperlinkGroup` TO `ActionGroup` ;");
+  $Manager->Execute("CREATE TABLE IF NOT EXISTS `ActionType` (
+      `Id` int(11) NOT NULL AUTO_INCREMENT,
+      `Name` varchar(255) NOT NULL,
+      PRIMARY KEY (`Id`)
+  ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+  
+  INSERT INTO `ActionType` (`Id`, `Name`) VALUES
+  (1, 'Odkaz'),
+  (2, 'Obrázek');");
+  $Manager->Execute("UPDATE `Action` SET `Type` = 1;");
+  $Manager->Execute("ALTER TABLE `Action` ADD FOREIGN KEY ( `Type` ) REFERENCES `ActionType` (".
+    "`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
+  $Manager->Execute("UPDATE `Panel` SET `Module` = 'ActionGroup' WHERE `Module` = 'HyperlinkGroup'");
+  $Manager->Execute("CREATE TABLE IF NOT EXISTS `ActionIcon` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+  $Manager->Execute("INSERT INTO `ActionIcon` (SELECT NULL AS `Id`, `IconFile` AS `Name` FROM `Action` WHERE `IconFile` != '' GROUP BY `IconFile`)");
+  $Manager->Execute("UPDATE `Action` SET `IconFile` = (SELECT `Id` FROM `ActionIcon` WHERE `ActionIcon`.`Name` = `Action`.`IconFile`) ");
+  $Manager->Execute("ALTER TABLE `Action` CHANGE `IconFile` `Icon` INT NULL ");
+  $Manager->Execute("UPDATE `Action` SET `Icon` = NULL WHERE `Icon` = 0");
+  $Manager->Execute("ALTER TABLE `Action` ADD INDEX ( `Icon` ) ");
+  $Manager->Execute("ALTER TABLE `Action` ADD FOREIGN KEY ( `Icon` ) REFERENCES `ActionIcon` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+    "VALUES (NULL , 'Akce', '23', 'Action', '');");
+}
 
 $Updates = array(
@@ -253 +288 @@
   507 => array('Revision' => 515, 'Function' => 'UpdateTo515'),
   515 => array('Revision' => 517, 'Function' => 'UpdateTo517'),
+  517 => array('Revision' => 526, 'Function' => 'UpdateTo526'),
 );
 

trunk/form_classes.php

@@ -19 +19 @@
 {
   $FormManager->Classes = array(
+  'Action' => array(
+    'Title' => 'Akce',
+    'Table' => 'Action',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+      'Title' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+      'URL' => array('Type' => 'Hyperlink', 'Caption' => 'Odkaz', 'Default' => ''),
+      'Icon' => array('Type' => 'TActionIcon', 'Caption' => 'Ikony', 'Default' => ''),
+      'Type' => array('Type' => 'TActionType', 'Caption' => 'Typ', 'Default' => ''),
+      'Group' => array('Type' => 'TActionGroup', 'Caption' => 'Skupina', 'Default' => ''),
+      'PermissionModule' => array('Type' => 'String', 'Caption' => 'Modul oprávnění', 'Default' => ''),
+      'PermissionOperation' => array('Type' => 'String', 'Caption' => 'Operace oprávnění', 'Default' => ''),
+      'Enable' => array('Type' => 'Boolean', 'Caption' => 'Povolení', 'Default' => ''),
+    ),
+  ),
+  'ActionIcon' => array(
+    'Title' => 'Ikony akcí',
+    'Table' => 'ActionIcon',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název souboru', 'Default' => ''),
+    ),
+  ),
+  'ActionGroup' => array(
+    'Title' => 'Skupiny akcí',
+    'Table' => 'ActionGroup',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+    ),
+  ),
+  'ActionType' => array(
+    'Title' => 'Typy akcí',
+    'Table' => 'ActionType',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+    ),
+  ),
   'FinanceBank' => array(
     'Title' => 'Banky',
@@ -1099 +1135 @@
     'Filter' => '1',
   ),
+  'TActionIcon' => array(
+    'Type' => 'Reference',
+    'Table' => 'ActionIcon',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TActionType' => array(
+    'Type' => 'Reference',
+    'Table' => 'ActionType',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TActionGroup' => array(
+    'Type' => 'Reference',
+    'Table' => 'ActionGroup',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
   'TDirectory' => array(
     'Type' => 'Reference',