Changeset 590 for trunk/Common


Ignore:
Timestamp:
Nov 2, 2013, 12:10:42 AM (11 years ago)
Author:
chronos
Message:
  • Opraveno: Chování systému při čisté instalaci bez aktivních modulů.
  • Upraveno: Seznam celkových aktualiací se nyní uchovává jako metoda třídy namísto globální proměnné. Moduly se totiž vkládají ve funkci a proměnná nebyla tedy globální.
  • Přidáno: Implementace metod Install a Uninstall modulů.
Location:
trunk/Common
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Common/AppModule.php

    r587 r590  
    6464  function Install()
    6565  {
     66    if($this->Installed) return;
     67    $List = array();
     68    $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
     69    $this->Manager->Perform($List, array(ModuleAction::Install), array(ModuleCondition::NotInstalled));
     70    $this->DoInstall();
    6671        $this->Installed = true;
    6772  }
    … …  
    6974  function Uninstall()
    7075  {
    71         $this->Installed = false;
     76    if(!$this->Installed) return;
     77    $this->Stop();
     78    $this->Installed = false;
     79    $List = array();
     80    $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
     81    $this->Manager->Perform($List, array(ModuleAction::Uninstall), array(ModuleCondition::Installed));
     82    $this->DoUninstall();
     83  }
     84 
     85  function Reinstall()
     86  {
     87    $this->Uninstall();
     88    $this->Install();
    7289  }
    7390 
    7491  function Start()
    7592  {
    76     if($this->Running) return;
     93    if($this->Running) return;
     94    if(!$this->Installed) return;
    7795    $List = array();
    7896    $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotRunning));
    … …  
    119137{
    120138  var $Modules;
     139  var $ModulesAvail;
    121140  var $System;
    122141  var $OnLoadModules;

  • trunk/Common/Database.php

    r589 r590  
    7777  function query($Query)
    7878  {
     79    if(!$this->Connected()) throw new Exception('Not connected to database');
    7980    $this->LastQuery = $Query;
    8081    if($this->ShowSQLQuery == true)

  • trunk/Common/Page.php

    r578 r590  
    1313  var $ShortTitle;
    1414  var $FullTitle;
     15  var $Encoding;
     16  var $Style;
    1517 
    1618  function __construct($System)
    … …  
    1820    parent::__construct($System);
    1921   
    20     $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
    21     $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
     22    $this->FormatHTML = false;
     23    $this->ShowRuntimeInfo = false;
     24    $this->Encoding = 'utf-8';
     25    $this->Style = 'new';
     26   
     27    // TODO: Move to external code
     28    if(isset($this->System->Config['Web']['FormatHTML']))
     29      $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
     30    if(isset($this->System->Config['Web']['ShowRuntimeInfo']))
     31      $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
     32    if(isset($this->System->Config['Web']['Charset']))
     33      $this->Encoding = $this->System->Config['Web']['Charset'];
     34    if(isset($this->System->Config['Web']['Style']))
     35      $this->Style = $this->System->Config['Web']['Style'];
    2236  }
    2337 
    … …  
    4862    {
    4963      $Navigation = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Navigation;
    50       
    51       if($Page->ParentClass != '')
     64     
     65      if(class_exists($Page->ParentClass))
    5266      {
    5367        $PageClass = $Page->ParentClass;
    … …  
    6175    if(isset($this->Load)) $BodyParam .= ' onload="'.$this->Load.'"';
    6276    if(isset($this->Unload)) $BodyParam .= ' onunload="'.$this->Unload.'"';
    63     $Output = '<?xml version="1.0" encoding="'.$this->System->Config['Web']['Charset'].'"?>'."\n".
     77    $Output = '<?xml version="1.0" encoding="'.$this->Encoding.'"?>'."\n".
    6478    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.
    6579    '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">'.
    66     '<head><link rel="stylesheet" href="'.$this->System->Link('/style/').$this->System->Config['Web']['Style'].'/style.css" type="text/css" media="all" />'.
    67     '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->System->Config['Web']['Charset'].'" />'.
    68     '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->System->Config['Web']['Style'].'/global.js"></script>'.
     80    '<head><link rel="stylesheet" href="'.$this->System->Link('/style/').$this->Style.'/style.css" type="text/css" media="all" />'.
     81    '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->Encoding.'" />'.
     82    '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->Style.'/global.js"></script>'.
    6983    '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>
    7084    </head><body'.$BodyParam.'>';
    … …  
    7589      if($this->System->Config['Web']['UserSupport'] == 1)
    7690      {
    77         if($this->System->User->User['Id'] == null)
     91        if(isset($this->System->User) and ($this->System->User->User['Id'] == null))
    7892          $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> '.
    7993            '<a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>';

  • trunk/Common/System.php

    r589 r590  
    2727    $this->ShowPage = true;
    2828    $this->ConfigManager = new Config();
     29    $this->RootURLFolder = $_SERVER['SCRIPT_NAME'];
     30    if(substr($this->RootURLFolder, -10, 10) == '/index.php')
     31      $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
    2932  } 
    3033 
    … …  
    4245      $Page[$LastKey] = $Handler;
    4346    } else $this->Pages[$Path] = $Handler;
     47  }
     48 
     49  function UnregisterPage($Path)
     50  {
     51    unset($this->Pages[$Path]); 
    4452  }
    4553 
    … …  
    129137      //$Output .= 'Nelze se připojit k databázi.';
    130138    }
    131     $this->RootURLFolder = $this->Config['Web']['RootFolder'];
    132     $this->FormManager->Root = $this->Config['Web']['RootFolder'];
     139    if(isset($this->Config['Web']['RootFolder']))
     140      $this->RootURLFolder = $this->Config['Web']['RootFolder'];
     141    $this->FormManager->Root = $this->RootURLFolder;
    133142 
    134143    $Database = $this->Database;
    … …  
    138147    include_once(dirname(__FILE__).'/../Modules/Setup/Setup.php');
    139148    $this->ModuleManager->RegisterModule(new ModuleSetup($this));
     149    $this->ModuleManager->Modules['Setup']->Installed = true;
    140150    $this->ModuleManager->Modules['Setup']->Start();
    141151    if($this->ModuleManager->Modules['Setup']->CheckState())
    142152    {
    143153      $this->ModuleManager->LoadModules();
     154      $this->ModuleManager->Modules['Setup']->Installed = true;
    144155      $this->ModuleManager->Modules['Setup']->Start();
    145156      $this->ModuleManager->StartAll();
Note: See TracChangeset for help on using the changeset viewer.