Changeset 594

Timestamp:

Nov 2, 2013, 11:23:19 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Vylepšena instalace modulu User.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/AppModule.php (modified) (2 diffs)
• Common/Page.php (modified) (1 diff)
• Common/Setup/Setup.php (modified) (2 diffs)
• Common/Setup/Update.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 593; // Subversion revision
+$Revision = 594; // Subversion revision
 $DatabaseRevision = 591; // SQL structure revision
 $ReleaseTime = '2013-11-02';

trunk/Common/AppModule.php

@@ -235 +235 @@
     foreach($this->Modules as $RefModule)
     {
-      $DepModule = $this->Modules[$Dependency];
       if(in_array($Module->Name, $RefModule->Dependencies) and 
           (in_array(ModuleCondition::All, $Conditions) or
@@ -273 +272 @@
   }
   
+  function UninstallAll()
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Uninstall));
+    $this->SaveState();
+  }
+  
   function ModulePresent($Name)
   {

trunk/Common/Page.php

@@ -87 +87 @@
       $Output .= '<div id="Title">'.$Title.'</div>
       <div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
-      if($this->System->Config['Web']['UserSupport'] == 1)
+      if(isset($this->System->User) and ($this->System->Config['Web']['UserSupport'] == 1))
       {
-        if(isset($this->System->User) and ($this->System->User->User['Id'] == null))
+        if($this->System->User->User['Id'] == null)
           $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> '.
             '<a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 

trunk/Common/Setup/Setup.php

@@ -404 +404 @@
     $this->Database->query("INSERT INTO `SystemVersion` (`Id`, `Revision`) VALUES
       (1, 591);");
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `Module` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Title` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
   }
   
   function Uninstall()
   {
+    $this->System->ModuleManager->UninstallAll();
+    $this->Database->query('DROP TABLE `Module`');
     $this->Database->query('DROP TABLE `SystemVersion`');
   }
@@ -419 +427 @@
   function Upgrade()
   {
-    $Output = $this->ModuleManager->Update();
+    $Output = $this->UpdateManager->Upgrade();
     return($Output);
   }

trunk/Common/Setup/Update.php

@@ -38 +38 @@
   }
   
-  function Update()
+  function Upgrade()
   {
           $DbRevision = $this->GetDbVersion();

trunk/Modules/User/User.php

@@ -431 +431 @@
   KEY `User` (`User`)
 ) ENGINE=MEMORY  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `PermissionGroup` (
+        `Id` int(11) NOT NULL AUTO_INCREMENT,
+        `Description` varchar(255) NOT NULL DEFAULT '',
+        PRIMARY KEY (`Id`)
+    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `PermissionGroupAssignment` (
+        `Id` int(11) NOT NULL AUTO_INCREMENT,
+        `Group` int(11) NOT NULL DEFAULT '0',
+        `AssignedGroup` int(11) DEFAULT NULL,
+        `AssignedOperation` int(11) DEFAULT NULL,
+        PRIMARY KEY (`Id`),
+        KEY `Group` (`Group`),
+        KEY `AssignedGroup` (`AssignedGroup`),
+        KEY `AssignedOperation` (`AssignedOperation`)
+        ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `PermissionOperation` (
+            `Id` int(11) NOT NULL AUTO_INCREMENT,
+        `Module` int(11) NOT NULL,
+            `Operation` varchar(128) NOT NULL DEFAULT '',
+            `Item` varchar(64) NOT NULL DEFAULT '',
+                `ItemId` int(11) NOT NULL DEFAULT '0',
+                PRIMARY KEY (`Id`),
+                    KEY `Module` (`Module`),
+                    KEY `Operation` (`Operation`),
+                    KEY `Item` (`Item`),
+                    KEY `ItemId` (`ItemId`)
+                    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    
+    $this->Database->query("CREATE TABLE IF NOT EXISTS `PermissionUserAssignment` (
+                    `Id` int(11) NOT NULL AUTO_INCREMENT,
+                    `User` int(11) DEFAULT NULL,
+                    `AssignedGroup` int(11) DEFAULT NULL,
+                    `AssignedOperation` int(11) DEFAULT NULL,
+                    PRIMARY KEY (`Id`),
+                        KEY `User` (`User`),
+                        KEY `AssignedGroup` (`AssignedGroup`),
+                            KEY `AssignedOperation` (`AssignedOperation`)
+                    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+    
+    $this->Database->query("ALTER TABLE `PermissionGroupAssignment`
+      ADD CONSTRAINT `PermissionGroupAssignment_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `PermissionGroup` (`Id`),
+      ADD CONSTRAINT `PermissionGroupAssignment_ibfk_2` FOREIGN KEY (`AssignedGroup`) REFERENCES `PermissionGroup` (`Id`),
+      ADD CONSTRAINT `PermissionGroupAssignment_ibfk_3` FOREIGN KEY (`AssignedOperation`) REFERENCES `PermissionOperation` (`Id`);");
+    
+    $this->Database->query("ALTER TABLE `PermissionOperation`
+      ADD CONSTRAINT `PermissionOperation_ibfk_1` FOREIGN KEY (`Module`) REFERENCES `Module` (`Id`);");
+    
+    $this->Database->query("ALTER TABLE `PermissionUserAssignment`
+      ADD CONSTRAINT `PermissionUserAssignment_ibfk_2` FOREIGN KEY (`AssignedGroup`) REFERENCES `PermissionGroup` (`Id`),
+      ADD CONSTRAINT `PermissionUserAssignment_ibfk_3` FOREIGN KEY (`AssignedOperation`) REFERENCES `PermissionOperation` (`Id`),
+      ADD CONSTRAINT `PermissionUserAssignment_ibfk_4` FOREIGN KEY (`User`) REFERENCES `User` (`Id`);");
   }
   
   function DoUninstall()
   {     
+    $this->Database->query('DROP TABLE `PermissionUserAssignment`');
+    $this->Database->query('DROP TABLE `PermissionGroupAssignment`');
+    $this->Database->query('DROP TABLE `PermissionGroup`');
+    $this->Database->query('DROP TABLE `PermissionOperation`');
     $this->Database->query('DROP TABLE `UserOnline`');
     $this->Database->query('DROP TABLE `User`');