-/phpBB/config.php

-/phpBB/config_dev.php

-/phpBB/config_test.php

-/tests/test_config.php

- - 5.2

- - DB=postgres

- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"

- - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi"

- - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi"

- - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"

-

-notifications:

- email:

- recipients:

- - dev-team@phpbb.com

- on_success: change

- on_failure: change

-We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](http://bamboo.phpbb.com) or check our travis build below.

-develop - [](http://travis-ci.org/phpbb/phpbb3)

-develop-olympus - [](http://travis-ci.org/phpbb/phpbb3)

- <property name="newversion" value="3.0.12" />

- <property name="prevversion" value="3.0.11" />

- <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.12-RC1, 3.0.12-RC2, 3.0.12-RC3" />

- --configuration phpunit.xml.all

- <!-- only works if you setup phpdoctor:

- git clone https://github.com/peej/phpdoctor.git

- and then create an executable phpdoctor in your path containing

- #!/bin/sh

- php -f /path/to/phpdoctor/phpdoc.php $@

- -->

- <exec dir="build"

- command="phpdoctor phpdoc-phpbb.ini"

- <exec dir="build/old_versions" command="diff -crNEBwd release-${version} release-${newversion} >

- <exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />

-

- save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />

- save/save_${prevversion}_to_${newversion}/prosilver/phpbb-${prevversion}_to_${newversion}_prosilver.patch" />

- save/save_${prevversion}_to_${newversion}/subsilver2/phpbb-${prevversion}_to_${newversion}_subsilver2.patch" />

- save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_shortlog.txt" />

- save/save_${prevversion}_to_${newversion}/phpbb-${prevversion}_to_${newversion}_git_diffstat.txt" />

- <exec dir="."

- command='php -r "\$j = json_decode(file_get_contents("composer.json")); echo isset(\$j->require);"'

- command="php composer.phar install"

-#!/usr/bin/env php

-<?php

-/**

-*

-* @package build

-* @copyright (c) 2010 phpBB Group

-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2

-*

-*/

-

-if ($_SERVER['argc'] != 3)

-{

- die("Please specify the previous and current version as arguments (e.g. build_diff.php '1.0.2' '1.0.3').");

-}

-

-$old_version = trim($_SERVER['argv'][1]);

-$new_version = trim($_SERVER['argv'][2]);

-

-$substitute_old = $old_version;

-$substitute_new = $new_version;

-$simple_name_old = 'release-' . $old_version;

-$simple_name_new = 'release-' . $new_version;

-$echo_changes = false;

-

-// DO NOT EVER USE THE FOLLOWING! Fix the script to generate proper changes,

-// do NOT manually create them.

-

-// Set this to true to just compress the changes and do not build them again

-// This should be used for building custom modified txt file. ;)

-$package_changed_files = false;

-

-//$debug_file = 'includes/functions_user.php'; //'styles/prosilver/style.cfg';

-$debug_file = false;

-

-if ($debug_file !== false)

-{

- $echo_changes = false;

-}

-

-$s_name = 'save_' . $substitute_old . '_to_' . $substitute_new;

-

-$location = dirname(__FILE__);

-

-if (!$package_changed_files)

-{

- if (!$echo_changes)

- {

- // Create directory...

- run_command("mkdir $location/save/{$s_name}");

- run_command("mkdir $location/save/{$s_name}/language");

- run_command("mkdir $location/save/{$s_name}/prosilver");

- run_command("mkdir $location/save/{$s_name}/subsilver2");

- }

-}

-

-// Build code changes and place them into 'save'

-if (!$package_changed_files)

-{

- build_code_changes('language');

- build_code_changes('prosilver');

- build_code_changes('subsilver2');

-}

-

-// Package code changes

-$code_changes_filename = 'phpBB-' . $substitute_old . '_to_' . $substitute_new . '-codechanges';

-

-if (!$echo_changes)

-{

- // Now compress the files...

- // Build Main phpBB Release

- $compress_programs = array(

-// 'tar.gz' => 'tar -czf',

- 'tar.bz2' => 'tar -cjf',

- 'zip' => 'zip -r'

- );

-

- chdir($location . '/save/' . $s_name);

- foreach ($compress_programs as $extension => $compress_command)

- {

- echo "Packaging code changes for $extension\n";

- run_command("rm ./../../new_version/release_files/{$code_changes_filename}.{$extension}");

- flush();

-

- // Build Package

- run_command("$compress_command ./../../new_version/release_files/{$code_changes_filename}.{$extension} *");

-

- // Build MD5 Sum

- run_command("md5sum ./../../new_version/release_files/{$code_changes_filename}.{$extension} > ./../../new_version/release_files/{$code_changes_filename}.{$extension}.md5");

- flush();

- }

-}

-

-/**

-* $output_format can be: language, prosilver and subsilver2

-*/

-function build_code_changes($output_format)

-{

- global $substitute_new, $substitute_old, $simple_name_old, $simple_name_new, $echo_changes, $package_changed_files, $location, $debug_file, $s_name;

-

- // Global array holding the data entries

- $data = array(

- 'header' => array(),

- 'diff' => array(),

- );

-

- // Read diff file and prepare the output filedata...

- //$patch_filename = '../new_version/patches/phpBB-' . $substitute_old . '_to_' . $substitute_new . '.patch';

- $release_filename = 'phpbb-' . $substitute_old . '_to_' . $substitute_new . '_' . $output_format . '.txt';

-

- if (!$package_changed_files)

- {

- if (!$echo_changes)

- {

- $fp = fopen('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 'wb');

-

- if (!$fp)

- {

- die('Unable to create ' . $release_filename);

- }

- }

- }

-

- include_once($location . '/build_helper.php');

- $package = new build_package(array($substitute_old, $substitute_new), false);

-

- $titles = array(

- 'language' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' Language Pack Changes',

- 'prosilver' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' prosilver Changes',

- 'subsilver2' => 'phpBB ' . $substitute_old . ' to phpBB ' . $substitute_new . ' subsilver2 Changes',

- );

-

- $data['header'] = array(

- 'title' => $titles[$output_format],

- 'intro' => '

-

-These are the ' . $titles[$output_format] . ' summed up into a little Mod. These changes are only partial and do not include any code changes, therefore not meant for updating phpBB.

-

- ',

- 'included_files' => array(),

- );

-

- // We collect the files we want to diff first (ironically we grab this from a diff file)

- if (!$echo_changes)

- {

- echo "\n\nCollecting Filenames:";

- }

-

- // We re-create the patch file

- foreach ($package->old_packages as $_package_name => $dest_package_filename)

- {

- chdir($package->locations['old_versions']);

-

- if (!$echo_changes)

- {

- echo "\n\n" . 'Creating patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number');

- }

-

- $dest_package_filename = $location . '/save/' . $s_name . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch';

- $package->run_command('diff ' . $package->diff_options . ' ' . $_package_name . ' ' . $package->get('simple_name') . ' > ' . $dest_package_filename);

-

- // Parse this diff to determine file changes from the checked versions and save them

- $result = $package->collect_diff_files($dest_package_filename, $_package_name);

- $package->run_command('rm ' . $dest_package_filename);

- }

-

- chdir($location);

-

- $filenames = array();

- foreach ($result['files'] as $filename)

- {

- if ($debug_file !== false && $filename != $debug_file)

- {

- continue;

- }

-

- // Decide which files to compare...

- switch ($output_format)

- {

- case 'language':

- if (strpos($filename, 'language/en/') !== 0)

- {

- continue 2;

- }

- break;

-

- case 'prosilver':

- if (strpos($filename, 'styles/prosilver/') !== 0)

- {

- continue 2;

- }

- break;

-

- case 'subsilver2':

- if (strpos($filename, 'styles/subsilver2/') !== 0)

- {

- continue 2;

- }

- break;

- }

-

- if (!file_exists($location . '/old_versions/' . $simple_name_old . '/' . $filename))

- {

- // New file... include it

- $data['header']['included_files'][] = array(

- 'old' => $location . '/old_versions/' . $simple_name_old . '/' . $filename,

- 'new' => $location . '/old_versions/' . $simple_name_new . '/' . $filename,

- 'phpbb_filename' => $filename,

- );

- continue;

- }

-

- $filenames[] = array(

- 'old' => $location . '/old_versions/' . $simple_name_old . '/' . $filename,

- 'new' => $location . '/old_versions/' . $simple_name_new . '/' . $filename,

- 'phpbb_filename' => $filename,

- );

- }

-

- // Now let us go through the filenames list and create a more comprehensive diff

- if (!$echo_changes)

- {

- fwrite($fp, build_header($output_format, $filenames, $data['header']));

- }

- else

- {

- //echo build_header('text', $filenames, $data['header']);

- }

-

- // Copy files...

- $files_to_copy = array();

-

- foreach ($data['header']['included_files'] as $filename)

- {

- $files_to_copy[] = $filename['phpbb_filename'];

- }

-

- // First step is to copy the new version over (clean structure)

- if (!$echo_changes && sizeof($files_to_copy))

- {

- foreach ($files_to_copy as $file)

- {

- // Create directory?

- $dirname = dirname($file);

-

- if ($dirname)

- {

- $dirname = explode('/', $dirname);

- $__dir = array();

-

- foreach ($dirname as $i => $dir)

- {

- $__dir[] = $dir;

- run_command("mkdir -p $location/save/" . $s_name . '/' . $output_format . '/' . implode('/', $__dir));

- }

- }

-

- $source_file = $location . '/new_version/phpBB3/' . $file;

- $dest_file = $location . '/save/' . $s_name . '/' . $output_format . '/';

- $dest_file .= $file;

-

- $command = "cp -p $source_file $dest_file";

- $result = trim(`$command`);

- echo "- Copied File: " . $source_file . " -> " . $dest_file . "\n";

- }

- }

-

- include_once('diff_class.php');

-

- if (!$echo_changes)

- {

- echo "\n\nDiffing Codebases:";

- }

-

- foreach ($filenames as $file_ary)

- {

- if (!file_exists($file_ary['old']))

- {

- $lines1 = array();

- }

- else

- {

- $lines1 = file($file_ary['old']);

- }

- $lines2 = file($file_ary['new']);

-

- if (!sizeof($lines1))

- {

- // New File

- }

- else

- {

- $diff = new Diff($lines1, $lines2);

- $fmt = new BBCodeDiffFormatter(false, 5, $debug_file);

-

- if (!$echo_changes)

- {

- fwrite($fp, $fmt->format_open($file_ary['phpbb_filename']));

- fwrite($fp, $fmt->format($diff, $lines1));

- fwrite($fp, $fmt->format_close($file_ary['phpbb_filename']));

- }

- else

- {

- echo $fmt->format_open($file_ary['phpbb_filename']);

- echo $fmt->format($diff, $lines1);

- echo $fmt->format_close($file_ary['phpbb_filename']);

- }

-

- if ($debug_file !== false)

- {

- echo $fmt->format_open($file_ary['phpbb_filename']);

- echo $fmt->format($diff, $lines1);

- echo $fmt->format_close($file_ary['phpbb_filename']);

- exit;

- }

- }

- }

-

- if (!$echo_changes)

- {

- fwrite($fp, build_footer($output_format));

-

- // Close file

- fclose($fp);

-

- chmod('save/' . $s_name . '/' . $output_format . '/' . $release_filename, 0666);

- }

- else

- {

- echo build_footer($output_format);

- }

-}

-

-/**

-* Build Footer

-*/

-function build_footer($mode)

-{

- $html = '';

-

- $html .= "# \n";

- $html .= "#-----[ SAVE/CLOSE ALL FILES ]------------------------------------------ \n";

- $html .= "# \n";

- $html .= "# EoM";

-

- return $html;

-}

-

-/**

-* Build Header

-*/

-function build_header($mode, $filenames, $header)

-{

- global $substitute_old;

-

- $html = '';

-

- $html .= "############################################################## \n";

- $html .= "## Title: " . $header['title'] . "\n";

- $html .= "## Author: naderman < naderman@phpbb.com > (Nils Adermann) http://www.phpbb.com \n";

- $html .= "## Description: \n";

-

- $intr = explode("\n", $header['intro']);

- $introduction = '';

- foreach ($intr as $_line)

- {

- $introduction .= wordwrap($_line, 80) . "\n";

- }

- $intr = explode("\n", $introduction);

-

- foreach ($intr as $_line)

- {

- $html .= "## " . $_line . "\n";

- }

- $html .= "## \n";

- $html .= "## Files To Edit: \n";

-

- foreach ($filenames as $file_ary)

- {

- $html .= "## " . $file_ary['phpbb_filename'] . "\n";

- }

- $html .= "##\n";

- if (sizeof($header['included_files']))

- {

- $html .= "## Included Files: \n";

- foreach ($header['included_files'] as $filename)

- {

- $html .= "## {$filename['phpbb_filename']}\n";

- }

- }

- $html .= "## License: http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 \n";

- $html .= "############################################################## \n";

- $html .= "\n";

-

- // COPY Statement?

- if (sizeof($header['included_files']))

- {

- $html .= "#\n#-----[ COPY ]------------------------------------------\n#\n";

- foreach ($header['included_files'] as $filename)

- {

- $html .= "copy {$filename['phpbb_filename']} to {$filename['phpbb_filename']}\n";

- }

- $html .= "\n";

- }

-

- return $html;

-}

-

-function run_command($command)

-{

- $result = trim(`$command`);

- echo "\n- Command Run: " . $command . "\n";

-}

-

-?>

-<?php

-/**

-*

-* @package build

-* @copyright (c) 2000 Geoffrey T. Dairiki <dairiki@dairiki.org>

-* @copyright (c) 2010 phpBB Group

-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2

-*

-*/

-

-/**

-* Class used internally by WikiDiff to actually compute the diffs.

-*

-* The algorithm used here is mostly lifted from the perl module

-* Algorithm::Diff (version 1.06) by Ned Konz, which is available at:

-* http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip

-*

-* More ideas are taken from:

-* http://www.ics.uci.edu/~eppstein/161/960229.html

-*

-* Some ideas are (and a bit of code) are from from analyze.c, from GNU

-* diffutils-2.7, which can be found at:

-* ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz

-*

-* Finally, some ideas (subdivision by NCHUNKS > 2, and some optimizations)

-* are my own.

-*/

-class _WikiDiffEngine

-{

- var $edits; // List of editing operation to convert XV to YV.

- var $xv = array(), $yv = array();

-

- function _WikiDiffEngine($from_lines, $to_lines)

- {

- $n_from = sizeof($from_lines);

- $n_to = sizeof($to_lines);

-

- $endskip = 0;

- // Ignore trailing and leading matching lines.

- while ($n_from > 0 && $n_to > 0)

- {

- if ($from_lines[$n_from - 1] != $to_lines[$n_to - 1])

- {

- break;

- }

-

- $n_from--;

- $n_to--;

- $endskip++;

- }

-

- for ($skip = 0; $skip < min($n_from, $n_to); $skip++)

- {

- if ($from_lines[$skip] != $to_lines[$skip])

- {

- break;

- }

- }

- $n_from -= $skip;

- $n_to -= $skip;

-

- $xlines = array();

- $ylines = array();

-

- // Ignore lines which do not exist in both files.

- for ($x = 0; $x < $n_from; $x++)

- {

- $xhash[$from_lines[$x + $skip]] = 1;

- }

-

- for ($y = 0; $y < $n_to; $y++)

- {

- $line = $to_lines[$y + $skip];

- $ylines[] = $line;

-

- if (($this->ychanged[$y] = empty($xhash[$line])))

- {

- continue;

- }

- $yhash[$line] = 1;

- $this->yv[] = $line;

- $this->yind[] = $y;

- }

-

- for ($x = 0; $x < $n_from; $x++)

- {

- $line = $from_lines[$x + $skip];

- $xlines[] = $line;

-

- if (($this->xchanged[$x] = empty($yhash[$line])))

- {

- continue; // fixme? what happens to yhash/xhash when

- // there are two identical lines??

- }

- $this->xv[] = $line;

- $this->xind[] = $x;

- }

-

- // Find the LCS.

- $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));

-

- // Merge edits when possible

- $this->_shift_boundaries($xlines, $this->xchanged, $this->ychanged);

- $this->_shift_boundaries($ylines, $this->ychanged, $this->xchanged);

-

- // Compute the edit operations.

- $this->edits = array();

-

- if ($skip)

- {

- $this->edits[] = $skip;

- }

-

- $x = 0;

- $y = 0;

-

- while ($x < $n_from || $y < $n_to)

- {

- // Skip matching "snake".

- $x0 = $x;

- $ncopy = 0;

- while ($x < $n_from && $y < $n_to && !$this->xchanged[$x] && !$this->ychanged[$y])

- {

- ++$x;

- ++$y;

- ++$ncopy;

- }

-

- if ($x > $x0)

- {

- $this->edits[] = $x - $x0;

- }

-

- // Find deletes.

- $x0 = $x;

- $ndelete = 0;

-

- while ($x < $n_from && $this->xchanged[$x])

- {

- ++$x;

- ++$ndelete;

- }

-

- if ($x > $x0)

- {

- $this->edits[] = -($x - $x0);

- }

-

- // Find adds.

- if (isset($this->ychanged[$y]) && $this->ychanged[$y])

- {

- $adds = array();

- while ($y < $n_to && $this->ychanged[$y])

- {

- $adds[] = $ylines[$y++];

- }

- $this->edits[] = $adds;

- }

- }

-

- if (!empty($endskip))

- {

- $this->edits[] = $endskip;

- }

- }

-

- /* Divide the Largest Common Subsequence (LCS) of the sequences

- * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally

- * sized segments.

- *

- * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an

- * array of NCHUNKS+1 (X, Y) indexes giving the diving points between

- * sub sequences. The first sub-sequence is contained in [X0, X1),

- * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note

- * that (X0, Y0) == (XOFF, YOFF) and

- * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).

- *

- * This function assumes that the first lines of the specified portions

- * of the two files do not match, and likewise that the last lines do not

- * match. The caller must trim matching lines from the beginning and end

- * of the portions it is going to specify.

- */

- function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)

- {

- $flip = false;

-

- if ($xlim - $xoff > $ylim - $yoff)

- {

- // Things seems faster (I'm not sure I understand why)

- // when the shortest sequence in X.

- $flip = true;

- list ($xoff, $xlim, $yoff, $ylim) = array( $yoff, $ylim, $xoff, $xlim);

- }

-

- if ($flip)

- {

- for ($i = $ylim - 1; $i >= $yoff; $i--)

- {

- $ymatches[$this->xv[$i]][] = $i;

- }

- }

- else

- {

- for ($i = $ylim - 1; $i >= $yoff; $i--)

- {

- $ymatches[$this->yv[$i]][] = $i;

- }

- }

-

- $this->lcs = 0;

- $this->seq[0]= $yoff - 1;

- $this->in_seq = array();

- $ymids[0] = array();

-

- $numer = $xlim - $xoff + $nchunks - 1;

- $x = $xoff;

-

- for ($chunk = 0; $chunk < $nchunks; $chunk++)

- {

- if ($chunk > 0)

- {

- for ($i = 0; $i <= $this->lcs; $i++)

- {

- $ymids[$i][$chunk-1] = $this->seq[$i];

- }

- }

-

- $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);

-

- for ( ; $x < $x1; $x++)

- {

- $_index = $flip ? $this->yv[$x] : $this->xv[$x];

- $matches = (isset($ymatches[$_index])) ? $ymatches[$_index] : array();

-

- if (!$matches)

- {

- continue;

- }

- reset($matches);

-

- while (list ($junk, $y) = each($matches))

- {

- if (!isset($this->in_seq[$y]) || !$this->in_seq[$y])

- {

- $k = $this->_lcs_pos($y);

- //if (!$k) die('assertion "!$k" failed');

- $ymids[$k] = $ymids[$k-1];

- break;

- }

- }

-

- while (list ($junk, $y) = each($matches))

- {

- if ($y > $this->seq[$k-1])

- {

- //if ($y >= $this->seq[$k]) die('assertion failed');

- // Optimization: this is a common case:

- // next match is just replacing previous match.

- $this->in_seq[$this->seq[$k]] = false;

- $this->seq[$k] = $y;

- $this->in_seq[$y] = 1;

- }

- else if (!isset($this->in_seq[$y]) || !$this->in_seq[$y])

- {

- $k = $this->_lcs_pos($y);

- //if (!$k) die('assertion "!$k" failed');

- $ymids[$k] = $ymids[$k-1];

- }

- }

- }

- }

-

- $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);

- $ymid = $ymids[$this->lcs];

-

- for ($n = 0; $n < $nchunks - 1; $n++)

- {

- $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);

- $y1 = $ymid[$n] + 1;

- $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);

- }

- $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);

-

- return array($this->lcs, $seps);

- }

-

- function _lcs_pos ($ypos)

- {

- $end = $this->lcs;

- if ($end == 0 || $ypos > $this->seq[$end])

- {

- $this->seq[++$this->lcs] = $ypos;

- $this->in_seq[$ypos] = 1;

- return $this->lcs;

- }

-

- $beg = 1;

- while ($beg < $end)

- {

- $mid = (int)(($beg + $end) / 2);

-

- if ($ypos > $this->seq[$mid])

- {

- $beg = $mid + 1;

- }

- else

- {

- $end = $mid;

- }

- }

-

- //if ($ypos == $this->seq[$end]) die("assertion failure");

-

- $this->in_seq[$this->seq[$end]] = false;

- $this->seq[$end] = $ypos;

- $this->in_seq[$ypos] = 1;

- return $end;

- }

-

- /* Find LCS of two sequences.

- *

- * The results are recorded in the vectors $this->{x,y}changed[], by

- * storing a 1 in the element for each line that is an insertion

- * or deletion (ie. is not in the LCS).

- *

- * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.

- *

- * Note that XLIM, YLIM are exclusive bounds.

- * All line numbers are origin-0 and discarded lines are not counted.

- */

- function _compareseq ($xoff, $xlim, $yoff, $ylim)

- {

- // Slide down the bottom initial diagonal.

- while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff])

- {

- ++$xoff;

- ++$yoff;

- }

-

- // Slide up the top initial diagonal.

- while ($xlim > $xoff && $ylim > $yoff && $this->xv[$xlim - 1] == $this->yv[$ylim - 1])

- {

- --$xlim;

- --$ylim;

- }

-

- if ($xoff == $xlim || $yoff == $ylim)

- {

- $lcs = 0;

- }

- else

- {

- // This is ad hoc but seems to work well.

- //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);

- //$nchunks = max(2,min(8,(int)$nchunks));

- $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;

- list ($lcs, $seps) = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);

- }

-

- if ($lcs == 0)

- {

- // X and Y sequences have no common subsequence:

- // mark all changed.

- while ($yoff < $ylim)

- {

- $this->ychanged[$this->yind[$yoff++]] = 1;

- }

-

- while ($xoff < $xlim)

- {

- $this->xchanged[$this->xind[$xoff++]] = 1;

- }

- }

- else

- {

- // Use the partitions to split this problem into subproblems.

- reset($seps);

-

- $pt1 = $seps[0];

-

- while ($pt2 = next($seps))

- {

- $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);

- $pt1 = $pt2;

- }

- }

- }

-

- /* Adjust inserts/deletes of identical lines to join changes

- * as much as possible.

- *

- * We do something when a run of changed lines include a

- * line at one end and have an excluded, identical line at the other.

- * We are free to choose which identical line is included.

- * `compareseq' usually chooses the one at the beginning,

- * but usually it is cleaner to consider the following identical line

- * to be the "change".

- *

- * This is extracted verbatim from analyze.c (GNU diffutils-2.7).

- */

- function _shift_boundaries ($lines, &$changed, $other_changed)

- {

- $i = 0;

- $j = 0;

- $len = sizeof($lines);

-

- while (1)

- {

- /*

- * Scan forwards to find beginning of another run of changes.

- * Also keep track of the corresponding point in the other file.

- */

-

- while ($i < $len && $changed[$i] == 0)

- {

- while ($other_changed[$j++])

- {

- continue;

- }

- $i++;

- }

-

- if ($i == $len)

- {

- break;

- }

-

- $start = $i;

-

- // Find the end of this run of changes.

- while (isset($changed[++$i]))

- {

- continue;

- }

-

- while (isset($other_changed[$j]) && $other_changed[$j])

- {

- $j++;

- }

-

- do

- {

- /*

- * Record the length of this run of changes, so that

- * we can later determine whether the run has grown.

- */

- $runlength = $i - $start;

-

- /*

- * Move the changed region back, so long as the

- * previous unchanged line matches the last changed one.

- * This merges with previous changed regions.

- */

- while ($start && $lines[$start - 1] == $lines[$i - 1])

- {

- $changed[--$start] = 1;

- $changed[--$i] = false;

-

- while ($changed[$start - 1])

- {

- $start--;

- }

-

- while ($other_changed[--$j])

- {

- continue;

- }

- }

-

- /*

- * Set CORRESPONDING to the end of the changed run, at the last

- * point where it corresponds to a changed run in the other file.

- * CORRESPONDING == LEN means no such point has been found.

- */

- $corresponding = empty($other_changed[$j - 1]) ? $len : $i;

-

- /*

- * Move the changed region forward, so long as the

- * first changed line matches the following unchanged one.

- * This merges with following changed regions.

- * Do this second, so that if there are no merges,

- * the changed region is moved forward as far as possible.

- */

- while ($i != $len && $lines[$start] == $lines[$i])

- {

- $changed[$start++] = false;

- $changed[$i++] = 1;

-

- while ($changed[$i])

- {

- $i++;

- }

-

- while ($other_changed[++$j])

- {

- $corresponding = $i;

- }

- }

- } while ($runlength != $i - $start);

-

- /*

- * If possible, move the fully-merged run of changes

- * back to a corresponding run in the other file.

- */

- while ($corresponding < $i)

- {

- $changed[--$start] = 1;

- $changed[--$i] = 0;

-

- while ($other_changed[--$j])

- {

- continue;

- }

- }

- }

- }

-}

-

-/**

-* Class representing a diff between two files.

-*/

-class Diff

-{

- var $edits;

-

- /**

- * Compute diff between files (or deserialize serialized WikiDiff.)

- */

- function Diff($from_lines = false, $to_lines = false)

- {

- if ($from_lines && $to_lines)

- {

- $compute = new _WikiDiffEngine($from_lines, $to_lines);

- $this->edits = $compute->edits;

- }

- else if ($from_lines)

- {

- // $from_lines is not really from_lines, but rather

- // a serialized Diff.

- $this->edits = unserialize($from_lines);

- }

- else

- {

- $this->edits = array();

- }

- }

-

- /**

- * Compute reversed Diff.

- *

- * SYNOPSIS:

- *

- * $diff = new Diff($lines1, $lines2);

- * $rev = $diff->reverse($lines1);

- *

- * // reconstruct $lines1 from $lines2:

- * $out = $rev->apply($lines2);

- */

- function reverse ($from_lines)

- {

- $x = 0;

- $rev = new Diff;

-

- for (reset($this->edits); $edit = current($this->edits); next($this->edits))

- {

- if (is_array($edit))

- { // Was an add, turn it into a delete.

- $nadd = sizeof($edit);

- if ($nadd == 0)

- {

- die("assertion error");

- }

- $edit = -$nadd;

- }

- else if ($edit > 0)

- {

- // Was a copy --- just pass it through. }

- $x += $edit;

- }

- else if ($edit < 0)

- { // Was a delete, turn it into an add.

- $ndelete = -$edit;

- $edit = array();

-

- while ($ndelete-- > 0)

- {

- $edit[] = $from_lines[$x++];

- }

- }

- else

- {

- die("assertion error");

- }

-

- $rev->edits[] = $edit;

- }

-

- return $rev;

- }

-

- /**

- * Compose (concatenate) Diffs.

- *

- * SYNOPSIS:

- *

- * $diff1 = new Diff($lines1, $lines2);

- * $diff2 = new Diff($lines2, $lines3);

- * $comp = $diff1->compose($diff2);

- *

- * // reconstruct $lines3 from $lines1:

- * $out = $comp->apply($lines1);

- */

- function compose ($that)

- {

- reset($this->edits);

- reset($that->edits);

-

- $comp = new Diff;

- $left = current($this->edits);

- $right = current($that->edits);

-

- while ($left || $right)

- {

- if (!is_array($left) && $left < 0)

- { // Left op is a delete.

- $newop = $left;

- $left = next($this->edits);

- }

- else if (is_array($right))

- { // Right op is an add.

- $newop = $right;

- $right = next($that->edits);

- }

- else if (!$left || !$right)

- {

- die ("assertion error");

- }

- else if (!is_array($left) && $left > 0)

- { // Left op is a copy.

- if ($left <= abs($right))

- {

- $newop = $right > 0 ? $left : -$left;

- $right -= $newop;

-

- if ($right == 0)

- {

- $right = next($that->edits);

- }

- $left = next($this->edits);

- }

- else

- {

- $newop = $right;

- $left -= abs($right);

- $right = next($that->edits);

- }

- }

- else

- { // Left op is an add.

- if (!is_array($left))

- {

- die('assertion error');

- }

- $nleft = sizeof($left);

-

- if ($nleft <= abs($right))

- {

- if ($right > 0)

- { // Right op is copy

- $newop = $left;

- $right -= $nleft;

- }

- else // Right op is delete

- {

- $newop = false;

- $right += $nleft;

- }

-

- if ($right == 0)

- {

- $right = next($that->edits);

- }

- $left = next($this->edits);

- }

- else

- {

- unset($newop);

-

- if ($right > 0)

- {

- for ($i = 0; $i < $right; $i++)

- {

- $newop[] = $left[$i];

- }

- }

-

- $tmp = array();

- for ($i = abs($right); $i < $nleft; $i++)

- {

- $tmp[] = $left[$i];

- }

- $left = $tmp;

- $right = next($that->edits);

- }

- }

-

- if (!$op)

- {

- $op = $newop;

- continue;

- }

-

- if (!$newop)

- {

- continue;

- }

-

- if (is_array($op) && is_array($newop))

- {

- // Both $op and $newop are adds.

- for ($i = 0; $i < sizeof($newop); $i++)

- {

- $op[] = $newop[$i];

- }

- }

- else if (($op > 0 && $newop > 0) || ($op < 0 && $newop < 0))

- { // $op and $newop are both either deletes or copies.

- $op += $newop;

- }

- else

- {

- $comp->edits[] = $op;

- $op = $newop;

- }

- }

-

- if ($op)

- {

- $comp->edits[] = $op;

- }

-

- return $comp;

- }

-

- /* Debugging only:

- function _dump ()

- {

- echo "<ol>";

- for (reset($this->edits);

- {

- $edit = current($this->edits);

- }

- next($this->edits))

- {

- echo "<li>";

- if ($edit > 0)

- echo "Copy $edit";

- else if ($edit < 0)

- echo "Delete " . -$edit;

- else if (is_array($edit))

- {

- echo "Add " . sizeof($edit) . "<ul>";

- for ($i = 0; $i < sizeof($edit); $i++)

- echo "<li>" . htmlspecialchars($edit[$i]);

- echo "</ul>";

- }

- else

- die("assertion error");

- }

- echo "</ol>";

- }

- */

-

- /**

- * Apply a Diff to a set of lines.

- *

- * SYNOPSIS:

- *

- * $diff = new Diff($lines1, $lines2);

- *

- * // reconstruct $lines2 from $lines1:

- * $out = $diff->apply($lines1);

- */

- function apply ($from_lines)

- {

- $x = 0;

- $xlim = sizeof($from_lines);

-

- for (reset($this->edits); $edit = current($this->edits); next($this->edits))

- {

- if (is_array($edit))

- {

- reset($edit);

- while (list ($junk, $line) = each($edit))

- {

- $output[] = $line;

- }

- }

- else if ($edit > 0)

- {

- while ($edit--)

- {

- $output[] = $from_lines[$x++];

- }

- }

- else

- {

- $x += -$edit;

- }

- }

-

- if ($x != $xlim)

- {

- die(sprintf("Diff::apply: line count mismatch: %s != %s", $x, $xlim));

- }

-

- return $output;

- }

-

- /**

- * Serialize a Diff.

- *

- * SYNOPSIS:

- *

- * $diff = new Diff($lines1, $lines2);

- * $string = $diff->serialize;

- *

- * // recover Diff from serialized version:

- * $diff2 = new Diff($string);

- */

- function serialize ()

- {

- return serialize($this->edits);

- }

-

- /**

- * Return true if two files were equal.

- */

- function isEmpty()

- {

- if (sizeof($this->edits) > 1)

- {

- return false;

- }

-

- if (sizeof($this->edits) == 0)

- {

- return true;

- }

-

- // Test for: only edit is a copy.

- return !is_array($this->edits[0]) && $this->edits[0] > 0;

- }

-

- /**

- * Compute the length of the Longest Common Subsequence (LCS).

- *

- * This is mostly for diagnostic purposed.

- */

- function lcs()

- {

- $lcs = 0;

- for (reset($this->edits); $edit = current($this->edits); next($this->edits))

- {

- if (!is_array($edit) && $edit > 0)

- {

- $lcs += $edit;

- }

- }

-

- return $lcs;

- }

-

- /**

- * Check a Diff for validity.

- *

- * This is here only for debugging purposes.

- */

- function _check ($from_lines, $to_lines)

- {

- $test = $this->apply($from_lines);

- if (serialize($test) != serialize($to_lines))

- {

- die("Diff::_check: failed");

- }

-

- reset($this->edits);

- $prev = current($this->edits);

- $prevtype = is_array($prev) ? 'a' : ($prev > 0 ? 'c' : 'd');

-

- while ($edit = next($this->edits))

- {

- $type = is_array($edit) ? 'a' : ($edit > 0 ? 'c' : 'd');

- if ($prevtype == $type)

- {

- die("Diff::_check: edit sequence is non-optimal");

- }

- $prevtype = $type;

- }

- $lcs = $this->lcs();

- echo "<strong>Diff Okay: LCS = $lcs</strong>\n";

- }

-}

-

-/**

-* A class to format a Diff as HTML.

-*

-* Usage:

-*

-* $diff = new Diff($lines1, $lines2); // compute diff.

-*

-* $fmt = new DiffFormatter;

-* echo $fmt->format($diff, $lines1); // Output HTMLified standard diff.

-*

-* or to output reverse diff (diff's that would take $lines2 to $lines1):

-*

-* $fmt = new DiffFormatter(true);

-* echo $fmt->format($diff, $lines1);

-*/

-class DiffFormatter

-{

- var $context_lines;

- var $do_reverse_diff;

- var $context_prefix, $deletes_prefix, $adds_prefix;

-

- function DiffFormatter ($reverse = false)

- {

- $this->do_reverse_diff = $reverse;

- $this->context_lines = 0;

- $this->context_prefix = '&nbsp;&nbsp;';

- $this->deletes_prefix = '&lt;&nbsp;';

- $this->adds_prefix = '&gt;&nbsp;';

- }

-

- function format ($diff, $from_lines)

- {

- $html = '<table width="100%" bgcolor="black" cellspacing=2 cellpadding=2 border=0>' . "\n";

- $html .= $this->_format($diff->edits, $from_lines);

- $html .= "</table>\n";

-

- return $html;

- }

-

- function _format ($edits, $from_lines)

- {

- $html = '';

- $x = 0; $y = 0;

- $xlim = sizeof($from_lines);

-

- reset($edits);

- while ($edit = current($edits))

- {

- if (!is_array($edit) && $edit >= 0)

- { // Edit op is a copy.

- $ncopy = $edit;

- }

- else

- {

- $ncopy = 0;

-

- if (empty($hunk))

- {

- // Start of an output hunk.

- $xoff = max(0, $x - $this->context_lines);

- $yoff = $xoff + $y - $x;

-

- if ($xoff < $x)

- {

- // Get leading context.

- $context = array();

-

- for ($i = $xoff; $i < $x; $i++)

- {

- $context[] = $from_lines[$i];

- }

- $hunk['c'] = $context;

- }

- }

-

- if (is_array($edit))

- {

- // Edit op is an add.

- $y += sizeof($edit);

- $hunk[$this->do_reverse_diff ? 'd' : 'a'] = $edit;

- }

- else

- {

- // Edit op is a delete

- $deletes = array();

-

- while ($edit++ < 0)

- {

- $deletes[] = $from_lines[$x++];

- }

-

- $hunk[$this->do_reverse_diff ? 'a' : 'd'] = $deletes;

- }

- }

-

- $next = next($edits);

-

- if (!empty($hunk))

- {

- // Originally $ncopy > 2 * $this->context_lines, but we need to split as early as we can for creating MOD Text Templates. ;)

- if (!$next || $ncopy > $this->context_lines)

- {

- // End of an output hunk.

- $hunks[] = $hunk;

- unset($hunk);

-

- $xend = min($x + $this->context_lines, $xlim);

-

- if ($x < $xend)

- {

- // Get trailing context.

- $context = array();

- for ($i = $x; $i < $xend; $i++)

- {

- $context[] = $from_lines[$i];

- }

- $hunks[] = array('c' => $context);

- }

-

- $xlen = $xend - $xoff;

- $ylen = $xend + $y - $x - $yoff;

- $xbeg = $xlen ? $xoff + 1 : $xoff;

- $ybeg = $ylen ? $yoff + 1 : $yoff;

-

- if ($this->do_reverse_diff)

- {

- list ($xbeg, $xlen, $ybeg, $ylen) = array($ybeg, $ylen, $xbeg, $xlen);

- }

-

- $html .= $this->_emit_diff($xbeg, $xlen, $ybeg, $ylen, $hunks);

- unset($hunks);

- }

- else if ($ncopy)

- {

- $hunks[] = $hunk;

-

- // Copy context.

- $context = array();

- for ($i = $x; $i < $x + $ncopy; $i++)

- {

- $context[] = $from_lines[$i];

- }

- $hunk = array('c' => $context);

- }

- }

-

- $x += $ncopy;

- $y += $ncopy;

- }

-

- return $html;

- }

-

- function _emit_lines($lines, $prefix, $color)

- {

- $html = '';

- reset($lines);

- while (list ($junk, $line) = each($lines))

- {

- $html .= "<tr bgcolor=\"$color\"><td><tt>$prefix</tt>";

- $html .= "<tt>" . htmlspecialchars($line) . "</tt></td></tr>\n";

- }

- return $html;

- }

-

- function _emit_diff ($xbeg,$xlen,$ybeg,$ylen,$hunks)

- {

- // Save hunk...

- $this->diff_hunks[] = $hunks;

-

- $html = '<tr><td><table width="100%" bgcolor="white" cellspacing="0" border="0" cellpadding="4">

- <tr bgcolor="#cccccc"><td><tt>' .

- $this->_diff_header($xbeg, $xlen, $ybeg, $ylen) . '

- </tt></td></tr>\n<tr><td>

- <table width="100%" cellspacing="0" border="0" cellpadding="2">

- ';

-

- $prefix = array('c' => $this->context_prefix, 'a' => $this->adds_prefix, 'd' => $this->deletes_prefix);

- $color = array('c' => '#ffffff', 'a' => '#ffcccc', 'd' => '#ccffcc');

-

- for (reset($hunks); $hunk = current($hunks); next($hunks))

- {

- if (!empty($hunk['c']))

- {

- $html .= $this->_emit_lines($hunk['c'], $this->context_prefix, '#ffffff');

- }

-

- if (!empty($hunk['d']))

- {

- $html .= $this->_emit_lines($hunk['d'], $this->deletes_prefix, '#ccffcc');

- }

-

- if (!empty($hunk['a']))

- {

- $html .= $this->_emit_lines($hunk['a'], $this->adds_prefix, '#ffcccc');

- }

- }

-

- $html .= "</table></td></tr></table></td></tr>\n";

- return $html;

- }

-

- function _diff_header ($xbeg,$xlen,$ybeg,$ylen)

- {

- $what = $xlen ? ($ylen ? 'c' : 'd') : 'a';

- $xlen = $xlen > 1 ? "," . ($xbeg + $xlen - 1) : '';

- $ylen = $ylen > 1 ? "," . ($ybeg + $ylen - 1) : '';

-

- return "$xbeg$xlen$what$ybeg$ylen";

- }

-}

-

-/**

-* A class to format a Diff as a pretty HTML unified diff.

-*

-* Usage:

-*

-* $diff = new Diff($lines1, $lines2); // compute diff.

-*

-* $fmt = new UnifiedDiffFormatter;

-* echo $fmt->format($diff, $lines1); // Output HTMLified unified diff.

-*/

-class UnifiedDiffFormatter extends DiffFormatter

-{

- function UnifiedDiffFormatter ($reverse = false, $context_lines = 3)

- {

- $this->do_reverse_diff = $reverse;

- $this->context_lines = $context_lines;

- $this->context_prefix = '&nbsp;';

- $this->deletes_prefix = '-';

- $this->adds_prefix = '+';

- }

-

- function _diff_header ($xbeg,$xlen,$ybeg,$ylen)

- {

- $xlen = $xlen == 1 ? '' : ",$xlen";

- $ylen = $ylen == 1 ? '' : ",$ylen";

-

- return "@@ -$xbeg$xlen +$ybeg$ylen @@";

- }

-}

-

-/**

-* A class to format a Diff as MOD Template instuctions.

-*

-* Usage:

-*

-* $diff = new Diff($lines1, $lines2); // compute diff.

-*

-* $fmt = new BBCodeDiffFormatter;

-* echo $fmt->format($diff, $lines1); // Output MOD Actions.

-*/

-class BBCodeDiffFormatter extends DiffFormatter

-{

- function BBCodeDiffFormatter ($reverse = false, $context_lines = 3, $debug = false)

- {

- $this->do_reverse_diff = $reverse;

- $this->context_lines = $context_lines;

- $this->context_prefix = '&nbsp;';

- $this->deletes_prefix = '-';

- $this->adds_prefix = '+';

- $this->debug = $debug;

- }

-

- function format ($diff, $from_lines)

- {

- $html = $this->_format($diff->edits, $from_lines);

-

- return $html;

- }

-

- function skip_lines(&$order_array, &$ordering)

- {

- if (sizeof($order_array['find_c']))

- {

- $text = implode('', $order_array['find_c']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- if (isset($order_array['first_find_c'][0]) &&

- is_array($order_array['first_find_c'][0]) &&

- trim(implode('', $order_array['first_find_c'][0])) != '' &&

- isset($order_array['replace']))

- {

- $order_array['add'] = $order_array['replace'];

- unset($order_array['replace']);

- // this is actually an after add

- }

- else

- {

- return true;

- }

- }

- }

-

- if (isset($order_array['add']) && sizeof($order_array['add']))

- {

- $text = implode('', $order_array['add']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- return true;

- }

- }

-

- if (isset($order_array['replace']) && sizeof($order_array['replace']))

- {

- $text = implode('', $order_array['replace']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- return true;

- }

- }

- }

-

- function _emit_lines_bb($ybeg, &$ordering)

- {

- $html = '';

-

- // Now adjust for bbcode display...

- foreach ($ordering as $order_array)

- {

- // Skip useless empty lines...

- if ($this->skip_lines($order_array, $ordering))

- {

- continue;

- }

-

- // Only include double-finds if the last find has very few code location indications...

- if (isset($order_array['first_find_c']) && sizeof($order_array['first_find_c']))

- {

- $text = implode('', $order_array['find_c']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- // no real find, use first_find_c if possible!

- //var_dump($order_array);

- if (is_array($order_array['first_find_c'][0]))

- {

- $order_array['find_c'] = $order_array['first_find_c'][0];

- }

- else

- {

- if (isset($order_array['replace']) || isset($order_array['add']) || isset($order_array['delete']))

- {

- echo "skipped an edit!\n";

- var_dump($order_array);

- }

- continue;

- }

- }

- else

- {

- if (strlen(implode('', $order_array['find_c'])) < 50 && is_array($order_array['first_find_c'][0]))

- {

- $html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";

- $html .= implode("", $order_array['first_find_c'][0]);

- $html .= "\n";

- $ybeg += sizeof($order_array['first_find_c'][0]);

- }

- }

- }

-

- // still here but nothing to do? what the heck?

- if (!isset($order_array['replace']) && !isset($order_array['add']) && !isset($order_array['delete']))

- {

- echo "skipped an edit!\n";

- var_dump($order_array);

- continue;

- }

-

- if (sizeof($order_array['find_c']))

- {

- $html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";

- $html .= implode("", $order_array['find_c']);

- $html .= "\n";

- }

-

- if (isset($order_array['replace']))

- {

- $html .= "#\n#-----[ REPLACE WITH ]---------------------------------------------\n#\n";

- $html .= implode("", $order_array['replace']);

- $html .= "\n";

- }

-

- if (isset($order_array['add']))

- {

- $html .= "#\n#-----[ AFTER, ADD ]---------------------------------------------\n#\n";

- $html .= implode("", $order_array['add']);

- $html .= "\n";

- }

-

- // There is no DELETE. :o

- // Let's try to adjust it then...

- if (isset($order_array['delete']))

- {

- $text = implode('', $order_array['delete']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- continue;

- }

-

- $ybeg += sizeof($order_array['find_c']);

-

- $html .= "#\n#-----[ FIND ]---------------------------------------------\n# Around Line {$ybeg}\n";

- $html .= implode("", $order_array['delete']);

- $html .= "\n";

-

- $html .= "#\n#-----[ REPLACE WITH ]---------------------------------------------\n# Just remove/delete the lines (replacing with an empty line)\n";

- $html .= "\n";

- $html .= "\n";

- }

- }

-

- return $html;

- }

-

- function format_open($filename)

- {

- $html = '';

- $html .= "#\n#-----[ OPEN ]--------------------------------------------- \n#\n{$filename}\n\n";

-

- return $html;

- }

-

- function format_close($filename)

- {

- return '';

- }

-

- function _emit_diff ($xbeg, $xlen, $ybeg, $ylen, $hunks)

- {

-

- // Go through the hunks to determine which method we are using (AFTER, ADD; REPLACE WITH or DELETE)

-

- // Remove the header...

- if (sizeof($hunks) <= 2 && !isset($hunks[1]['a']) && !isset($hunks[1]['d']))

- {

- $reorder = false;

- $orig_hunks = $hunks;

-

- foreach ($hunks as $key => $hunk)

- {

- if (isset($hunk['a']) && isset($hunk['d']))

- {

- /**/ if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)

- {

- if (preg_match('/\* @version \$Id:.+\$$/', $hunk['a'][0]) && preg_match('/\* @version \$Id:.+\$$/', $hunk['d'][0]))

- {

- // Only remove this sole hunk...

- unset($hunks[$key]);

- $reorder = true;

- continue;

- }

- }/**/

-

- // Compare the add and replace one...

- $string_1 = rtrim(trim(implode('', $hunk['a'])));

- $string_2 = rtrim(trim(implode('', $hunk['d'])));

-

- if (strcmp($string_1, $string_2) === 0)

- {

- // Only remove this sole hunk...

- unset($hunks[$key]);

- $reorder = true;

- continue;

- }

- }

- }

-

- if ($reorder)

- {

- // Now check if we have no more 'a' and 'd's

- $hunks = array_merge($hunks, array());

- }

- }

- else

- {

- $reorder = false;

- $orig_hunks = $hunks;

-

- foreach ($hunks as $key => $hunk)

- {

- if (isset($hunk['a']) && isset($hunk['d']))

- {

- /**/ if (sizeof($hunk['a']) == 1 && sizeof($hunk['d']) == 1)

- {

- if (preg_match('/\* @version \$Id:.+\$$/', $hunk['a'][0]) && preg_match('/\* @version \$Id:.+\$$/', $hunk['d'][0]))

- {

- // Only remove this sole hunk...

- unset($hunks[$key]);

- $reorder = true;

- continue;

- }

- }/**/

-

- // Compare the add and replace one...

- $string_1 = rtrim(trim(implode('', $hunk['a'])));

- $string_2 = rtrim(trim(implode('', $hunk['d'])));

-

- if (strcmp($string_1, $string_2) === 0)

- {

- // Only remove this sole hunk...

- unset($hunks[$key]);

- $reorder = true;

- continue;

- }

- }

- }

-

- if ($reorder)

- {

- $hunks = array_merge($hunks, array());

-

- if (sizeof($hunks) == 1 && sizeof($hunks[0]) == 1 && isset($hunks[0]['c']))

- {

- return;

- }

- else

- {

- $hunks = $orig_hunks;

- }

- }

- }

-

- if (sizeof($hunks) == 1 && sizeof($hunks[0]) == 1 && isset($hunks[0]['c']))

- {

- return;

- }

-

- $replace = false;

- foreach ($hunks as $key => $hunk)

- {

- if (isset($hunk['d']) && isset($hunk['a']))

- {

- $replace = true;

- break;

- }

- }

-

- $ordering = array();

- $cur_pos = 0;

-

- // Replace-block

- if ($replace)

- {

- foreach ($hunks as $hunk)

- {

- if (!isset($hunk['a']) && !isset($hunk['d']))

- {

- continue;

- }

-

- if (!empty($hunk['c']))

- {

- if (!isset($ordering[$cur_pos]['find_c']))

- {

- $ordering[$cur_pos]['find_c'] = $hunk['c'];

- }

- else

- {

- $ordering[$cur_pos]['end_c'] = $hunk['c'];

- }

- }

-

- // Make sure we begin fresh...

- if (!isset($ordering[$cur_pos]['replace']))

- {

- $ordering[$cur_pos]['first_find_c'][] = $ordering[$cur_pos]['find_c'];

- $ordering[$cur_pos]['find_c'] = array();

- $ordering[$cur_pos]['replace'] = array();

- }

-

- // Add the middle part if one exist...

- if (isset($ordering[$cur_pos]['end_c']))

- {

- $ordering[$cur_pos]['find_c'] = array_merge($ordering[$cur_pos]['find_c'], $ordering[$cur_pos]['end_c']);

- $ordering[$cur_pos]['replace'] = array_merge($ordering[$cur_pos]['replace'], $ordering[$cur_pos]['end_c']);

- unset($ordering[$cur_pos]['end_c']);

- }

-

- if (isset($hunk['d']))

- {

- $ordering[$cur_pos]['find_c'] = array_merge($ordering[$cur_pos]['find_c'], $hunk['d']);

- }

-

- if (isset($hunk['a']))

- {

- $ordering[$cur_pos]['replace'] = array_merge($ordering[$cur_pos]['replace'], $hunk['a']);

- }

- }

- }

- else

- {

- foreach ($hunks as $hunk)

- {

- if (!empty($hunk['c']))

- {

- if (!isset($ordering[$cur_pos]['find_c']))

- {

- $ordering[$cur_pos]['find_c'] = $hunk['c'];

- }

- else

- {

- $ordering[$cur_pos]['end_c'] = $hunk['c'];

- }

- }

-

- if (!empty($hunk['a']))

- {

- if (isset($ordering[$cur_pos]['delete']))

- {

- // If ordering is set with an delete entry, we will actually begin a new ordering array (to seperate delete from add)

- $cur_pos++;

- $ordering[$cur_pos]['find_c'] = $ordering[($cur_pos - 1)]['end_c'];

- $ordering[$cur_pos]['add'] = $hunk['a'];

- }

- else

- {

- if (isset($ordering[$cur_pos]['add']))

- {

- // Now, we really need to be quite careful here...

- if (isset($ordering[$cur_pos]['end_c']) && isset($hunk['c']) && isset($hunk['a']) && sizeof($hunk) == 2)

- {

- // There is a new find/add entry we did not catch... let's try to add a new entry then... but first check the hunk[a] contents...

- $text = trim(implode("\n", $hunk['c']));

- if ($text == "\n" || !$text)

- {

- $ordering[$cur_pos]['add'] = array_merge($ordering[$cur_pos]['add'], array("\n"), $hunk['a']);

- }

- else if (sizeof($hunk['c']) > 2 || strlen(implode('', $hunk['c'])) > 20)

- {

- $cur_pos++;

- $ordering[$cur_pos]['find_c'] = $ordering[($cur_pos - 1)]['end_c'];

- $ordering[$cur_pos]['add'] = $hunk['a'];

- }

- else

- {

- $cur_pos++;

- $ordering[$cur_pos]['find_c'] = $ordering[($cur_pos - 1)]['end_c'];

- $ordering[$cur_pos]['add'] = $hunk['a'];

-/* echo 'FIND STATEMENT TOO TINY';

- echo ";".rawurlencode($text).";";

- var_dump($hunk);

- exit;*/

- }

- }

- else

- {

- echo 'UNCATCHED ENTRY';

- var_dump($hunks);

- exit;

- }

- }

- else

- {

- $ordering[$cur_pos]['add'] = $hunk['a'];

- }

- }

- }

- else if (!empty($hunk['d']))

- {

- if (isset($ordering[$cur_pos]['add']))

- {

- // If ordering is set with an add entry, we will actually begin a new ordering array (to seperate delete from add)

- $cur_pos++;

- $ordering[$cur_pos]['find_c'] = $ordering[($cur_pos - 1)]['end_c'];

- $ordering[$cur_pos]['delete'] = $hunk['d'];

- }

- else

- {

- $ordering[$cur_pos]['delete'] = $hunk['d'];

- }

- }

- }

- }

-

- $html = '';

-

- return $this->_emit_lines_bb($ybeg, $ordering);

- }

-

- function _diff_header($xbeg, $xlen, $ybeg, $ylen)

- {

- }

-}

-

-

-/**

-* A class to format a Diff as MOD Template instuctions.

-*

-* Usage:

-*

-* $diff = new Diff($lines1, $lines2); // compute diff.

-*

-* $fmt = new BBCodeDiffFormatter;

-* echo $fmt->format($diff, $lines1); // Output MOD Actions.

-*/

-class MODXDiffFormatter extends BBCodeDiffFormatter

-{

- function MODXDiffFormatter ($reverse = false, $context_lines = 3, $debug = false)

- {

- $this->do_reverse_diff = $reverse;

- $this->context_lines = $context_lines;

- $this->context_prefix = '&nbsp;';

- $this->deletes_prefix = '-';

- $this->adds_prefix = '+';

- $this->debug = $debug;

- }

-

- function _emit_lines_bb($ybeg, &$ordering)

- {

- $html = '';

-

- // Now adjust for bbcode display...

- foreach ($ordering as $order_array)

- {

- // Skip useless empty lines...

- if ($this->skip_lines($order_array, $ordering))

- {

- continue;

- }

-

- // Only include double-finds if the last find has very few code location indications...

- if (sizeof($order_array['first_find_c']))

- {

- $text = implode('', $order_array['find_c']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- continue;

- }

-

- if (strlen(implode('', $order_array['find_c'])) < 50)

- {

- if (substr($html, -8) !== '</find>' . "\n")

- {

- $html .= ' <edit>' . "\n";

- }

-

- $html .= ' <comment lang="en">Around Line ' . $ybeg . '</comment>' . "\n";

- $html .= ' <find>' . htmlspecialchars(implode('', $order_array['first_find_c'][0])) . '</find>' . "\n";

- $ybeg += sizeof($order_array['first_find_c'][0]);

- }

- }

-

- if (sizeof($order_array['find_c']))

- {

- if (substr($html, -8) !== '</find>' . "\n")

- {

- $html .= ' <edit>' . "\n";

- }

-

-// $html .= ' <edit>' . "\n";

- $html .= ' <comment lang="en">Around Line ' . $ybeg . '</comment>' . "\n";

- $html .= ' <find>' . htmlspecialchars(implode('', $order_array['find_c'])) . '</find>' . "\n";

- }

-

- if (isset($order_array['replace']))

- {

- $html .= ' <action type="replace-with">' . htmlspecialchars(implode('', $order_array['replace'])) . '</action>' . "\n";

- $html .= ' </edit>' . "\n";

- }

-

- if (isset($order_array['add']))

- {

- $html .= ' <action type="after-add">' . htmlspecialchars(implode('', $order_array['add'])) . '</action>' . "\n";

- $html .= ' </edit>' . "\n";

- }

-

- // There is no DELETE. :o

- // Let's try to adjust it then...

- if (isset($order_array['delete']))

- {

- $text = implode('', $order_array['delete']);

- if ($text === "\n" || $text === "\t" || $text === '')

- {

- continue;

- }

-

- $ybeg += sizeof($order_array['find_c']);

-

- if (substr($html, -8) !== '</find>' . "\n")

- {

- $html .= ' <edit>' . "\n";

- }

- $html .= ' <comment lang="en">Around Line ' . $ybeg . ' / Just remove/delete the lines (replacing with an empty line)</comment>' . "\n";

- $html .= ' <find>' . htmlspecialchars(implode('', $order_array['delete'])) . '</find>' . "\n";

- $html .= ' <action type="replace-with"></action>' . "\n";

- $html .= ' </edit>';

- }

- }

-

- return $html;

- }

-

- function format_open($filename)

- {

- return '<open src="' . $filename . '">' . "\n";

- }

-

- function format_close($filename)

- {

- return '</open>' . "\n";

- }

-

- function _diff_header($xbeg, $xlen, $ybeg, $ylen)

- {

- }

-}

-

- // Build MD5 Sum

- $package->run_command('md5sum ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . ' > ../release_files/' . $package->get('release_filename') . '-patch.' . $extension . '.md5');

- // Build MD5 Sum

- $package->run_command('md5sum ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . ' > ../../release_files/' . $package->get('release_filename') . '-files.' . $extension . '.md5');

-

- // Build MD5 Sum

- $package->run_command("md5sum ../../release_files/phpBB-$last_version.$extension > ../../release_files/phpBB-$last_version.$extension.md5");

-

- // Build MD5 Sum

- $package->run_command('md5sum ./release_files/' . $package->get('release_filename') . '.' . $extension . ' > ./release_files/' . $package->get('release_filename') . '.' . $extension . '.md5');

-$package->run_command("md5sum $file > $file.md5");

-; Default configuration file for PHPDoctor

-

-; This config file will cause PHPDoctor to generate API documentation of

-; itself.

-

-

-; PHPDoctor settings

-; -----------------------------------------------------------------------------

-

-; Names of files to parse. This can be a single filename, or a comma separated

-; list of filenames. Wildcards are allowed.

-

-files = "*.php"

-

-; Names of files or directories to ignore. This can be a single filename, or a

-; comma separated list of filenames. Wildcards are NOT allowed.

-

-;ignore = "CVS, .svn, .git, _compiled"

-ignore = templates_c/,*HTML/default/*,spec/,*config.php*,*CVS/,test_chora.php,testupdate/,cache/,store/,*proSilver/,develop/,includes/utf/data/,includes/captcha/fonts/,install/update/,install/update.new/,files/,*phpinfo.php*,*update_script.php*,*upgrade.php*,*convert.php*,install/converter/,language/de/,script/,*swatch.php*,*test.php*,*test2.php*,*install.php*,*functions_diff.php*,*acp_update.php*,acm_xcache.php

-

-; The directory to look for files in, if not used the PHPDoctor will look in

-; the current directory (the directory it is run from).

-

-source_path = "../phpBB/"

-

-; If you do not want PHPDoctor to look in each sub directory for files

-; uncomment this line.

-

-;subdirs = off

-

-; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other

-; than warnings and errors. Verbose mode outputs additional messages during

-; execution.

-

-quiet = on

-;verbose = on

-

-; Select the doclet to use for generating output.

-

-doclet = standard

-;doclet = debug

-

-; The directory to find the doclet in. Doclets control the HTML output of

-; phpDoctor and can be modified to suit your needs. They are expected to be

-; in a directory named after themselves at the location given.

-

-;doclet_path = ./doclets

-

-; Select the formatter to use for generating output.

-

-;formatter = htmlStandardFormatter

-

-; The directory to find the formatter in. Formatters convert textual markup

-; for use by the doclet.

-

-;formatter_path = ./formatters

-

-; The directory to find taglets in. Taglets allow you to make PHPDoctor handle

-; new tags and to alter the behavour of existing tags and their output.

-

-;taglet_path = ./taglets

-

-; If the code you are parsing does not use package tags or not all elements

-; have package tags, use this setting to place unbound elements into a

-; particular package.

-

-default_package = "phpBB"

-

-use_class_path_as_package = off

-

-ignore_package_tags = off

-

-; Specifies the name of a HTML file containing text for the overview

-; documentation to be placed on the overview page. The path is relative to

-; "source_path" unless an absolute path is given.

-

-overview = ../README.md

-

-; Package comments will be looked for in a file named package.html in the same

-; directory as the first source file parsed in that package or in the directory

-; given below. If package comments are placed in the directory given below then

-; they should be named "<packageName>.html".

-

-package_comment_dir = ./

-

-; Parse out global variables and/or global constants?

-

-;globals = off

-;constants = off

-

-; Generate documentation for all class members

-

-;private = on

-

-; Generate documentation for public and protected class members

-

-;protected = on

-

-; Generate documentation for only public class members

-

-;public = on

-

-; Use the PEAR compatible handling of the docblock first sentence

-

-;pear_compat = on

-

-; Standard doclet settings

-; -----------------------------------------------------------------------------

-

-; The directory to place generated documentation in. If the given path is

-; relative to it will be relative to "source_path".

-

-d = "../build/api/"

-

-; Specifies the title to be placed in the HTML <title> tag.

-

-windowtitle = "phpBB3"

-

-; Specifies the title to be placed near the top of the overview summary file.

-

-doctitle = "phpBB3 Sourcecode Documentation"

-

-; Specifies the header text to be placed at the top of each output file. The

-; header will be placed to the right of the upper navigation bar.

-

-header = "phpBB3"

-

-; Specifies the footer text to be placed at the bottom of each output file. The

-; footer will be placed to the right of the lower navigation bar.

-

-footer = "phpBB3"

-

-; Specifies the text to be placed at the bottom of each output file. The text

-; will be placed at the bottom of the page, below the lower navigation bar.

-

-;bottom = "This document was generated by <a href="http://peej.github.com/phpdoctor/">PHPDoctor: The PHP Documentation Creator</a>"

-

-; Create a class tree?

-

-;tree = off

-

-; Use GeSHi to include formatted source files in the documentation. PHPDoctor will look in the current doclet directory for a /geshi subdirectory. Unpack the GeSHi archive from http://qbnz.com/highlighter to get this directory - it will contain a php script and a subdirectory with formatting files.

-

-include_source = off

-

- if ! echo "$line" | grep -Eq "^\[(ticket/[0-9]+|feature/$branch_regex|task/$branch_regex)\] [A-Z].+$"

- complain "$severity: heading should be a sentence beginning with a capital letter." 1>&2

-<Files "config.php">

-Order Allow,Deny

-Deny from All

-</Files>

-

-<Files "common.php">

-Order Allow,Deny

-Deny from All

-</Files>

- if (!file_exists($phpbb_root_path . $cfg_array[$config_name]))

- if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name]))

- if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')

- if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !phpbb_is_writable($phpbb_root_path . $cfg_array[$config_name]))

- {L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;Users per page: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->

- <div class="errorbox">

- <dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>

- if (textEl.createTextRange)

- "fabpot/goutte": "v0.1.0",

- "phpunit/dbunit": "1.2.*",

- "phpunit/phpunit": "3.7.*",

- "phing/phing": "2.4.*"

- "hash": "ef6d05965cca4e390fff7ce63e9d2d49",

- "version": "v0.1.0",

- "url": "https://github.com/fabpot/Goutte",

- "reference": "v0.1.0"

- "url": "https://github.com/fabpot/Goutte/archive/v0.1.0.zip",

- "reference": "v0.1.0",

- "guzzle/guzzle": "3.0.*",

- "symfony/browser-kit": "2.1.*",

- "symfony/css-selector": "2.1.*",

- "symfony/dom-crawler": "2.1.*",

- "symfony/finder": "2.1.*",

- "symfony/process": "2.1.*"

- "time": "2012-12-02 13:44:35"

- "name": "guzzle/guzzle",

- "version": "v3.0.7",

- "url": "https://github.com/guzzle/guzzle",

- "reference": "v3.0.7"

- "url": "https://github.com/guzzle/guzzle/archive/v3.0.7.zip",

- "reference": "v3.0.7",

- "ext-curl": "*",

- "replace": {

- "guzzle/batch": "self.version",

- "guzzle/cache": "self.version",

- "guzzle/http": "self.version",

- "guzzle/inflection": "self.version",

- "guzzle/iterator": "self.version",

- "guzzle/log": "self.version",

- "guzzle/plugin": "self.version",

- "guzzle/plugin-async": "self.version",

- "guzzle/plugin-backoff": "self.version",

- "guzzle/plugin-cache": "self.version",

- "guzzle/plugin-cookie": "self.version",

- "guzzle/plugin-curlauth": "self.version",

- "guzzle/plugin-history": "self.version",

- "guzzle/plugin-log": "self.version",

- "guzzle/plugin-md5": "self.version",

- "guzzle/plugin-mock": "self.version",

- "guzzle/plugin-oauth": "self.version",

- "guzzle/service": "self.version",

- "guzzle/stream": "self.version"

- "require-dev": {

- "doctrine/common": "*",

- "monolog/monolog": "1.*",

- "phpunit/phpunit": "3.7.*",

- "symfony/class-loader": "*",

- "zend/zend-cache1": "1.12",

- "zend/zend-log1": "1.12",

- "zendframework/zend-cache": "2.0.*",

- "zendframework/zend-log": "2.0.*"

- "dev-master": "3.0-dev"

- "Guzzle\\Tests": "tests/",

- "Guzzle": "src/"

- },

- {

- "name": "Guzzle Community",

- "homepage": "https://github.com/guzzle/guzzle/contributors"

- "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",

- "framework",

- "http client",

- "rest",

- "web service"

- "time": "2012-12-19 23:06:35"

- "url": "https://github.com/phingofficial/phing",

- "reference": "2.4.14"

- "url": "https://github.com/phingofficial/phing/archive/2.4.14.zip",

- "reference": "2.4.14",

- "version": "1.2.3",

- "reference": "1.2.3"

- "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/1.2.3",

- "reference": "1.2.3",

- "phpunit/phpunit": ">=3.7.0@stable"

- "dbunit.php"

- "dev-master": "1.2.x-dev"

- "time": "2013-03-01 11:50:46"

- "version": "1.2.12",

- "reference": "1.2.12"

- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12",

- "reference": "1.2.12",

- "phpunit/php-file-iterator": ">=1.3.0@stable",

- "phpunit/php-text-template": ">=1.1.1@stable",

- "phpunit/php-token-stream": ">=1.1.3@stable"

- "phpunit/phpunit": "3.7.*@dev"

- "ext-xdebug": ">=2.0.5"

- "dev-master": "1.2.x-dev"

- "PHP/"

- "time": "2013-07-06 06:26:16"

- "version": "1.3.3",

- "url": "git://github.com/sebastianbergmann/php-file-iterator.git",

- "reference": "1.3.3"

- "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",

- "reference": "1.3.3",

- "homepage": "http://www.phpunit.de/",

- "time": "2012-10-11 04:44:38"

- "version": "1.1.4",

- "url": "git://github.com/sebastianbergmann/php-text-template.git",

- "reference": "1.1.4"

- "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",

- "reference": "1.1.4",

- "time": "2012-10-31 11:15:28"

- "version": "1.0.4",

- "url": "git://github.com/sebastianbergmann/php-timer.git",

- "reference": "1.0.4"

- "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",

- "reference": "1.0.4",

- "homepage": "http://www.phpunit.de/",

- "time": "2012-10-11 04:45:58"

- "version": "1.1.5",

- "url": "git://github.com/sebastianbergmann/php-token-stream.git",

- "reference": "1.1.5"

- "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",

- "reference": "1.1.5",

- "homepage": "http://www.phpunit.de/",

- "time": "2012-10-11 04:47:14"

- "version": "3.7.22",

- "reference": "3.7.22"

- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.22",

- "reference": "3.7.22",

- "phpunit/php-code-coverage": "~1.2.1",

- "phpunit/php-file-iterator": ">=1.3.1",

- "phpunit/php-text-template": ">=1.1.1",

- "phpunit/phpunit-mock-objects": "~1.2.0",

- "require-dev": {

- "pear-pear/pear": "1.9.4"

- },

- "ext-json": "*",

- "ext-simplexml": "*",

- "ext-tokenizer": "*",

- "phpunit/php-invoker": ">=1.1.0,<1.2.0"

- "composer/bin/phpunit"

- "dev-master": "3.7.x-dev"

- "PHPUnit/"

- "time": "2013-07-06 06:29:15"

- "version": "1.2.3",

- "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",

- "reference": "1.2.3"

- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",

- "reference": "1.2.3",

- "phpunit/php-text-template": ">=1.1.1@stable"

- "PHPUnit/"

- "time": "2013-01-13 10:24:48"

- "version": "v2.1.11",

- "reference": "v2.1.11"

- "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.1.11",

- "reference": "v2.1.11",

- "symfony/dom-crawler": "2.1.*"

- "symfony/css-selector": "2.1.*",

- "symfony/process": "2.1.*"

- "symfony/process": "2.1.*"

- "Symfony\\Component\\BrowserKit": ""

- "email": "fabien@symfony.com"

- "time": "2013-04-29 20:22:06"

- "version": "v2.1.11",

- "reference": "v2.1.11"

- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/v2.1.11",

- "reference": "v2.1.11",

- "Symfony\\Component\\CssSelector": ""

- "email": "fabien@symfony.com"

- "time": "2013-05-17 00:31:34"

- "version": "v2.1.11",

- "reference": "v2.1.11"

- "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.1.11",

- "reference": "v2.1.11",

- "symfony/css-selector": "2.1.*"

- "symfony/css-selector": "2.1.*"

- "Symfony\\Component\\DomCrawler": ""

- "email": "fabien@symfony.com"

- "time": "2013-05-16 00:06:15"

- "version": "v2.3.1",

- "reference": "v2.3.1"

- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.1",

- "reference": "v2.3.1",

- "symfony/dependency-injection": ">=2.0,<3.0"

- "email": "fabien@symfony.com"

- "time": "2013-05-13 14:36:40"

- "version": "v2.1.11",

- "reference": "v2.1.11"

- "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.1.11",

- "reference": "v2.1.11",

- "Symfony\\Component\\Finder": ""

- "email": "fabien@symfony.com"

- "time": "2013-05-25 15:47:15"

- "version": "v2.1.11",

- "reference": "v2.1.11"

- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.11",

- "reference": "v2.1.11",

- "Symfony\\Component\\Process": ""

- "email": "fabien@symfony.com"

- "time": "2013-05-06 10:21:56"

- "version": "v2.3.1",

- "reference": "v2.3.1"

- "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1",

- "reference": "v2.3.1",

- "dev-master": "2.3-dev"

- "email": "fabien@symfony.com"

- "time": "2013-05-10 18:12:13"

- $line .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";

- $line .= "\t) ON [PRIMARY] \n";

- $line .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";

- EXreaction (Nathan Guse)

- imkingdavid (David King)

- kellanved (Henry Sudhof) [04/2007 - 03/2011]

- <ol style="list-style-type: lower-roman;">

- </ol>

- <a name="v3011"></a><h3>1.i. Changes since 3.0.11</h3>

- <a name="v3010"></a><h3>1.ii. Changes since 3.0.10</h3>

- <a name="v309"></a><h3>1.iii. Changes since 3.0.9</h3>

- <a name="v308"></a><h3>1.iv. Changes since 3.0.8</h3>

-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9925'>PHPBB3-9925</a>] - prosilver logo margin bug in IE 6-7-8

-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9933'>PHPBB3-9933</a>] - Wrong handling of consecutive multiple asterisks in word censor

-<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9949'>PHPBB3-9949</a>] - $user-&gt;lang() is not handling arguments as per documentation

-

-

-

-

- <a name="v307-PL1"></a><h3>1.v. Changes since 3.0.7-PL1</h3>

- <a name="v307"></a><h3>1.vi. Changes since 3.0.7</h3>

- <a name="v306"></a><h3>1.vii. Changes since 3.0.6</h3>

- <a name="v305"></a><h3>1.viii. Changes since 3.0.5</h3>

- <a name="v304"></a><h3>1.ix. Changes since 3.0.4</h3>

- <a name="v303"></a><h3>1.x. Changes since 3.0.3</h3>

- <a name="v302"></a><h3>1.xi. Changes since 3.0.2</h3>

- <a name="v301"></a><h3>1.xii. Changes since 3.0.1</h3>

- <a name="v300"></a><h3>1.xiii Changes since 3.0.0</h3>

- <a name="v30rc8"></a><h3>1.xiv. Changes since 3.0.RC8</h3>

- <a name="v30rc7"></a><h3>1.xv. Changes since 3.0.RC7</h3>

- <a name="v30rc6"></a><h3>1.xvi. Changes since 3.0.RC6</h3>

- <a name="v30rc5"></a><h3>1.xvii. Changes since 3.0.RC5</h3>

- <a name="v30rc4"></a><h3>1.xviii. Changes since 3.0.RC4</h3>

- <a name="v30rc3"></a><h3>1.xix. Changes since 3.0.RC3</h3>

- <a name="v30rc2"></a><h3>1.xx. Changes since 3.0.RC2</h3>

- <a name="v30rc1"></a><h3>1.xxi. Changes since 3.0.RC1</h3>

- <p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <strong>3.0.11</strong> you should select the appropriate <code>phpBB-3.0.12-files.zip/tar.bz2</code> file.</p>

- <p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is <strong>3.0.11</strong>, you need the <code>phpBB-3.0.12-patch.zip/tar.bz2</code> file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <code>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</code> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>

- <p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.0.11</strong>, you need the <code>phpBB-3.0.11_to_3.0.12.zip/tar.bz2</code> file.</p>

- <p>This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem. </p>

- 'moredata' =&gt; $another_int

- 'moredata' =&gt; $another_int

- FORUMS_TABLE =&gt; 'f'

- 'ON' =&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id'

- )

- 'ORDER_BY' =&gt; 'left_id'

- FORUMS_TABLE =&gt; 'f'

- 'ORDER_BY' =&gt; 'left_id'

- 'ON' =&gt; 'ft.user_id = ' . $user-&gt;data['user_id'] . ' AND ft.forum_id = f.forum_id'

- )

- if ($size)

- {

- header("Content-Length: $size");

- }

-

- global $db, $cache;

- static $result;

- if (!isset($result))

- $result = $db->sql_query_limit($sql, $this->num_items);

- return $db->sql_fetchrow($result);

- if (!preg_match('/FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?/', $query, $regs))

- $tables = array_map('trim', explode(',', $regs[1]));

- 'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'string', 'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),

- 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rwpath', 'type' => 'text:20:255', 'explain' => true),

- exit;

- 'S_MBSTRING_HTTP_INPUT_FAIL' => (@ini_get('mbstring.http_input') != 'pass'),

- 'S_MBSTRING_HTTP_OUTPUT_FAIL' => (@ini_get('mbstring.http_output') != 'pass'),

- if (empty($phpinfo) || empty($output))

- $errstr = '';

- $errno = 0;

-

- $info = obtain_latest_version_info(request_var('versioncheck_force', false));

- // You can't delete the founder

- if ($delete && $user_row['user_type'] != USER_FOUNDER)

- $result = $db->sql_query_limit($sql, $config['posts_per_page'], $start);

- $bbcode_tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl);

- $tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl);

-define('PHPBB_VERSION', '3.0.12');

- // Determine if the table must be created with TEXTIMAGE

- $create_textimage = false;

-

- if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"

- // create textimage DDL based off of the existance of certain column types

- if (!$create_textimage)

- {

- $create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];

- }

-

- $table_sql .= "\n);";

- $statements[] = $table_sql;

- break;

-

- $table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');

- // Add unqiue indexes?

- * Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.

- // remove default cosntraints first

- // http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx

- $statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)

- SET @drop_default_name =

- (SELECT so.name FROM sysobjects so

- JOIN sysconstraints sc ON so.id = sc.constid

- WHERE object_name(so.parent_obj) = '{$table_name}'

- AND so.xtype = 'D'

- AND sc.colid = (SELECT colid FROM syscolumns

- WHERE id = object_id('{$table_name}')

- AND name = '{$column_name}'))

- IF @drop_default_name <> ''

- BEGIN

- SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'

- EXEC(@cmd)

- END";

- $sql .= ') ON [PRIMARY]';

- $statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';

- $statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';

- $statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)

- SET @drop_default_name =

- (SELECT so.name FROM sysobjects so

- JOIN sysconstraints sc ON so.id = sc.constid

- WHERE object_name(so.parent_obj) = '{$table_name}'

- AND so.xtype = 'D'

- AND sc.colid = (SELECT colid FROM syscolumns

- WHERE id = object_id('{$table_name}')

- AND name = '{$column_name}'))

- IF @drop_default_name <> ''

- BEGIN

- SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'

- EXEC(@cmd)

- END

- SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'

- EXEC(@cmd)";

- $url = generate_board_url();

- if (!empty($_SERVER['SERVER_PROTOCOL']))