flyspray-PLD.patch

   1 --- flyspray-0.9.8/header.php   2005-10-23 03:11:14.000000000 +0300
   2 +++ /tmp/header.php     2005-12-11 18:38:26.000000000 +0200
   3 @@ -34,7 +34,7 @@
   4  //echo get_include_path();
   5
   6  // Define the path to the config file.  Change this line if you move flyspray.conf.php elsewhere
   7 -$conf_file = $path . $slash . "flyspray.conf.php";
   8 +$conf_file = '/etc/webapps/flyspray/flyspray.conf';
   9
  10  // Check if config file exists and its not empty.
  11  // If it doesn't exist or is empty, take the user to the setup page
  12 --- flyspray-0.9.8/setup/index.php      2005-09-18 13:45:46.000000000 +0300
  13 +++ /tmp/index.php      2005-12-11 18:56:30.000000000 +0200
  14 @@ -14,9 +14,9 @@
  15
  16  error_reporting(0);
  17
  18 -if (file_exists('../flyspray.conf.php') && (count($config = parse_ini_file('../flyspray.conf.php', true)) > 0) )
  19 +if (file_exists('/etc/webapps/flyspray/flyspray.conf') && (count($config = parse_ini_file('/etc/webapps/flyspray/flyspray.conf', true)) > 0) )
  20  {
  21 -   die('Flyspray Already Installed. Delete the contents of flyspray.conf.php to run setup.');
  22 +   die('Flyspray Already Installed. Delete the contents of /etc/webapps/flyspray/flyspray.conf to run setup.');
  23  }
  24
  25  // ---------------------------------------------------------------------
  26 @@ -192,7 +192,7 @@
  27     function CheckAdodbLibrary()
  28     {
  29        // Get the ADOdb library path. If not found it will be FALSE
  30 -      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
  31 +      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/php/adodb');
  32
  33        // Update the status of the library
  34        $this->mAdodbStatus = ($this->mAdodbPath) ? TRUE : FALSE;
  35 @@ -209,7 +209,7 @@
  36     function CheckConfigFile()
  37     {
  38        // Get the full path to the file
  39 -      $file = realpath('../flyspray.conf.php');
  40 +      $file = '/etc/webapps/flyspray/flyspray.conf';
  41
  42        // Update the status of the Config file
  43        $this->mConfigFileStatus = $this->IsWriteable($file);
  44 @@ -1211,6 +1211,7 @@
  45
  46        $config_intro    =
  47        "; <?php die( 'Do not access this page directly.' ); ?>
  48 +         ; vim: syn=dosini
  49
  50        ; This is the Flysplay configuration file. It contains the basic settings
  51        ; needed for Flyspray to operate. All other preferences are stored in the
  52 @@ -1265,7 +1266,7 @@
  53
  54        $config_text = $config_intro . implode( "\n", $config );
  55
  56 -      if (is_writable('../flyspray.conf.php') && ($fp = fopen('../flyspray.conf.php', "w")))
  57 +      if (is_writable('/etc/webapps/flyspray/flyspray.conf') && ($fp = fopen('/etc/webapps/flyspray/flyspray.conf', "w")))
  58        {
  59           fputs($fp, $config_text, strlen($config_text));
  60           fclose($fp);
  61 diff -u ../../../flyspray-0.9.8/setup/templates/./complete_install.tpl.php /tmp/complete_install.tpl.php
  62 --- flyspray-0.9.8/setup/templates/./complete_install.tpl.php   2005-08-27 05:49:56.000000000 +0300
  63 +++ /tmp/complete_install.tpl.php       2005-12-11 19:00:06.000000000 +0200
  64 @@ -33,8 +33,8 @@
  65                                                 <td>
  66                                                         The configuration file is not writeable. You will have to upload the following
  67                                                         code manually. Click in the textarea to highlight all of the code. Copy and
  68 -                                                       paste the contents into the flyspray.conf.php file available in the base of
  69 -                                                       <?php echo $product_name; ?> installation.
  70 +                                                       paste the contents into the flyspray.conf file in the webapps directory of
  71 +                                                       <?php echo $product_name; ?> (/etc/webapps/flyspray).
  72                                                 </td>
  73                                         </tr>
  74                                         <tr>
  75 @@ -50,10 +50,10 @@
  76                                 if (!$config_writeable)
  77                                 {
  78                                 ?>
  79 -                               <h3>flyspray.conf.php NOT writeable</h3>
  80 +                               <h3>flyspray.conf NOT writeable</h3>
  81                                 <p>
  82 -                                       To complete setup, copy and paste the contents of the textarea box into flyspray.conf.php
  83 -                                       This file resides in the base of your <?php echo $product_name; ?> installation.
  84 +                                       To complete setup, copy and paste the contents of the textarea box into flyspray.conf
  85 +                                       This file resides in the webapps directory of your <?php echo $product_name; ?> installation (/etc/webapps/flyspray).
  86                                 </p>
  87                                 <?php
  88                                 }
  89 diff -u ../../../flyspray-0.9.8/setup/templates/./pre_install.tpl.php /tmp/pre_install.tpl.php
  90 --- flyspray-0.9.8/setup/templates/./pre_install.tpl.php        2005-08-27 05:49:56.000000000 +0300
  91 +++ /tmp/pre_install.tpl.php    2005-12-11 18:58:20.000000000 +0200
  92 @@ -100,7 +100,7 @@
  93                         <div class="installBlock">
  94                                 <table class="formBlock">
  95                                 <tr>
  96 -                                       <td valign="top">../flyspray.conf.php</td>
  97 +                                       <td valign="top">../flyspray.conf</td>
  98                                         <td align="left"><b><?php echo $config_output; ?></b></td>
  99                                         <td>&nbsp;</td>
 100                                 </tr>
 101 @@ -114,12 +114,12 @@
 102                                 </p>
 103                                 <?php if (!$config_status){ ?>
 104                                 <p>
 105 -                               The installer has detected that the <strong>flyspray.conf.php</strong> file is not
 106 +                               The installer has detected that the <strong>flyspray.conf</strong> file is not
 107                                 writeable. Please make it writeable by the web-server user or world writeable to
 108                                 proceed with the setup. Alternatively if you wish to proceed, the installer will
 109                                 make available the contents of the configuration file at the end of the setup. You
 110                                 will then have to manually copy and paste the contents into the configuration file
 111 -                               located at <strong><?php echo APPLICATION_PATH . '/flyspray.conf.php'; ?></strong>.
 112 +                               located at <strong>/etc/webapps/flyspray/flyspray.conf</strong>.
 113                                 </p>
 114                                 <?php } ?>
 115                         </div>
 116 diff -u templates/license.tpl.php /tmp/license.tpl.php
 117 --- ./setup/templates/license.tpl.php   2005-08-27 05:49:56.000000000 +0300
 118 +++ /tmp/license.tpl.php        2005-12-11 19:07:25.000000000 +0200
 119 @@ -23,7 +23,7 @@
 120           <div class="clr"></div>
 121
 122           <div class="formBlock" style="width:470px;position:relative;">
 123 -            <iframe src="../docs/licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
 124 +            <iframe src="licences/gnu_lgpl.html" class="license" width="450" frameborder="0" scrolling="auto"></iframe>
 125           </div>
 126
 127           <div class="clr"></div>
 128 --- flyspray-0.9.8/setup/index.php      2005-12-11 19:32:38.000000000 +0200
 129 +++ /tmp/index.php      2005-12-11 19:36:24.000000000 +0200
 130 @@ -1341,7 +1347,7 @@
 131     function ProcessDatabaseSetup($data)
 132     {
 133        // Look for ADOdb
 134 -      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
 135 +      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/php/adodb');
 136        require_once($this->mAdodbPath);
 137
 138        // Perform a number of fatality checks, then die gracefully
 139 --- flyspray-0.9.8/setup/index.php      2005-12-11 19:37:17.000000000 +0200
 140 +++ /tmp/index.php      2005-12-11 19:40:25.000000000 +0200
 141 @@ -1118,7 +1118,7 @@
 142                    'db_hostname' => array('Database hostname', 'string', TRUE),
 143                    'db_type' =>  array('Database type', 'string', TRUE),
 144                    'db_username' => array('Database username', 'string', TRUE),
 145 -                  'db_password' => array('Database password', 'string', TRUE),
 146 +                  'db_password' => array('Database password', 'string', false),
 147                    'db_name' => array('Database name', 'string', TRUE),
 148                    'db_prefix' => array('Table prefix', 'string', TRUE),
 149                    'db_delete' => array('Delete tables checkbox', 'string', FALSE),
 150 --- flyspray-0.9.8/setup/index.php      2005-12-11 19:40:49.000000000 +0200
 151 +++ /tmp/index.php      2005-12-11 19:46:55.000000000 +0200
 152 @@ -1155,7 +1155,7 @@
 153                 'db_hostname' => array('Database hostname', 'string', TRUE),
 154                 'db_type' =>  array('Database type', 'string', TRUE),
 155                 'db_username' => array('Database username', 'string', TRUE),
 156 -               'db_password' => array('Database password', 'string', TRUE),
 157 +               'db_password' => array('Database password', 'string', false),
 158                 'db_name' => array('Database name', 'string', TRUE),
 159                 'db_prefix' => array('Table prefix', 'string', TRUE),
 160                 'db_setup_options' =>  array('Database type', 'number', TRUE),
 161 @@ -1385,7 +1385,7 @@
 162              break;
 163
 164              default:
 165 -            $_SESSION['page_message'][] = 'Please verify your username/password/database details.';
 166 +            $_SESSION['page_message'][] = "Please verify your username/password/database details (error=$error_number)";
 167              return FALSE;
 168              break;
 169           }