flyspray-PLD.patch

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