Changeset 565

Timestamp:

Sep 1, 2013, 11:37:27 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Třída Module nahrazena třídami Model, View, Controller.
• Přidáno: Modul Wiki.

Location:

trunk

Files:

• Common/Base.php (moved) (moved from trunk/Common/Module.php ) (3 diffs)
• Common/Config.php (added)
• Common/Global.php (modified) (1 diff)
• Common/Page.php (modified) (1 diff)
• Common/Version.php (modified) (1 diff)
• Modules/File/File.php (modified) (1 diff)
• Modules/Finance/Bill.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/TimeMeasure/TimeMeasure.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Modules/Wiki (added)
• Modules/Wiki/Wiki.php (added)
• admin/Updates.php (modified) (2 diffs)

trunk/Common/Base.php

@@ -1 +1 @@
 <?php
 
-class Module
+class Base
 {
   /** @var Database */
@@ -7 +7 @@
   /** @var System */
   var $System;
-  var $Title = '';
-  var $Dependencies = array();
-  var $CurrentPath = '/';
 
   function __construct($System)
@@ -17 +14 @@
   }
 }
+
+class Model extends Base
+{
+  
+}
+
+class View extends Base
+{
+  
+}
+
+class Controller extends Base
+{
+  
+}

trunk/Common/Global.php

@@ -11 +11 @@
 include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/VarDumper.php');
-include_once(dirname(__FILE__).'/Module.php');
+include_once(dirname(__FILE__).'/Base.php');
 include_once(dirname(__FILE__).'/AppModule.php');
 include_once(dirname(__FILE__).'/Database.php');

trunk/Common/Page.php

@@ -3 +3 @@
 define('PAGE_NOT_FOUND', 'Stránka nenalezena');
 
-class Page extends Module
+class Page extends Model
 {
   var $TimeStart;

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 564; // Subversion revision
-$DatabaseRevision = 551; // SQL structure revision
-$ReleaseTime = '2013-08-10';
+$Revision = 565; // Subversion revision
+$DatabaseRevision = 565; // SQL structure revision
+$ReleaseTime = '2013-09-01';

trunk/Modules/File/File.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/MimeTypes.php');
 
-class File extends Module
+class File extends Model
 {
   var $FilesDir;

trunk/Modules/Finance/Bill.php

@@ -1 +1 @@
 <?php
 
-class Bill extends Module
+class Bill extends Model
 {
   var $SpecificSymbol = 1; // počítačová sít

trunk/Modules/Finance/Finance.php

@@ -17 +17 @@
 define('INVOICE_OUT_DOC_LINE', 6);
 
-class Finance extends Module
+class Finance extends Model
 {
   var $kWh;

trunk/Modules/Meteostation/Meteostation.php

@@ -18 +18 @@
 }
 
-class MeteoStation extends Module
+class MeteoStation extends Model
 {
   var $Id;

trunk/Modules/TimeMeasure/TimeMeasure.php

@@ -27 +27 @@
   {
     parent::Start();
+    $this->System->Pages['grafy'] = 'PageMeasure';
     $this->System->FormManager->RegisterClass('Measure', array(
       'Title' => 'Měření',

trunk/Modules/User/User.php

@@ -49 +49 @@
 // TODO: Make User class more general without dependencies to System, Mail, Log 
 
-class User extends Module
+class User extends Model
 {
   var $Roles = array();

trunk/admin/Updates.php

@@ -343 +343 @@
 }
 
+function UpdateTo565($Manager)
+{  
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `WikiPage` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Name` varchar(255) NOT NULL,
+    `NormalizedName` varchar(255) NOT NULL,
+    `VisibleInMenu` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    UNIQUE KEY `Name` (`Name`),
+    KEY `VisibleInMenu` (`VisibleInMenu`)
+    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `WikiPageContent` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Page` int(11) NOT NULL,
+    `Time` datetime NOT NULL,
+    `Content` text NOT NULL,
+    `User` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `User` (`User`),
+        KEY `Page` (`Page`)
+    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+    $Manager->Execute('ALTER TABLE `WikiPageContent`
+    ADD CONSTRAINT `WikiPageContent_ibfk_2` FOREIGN KEY (`Page`) REFERENCES `WikiPage` (`Id`),
+ADD CONSTRAINT `WikiPageContent_ibfk_1` FOREIGN KEY (`User`) REFERENCES `User` (`ID`);');
+}
 
 $Updates = array(
@@ -363 +388 @@
   549 => array('Revision' => 550, 'Function' => 'UpdateTo550'),
   550 => array('Revision' => 551, 'Function' => 'UpdateTo551'),
+  551 => array('Revision' => 565, 'Function' => 'UpdateTo565'),
 );