---- flyspray-0.9.8/header.php 2005-10-23 03:11:14.000000000 +0300
-+++ /tmp/header.php 2005-12-11 18:38:26.000000000 +0200
-@@ -34,7 +34,7 @@
- //echo get_include_path();
+diff -ur flyspray-0.9.9.5.1/includes/class.flyspray.php flyspray-0.9.9.5.1.new/includes/class.flyspray.php
+--- flyspray-0.9.9.5.1/includes/class.flyspray.php 2008-03-24 16:20:56.000000000 +0000
++++ flyspray-0.9.9.5.1.new/includes/class.flyspray.php 2008-07-10 07:18:53.000000000 +0000
+@@ -113,7 +113,7 @@
- // Define the path to the config file. Change this line if you move flyspray.conf.php elsewhere
--$conf_file = $path . $slash . "flyspray.conf.php";
-+$conf_file = '/etc/webapps/flyspray/flyspray.conf';
-
- // Check if config file exists and its not empty.
- // If it doesn't exist or is empty, take the user to the setup page
---- flyspray-0.9.8/setup/index.php 2005-09-18 13:45:46.000000000 +0300
-+++ /tmp/index.php 2005-12-11 18:56:30.000000000 +0200
-@@ -14,9 +14,9 @@
-
- error_reporting(0);
-
--if (file_exists('../flyspray.conf.php') && (count($config = parse_ini_file('../flyspray.conf.php', true)) > 0) )
-+if (file_exists('/etc/webapps/flyspray/flyspray.conf') && (count($config = parse_ini_file('/etc/webapps/flyspray/flyspray.conf', true)) > 0) )
- {
-- die('Flyspray Already Installed. Delete the contents of flyspray.conf.php to run setup.');
-+ die('Flyspray Already Installed. Delete the contents of /etc/webapps/flyspray/flyspray.conf to run setup.');
- }
-
- // ---------------------------------------------------------------------
-@@ -192,7 +192,7 @@
- function CheckAdodbLibrary()
- {
- // Get the ADOdb library path. If not found it will be FALSE
-- $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
-+ $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/pear/adodb');
-
- // Update the status of the library
- $this->mAdodbStatus = ($this->mAdodbPath) ? TRUE : FALSE;
-@@ -209,7 +209,7 @@
- function CheckConfigFile()
- {
- // Get the full path to the file
-- $file = realpath('../flyspray.conf.php');
-+ $file = '/etc/webapps/flyspray/flyspray.conf';
-
- // Update the status of the Config file
- $this->mConfigFileStatus = $this->IsWriteable($file);
-@@ -1211,6 +1211,7 @@
-
- $config_intro =
- "; <?php die( 'Do not access this page directly.' ); ?>
-+ ; vim: syn=dosini
-
- ; This is the Flysplay configuration file. It contains the basic settings
- ; needed for Flyspray to operate. All other preferences are stored in the
-@@ -1265,7 +1266,7 @@
-
- $config_text = $config_intro . implode( "\n", $config );
-
-- if (is_writable('../flyspray.conf.php') && ($fp = fopen('../flyspray.conf.php', "w")))
-+ if (is_writable('/etc/webapps/flyspray/flyspray.conf') && ($fp = fopen('/etc/webapps/flyspray/flyspray.conf', "w")))
- {
- fputs($fp, $config_text, strlen($config_text));
- fclose($fp);
-diff -u ../../../flyspray-0.9.8/setup/templates/./complete_install.tpl.php /tmp/complete_install.tpl.php
---- flyspray-0.9.8/setup/templates/./complete_install.tpl.php 2005-08-27 05:49:56.000000000 +0300
-+++ /tmp/complete_install.tpl.php 2005-12-11 19:00:06.000000000 +0200
-@@ -33,8 +33,8 @@
- <td>
+ function get_config_path($basedir = BASEDIR)
+ {
+- $cfile = $basedir . '/flyspray.conf.php';
++ $cfile = '/etc/webapps/flyspray/flyspray.conf';
+ if (is_readable($hostconfig = sprintf('%s/%s.conf.php', $basedir, $_SERVER['SERVER_NAME']))) {
+ $cfile = $hostconfig;
+ }
+Tylko w flyspray-0.9.9.5.1.new/includes: class.flyspray.php~
+diff -ur flyspray-0.9.9.5.1/setup/exportdb.php flyspray-0.9.9.5.1.new/setup/exportdb.php
+--- flyspray-0.9.9.5.1/setup/exportdb.php 2007-02-04 07:11:48.000000000 +0000
++++ flyspray-0.9.9.5.1.new/setup/exportdb.php 2008-07-10 07:19:56.000000000 +0000
+@@ -3,10 +3,10 @@
+ error_reporting(E_ALL);
+
+
+-require_once '../adodb/adodb.inc.php';
+-require_once '../adodb/adodb-xmlschema03.inc.php';
++require_once '/usr/share/php/adodb/adodb.inc.php';
++require_once '/usr/share/php/adodb/adodb-xmlschema03.inc.php';
+
+-$conf = @parse_ini_file('../flyspray.conf.php', true) or die('Cannot open config file.');
++$conf = @parse_ini_file('/etc/webapps/flyspray/flyspray.conf', true) or die('Cannot open config file.');
+
+ /* Start by creating a normal ADODB connection.
+ */
+@@ -26,4 +26,4 @@
+
+ file_put_contents('flyspray-schema.xml', $data);
+
+-?>
+\ Brak znaku nowej linii na końcu pliku
++?>
+Tylko w flyspray-0.9.9.5.1.new/setup: exportdb.php~
+diff -ur flyspray-0.9.9.5.1/setup/templates/complete_install.tpl flyspray-0.9.9.5.1.new/setup/templates/complete_install.tpl
+--- flyspray-0.9.9.5.1/setup/templates/complete_install.tpl 2007-02-04 07:11:48.000000000 +0000
++++ flyspray-0.9.9.5.1.new/setup/templates/complete_install.tpl 2008-07-04 12:10:36.000000000 +0000
+@@ -21,7 +21,7 @@
The configuration file is not writeable. You will have to upload the following
code manually. Click in the textarea to highlight all of the code. Copy and
-- paste the contents into the flyspray.conf.php file available in the base of
-- <?php echo $product_name; ?> installation.
-+ paste the contents into the flyspray.conf file in the webapps directory of
-+ <?php echo $product_name; ?> (/etc/webapps/flyspray).
+ paste the contents into the flyspray.conf.php file available in the base of
+- {$product_name} installation.
++ {$product_name} (/etc/webapps/flyspray).
</td>
</tr>
<tr>
-@@ -50,10 +50,10 @@
+@@ -37,10 +37,10 @@
if (!$config_writeable)
{
?>
- <h3>flyspray.conf.php NOT writeable</h3>
+ <h3>flyspray.conf NOT writeable</h3>
<p>
-- To complete setup, copy and paste the contents of the textarea box into flyspray.conf.php
-- This file resides in the base of your <?php echo $product_name; ?> installation.
-+ To complete setup, copy and paste the contents of the textarea box into flyspray.conf
-+ This file resides in the webapps directory of your <?php echo $product_name; ?> installation (/etc/webapps/flyspray).
+ To complete setup, copy and paste the contents of the textarea box into flyspray.conf.php
+- This file resides in the base of your {$product_name} installation.
++ This file resides in the base of your {$product_name} installation (/etc/webapps/flyspray).
</p>
<?php
}
-diff -u ../../../flyspray-0.9.8/setup/templates/./pre_install.tpl.php /tmp/pre_install.tpl.php
---- flyspray-0.9.8/setup/templates/./pre_install.tpl.php 2005-08-27 05:49:56.000000000 +0300
-+++ /tmp/pre_install.tpl.php 2005-12-11 18:58:20.000000000 +0200
-@@ -100,7 +100,7 @@
+@@ -72,4 +72,4 @@
+ </div>
+ </form>
+ </div><!-- end of right -->
+- <div class="clr"></div>
+\ Brak znaku nowej linii na końcu pliku
++ <div class="clr"></div>
+Tylko w flyspray-0.9.9.5.1.new/setup/templates: complete_install.tpl~
+diff -ur flyspray-0.9.9.5.1/setup/templates/license.tpl flyspray-0.9.9.5.1.new/setup/templates/license.tpl
+--- flyspray-0.9.9.5.1/setup/templates/license.tpl 2007-02-04 07:11:48.000000000 +0000
++++ flyspray-0.9.9.5.1.new/setup/templates/license.tpl 2008-07-04 12:13:11.000000000 +0000
+@@ -11,7 +11,7 @@
+ <div class="clr"></div>
+
+ <div class="formBlock" style="width:470px;position:relative;">
+- <iframe src="../docs/licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
++ <iframe src="licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
+ </div>
+
+ <div class="clr"></div>
+Tylko w flyspray-0.9.9.5.1.new/setup/templates: license.tpl~
+diff -ur flyspray-0.9.9.5.1/setup/templates/pre_install.tpl flyspray-0.9.9.5.1.new/setup/templates/pre_install.tpl
+--- flyspray-0.9.9.5.1/setup/templates/pre_install.tpl 2007-03-24 13:26:36.000000000 +0000
++++ flyspray-0.9.9.5.1.new/setup/templates/pre_install.tpl 2008-07-04 12:12:30.000000000 +0000
+@@ -38,7 +38,7 @@
+ </p>
+ <?php if (!$sapiStatus): ?>
+ <p><strong>CGI server API is not supported</strong>. Consider upgrading to FastCGI, otherwise you have to add
+- <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf.php after setup.
++ <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf after setup.
+ </p>
+ <?php endif; ?>
+ </div>
+@@ -69,7 +69,7 @@
<div class="installBlock">
<table class="formBlock">
<tr>
- <td valign="top">../flyspray.conf.php</td>
+ <td valign="top">../flyspray.conf</td>
- <td align="left"><b><?php echo $config_output; ?></b></td>
+ <td align="left"><b>{!$config_output}</b></td>
<td> </td>
</tr>
-@@ -114,12 +114,12 @@
+@@ -93,12 +93,12 @@
</p>
- <?php if (!$config_status){ ?>
+ <?php if (!$config_status): ?>
<p>
- The installer has detected that the <strong>flyspray.conf.php</strong> file is not
+ The installer has detected that the <strong>flyspray.conf</strong> file is not
proceed with the setup. Alternatively if you wish to proceed, the installer will
make available the contents of the configuration file at the end of the setup. You
will then have to manually copy and paste the contents into the configuration file
-- located at <strong><?php echo APPLICATION_PATH . '/flyspray.conf.php'; ?></strong>.
-+ located at <strong>/etc/webapps/flyspray/flyspray.conf</strong>.
+- located at <strong><?php echo APPLICATION_PATH . DIRECTORY_SEPARATOR . 'flyspray.conf.php'; ?></strong>.
++ located at <strong>'/etc/webapps/flyspray/flyspray.conf</strong>.
</p>
- <?php } ?>
+ <?php endif; ?>
</div>
-diff -u templates/license.tpl.php /tmp/license.tpl.php
---- ./setup/templates/license.tpl.php 2005-08-27 05:49:56.000000000 +0300
-+++ /tmp/license.tpl.php 2005-12-11 19:07:25.000000000 +0200
-@@ -23,7 +23,7 @@
- <div class="clr"></div>
+@@ -124,4 +124,4 @@
+ </div>
+ <div class="clr"></div>
+ </div><!-- end of right -->
+- <div class="clr"></div>
+\ Brak znaku nowej linii na końcu pliku
++ <div class="clr"></div>
+Tylko w flyspray-0.9.9.5.1.new/setup/templates: pre_install.tpl~
+diff -ur flyspray-0.9.9.5.1/setup/upgrade.php flyspray-0.9.9.5.1.new/setup/upgrade.php
+--- flyspray-0.9.9.5.1/setup/upgrade.php 2007-08-23 17:55:30.000000000 +0000
++++ flyspray-0.9.9.5.1.new/setup/upgrade.php 2008-07-10 07:16:42.000000000 +0000
+@@ -39,8 +39,8 @@
+ @require_once OBJECTS_PATH . '/class.tpl.php';
- <div class="formBlock" style="width:470px;position:relative;">
-- <iframe src="../docs/licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
-+ <iframe src="licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
- </div>
+ // Initialise DB
+-require_once APPLICATION_PATH . '/adodb/adodb.inc.php';
+-require_once APPLICATION_PATH . '/adodb/adodb-xmlschema03.inc.php';
++require_once '/usr/share/php/adodb/adodb.inc.php';
++require_once '/usr/share/php/adodb/adodb-xmlschema03.inc.php';
- <div class="clr"></div>
---- flyspray-0.9.8/setup/index.php 2005-12-11 19:32:38.000000000 +0200
-+++ /tmp/index.php 2005-12-11 19:36:24.000000000 +0200
-@@ -1341,7 +1347,7 @@
- function ProcessDatabaseSetup($data)
+ $db = new Database;
+ $db->dbOpenFast($conf['database']);
+@@ -204,7 +204,7 @@
+ }
+
+ $this->old_config = parse_ini_file($location, true) or die('Aborting: Could not open config file at ' . $location);
+- $this->new_config = parse_ini_file($upgrade_path . '/flyspray.conf.php', true);
++ $this->new_config = parse_ini_file($upgrade_path . '/flyspray.conf', true);
+ // Now we overwrite all values of the *default* file if there is one in the existing config
+ array_walk($this->new_config, array($this, '_merge_configs'));
+ // save custom attachment definitions
+Tylko w flyspray-0.9.9.5.1.new/setup: upgrade.php~
+--- flyspray-0.9.9.5.1/setup/index.php.fix 2008-11-19 08:15:12.620962967 +0100
++++ flyspray-0.9.9.5.1/setup/index.php 2008-11-19 08:15:27.117628234 +0100
+@@ -12,9 +12,9 @@ session_start();
+ ini_set('memory_limit', '64M');
+
+
+-if (is_readable ('../flyspray.conf.php') && count(parse_ini_file('../flyspray.conf.php')) > 0)
++if (is_readable ('/etc/webapps/flyspray/flyspray.conf') && count(parse_ini_file('/etc/webapps/flyspray/flyspray.conf')) > 0)
+ {
+- die('Flyspray already installed. Use the <a href="upgrade.php">upgrader</a> to upgrade your Flyspray, or delete flyspray.conf.php to run setup.
++ 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.
+ You can *not* use the setup on an existing database.');
+ }
+
+@@ -88,7 +88,7 @@ class Setup extends Flyspray
+ function Setup()
{
// Look for ADOdb
-- $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
-+ $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/pear/adodb');
- require_once($this->mAdodbPath);
-
- // Perform a number of fatality checks, then die gracefully
---- flyspray-0.9.8/setup/index.php 2005-12-11 19:37:17.000000000 +0200
-+++ /tmp/index.php 2005-12-11 19:40:25.000000000 +0200
-@@ -1118,7 +1118,7 @@
- 'db_hostname' => array('Database hostname', 'string', TRUE),
- 'db_type' => array('Database type', 'string', TRUE),
- 'db_username' => array('Database username', 'string', TRUE),
-- 'db_password' => array('Database password', 'string', TRUE),
-+ 'db_password' => array('Database password', 'string', false),
- 'db_name' => array('Database name', 'string', TRUE),
- 'db_prefix' => array('Table prefix', 'string', TRUE),
- 'db_delete' => array('Delete tables checkbox', 'string', FALSE),
---- flyspray-0.9.8/setup/index.php 2005-12-11 19:40:49.000000000 +0200
-+++ /tmp/index.php 2005-12-11 19:46:55.000000000 +0200
-@@ -1155,7 +1155,7 @@
- 'db_hostname' => array('Database hostname', 'string', TRUE),
- 'db_type' => array('Database type', 'string', TRUE),
- 'db_username' => array('Database username', 'string', TRUE),
-- 'db_password' => array('Database password', 'string', TRUE),
-+ 'db_password' => array('Database password', 'string', false),
- 'db_name' => array('Database name', 'string', TRUE),
- 'db_prefix' => array('Table prefix', 'string', TRUE),
- 'db_setup_options' => array('Database type', 'number', TRUE),
-@@ -1385,7 +1385,7 @@
- break;
-
- default:
-- $_SESSION['page_message'][] = 'Please verify your username/password/database details.';
-+ $_SESSION['page_message'][] = "Please verify your username/password/database details (error=$error_number)";
- return FALSE;
- break;
- }
+- $this->mAdodbPath = APPLICATION_PATH . '/adodb/adodb.inc.php';
++ $this->mAdodbPath = '/usr/share/php/adodb/adodb.inc.php';
+ $this->mProductName = 'Flyspray';
+ $this->mMinPasswordLength = 8;
+
+@@ -125,9 +125,9 @@ class Setup extends Flyspray
+ // Get the full path to the file
+ $file = APPLICATION_PATH .'/' . $path;
+
+- // In case it is flyspray.conf.php, the file does not exist
++ // In case it is flyspray.conf, the file does not exist
+ // so we can't tell that it is writeable. So we attempt to create an empty one
+- if ($path == 'flyspray.conf.php') {
++ if ($path == 'flyspray.conf') {
+ $fp = @fopen($file, 'wb');
+ @fclose($fp);
+ }
+@@ -305,7 +305,7 @@ class Setup extends Flyspray
+ 'vars' => array(
+ 'product_name' => $this->mProductName,
+ 'message' => $this->GetPageMessage(),
+- 'config_writeable' => $this->mWriteStatus['flyspray.conf.php'],
++ 'config_writeable' => $this->mWriteStatus['flyspray.conf'],
+ 'config_text' => $this->mConfigText,
+ 'admin_username' => $this->mAdminUsername,
+ 'admin_password' => $this->mAdminPassword,
+@@ -397,10 +397,10 @@ class Setup extends Flyspray
+ 'required_php' => $this->mPhpRequired,
+ 'php_output' => $this->CheckPhpCompatibility(),
+ 'database_output' => $this->GetDatabaseOutput(),
+- 'config_output' => $this->CheckWriteability('flyspray.conf.php'),
++ 'config_output' => $this->CheckWriteability('flyspray.conf'),
+ 'cache_output' => $this->CheckWriteability('cache'),
+ 'att_output' => $this->CheckWriteability('attachments'),
+- 'config_status' => $this->mWriteStatus['flyspray.conf.php'],
++ 'config_status' => $this->mWriteStatus['flyspray.conf'],
+ 'xmlStatus' => $this->xmlStatus,
+ 'sapiStatus' => $this->sapiStatus,
+ 'php_settings' => $this->GetPhpSettings(),
+@@ -806,16 +806,16 @@ class Setup extends Flyspray
+
+ $config_text = $config_intro . implode( "\n", $config );
+
+- if (is_writable('../flyspray.conf.php') && ($fp = fopen('../flyspray.conf.php', "wb")))
++ if (is_writable('/etc/webapps/flyspray/flyspray.conf') && ($fp = fopen('../flyspray.conf.php', "wb")))
+ {
+ fputs($fp, $config_text, strlen($config_text));
+ fclose($fp);
+- $this->mWriteStatus['flyspray.conf.php'] = true;
++ $this->mWriteStatus['flyspray.conf'] = true;
+ }
+ else
+ {
+ $this->mConfigText = $config_text;
+- $this->mWriteStatus['flyspray.conf.php'] = false;
++ $this->mWriteStatus['flyspray.conf'] = false;
+ }
+
+
+--- flyspray-0.9.9.5.1/includes/class.database.php.fix 2008-11-19 08:15:18.444295607 +0100
++++ flyspray-0.9.9.5.1/includes/class.database.php 2008-11-19 08:15:35.107627899 +0100
+@@ -16,7 +16,7 @@ if (!defined('IN_FS')) {
+ die('Do not access this file directly.');
+ }
+
+-require_once dirname(dirname(__FILE__)) . '/adodb/adodb.inc.php';
++require_once '/usr/share/php/adodb/adodb.inc.php';
+
+ class Database
+ {
+@@ -53,7 +53,7 @@ class Database
+ if(!is_array($conf) || extract($conf, EXTR_REFS|EXTR_SKIP) < 5) {
+
+ die( 'Flyspray was unable to connect to the database. '
+- .'Check your settings in flyspray.conf.php');
++ .'Check your settings in flyspray.conf');
+ }
+
+ $this->dbOpen($dbhost, $dbuser, $dbpass, $dbname, $dbtype, isset($dbprefix) ? $dbprefix : '');
+@@ -82,7 +82,7 @@ class Database
+ if ($this->dblink === false || (!empty($this->dbprefix) && !preg_match('/^[a-z][a-z0-9_]+$/i', $this->dbprefix))) {
+
+ die('Flyspray was unable to connect to the database. '
+- .'Check your settings in flyspray.conf.php');
++ .'Check your settings in flyspray.conf');
+ }
+ $this->dblink->SetFetchMode(ADODB_FETCH_BOTH);
+
projects / packages / flyspray.git / blobdiff