Changeset 12690

Show
Ignore:
Timestamp:
10/08/07 14:17:30 (1 year ago)
Author:
juhana
Message:

Some minor fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/midgard/data/midgard_admin_sitewizard_creator_host.php

    r12581 r12690  
    2525    private $host_prefix = ''; 
    2626     
     27    private $host_port = 0; 
     28     
    2729    private $host_style_id = null; 
    2830       
    …… 
    3739        $this->verbose('Initializing host creation'); 
    3840     
    39         if (is_object($this->sitegroup)) 
     41        if (!is_object($this->sitegroup)) 
    4042        {         
    41             if (!$this->sitegroup = mgd_get_sitegroup($sitegroup_guid) /*new midgard_sitegroup()*/) 
     43            if (!$this->sitegroup = mgd_get_sitegroup(/*$sitegroup_guid*/ 1) /*new midgard_sitegroup()*/) 
    4244            { 
    4345                throw new midgard_admin_sitewizard_exception("Sitewizard couldn't initialize sitegroup object. 
    …… 
    6264        $this->host->sitegroup = $this->sitegroup->id; 
    6365        $this->host->name = $this->host_url; 
    64         $this->host->port = 80; 
     66        $this->host->port = $this->host_port; 
    6567        $this->host->online = 1; 
    6668        $this->host->owner = $this->sitegroup->admingroup; 
    …… 
    8688            } 
    8789         
    88             $this->verbose("Created host PREFIX: " . $host->name . $host->prefix . " GUID: "  
     90            $this->verbose("Created host PREFIX: " . $this->host->name . $this->host->prefix . " GUID: "  
    8991                . $this->host->guid); 
    9092         
    …… 
    142144    } 
    143145     
     146    public function set_host_port($host_port) 
     147    { 
     148        $this->verbose("Setting host port \"" . $host_port . "\""); 
     149     
     150        $this->host_port = $host_port; 
     151    } 
     152     
    144153    public function set_host_prefix($host_prefix) 
    145154    { 
    …… 
    177186    { 
    178187        return $this->host; 
     188    } 
     189     
     190    public function get_sitegroup() 
     191    { 
     192        return $this->sitegroup; 
    179193    } 
    180194     

  • trunk/midgard/data/midgard_admin_sitewizard_creator_structure.php

    r12581 r12690  
    444444            $this->verbose('Creating root topic from configuration'); 
    445445 
    446             $this->creation_root_topic = midgard_topic(); 
     446            $this->creation_root_topic = new midgard_topic(); 
    447447            $this->creation_root_topic->up = 0; 
    448448            $this->creation_root_topic->sitegroup = $this->sitegroup->id;