Changeset 405 for branches

Timestamp:

Jun 12, 2012, 7:25:25 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Podpora překládání.
• Přidáno: Do seznamu modulů přidány akce Instalovat a Odinstalovat.

Location:

branches/Modular

Files:

• Common/Global.php (modified) (2 diffs)
• Common/Localization.php (added)
• Common/Module.php (modified) (1 diff)
• Common/Navigation.php (added)
• Common/ViewList.php (modified) (2 diffs)
• Locale (added)
• Locale/csCZ.php (added)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/System/System.php (modified) (2 diffs)
• Modules/User/User.php (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• index.php (modified) (1 diff)

branches/Modular/Common/Global.php

@@ -25 +25 @@
 include_once('ViewForm.php');
 include_once('Types/Type.php');
+include_once('Localization.php');
+include_once('Navigation.php');
   
 
@@ -73 +75 @@
   $System->RootFolder = $Config['Web']['RootFolder'];
   $System->Config = &$Config;
+  $System->Localization = new Localization();
+  $System->Localization->Locale = $Config['Web']['Locale'];
+  $System->Localization->Load();
+  $System->Navigation = new Navigation();
 }
 

branches/Modular/Common/Module.php

@@ -270 +270 @@
     }
   }
+  
+  function SearchModuleById($Id)
+  {
+    foreach($this->Modules as $Module)
+    {
+      DebugLog($Module->Name.' '.$Module->Id);
+      if($Module->Id == $Id) return($Module->Name);
+    }        
+    return('');
+  }
 }
 

branches/Modular/Common/ViewList.php

@@ -55 +55 @@
         foreach($this->Actions as $Action)
         {
-          if(array_key_exists('Confirm', $Action)) $Confirm = ' onclick="return confirmAction(\''.$this->System->Localization->Translate($Action['Confirm']).'\');"';
+          if(array_key_exists('Confirm', $Action) and ($Action['Confirm'] != '')) 
+            $Confirm = ' onclick="return confirmAction(\''.$this->System->Localization->Translate($Action['Confirm']).'\');"';
             else $Confirm = '';
           if(strpos($Action['Name'], '<') !== false) $ActionName = $Action['Name'];
@@ -148 +149 @@
       'Type' => ViewItemTypeOneToMany, 'SQL' => $Name, 'TargetTable' => $TargetTable);
   }   
+  
+  function AddItemAction($Name, $Module, $Action, $Confirm)
+  {
+    $this->Actions[$Name] = array('Name' => $Name, 'Module' => $Module, 
+      'Action' => $Action, 'Confirm' => $Confirm);
+  }
 }
 

branches/Modular/Modules/Finance/Finance.php

@@ -286 +286 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Accounting processing';
-    $this->Dependencies = array('User', 'Subject');
+    $this->Dependencies = array('User', 'Subject', 'Member', 'Network');
     $this->SupportedModels = array('FinanceYear', 'DocumentLine', 'DocumentLineSequence',
       'FinanceTariff', 'FinanceOperation', 'FinanceClaimsLiabilities',

branches/Modular/Modules/System/System.php

@@ -12 +12 @@
   function Show()
   {
+    $Output = '';
+    if(array_key_exists('A', $_GET))
+    {
+      if($_GET['A'] == 'Install') 
+      {
+        $this->System->LoadModules(false);
+        $ModuleName = $this->System->SearchModuleById($_GET['Id']);
+        if($ModuleName != '') 
+        {
+          $this->System->Modules[$ModuleName]->Install();
+          $this->System->Init();
+        } else $Output .= 'Modul id '.$_GET['Id'].' nenalezen';
+        
+      }
+      if($_GET['A'] == 'Uninstall') 
+      {
+        $ModuleName = $this->System->SearchModuleById($_GET['Id']);
+        if($ModuleName != '') 
+        {
+          $this->System->Modules[$ModuleName]->UnInstall();
+          $this->System->Init();
+        } else $Output .= 'Modul id '.$_GET['Id'].' nenalezen';
+      }
+    }
     $View = new ViewModules($this->System);
     $View->LoadFromDatabase();
-    return($View->Show());
+    $Output .= $View->Show();
+    return($Output);
   }
 }
@@ -30 +55 @@
     $this->AddItemBoolean('Installed', 'Instalováno');
     $this->AddItemText('Description', 'Popis');
+    $this->AddItemAction('Install', 'System', 'Install', '');
+    $this->AddItemAction('Uninstall', 'System', 'Uninstall', '');
   }
 }

branches/Modular/Modules/User/User.php

@@ -383 +383 @@
     $thus->System->Modules['User']->Models['User']->AnonymousUserId = ANONYMOUS_ID;
     $this->System->Pages['uzivatele'] = 'UserListPage';
-    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Modules['User']->Models['User']->Check();
+    if(isset($_SERVER['REMOTE_ADDR'])) $this->System->Modules['User']->Models['User']->Check();    
   }
   

branches/Modular/config.sample.php

@@ -16 +16 @@
   'Web' => array
   (
+    'Locale' => 'csCZ',
     'Style' => 'simple',
     'FormatHTML' => false,

branches/Modular/index.php

@@ -11 +11 @@
 $Page = $System->PathItems[0];
 //if(substr($Page, -1) == '/') $Page = substr($Page, 0, -1);
-//print_r($System->Pages);
+print_r($System->Pages);
 if(array_key_exists($Page, $System->Pages)) 
 {