Navigation

Changeset 17896

Timestamp:

10/03/08 16:00:43 (2 months ago)

Author:

piotras

Message:

Fix #311

Files:

r17834	r17896
40	40	private $pear_dir;
41	41	private $web_dir;
	42	private $web_dir_hack = null;
42	43
43	44	private $pear_ui;
…	…
139	140	private function set_midcom_static()
140	141	{
	142	if($this->web_dir_hack === null)
	143	{
	144	return;
	145	}
141	146	/* we can not use isDefined method as it always returns true */
142	147	/* let's get key's value and return if it's empty, false or null */
143		if(($this->pear_config->get("web_dir") === '')
	148	/*if(($this->pear_config->get("web_dir") === '')
144	149	\|\| ($this->pear_config->get("web_dir") === false)
145	150	\|\| ($this->pear_config->get("web_dir") === null))
146		{
	151	{
147	152	return;
148	153	}
149
150		$this->initial_web_dir = $this->pear_config->get('web_dir');
	154	*/
	155
	156	$this->initial_web_dir = $this->web_dir_hack;
151	157
152	158	if(!strstr($this->initial_web_dir, 'midcom'))
…	…
160	166	}
161	167
162		$set = $this->pear_config->set('web_dir', $this->midcom_static_dir, 'user');
	168	midgard_setup_ui_cli::message("Setting midcom static dir" . $this->midcom_static_dir);
	169
	170	$set = $this->pear_config->set('web_dir', $this->midcom_static_dir);
163	171
164	172	if(!$set)
…	…
167	175	/* write configuration */
168	176	$this->pear_config->writeConfigFile();
	177	/* "reload" configuration */
	178	$this->pear_config->readConfigFile();
169	179	}
170	180
…	…
228	238	$this->install_pearified_base_package("Role_Web");
229	239	midgard_setup_pear::reload_roles(&$this->pear_config);
	240
	241	$this->web_dir_hack = $this->pear_config->configuration_info['web_dir']['default'];
230	242
231	243	$this->set_midcom_static();

r17826	r17896
2	2	# If needed, add one package per line
3	3
	4	midcom
4	5	midcom_helper_datamanager2
5	6	org_openpsa_httplib