- updated to 0.9.9.5.1
[packages/flyspray.git] / flyspray-PLD.patch
CommitLineData
05a6e108
SP
1diff -ur flyspray-0.9.9.5.1/includes/class.flyspray.php flyspray-0.9.9.5.1.new/includes/class.flyspray.php
2--- flyspray-0.9.9.5.1/includes/class.flyspray.php 2008-03-24 16:20:56.000000000 +0000
3+++ flyspray-0.9.9.5.1.new/includes/class.flyspray.php 2008-07-10 07:18:53.000000000 +0000
4@@ -113,7 +113,7 @@
5
6 function get_config_path($basedir = BASEDIR)
7 {
8- $cfile = $basedir . '/flyspray.conf.php';
9+ $cfile = '/etc/webapps/flyspray/flyspray.conf';
10 if (is_readable($hostconfig = sprintf('%s/%s.conf.php', $basedir, $_SERVER['SERVER_NAME']))) {
11 $cfile = $hostconfig;
12 }
13Tylko w flyspray-0.9.9.5.1.new/includes: class.flyspray.php~
05a6e108
SP
14diff -ur flyspray-0.9.9.5.1/setup/exportdb.php flyspray-0.9.9.5.1.new/setup/exportdb.php
15--- flyspray-0.9.9.5.1/setup/exportdb.php 2007-02-04 07:11:48.000000000 +0000
16+++ flyspray-0.9.9.5.1.new/setup/exportdb.php 2008-07-10 07:19:56.000000000 +0000
17@@ -3,10 +3,10 @@
18 error_reporting(E_ALL);
19
20
21-require_once '../adodb/adodb.inc.php';
22-require_once '../adodb/adodb-xmlschema03.inc.php';
23+require_once '/usr/share/php/adodb/adodb.inc.php';
24+require_once '/usr/share/php/adodb/adodb-xmlschema03.inc.php';
25
26-$conf = @parse_ini_file('../flyspray.conf.php', true) or die('Cannot open config file.');
27+$conf = @parse_ini_file('/etc/webapps/flyspray/flyspray.conf', true) or die('Cannot open config file.');
28
29 /* Start by creating a normal ADODB connection.
30 */
31@@ -26,4 +26,4 @@
32
33 file_put_contents('flyspray-schema.xml', $data);
34
35-?>
36\ Brak znaku nowej linii na końcu pliku
37+?>
38Tylko w flyspray-0.9.9.5.1.new/setup: exportdb.php~
8298f505
SP
39diff -ur flyspray-0.9.9.5.1/setup/templates/complete_install.tpl flyspray-0.9.9.5.1.new/setup/templates/complete_install.tpl
40--- flyspray-0.9.9.5.1/setup/templates/complete_install.tpl 2007-02-04 07:11:48.000000000 +0000
41+++ flyspray-0.9.9.5.1.new/setup/templates/complete_install.tpl 2008-07-04 12:10:36.000000000 +0000
42@@ -21,7 +21,7 @@
d22c3264
ER
43 The configuration file is not writeable. You will have to upload the following
44 code manually. Click in the textarea to highlight all of the code. Copy and
8298f505
SP
45 paste the contents into the flyspray.conf.php file available in the base of
46- {$product_name} installation.
47+ {$product_name} (/etc/webapps/flyspray).
d22c3264
ER
48 </td>
49 </tr>
50 <tr>
8298f505 51@@ -37,10 +37,10 @@
d22c3264
ER
52 if (!$config_writeable)
53 {
54 ?>
55- <h3>flyspray.conf.php NOT writeable</h3>
56+ <h3>flyspray.conf NOT writeable</h3>
57 <p>
8298f505
SP
58 To complete setup, copy and paste the contents of the textarea box into flyspray.conf.php
59- This file resides in the base of your {$product_name} installation.
60+ This file resides in the base of your {$product_name} installation (/etc/webapps/flyspray).
d22c3264
ER
61 </p>
62 <?php
63 }
8298f505
SP
64@@ -72,4 +72,4 @@
65 </div>
66 </form>
67 </div><!-- end of right -->
68- <div class="clr"></div>
69\ Brak znaku nowej linii na końcu pliku
70+ <div class="clr"></div>
71Tylko w flyspray-0.9.9.5.1.new/setup/templates: complete_install.tpl~
72diff -ur flyspray-0.9.9.5.1/setup/templates/license.tpl flyspray-0.9.9.5.1.new/setup/templates/license.tpl
73--- flyspray-0.9.9.5.1/setup/templates/license.tpl 2007-02-04 07:11:48.000000000 +0000
74+++ flyspray-0.9.9.5.1.new/setup/templates/license.tpl 2008-07-04 12:13:11.000000000 +0000
75@@ -11,7 +11,7 @@
76 <div class="clr"></div>
77
78 <div class="formBlock" style="width:470px;position:relative;">
79- <iframe src="../docs/licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
80+ <iframe src="licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
81 </div>
82
83 <div class="clr"></div>
84Tylko w flyspray-0.9.9.5.1.new/setup/templates: license.tpl~
85diff -ur flyspray-0.9.9.5.1/setup/templates/pre_install.tpl flyspray-0.9.9.5.1.new/setup/templates/pre_install.tpl
86--- flyspray-0.9.9.5.1/setup/templates/pre_install.tpl 2007-03-24 13:26:36.000000000 +0000
87+++ flyspray-0.9.9.5.1.new/setup/templates/pre_install.tpl 2008-07-04 12:12:30.000000000 +0000
88@@ -38,7 +38,7 @@
89 </p>
90 <?php if (!$sapiStatus): ?>
91 <p><strong>CGI server API is not supported</strong>. Consider upgrading to FastCGI, otherwise you have to add
92- <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf.php after setup.
93+ <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf after setup.
94 </p>
95 <?php endif; ?>
96 </div>
97@@ -69,7 +69,7 @@
d22c3264
ER
98 <div class="installBlock">
99 <table class="formBlock">
100 <tr>
101- <td valign="top">../flyspray.conf.php</td>
102+ <td valign="top">../flyspray.conf</td>
8298f505 103 <td align="left"><b>{!$config_output}</b></td>
d22c3264
ER
104 <td>&nbsp;</td>
105 </tr>
8298f505 106@@ -93,12 +93,12 @@
d22c3264 107 </p>
8298f505 108 <?php if (!$config_status): ?>
d22c3264
ER
109 <p>
110- The installer has detected that the <strong>flyspray.conf.php</strong> file is not
111+ The installer has detected that the <strong>flyspray.conf</strong> file is not
112 writeable. Please make it writeable by the web-server user or world writeable to
113 proceed with the setup. Alternatively if you wish to proceed, the installer will
114 make available the contents of the configuration file at the end of the setup. You
115 will then have to manually copy and paste the contents into the configuration file
8298f505
SP
116- located at <strong><?php echo APPLICATION_PATH . DIRECTORY_SEPARATOR . 'flyspray.conf.php'; ?></strong>.
117+ located at <strong>'/etc/webapps/flyspray/flyspray.conf</strong>.
d22c3264 118 </p>
8298f505 119 <?php endif; ?>
d22c3264 120 </div>
8298f505
SP
121@@ -124,4 +124,4 @@
122 </div>
123 <div class="clr"></div>
124 </div><!-- end of right -->
125- <div class="clr"></div>
126\ Brak znaku nowej linii na końcu pliku
127+ <div class="clr"></div>
128Tylko w flyspray-0.9.9.5.1.new/setup/templates: pre_install.tpl~
15bdf37a
SP
129diff -ur flyspray-0.9.9.5.1/setup/upgrade.php flyspray-0.9.9.5.1.new/setup/upgrade.php
130--- flyspray-0.9.9.5.1/setup/upgrade.php 2007-08-23 17:55:30.000000000 +0000
05a6e108 131+++ flyspray-0.9.9.5.1.new/setup/upgrade.php 2008-07-10 07:16:42.000000000 +0000
15bdf37a
SP
132@@ -39,8 +39,8 @@
133 @require_once OBJECTS_PATH . '/class.tpl.php';
134
135 // Initialise DB
136-require_once APPLICATION_PATH . '/adodb/adodb.inc.php';
137-require_once APPLICATION_PATH . '/adodb/adodb-xmlschema03.inc.php';
138+require_once '/usr/share/php/adodb/adodb.inc.php';
139+require_once '/usr/share/php/adodb/adodb-xmlschema03.inc.php';
140
141 $db = new Database;
142 $db->dbOpenFast($conf['database']);
05a6e108
SP
143@@ -204,7 +204,7 @@
144 }
145
146 $this->old_config = parse_ini_file($location, true) or die('Aborting: Could not open config file at ' . $location);
147- $this->new_config = parse_ini_file($upgrade_path . '/flyspray.conf.php', true);
148+ $this->new_config = parse_ini_file($upgrade_path . '/flyspray.conf', true);
149 // Now we overwrite all values of the *default* file if there is one in the existing config
150 array_walk($this->new_config, array($this, '_merge_configs'));
151 // save custom attachment definitions
15bdf37a 152Tylko w flyspray-0.9.9.5.1.new/setup: upgrade.php~
f2b2a416 153--- flyspray-0.9.9.5.1/setup/index.php.fix 2008-11-19 08:15:12.620962967 +0100
154+++ flyspray-0.9.9.5.1/setup/index.php 2008-11-19 08:15:27.117628234 +0100
155@@ -12,9 +12,9 @@ session_start();
156 ini_set('memory_limit', '64M');
157
158
159-if (is_readable ('../flyspray.conf.php') && count(parse_ini_file('../flyspray.conf.php')) > 0)
160+if (is_readable ('/etc/webapps/flyspray/flyspray.conf') && count(parse_ini_file('/etc/webapps/flyspray/flyspray.conf')) > 0)
161 {
162- die('Flyspray already installed. Use the <a href="upgrade.php">upgrader</a> to upgrade your Flyspray, or delete flyspray.conf.php to run setup.
163+ die('Flyspray already installed. Use the <a href="upgrade.php">upgrader</a> to upgrade your Flyspray, or delete /etc/webapps/flyspray/flyspray.conf to run setup.
164 You can *not* use the setup on an existing database.');
165 }
166
167@@ -88,7 +88,7 @@ class Setup extends Flyspray
168 function Setup()
169 {
170 // Look for ADOdb
171- $this->mAdodbPath = APPLICATION_PATH . '/adodb/adodb.inc.php';
172+ $this->mAdodbPath = '/usr/share/php/adodb/adodb.inc.php';
173 $this->mProductName = 'Flyspray';
174 $this->mMinPasswordLength = 8;
175
176@@ -125,9 +125,9 @@ class Setup extends Flyspray
177 // Get the full path to the file
178 $file = APPLICATION_PATH .'/' . $path;
179
180- // In case it is flyspray.conf.php, the file does not exist
181+ // In case it is flyspray.conf, the file does not exist
182 // so we can't tell that it is writeable. So we attempt to create an empty one
183- if ($path == 'flyspray.conf.php') {
184+ if ($path == 'flyspray.conf') {
185 $fp = @fopen($file, 'wb');
186 @fclose($fp);
187 }
188@@ -305,7 +305,7 @@ class Setup extends Flyspray
189 'vars' => array(
190 'product_name' => $this->mProductName,
191 'message' => $this->GetPageMessage(),
192- 'config_writeable' => $this->mWriteStatus['flyspray.conf.php'],
193+ 'config_writeable' => $this->mWriteStatus['flyspray.conf'],
194 'config_text' => $this->mConfigText,
195 'admin_username' => $this->mAdminUsername,
196 'admin_password' => $this->mAdminPassword,
197@@ -397,10 +397,10 @@ class Setup extends Flyspray
198 'required_php' => $this->mPhpRequired,
199 'php_output' => $this->CheckPhpCompatibility(),
200 'database_output' => $this->GetDatabaseOutput(),
201- 'config_output' => $this->CheckWriteability('flyspray.conf.php'),
202+ 'config_output' => $this->CheckWriteability('flyspray.conf'),
203 'cache_output' => $this->CheckWriteability('cache'),
204 'att_output' => $this->CheckWriteability('attachments'),
205- 'config_status' => $this->mWriteStatus['flyspray.conf.php'],
206+ 'config_status' => $this->mWriteStatus['flyspray.conf'],
207 'xmlStatus' => $this->xmlStatus,
208 'sapiStatus' => $this->sapiStatus,
209 'php_settings' => $this->GetPhpSettings(),
210@@ -806,16 +806,16 @@ class Setup extends Flyspray
211
212 $config_text = $config_intro . implode( "\n", $config );
213
214- if (is_writable('../flyspray.conf.php') && ($fp = fopen('../flyspray.conf.php', "wb")))
215+ if (is_writable('/etc/webapps/flyspray/flyspray.conf') && ($fp = fopen('../flyspray.conf.php', "wb")))
216 {
217 fputs($fp, $config_text, strlen($config_text));
218 fclose($fp);
219- $this->mWriteStatus['flyspray.conf.php'] = true;
220+ $this->mWriteStatus['flyspray.conf'] = true;
221 }
222 else
223 {
224 $this->mConfigText = $config_text;
225- $this->mWriteStatus['flyspray.conf.php'] = false;
226+ $this->mWriteStatus['flyspray.conf'] = false;
227 }
228
229
230--- flyspray-0.9.9.5.1/includes/class.database.php.fix 2008-11-19 08:15:18.444295607 +0100
231+++ flyspray-0.9.9.5.1/includes/class.database.php 2008-11-19 08:15:35.107627899 +0100
232@@ -16,7 +16,7 @@ if (!defined('IN_FS')) {
233 die('Do not access this file directly.');
234 }
235
236-require_once dirname(dirname(__FILE__)) . '/adodb/adodb.inc.php';
237+require_once '/usr/share/php/adodb/adodb.inc.php';
238
239 class Database
240 {
241@@ -53,7 +53,7 @@ class Database
242 if(!is_array($conf) || extract($conf, EXTR_REFS|EXTR_SKIP) < 5) {
243
244 die( 'Flyspray was unable to connect to the database. '
245- .'Check your settings in flyspray.conf.php');
246+ .'Check your settings in flyspray.conf');
247 }
248
249 $this->dbOpen($dbhost, $dbuser, $dbpass, $dbname, $dbtype, isset($dbprefix) ? $dbprefix : '');
250@@ -82,7 +82,7 @@ class Database
251 if ($this->dblink === false || (!empty($this->dbprefix) && !preg_match('/^[a-z][a-z0-9_]+$/i', $this->dbprefix))) {
252
253 die('Flyspray was unable to connect to the database. '
254- .'Check your settings in flyspray.conf.php');
255+ .'Check your settings in flyspray.conf');
256 }
257 $this->dblink->SetFetchMode(ADODB_FETCH_BOTH);
258
This page took 0.108747 seconds and 4 git commands to generate.