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