flyspray-PLD.patch

   1 diff -ur flyspray-0.9.9.5.1/includes/class.database.php flyspray-0.9.9.5.1.new/includes/class.database.php
   2 --- flyspray-0.9.9.5.1/includes/class.database.php      2008-03-17 17:41:16.000000000 +0000
   3 +++ flyspray-0.9.9.5.1.new/includes/class.database.php  2008-07-10 06:42:55.000000000 +0000
   4 @@ -16,7 +16,7 @@
   5      die('Do not access this file directly.');
   6  }
   7
   8 -require_once dirname(dirname(__FILE__)) . '/adodb/adodb.inc.php';
   9 +require_once . '/usr/share/php/adodb/adodb.inc.php';
  10
  11  class Database
  12  {
  13 Tylko w flyspray-0.9.9.5.1.new/includes: class.database.php~
  14 diff -ur flyspray-0.9.9.5.1/setup/index.php flyspray-0.9.9.5.1.new/setup/index.php
  15 --- flyspray-0.9.9.5.1/setup/index.php  2008-03-07 18:55:22.000000000 +0000
  16 +++ flyspray-0.9.9.5.1.new/setup/index.php      2008-07-10 06:44:40.000000000 +0000
  17 @@ -12,9 +12,9 @@
  18  ini_set('memory_limit', '64M');
  19
  20
  21 -if (is_readable ('../flyspray.conf.php') && count(parse_ini_file('../flyspray.conf.php')) > 0)
  22 +if (is_readable ('/etc/webapps/flyspray/flyspray.conf.php') && count(parse_ini_file('/etc/webapps/flyspray/flyspray.conf.php')) > 0)
  23  {
  24 -   die('Flyspray already installed. Use the <a href="upgrade.php">upgrader</a> to upgrade your Flyspray, or delete flyspray.conf.php to run setup.
  25 +   die('Flyspray already installed. Use the <a href="upgrade.php">upgrader</a> to upgrade your Flyspray, or delete /etc/webapps/flyspray/flyspray.conf.php to run setup.
  26          You can *not* use the setup on an existing database.');
  27  }
  28
  29 @@ -88,7 +88,7 @@
  30     function Setup()
  31     {
  32        // Look for ADOdb
  33 -      $this->mAdodbPath         = APPLICATION_PATH . '/adodb/adodb.inc.php';
  34 +      $this->mAdodbPath         = '/usr/share/php/adodb/adodb.inc.php';
  35        $this->mProductName       = 'Flyspray';
  36        $this->mMinPasswordLength        = 8;
  37
  38 @@ -806,7 +806,7 @@
  39
  40        $config_text = $config_intro . implode( "\n", $config );
  41
  42 -      if (is_writable('../flyspray.conf.php') && ($fp = fopen('../flyspray.conf.php', "wb")))
  43 +      if (is_writable('/etc/webapps/flyspray/flyspray.conf.php') && ($fp = fopen('/etc/webapps/flyspray/flyspray.conf.php', "wb")))
  44        {
  45           fputs($fp, $config_text, strlen($config_text));
  46           fclose($fp);
  47 Tylko w flyspray-0.9.9.5.1.new/setup: index.php~
  48 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
  49 --- flyspray-0.9.9.5.1/setup/templates/complete_install.tpl     2007-02-04 07:11:48.000000000 +0000
  50 +++ flyspray-0.9.9.5.1.new/setup/templates/complete_install.tpl 2008-07-04 12:10:36.000000000 +0000
  51 @@ -21,7 +21,7 @@
  52                                                         The configuration file is not writeable. You will have to upload the following
  53                                                         code manually. Click in the textarea to highlight all of the code. Copy and
  54                                                         paste the contents into the flyspray.conf.php file available in the base of
  55 -                                                       {$product_name} installation.
  56 +                                                       {$product_name} (/etc/webapps/flyspray).
  57                                                 </td>
  58                                         </tr>
  59                                         <tr>
  60 @@ -37,10 +37,10 @@
  61                                 if (!$config_writeable)
  62                                 {
  63                                 ?>
  64 -                               <h3>flyspray.conf.php NOT writeable</h3>
  65 +                               <h3>flyspray.conf NOT writeable</h3>
  66                                 <p>
  67                                         To complete setup, copy and paste the contents of the textarea box into flyspray.conf.php
  68 -                                       This file resides in the base of your {$product_name} installation.
  69 +                                       This file resides in the base of your {$product_name} installation (/etc/webapps/flyspray).
  70                                 </p>
  71                                 <?php
  72                                 }
  73 @@ -72,4 +72,4 @@
  74                                 </div>
  75                         </form>
  76                         </div><!-- end of right -->
  77 -                       <div class="clr"></div>
  78 \ Brak znaku nowej linii na końcu pliku
  79 +                       <div class="clr"></div>
  80 Tylko w flyspray-0.9.9.5.1.new/setup/templates: complete_install.tpl~
  81 diff -ur flyspray-0.9.9.5.1/setup/templates/license.tpl flyspray-0.9.9.5.1.new/setup/templates/license.tpl
  82 --- flyspray-0.9.9.5.1/setup/templates/license.tpl      2007-02-04 07:11:48.000000000 +0000
  83 +++ flyspray-0.9.9.5.1.new/setup/templates/license.tpl  2008-07-04 12:13:11.000000000 +0000
  84 @@ -11,7 +11,7 @@
  85           <div class="clr"></div>
  86
  87           <div class="formBlock" style="width:470px;position:relative;">
  88 -            <iframe src="../docs/licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
  89 +            <iframe src="licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
  90           </div>
  91
  92           <div class="clr"></div>
  93 Tylko w flyspray-0.9.9.5.1.new/setup/templates: license.tpl~
  94 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
  95 --- flyspray-0.9.9.5.1/setup/templates/pre_install.tpl  2007-03-24 13:26:36.000000000 +0000
  96 +++ flyspray-0.9.9.5.1.new/setup/templates/pre_install.tpl      2008-07-04 12:12:30.000000000 +0000
  97 @@ -38,7 +38,7 @@
  98                  </p>
  99                  <?php if (!$sapiStatus): ?>
 100                  <p><strong>CGI server API is not supported</strong>. Consider upgrading to FastCGI, otherwise you have to add
 101 -                <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf.php after setup.
 102 +                <code>force_baseurl = "http://yourflyspray/"</code> manually to flyspray.conf after setup.
 103                  </p>
 104                  <?php endif; ?>
 105                         </div>
 106 @@ -69,7 +69,7 @@
 107                         <div class="installBlock">
 108                                 <table class="formBlock">
 109                                 <tr>
 110 -                                       <td valign="top">../flyspray.conf.php</td>
 111 +                                       <td valign="top">../flyspray.conf</td>
 112                                         <td align="left"><b>{!$config_output}</b></td>
 113                                         <td>&nbsp;</td>
 114                                 </tr>
 115 @@ -93,12 +93,12 @@
 116                                 </p>
 117                                 <?php if (!$config_status): ?>
 118                                 <p>
 119 -                               The installer has detected that the <strong>flyspray.conf.php</strong> file is not
 120 +                               The installer has detected that the <strong>flyspray.conf</strong> file is not
 121                                 writeable. Please make it writeable by the web-server user or world writeable to
 122                                 proceed with the setup. Alternatively if you wish to proceed, the installer will
 123                                 make available the contents of the configuration file at the end of the setup. You
 124                                 will then have to manually copy and paste the contents into the configuration file
 125 -                               located at <strong><?php echo APPLICATION_PATH . DIRECTORY_SEPARATOR . 'flyspray.conf.php'; ?></strong>.
 126 +                               located at <strong>'/etc/webapps/flyspray/flyspray.conf</strong>.
 127                                 </p>
 128                                 <?php endif; ?>
 129                         </div>
 130 @@ -124,4 +124,4 @@
 131                         </div>
 132                         <div class="clr"></div>
 133                         </div><!-- end of right -->
 134 -                       <div class="clr"></div>
 135 \ Brak znaku nowej linii na końcu pliku
 136 +                       <div class="clr"></div>
 137 Tylko w flyspray-0.9.9.5.1.new/setup/templates: pre_install.tpl~
 138 diff -ur flyspray-0.9.9.5.1/setup/upgrade.php flyspray-0.9.9.5.1.new/setup/upgrade.php
 139 --- flyspray-0.9.9.5.1/setup/upgrade.php        2007-08-23 17:55:30.000000000 +0000
 140 +++ flyspray-0.9.9.5.1.new/setup/upgrade.php    2008-07-10 06:45:24.000000000 +0000
 141 @@ -39,8 +39,8 @@
 142  @require_once OBJECTS_PATH . '/class.tpl.php';
 143
 144  // Initialise DB
 145 -require_once APPLICATION_PATH . '/adodb/adodb.inc.php';
 146 -require_once APPLICATION_PATH . '/adodb/adodb-xmlschema03.inc.php';
 147 +require_once '/usr/share/php/adodb/adodb.inc.php';
 148 +require_once '/usr/share/php/adodb/adodb-xmlschema03.inc.php';
 149
 150  $db = new Database;
 151  $db->dbOpenFast($conf['database']);
 152 Tylko w flyspray-0.9.9.5.1.new/setup: upgrade.php~