- - travis/install-php-extensions.sh

-

-notifications:

- email:

- recipients:

- - dev-team@phpbb.com

- on_success: change

- on_failure: change

- <property name="newversion" value="3.1.0-a2" />

- <property name="prevversion" value="3.1.0-a1" />

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

- <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" />

-#!/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} *");

- 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)

- {

- }

-}

- <dt><label for="location">{L_LOCATION}{L_COLON}</label></dt>

- <dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>

- </dl>

- <dl>

- <dt><label for="occupation">{L_OCCUPATION}{L_COLON}</label></dt>

- <dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>

- </dl>

- <dl>

- <dt><label for="interests">{L_INTERESTS}{L_COLON}</label></dt>

- <dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>

- </dl>

- <dl>

- document.forms[form_name].elements[text_name].focus();

- } else if (document.forms[form_name].elements[text_name].selectionEnd

- && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {

- mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);

- document.forms[form_name].elements[text_name].focus();

- phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0],

- phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML;

-

- // Hide the basic upload panel and remove the attach row template.

- $('#attach-row-tpl, #attach-panel-basic').remove();

- // Show multi-file upload options.

- $('#attach-panel-multi').show();

- // Initialize the Plupload uploader.

- uploader.init();

- // Point out the drag-and-drop zone if it's supported.

- if (!uploader.features.dragdrop) {

- $('#drag-n-drop-message').show();

- }

- var index = phpbb.plupload.ids.indexOf(Number(attach_id));

- var textarea = $(phpbb.plupload.form).find('textarea[name="message"]'),

- $occupation = "phpBB tester";

- $location = "phpBB world hq";

- $interests = "Eating, sleeping, living, and breathing phpBB";

- $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)

- VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";

- <a name="v310a1"></a><h3>1.i. Changes since 3.1.0-a1</h3>

- <a name="v30x"></a><h3>1.ii. Changes since 3.0.x</h3>

- <a name="v3011"></a><h3>1.iii. Changes since 3.0.11</h3>

- <a name="v3010"></a><h3>1.iv. Changes since 3.0.10</h3>

- <a name="v309"></a><h3>1.v. Changes since 3.0.9</h3>

- <a name="v308"></a><h3>1.vi. Changes since 3.0.8</h3>

- <a name="v307-PL1"></a><h3>1.vii. Changes since 3.0.7-PL1</h3>

- <a name="v307"></a><h3>1.viii. Changes since 3.0.7</h3>

- <a name="v306"></a><h3>1.ix. Changes since 3.0.6</h3>

- <a name="v305"></a><h3>1.x. Changes since 3.0.5</h3>

- <a name="v304"></a><h3>1.xi. Changes since 3.0.4</h3>

- <a name="v303"></a><h3>1.xii. Changes since 3.0.3</h3>

- <a name="v302"></a><h3>1.xiii. Changes since 3.0.2</h3>

- <a name="v301"></a><h3>1.xiv. Changes since 3.0.1</h3>

- <a name="v300"></a><h3>1.xv Changes since 3.0.0</h3>

- <a name="v30rc8"></a><h3>1.xvi. Changes since 3.0.RC8</h3>

- <a name="v30rc7"></a><h3>1.xvii. Changes since 3.0.RC7</h3>

- <a name="v30rc6"></a><h3>1.xviii. Changes since 3.0.RC6</h3>

- <a name="v30rc5"></a><h3>1.xix. Changes since 3.0.RC5</h3>

- <a name="v30rc4"></a><h3>1.xx. Changes since 3.0.RC4</h3>

- <a name="v30rc3"></a><h3>1.xxi. Changes since 3.0.RC3</h3>

- <a name="v30rc2"></a><h3>1.xxii. Changes since 3.0.RC2</h3>

- <a name="v30rc1"></a><h3>1.xxiii. Changes since 3.0.RC1</h3>

- global $db, $user, $cache, $phpbb_root_path, $phpbb_dispatcher;

- $forum_data_sql['forum_password'] = phpbb_hash($forum_data_sql['forum_password']);

- global $request;

- include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

- // Define some default values for each field type

- $default_values = array(

- FIELD_STRING => array('field_length' => 10, 'field_minlen' => 0, 'field_maxlen' => 20, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),

- FIELD_TEXT => array('field_length' => '5|80', 'field_minlen' => 0, 'field_maxlen' => 1000, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),

- FIELD_INT => array('field_length' => 5, 'field_minlen' => 0, 'field_maxlen' => 100, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),

- FIELD_DATE => array('field_length' => 10, 'field_minlen' => 10, 'field_maxlen' => 10, 'field_validation' => '', 'field_novalue' => ' 0- 0- 0', 'field_default_value' => ' 0- 0- 0'),

- FIELD_BOOL => array('field_length' => 1, 'field_minlen' => 0, 'field_maxlen' => 0, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),

- FIELD_DROPDOWN => array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),

- );

-

- $cp = new custom_profile_admin();

- foreach ($this->lang_defs['entry'] as $field_id => $field_ary)

- $this->lang_defs['diff'][$field_id] = array_diff(array_values($this->lang_defs['iso']), $field_ary);

- $field_type = request_var('field_type', 0);

- if (!$field_type)

- $field_row = array_merge($default_values[$field_type], array(

- 1 => array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_pm', 'field_show_on_vt', 'field_required', 'field_show_novalue', 'field_hide', 'field_show_profile', 'field_no_view'),

- // Text-based fields require the lang_default_value to be excluded

- if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)

- {

- $exclude[1][] = 'lang_default_value';

- }

-

- // option-specific fields require lang_options to be excluded

- if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)

- {

- $exclude[1][] = 'lang_options';

- }

-

- $cp->vars['field_ident'] = ($action == 'create' && $step == 1) ? utf8_clean_string(request_var('field_ident', $field_row['field_ident'], true)) : request_var('field_ident', $field_row['field_ident']);

- $cp->vars['lang_name'] = utf8_normalize_nfc(request_var('lang_name', $field_row['lang_name'], true));

- $cp->vars['lang_explain'] = utf8_normalize_nfc(request_var('lang_explain', $field_row['lang_explain'], true));

- $cp->vars['lang_default_value'] = utf8_normalize_nfc(request_var('lang_default_value', $field_row['lang_default_value'], true));

-

- // A boolean field expects an array as the lang options

- if ($field_type == FIELD_BOOL)

- {

- $options = utf8_normalize_nfc(request_var('lang_options', array(''), true));

- }

- else

- {

- $options = utf8_normalize_nfc(request_var('lang_options', '', true));

- }

-

- // Manipulate the intended variables a little bit if needed

- if ($field_type == FIELD_DROPDOWN && $key == 'field_maxlen')

- {

- // Get the number of options if this key is 'field_maxlen'

- $var = sizeof(explode("\n", utf8_normalize_nfc(request_var('lang_options', '', true))));

- }

- else if ($field_type == FIELD_TEXT && $key == 'field_length')

- {

- if (isset($_REQUEST['rows']))

- {

- $cp->vars['rows'] = request_var('rows', 0);

- $cp->vars['columns'] = request_var('columns', 0);

- $var = $cp->vars['rows'] . '|' . $cp->vars['columns'];

- }

- else

- {

- $row_col = explode('|', $var);

- $cp->vars['rows'] = $row_col[0];

- $cp->vars['columns'] = $row_col[1];

- }

- }

- else if ($field_type == FIELD_DATE && $key == 'field_default_value')

- {

- $always_now = request_var('always_now', -1);

-

- if ($always_now == 1 || ($always_now === -1 && $var == 'now'))

- {

- $now = getdate();

-

- $cp->vars['field_default_value_day'] = $now['mday'];

- $cp->vars['field_default_value_month'] = $now['mon'];

- $cp->vars['field_default_value_year'] = $now['year'];

- $var = 'now';

- $request->overwrite('field_default_value', $var, \phpbb\request\request_interface::POST);

- }

- else

- {

- if (isset($_REQUEST['field_default_value_day']))

- {

- $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0);

- $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0);

- $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0);

- $var = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']);

- $request->overwrite('field_default_value', $var, \phpbb\request\request_interface::POST);

- }

- else

- {

- list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var);

- }

- }

- }

- else if ($field_type == FIELD_BOOL && $key == 'field_default_value')

- {

- // 'field_length' == 1 defines radio buttons. Possible values are 1 or 2 only.

- // 'field_length' == 2 defines checkbox. Possible values are 0 or 1 only.

- // If we switch the type on step 2, we have to adjust field value.

- // 1 is a common value for the checkbox and radio buttons.

-

- // Adjust unchecked checkbox value.

- // If we return or save settings from 2nd/3rd page

- // and the checkbox is unchecked, set the value to 0.

- if (isset($_REQUEST['step']) && !isset($_REQUEST[$key]))

- {

- $var = 0;

- }

-

- // If we switch to the checkbox type but former radio buttons value was 2,

- // which is not the case for the checkbox, set it to 0 (unchecked).

- if ($cp->vars['field_length'] == 2 && $var == 2)

- {

- $var = 0;

- }

- // If we switch to the radio buttons but the former checkbox value was 0,

- // which is not the case for the radio buttons, set it to 0.

- else if ($cp->vars['field_length'] == 1 && $var == 0)

- {

- $var = 2;

- }

- }

- else if ($field_type == FIELD_INT && $key == 'field_default_value')

- {

- // Permit an empty string

- if ($action == 'create' && request_var('field_default_value', '') === '')

- {

- $var = '';

- }

- }

- else if ($key == 'l_lang_options' && $field_type == FIELD_BOOL)

- {

- $cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => array('')), true));

- }

- else if ($key == 'l_lang_options' && is_array($cp->vars[$key]))

- {

- foreach ($cp->vars[$key] as $lang_id => $options)

- {

- $cp->vars[$key][$lang_id] = explode("\n", $options);

- }

- }

- if ($field_type == FIELD_DROPDOWN && !sizeof($cp->vars['lang_options']))

- {

- $error[] = $user->lang['NO_FIELD_ENTRIES'];

- }

-

- if ($field_type == FIELD_BOOL && (empty($cp->vars['lang_options'][0]) || empty($cp->vars['lang_options'][1])))

- {

- $error[] = $user->lang['NO_FIELD_ENTRIES'];

- }

- if ($field_type == FIELD_TEXT && $key == 'field_length' && isset($_REQUEST['rows']))

- {

- $cp->vars['rows'] = request_var('rows', 0);

- $cp->vars['columns'] = request_var('columns', 0);

- $_new_key_ary[$key] = $cp->vars['rows'] . '|' . $cp->vars['columns'];

- }

- else if ($field_type == FIELD_DATE && $key == 'field_default_value')

- {

- $always_now = request_var('always_now', 0);

-

- if ($always_now)

- {

- $_new_key_ary[$key] = 'now';

- }

- else if (isset($_REQUEST['field_default_value_day']))

- {

- $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0);

- $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0);

- $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0);

- $_new_key_ary[$key] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']);

- }

- }

- else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && isset($_REQUEST['l_lang_options']))

- {

- $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true));

- }

- else if ($field_type == FIELD_BOOL && $key == 'field_default_value')

- {

- $_new_key_ary[$key] = request_var($key, $cp->vars[$key]);

- }

- else

- if (!isset($_REQUEST[$key]))

- {

- $var = false;

- }

- else if ($key == 'field_ident' && isset($cp->vars[$key]))

- {

- $_new_key_ary[$key]= $cp->vars[$key];

- }

- else

- {

- $_new_key_ary[$key] = ($field_type == FIELD_BOOL && $key == 'lang_options') ? utf8_normalize_nfc(request_var($key, array(''), true)) : utf8_normalize_nfc(request_var($key, '', true));

- }

-

- // Build common create options

- $template->assign_vars(array(

- 'FIELD_TYPE' => $user->lang['FIELD_' . strtoupper($cp->profile_types[$field_type])],

- 'LANG_EXPLAIN' => $cp->vars['lang_explain'])

- // String and Text needs to set default values here...

- if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)

- {

- $template->assign_vars(array(

- 'S_TEXT' => ($field_type == FIELD_TEXT) ? true : false,

- 'S_STRING' => ($field_type == FIELD_STRING) ? true : false,

-

- 'L_DEFAULT_VALUE_EXPLAIN' => $user->lang[strtoupper($cp->profile_types[$field_type]) . '_DEFAULT_VALUE_EXPLAIN'],

- 'LANG_DEFAULT_VALUE' => $cp->vars['lang_default_value'])

- );

- }

-

- if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)

- {

- // Initialize these array elements if we are creating a new field

- if (!sizeof($cp->vars['lang_options']))

- {

- if ($field_type == FIELD_BOOL)

- {

- // No options have been defined for a boolean field.

- $cp->vars['lang_options'][0] = '';

- $cp->vars['lang_options'][1] = '';

- }

- else

- {

- // No options have been defined for the dropdown menu

- $cp->vars['lang_options'] = array();

- }

- }

-

- $template->assign_vars(array(

- 'S_BOOL' => ($field_type == FIELD_BOOL) ? true : false,

- 'S_DROPDOWN' => ($field_type == FIELD_DROPDOWN) ? true : false,

-

- 'L_LANG_OPTIONS_EXPLAIN' => $user->lang[strtoupper($cp->profile_types[$field_type]) . '_ENTRIES_EXPLAIN'],

- 'LANG_OPTIONS' => ($field_type == FIELD_DROPDOWN) ? implode("\n", $cp->vars['lang_options']) : '',

- 'FIRST_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][0] : '',

- 'SECOND_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '')

- );

- }

- $function = 'get_' . $cp->profile_types[$field_type] . '_options';

- $options = $cp->$function();

- 'FIELD_TYPE' => $user->lang['FIELD_' . strtoupper($cp->profile_types[$row['field_type']])],

- foreach ($cp->profile_types as $key => $value)

- $s_select_type .= '<option value="' . $key . '">' . $user->lang['FIELD_' . strtoupper($value)] . '</option>';

- 'S_TYPE_OPTIONS' => $s_select_type)

- );

- global $user, $config, $db;

- $options = array();

- $options['lang_name'] = 'string';

- if ($cp->vars['lang_explain'])

- {

- $options['lang_explain'] = 'text';

- }

-

- switch ($field_type)

- {

- case FIELD_BOOL:

- $options['lang_options'] = 'two_options';

- break;

-

- case FIELD_DROPDOWN:

- $options['lang_options'] = 'optionfield';

- break;

-

- case FIELD_TEXT:

- case FIELD_STRING:

- if (strlen($cp->vars['lang_default_value']))

- {

- $options['lang_default_value'] = ($field_type == FIELD_STRING) ? 'string' : 'text';

- }

- break;

- }

- global $db, $config, $user;

- $profile_sql[] = $this->add_field_ident($field_ident, $field_type);

- // These are always arrays because the key is the language id...

- $cp->vars['l_lang_name'] = utf8_normalize_nfc(request_var('l_lang_name', array(0 => ''), true));

- $cp->vars['l_lang_explain'] = utf8_normalize_nfc(request_var('l_lang_explain', array(0 => ''), true));

- $cp->vars['l_lang_default_value'] = utf8_normalize_nfc(request_var('l_lang_default_value', array(0 => ''), true));

-

- if ($field_type != FIELD_BOOL)

- {

- $cp->vars['l_lang_options'] = utf8_normalize_nfc(request_var('l_lang_options', array(0 => ''), true));

- }

- else

- {

- /**

- * @todo check if this line is correct...

- $cp->vars['l_lang_default_value'] = request_var('l_lang_default_value', array(0 => array('')), true);

- */

- $cp->vars['l_lang_options'] = utf8_normalize_nfc(request_var('l_lang_options', array(0 => array('')), true));

- }

- 'field_type' => (int) $field_type,

- 'field_type' => (int) $field_type,

- function add_field_ident($field_ident, $field_type)

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD `$field_ident` ";

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $sql .= ' VARCHAR(255) ';

- break;

-

- case FIELD_DATE:

- $sql .= 'VARCHAR(10) ';

- break;

-

- case FIELD_TEXT:

- $sql .= "TEXT";

- // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED";

- break;

-

- case FIELD_BOOL:

- $sql .= 'TINYINT(2) ';

- break;

-

- case FIELD_DROPDOWN:

- $sql .= 'MEDIUMINT(8) ';

- break;

-

- case FIELD_INT:

- $sql .= 'BIGINT(20) ';

- break;

- }

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $type = ' VARCHAR(255) ';

- break;

-

- case FIELD_DATE:

- $type = 'VARCHAR(10) ';

- break;

-

- case FIELD_TEXT:

- $type = "TEXT(65535)";

- // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED";

- break;

-

- case FIELD_BOOL:

- $type = 'TINYINT(2) ';

- break;

-

- case FIELD_DROPDOWN:

- $type = 'MEDIUMINT(8) ';

- break;

-

- case FIELD_INT:

- $type = 'BIGINT(20) ';

- break;

- }

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $new_table_cols = $field_ident . ' ' . $type . ',' . $new_table_cols;

- $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident [$type]";

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $sql .= ' [VARCHAR] (255) ';

- break;

-

- case FIELD_DATE:

- $sql .= '[VARCHAR] (10) ';

- break;

-

- case FIELD_TEXT:

- $sql .= "[TEXT]";

- // ADD {$field_ident}_bbcode_uid [VARCHAR] (5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield [INT] UNSIGNED";

- break;

-

- case FIELD_BOOL:

- case FIELD_DROPDOWN:

- $sql .= '[INT] ';

- break;

-

- case FIELD_INT:

- $sql .= '[FLOAT] ';

- break;

- }

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD COLUMN \"$field_ident\" ";

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $sql .= ' VARCHAR(255) ';

- break;

-

- case FIELD_DATE:

- $sql .= 'VARCHAR(10) ';

- break;

-

- case FIELD_TEXT:

- $sql .= "TEXT";

- // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield INT4 UNSIGNED";

- break;

-

- case FIELD_BOOL:

- $sql .= 'INT2 ';

- break;

-

- case FIELD_DROPDOWN:

- $sql .= 'INT4 ';

- break;

-

- case FIELD_INT:

- $sql .= 'INT8 ';

- break;

- }

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . ' ADD "' . strtoupper($field_ident) . '" ';

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $sql .= ' VARCHAR(255) ';

- break;

-

- case FIELD_DATE:

- $sql .= 'VARCHAR(10) ';

- break;

-

- case FIELD_TEXT:

- $sql .= "BLOB SUB_TYPE TEXT";

- // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield INTEGER UNSIGNED";

- break;

-

- case FIELD_BOOL:

- case FIELD_DROPDOWN:

- $sql .= 'INTEGER ';

- break;

-

- case FIELD_INT:

- $sql .= 'DOUBLE PRECISION ';

- break;

- }

-

- // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.

- $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";

-

- switch ($field_type)

- {

- case FIELD_STRING:

- $sql .= ' VARCHAR2(255) ';

- break;

-

- case FIELD_DATE:

- $sql .= 'VARCHAR2(10) ';

- break;

-

- case FIELD_TEXT:

- $sql .= "CLOB";

- // ADD {$field_ident}_bbcode_uid VARCHAR2(5) NOT NULL,

- // ADD {$field_ident}_bbcode_bitfield NUMBER(11) UNSIGNED";

- break;

-

- case FIELD_BOOL:

- $sql .= 'NUMBER(2) ';

- break;

-

- case FIELD_DROPDOWN:

- $sql .= 'NUMBER(8) ';

- break;

-

- case FIELD_INT:

- $sql .= 'NUMBER(20) ';

- break;

- }

- $update_password = ($data['new_password'] && !phpbb_check_hash($data['new_password'], $user_row['user_password'])) ? true : false;

- 'user_password' => phpbb_hash($data['new_password']),

- include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

- $cp = new custom_profile();

- 'location' => utf8_normalize_nfc(request_var('location', $user_row['user_from'], true)),

- 'occupation' => utf8_normalize_nfc(request_var('occupation', $user_row['user_occ'], true)),

- 'interests' => utf8_normalize_nfc(request_var('interests', $user_row['user_interests'], true)),

- 'location' => array('string', true, 2, 100),

- 'occupation' => array('string', true, 2, 500),

- 'interests' => array('string', true, 2, 500),

- 'user_from' => $data['location'],

- 'user_occ' => $data['occupation'],

- 'user_interests'=> $data['interests'],

- 'LOCATION' => $data['location'],

- 'OCCUPATION' => $data['occupation'],

- 'INTERESTS' => $data['interests'],

-define('PHPBB_VERSION', '3.1.0-a3-dev');

-

- 'forum_password' => array('VCHAR_UNI:40', ''),

- 'field_type' => array('TINT:4', 0),

- 'field_type' => array('TINT:4', 0),

- 'user_password' => array('VCHAR_UNI:40', ''),

- 'user_from' => array('VCHAR_UNI:100', ''),

- 'user_occ' => array('TEXT_UNI', ''),

- 'user_interests' => array('TEXT_UNI', ''),

-* @version Version 0.1 / slightly modified for phpBB 3.1.x (using $H$ as hash type identifier)

-*

-* Portable PHP password hashing framework.

-*

-* Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in

-* the public domain.

-*

-* There's absolutely no warranty.

-*

-* The homepage URL for this framework is:

-*

-* http://www.openwall.com/phpass/

-*

-* Please be sure to update the Version line if you edit this file in any way.

-* It is suggested that you leave the main version number intact, but indicate

-* your project name (after the slash) and add your own revision information.

-*

-* Please do not change the "private" password hashing method implemented in

-* here, thereby making your hashes incompatible. However, if you must, please

-* change the hash type identifier (the "$P$") to something different.

-*

-* Obviously, since this code is in the public domain, the above are not

-* requirements (there can be none), but merely suggestions.

-* Hash the password

- $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

-

- $random_state = unique_id();

- $random = '';

- $count = 6;

-

- if (($fh = @fopen('/dev/urandom', 'rb')))

- {

- $random = fread($fh, $count);

- fclose($fh);

- }

-

- if (strlen($random) < $count)

- {

- $random = '';

-

- for ($i = 0; $i < $count; $i += 16)

- {

- $random_state = md5(unique_id() . $random_state);

- $random .= pack('H*', md5($random_state));

- }

- $random = substr($random, 0, $count);

- }

-

- $hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64);

-

- if (strlen($hash) == 34)

- {

- return $hash;

- }

- return md5($password);

- if (strlen($password) > 4096)

- {

- // If the password is too huge, we will simply reject it

- // and not let the server try to hash it.

- return false;

- }

-

- $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';

- if (strlen($hash) == 34)

- {

- return (_hash_crypt_private($password, $hash, $itoa64) === $hash) ? true : false;

- }

- return (md5($password) === $hash) ? true : false;

-}

-

-/**

-* Generate salt for hash generation

-*/

-function _hash_gensalt_private($input, &$itoa64, $iteration_count_log2 = 6)

-{

- if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)

- {

- $iteration_count_log2 = 8;

- }

-

- $output = '$H$';

- $output .= $itoa64[min($iteration_count_log2 + 5, 30)];

- $output .= _hash_encode64($input, 6, $itoa64);

-

- return $output;

-}

-

-/**

-* Encode hash

-*/

-function _hash_encode64($input, $count, &$itoa64)

-{

- $output = '';

- $i = 0;

-

- do

- {

- $value = ord($input[$i++]);

- $output .= $itoa64[$value & 0x3f];

-

- if ($i < $count)

- {

- $value |= ord($input[$i]) << 8;

- }

-

- $output .= $itoa64[($value >> 6) & 0x3f];

-

- if ($i++ >= $count)

- {

- break;

- }

-

- if ($i < $count)

- {

- $value |= ord($input[$i]) << 16;

- }

-

- $output .= $itoa64[($value >> 12) & 0x3f];

-

- if ($i++ >= $count)

- {

- break;

- }

-

- $output .= $itoa64[($value >> 18) & 0x3f];

- }

- while ($i < $count);

-

- return $output;

-}

-

-/**

-* The crypt function/replacement

-*/

-function _hash_crypt_private($password, $setting, &$itoa64)

-{

- $output = '*';

-

- // Check for correct hash

- if (substr($setting, 0, 3) != '$H$' && substr($setting, 0, 3) != '$P$')

- {

- return $output;

- }

-

- $count_log2 = strpos($itoa64, $setting[3]);

-

- if ($count_log2 < 7 || $count_log2 > 30)

- {

- return $output;

- }

-

- $count = 1 << $count_log2;

- $salt = substr($setting, 4, 8);

-

- if (strlen($salt) != 8)

- {

- return $output;

- }

-

- /**

- * We're kind of forced to use MD5 here since it's the only

- * cryptographic primitive available in all versions of PHP

- * currently in use. To implement our own low-level crypto

- * in PHP would result in much worse performance and

- * consequently in lower iteration counts and hashes that are

- * quicker to crack (by non-PHP code).

- */

- $hash = md5($salt . $password, true);

- do

- {

- $hash = md5($hash . $password, true);

- }

- while (--$count);

-

- $output = substr($setting, 0, 12);

- $output .= _hash_encode64($hash, 16, $itoa64);

-

- return $output;

- global $db, $config, $user, $template, $phpEx;

- $password = request_var('password', '', true);

- if (phpbb_check_hash($password, $forum_data['forum_password']))

-<?php

-/**

-*

-* @package phpBB3

-* @copyright (c) 2005 phpBB Group

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

-*

-*/

-

-/**

-* @ignore

-*/

-if (!defined('IN_PHPBB'))

-{

- exit;

-}

-

-/**

-* Custom Profile Fields

-* @package phpBB3

-*/

-class custom_profile

-{

- var $profile_types = array(FIELD_INT => 'int', FIELD_STRING => 'string', FIELD_TEXT => 'text', FIELD_BOOL => 'bool', FIELD_DROPDOWN => 'dropdown', FIELD_DATE => 'date');

- var $profile_cache = array();

- var $options_lang = array();

-

- /**

- * Assign editable fields to template, mode can be profile (for profile change) or register (for registration)

- * Called by ucp_profile and ucp_register

- * @access public

- */

- function generate_profile_fields($mode, $lang_id)

- {

- global $db, $template, $auth;

-

- $sql_where = '';

- switch ($mode)

- {

- case 'register':

- // If the field is required we show it on the registration page

- $sql_where .= ' AND f.field_show_on_reg = 1';

- break;

-

- case 'profile':

- // Show hidden fields to moderators/admins

- if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))

- {

- $sql_where .= ' AND f.field_show_profile = 1';

- }

- break;

-

- default:

- trigger_error('Wrong profile mode specified', E_USER_ERROR);

- break;

- }

-

- $sql = 'SELECT l.*, f.*

- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f

- WHERE f.field_active = 1

- $sql_where

- AND l.lang_id = $lang_id

- AND l.field_id = f.field_id

- ORDER BY f.field_order";

- $result = $db->sql_query($sql);

-

- while ($row = $db->sql_fetchrow($result))

- {

- // Return templated field

- $tpl_snippet = $this->process_field_row('change', $row);

-

- // Some types are multivalue, we can't give them a field_id as we would not know which to pick

- $type = (int) $row['field_type'];

-

- $template->assign_block_vars('profile_fields', array(

- 'LANG_NAME' => $row['lang_name'],

- 'LANG_EXPLAIN' => $row['lang_explain'],

- 'FIELD' => $tpl_snippet,

- 'FIELD_ID' => ($type == FIELD_DATE || ($type == FIELD_BOOL && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'],

- 'S_REQUIRED' => ($row['field_required']) ? true : false)

- );

- }

- $db->sql_freeresult($result);

- }

-

- /**

- * Validate entered profile field data

- * @access public

- */

- function validate_profile_field($field_type, &$field_value, $field_data)

- {

- switch ($field_type)

- {

- case FIELD_DATE:

- $field_validate = explode('-', $field_value);

-

- $day = (isset($field_validate[0])) ? (int) $field_validate[0] : 0;

- $month = (isset($field_validate[1])) ? (int) $field_validate[1] : 0;

- $year = (isset($field_validate[2])) ? (int) $field_validate[2] : 0;

-

- if ((!$day || !$month || !$year) && !$field_data['field_required'])

- {

- return false;

- }

-

- if ((!$day || !$month || !$year) && $field_data['field_required'])

- {

- return 'FIELD_REQUIRED';

- }

-

- if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()) + 50)

- {

- return 'FIELD_INVALID_DATE';

- }

-

- if (checkdate($month, $day, $year) === false)

- {

- return 'FIELD_INVALID_DATE';

- }

- break;

-

- case FIELD_BOOL:

- $field_value = (bool) $field_value;

-

- if (!$field_value && $field_data['field_required'])

- {

- return 'FIELD_REQUIRED';

- }

- break;

-

- case FIELD_INT:

- if (trim($field_value) === '' && !$field_data['field_required'])

- {

- return false;

- }

-

- $field_value = (int) $field_value;

-

- if ($field_value < $field_data['field_minlen'])

- {

- return 'FIELD_TOO_SMALL';

- }

- else if ($field_value > $field_data['field_maxlen'])

- {

- return 'FIELD_TOO_LARGE';

- }

- break;

-

- case FIELD_DROPDOWN:

- $field_value = (int) $field_value;

-

- // retrieve option lang data if necessary

- if (!isset($this->options_lang[$field_data['field_id']]) || !isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']]) || !sizeof($this->options_lang[$file_data['field_id']][$field_data['lang_id']]))

- {

- $this->get_option_lang($field_data['field_id'], $field_data['lang_id'], FIELD_DROPDOWN, false);

- }

-

- if (!isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']][$field_value]))

- {

- return 'FIELD_INVALID_VALUE';

- }

-

- if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])

- {

- return 'FIELD_REQUIRED';

- }

- break;

-

- case FIELD_STRING:

- case FIELD_TEXT:

- if (trim($field_value) === '' && !$field_data['field_required'])

- {

- return false;

- }

- else if (trim($field_value) === '' && $field_data['field_required'])

- {

- return 'FIELD_REQUIRED';

- }

-

- if ($field_data['field_minlen'] && utf8_strlen($field_value) < $field_data['field_minlen'])

- {

- return 'FIELD_TOO_SHORT';

- }

- else if ($field_data['field_maxlen'] && utf8_strlen($field_value) > $field_data['field_maxlen'])

- {

- return 'FIELD_TOO_LONG';

- }

-

- if (!empty($field_data['field_validation']) && $field_data['field_validation'] != '.*')

- {

- $field_validate = ($field_type == FIELD_STRING) ? $field_value : bbcode_nl2br($field_value);

- if (!preg_match('#^' . str_replace('\\\\', '\\', $field_data['field_validation']) . '$#i', $field_validate))

- {

- return 'FIELD_INVALID_CHARS';

- }

- }

- break;

- }

-

- return false;

- }

-

- /**

- * Build profile cache, used for display

- * @access private

- */

- function build_cache()

- {

- global $db, $user, $auth;

-

- $this->profile_cache = array();

-

- // Display hidden/no_view fields for admin/moderator

- $sql = 'SELECT l.*, f.*

- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f

- WHERE l.lang_id = ' . $user->get_iso_lang_id() . '

- AND f.field_active = 1 ' .

- ((!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) ? ' AND f.field_hide = 0 ' : '') . '

- AND f.field_no_view = 0

- AND l.field_id = f.field_id

- ORDER BY f.field_order';

- $result = $db->sql_query($sql);

-

- while ($row = $db->sql_fetchrow($result))

- {

- $this->profile_cache[$row['field_ident']] = $row;

- }

- $db->sql_freeresult($result);

- }

-

- /**

- * Get language entries for options and store them here for later use

- */

- function get_option_lang($field_id, $lang_id, $field_type, $preview)

- {

- global $db;

-

- if ($preview)

- {

- $lang_options = (!is_array($this->vars['lang_options'])) ? explode("\n", $this->vars['lang_options']) : $this->vars['lang_options'];

-

- foreach ($lang_options as $num => $var)

- {

- $this->options_lang[$field_id][$lang_id][($num + 1)] = $var;

- }

- }

- else

- {

- $sql = 'SELECT option_id, lang_value

- FROM ' . PROFILE_FIELDS_LANG_TABLE . "

- WHERE field_id = $field_id

- AND lang_id = $lang_id

- AND field_type = $field_type

- ORDER BY option_id";

- $result = $db->sql_query($sql);

-

- while ($row = $db->sql_fetchrow($result))

- {

- $this->options_lang[$field_id][$lang_id][($row['option_id'] + 1)] = $row['lang_value'];

- }

- $db->sql_freeresult($result);

- }

- }

-

- /**

- * Submit profile field for validation

- * @access public

- */

- function submit_cp_field($mode, $lang_id, &$cp_data, &$cp_error)

- {

- global $auth, $db, $user;

-

- $sql_where = '';

- switch ($mode)

- {

- case 'register':

- // If the field is required we show it on the registration page

- $sql_where .= ' AND f.field_show_on_reg = 1';

- break;

-

- case 'profile':

- // Show hidden fields to moderators/admins

- if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))

- {

- $sql_where .= ' AND f.field_show_profile = 1';

- }

- break;

-

- default:

- trigger_error('Wrong profile mode specified', E_USER_ERROR);

- break;

- }

-

- $sql = 'SELECT l.*, f.*

- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f

- WHERE l.lang_id = $lang_id

- AND f.field_active = 1

- $sql_where

- AND l.field_id = f.field_id

- ORDER BY f.field_order";

- $result = $db->sql_query($sql);

-

- while ($row = $db->sql_fetchrow($result))

- {

- $cp_data['pf_' . $row['field_ident']] = $this->get_profile_field($row);

- $check_value = $cp_data['pf_' . $row['field_ident']];

-

- if (($cp_result = $this->validate_profile_field($row['field_type'], $check_value, $row)) !== false)

- {

- // If not and only showing common error messages, use this one

- $error = '';

- switch ($cp_result)

- {

- case 'FIELD_INVALID_DATE':

- case 'FIELD_INVALID_VALUE':

- case 'FIELD_REQUIRED':

- $error = $user->lang($cp_result, $row['lang_name']);

- break;

-

- case 'FIELD_TOO_SHORT':

- case 'FIELD_TOO_SMALL':

- $error = $user->lang($cp_result, (int) $row['field_minlen'], $row['lang_name']);

- break;

-

- case 'FIELD_TOO_LONG':

- case 'FIELD_TOO_LARGE':

- $error = $user->lang($cp_result, (int) $row['field_maxlen'], $row['lang_name']);

- break;

-

- case 'FIELD_INVALID_CHARS':

- switch ($row['field_validation'])

- {

- case '[0-9]+':

- $error = $user->lang($cp_result . '_NUMBERS_ONLY', $row['lang_name']);

- break;

-

- case '[\w]+':

- $error = $user->lang($cp_result . '_ALPHA_ONLY', $row['lang_name']);

- break;

-

- case '[\w_\+\. \-\[\]]+':

- $error = $user->lang($cp_result . '_SPACERS_ONLY', $row['lang_name']);

- break;

- }

- break;

- }

-

- if ($error != '')

- {

- $cp_error[] = $error;

- }

- }

- }

- $db->sql_freeresult($result);

- }

-

- /**

- * Update profile field data directly

- */

- function update_profile_field_data($user_id, &$cp_data)

- {

- global $db;

-

- if (!sizeof($cp_data))

- {

- return;

- }

-

- switch ($db->sql_layer)

- {

- case 'oracle':

- case 'firebird':

- case 'postgres':

- $right_delim = $left_delim = '"';

- break;

-

- case 'sqlite':

- case 'mssql':

- case 'mssql_odbc':

- case 'mssqlnative':

- $right_delim = ']';

- $left_delim = '[';

- break;

-

- case 'mysql':

- case 'mysql4':

- case 'mysqli':

- $right_delim = $left_delim = '`';

- break;

- }

-

- // use new array for the UPDATE; changes in the key do not affect the original array

- $cp_data_sql = array();

- foreach ($cp_data as $key => $value)

- {

- // Firebird is case sensitive with delimiter

- $cp_data_sql[$left_delim . (($db->sql_layer == 'firebird' || $db->sql_layer == 'oracle') ? strtoupper($key) : $key) . $right_delim] = $value;

- }

-

- $sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '

- SET ' . $db->sql_build_array('UPDATE', $cp_data_sql) . "

- WHERE user_id = $user_id";

- $db->sql_query($sql);

-

- if (!$db->sql_affectedrows())

- {

- $cp_data_sql['user_id'] = (int) $user_id;

-

- $db->sql_return_on_error(true);

-

- $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data_sql);

- $db->sql_query($sql);

-

- $db->sql_return_on_error(false);

- }

- }

-

- /**

- * Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)

- * This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template

- * @access public

- */

- function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)

- {

- global $db;

-

- if ($mode == 'grab')

- {

- if (!is_array($user_id))

- {

- $user_id = array($user_id);

- }

-

- if (!sizeof($this->profile_cache))

- {

- $this->build_cache();

- }

-

- if (!sizeof($user_id))

- {

- return array();

- }

-

- $sql = 'SELECT *

- FROM ' . PROFILE_FIELDS_DATA_TABLE . '

- WHERE ' . $db->sql_in_set('user_id', array_map('intval', $user_id));

- $result = $db->sql_query($sql);

-

- $field_data = array();

- while ($row = $db->sql_fetchrow($result))

- {

- $field_data[$row['user_id']] = $row;

- }

- $db->sql_freeresult($result);

-

- $user_fields = array();

-

- $user_ids = $user_id;

-

- // Go through the fields in correct order

- foreach (array_keys($this->profile_cache) as $used_ident)

- {

- foreach ($field_data as $user_id => $row)

- {

- $user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];

- $user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];

- }

-

- foreach ($user_ids as $user_id)

- {

- if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])

- {

- $user_fields[$user_id][$used_ident]['value'] = '';

- $user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];

- }

- }

- }

-

- return $user_fields;

- }

- else if ($mode == 'show')

- {

- // $profile_row == $user_fields[$row['user_id']];

- $tpl_fields = array();

- $tpl_fields['row'] = $tpl_fields['blockrow'] = array();

-

- foreach ($profile_row as $ident => $ident_ary)

- {

- $value = $this->get_profile_value($ident_ary);

-

- if ($value === NULL)

- {

- continue;

- }

-

- $tpl_fields['row'] += array(

- 'PROFILE_' . strtoupper($ident) . '_VALUE' => $value,

- 'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'],

- 'PROFILE_' . strtoupper($ident) . '_NAME' => $ident_ary['data']['lang_name'],

- 'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $ident_ary['data']['lang_explain'],

-

- 'S_PROFILE_' . strtoupper($ident) => true

- );

-

- $tpl_fields['blockrow'][] = array(

- 'PROFILE_FIELD_VALUE' => $value,

- 'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'],

- 'PROFILE_FIELD_NAME' => $ident_ary['data']['lang_name'],

- 'PROFILE_FIELD_EXPLAIN' => $ident_ary['data']['lang_explain'],

-

- 'S_PROFILE_' . strtoupper($ident) => true

- );

- }

-

- return $tpl_fields;

- }

- else

- {

- trigger_error('Wrong mode for custom profile', E_USER_ERROR);

- }

- }

-

- /**

- * Get Profile Value for display

- */

- function get_profile_value($ident_ary)

- {

- $value = $ident_ary['value'];

- $field_type = $ident_ary['data']['field_type'];

-

- switch ($this->profile_types[$field_type])

- {

- case 'int':

- if ($value === '' && !$ident_ary['data']['field_show_novalue'])

- {

- return NULL;

- }

- return (int) $value;

- break;

-

- case 'string':

- case 'text':

- if (!$value && !$ident_ary['data']['field_show_novalue'])

- {

- return NULL;

- }

-

- $value = make_clickable($value);

- $value = censor_text($value);

- $value = bbcode_nl2br($value);

- return $value;

- break;

-

- // case 'datetime':

- case 'date':

- $date = explode('-', $value);

- $day = (isset($date[0])) ? (int) $date[0] : 0;

- $month = (isset($date[1])) ? (int) $date[1] : 0;

- $year = (isset($date[2])) ? (int) $date[2] : 0;

-

- if (!$day && !$month && !$year && !$ident_ary['data']['field_show_novalue'])

- {

- return NULL;

- }

- else if ($day && $month && $year)

- {

- global $user;

- // Date should display as the same date for every user regardless of timezone

-

- return $user->create_datetime()

- ->setDate($year, $month, $day)

- ->setTime(0, 0, 0)

- ->format($user->lang['DATE_FORMAT'], true);

- }

-

- return $value;

- break;

-

- case 'dropdown':

- $field_id = $ident_ary['data']['field_id'];

- $lang_id = $ident_ary['data']['lang_id'];

- if (!isset($this->options_lang[$field_id][$lang_id]))

- {

- $this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);

- }

-

- if ($value == $ident_ary['data']['field_novalue'] && !$ident_ary['data']['field_show_novalue'])

- {

- return NULL;

- }

-

- $value = (int) $value;

-

- // User not having a value assigned

- if (!isset($this->options_lang[$field_id][$lang_id][$value]))

- {

- if ($ident_ary['data']['field_show_novalue'])

- {

- $value = $ident_ary['data']['field_novalue'];

- }

- else

- {

- return NULL;

- }

- }

-

- return $this->options_lang[$field_id][$lang_id][$value];

- break;

-

- case 'bool':

- $field_id = $ident_ary['data']['field_id'];

- $lang_id = $ident_ary['data']['lang_id'];

- if (!isset($this->options_lang[$field_id][$lang_id]))

- {

- $this->get_option_lang($field_id, $lang_id, FIELD_BOOL, false);

- }

-

- if (!$value && $ident_ary['data']['field_show_novalue'])

- {

- $value = $ident_ary['data']['field_default_value'];

- }

-

- if ($ident_ary['data']['field_length'] == 1)

- {

- return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL;

- }

- else if (!$value)

- {

- return NULL;

- }

- else

- {

- return $this->options_lang[$field_id][$lang_id][(int) ($value) + 1];

- }

- break;

-

- default:

- trigger_error('Unknown profile type', E_USER_ERROR);

- break;

- }

- }

-

- /**

- * Get field value for registration/profile

- * @access private

- */

- function get_var($field_validation, &$profile_row, $default_value, $preview)

- {

- global $user;

- global $request;

-

- $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];

- $user_ident = $profile_row['field_ident'];

- // checkbox - set the value to "true" if it has been set to 1

- if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)

- {

- $value = (isset($_REQUEST[$profile_row['field_ident']]) && request_var($profile_row['field_ident'], $default_value) == 1) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);

- }

- else if ($profile_row['field_type'] == FIELD_INT)

- {

- if (isset($_REQUEST[$profile_row['field_ident']]))

- {

- $value = ($request->variable($profile_row['field_ident'], '') === '') ? NULL : $request->variable($profile_row['field_ident'], $default_value);

- }

- else

- {

- if (!$preview && array_key_exists($user_ident, $user->profile_fields) && is_null($user->profile_fields[$user_ident]))

- {

- $value = NULL;

- }

- else if (!isset($user->profile_fields[$user_ident]) || $preview)

- {

- $value = $default_value;

- }

- else

- {

- $value = $user->profile_fields[$user_ident];

- }

- }

-

- return (is_null($value) || $value === '') ? '' : (int) $value;

- }

- else

- {

- $value = (isset($_REQUEST[$profile_row['field_ident']])) ? request_var($profile_row['field_ident'], $default_value, true) : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);

-

- if (gettype($value) == 'string')

- {

- $value = utf8_normalize_nfc($value);

- }

- }

-

- switch ($field_validation)

- {

- case 'int':

- return (int) $value;

- break;

- }

-

- return $value;

- }

-

- /**

- * Process int-type

- * @access private

- */

- function generate_int($profile_row, $preview = false)

- {

- global $template;

-

- $profile_row['field_value'] = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

- }

-

- /**

- * Process date-type

- * @access private

- */

- function generate_date($profile_row, $preview = false)

- {

- global $user, $template;

-

- $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];

- $user_ident = $profile_row['field_ident'];

-

- $now = getdate();

-

- if (!isset($_REQUEST[$profile_row['field_ident'] . '_day']))

- {

- if ($profile_row['field_default_value'] == 'now')

- {

- $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);

- }

- list($day, $month, $year) = explode('-', ((!isset($user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $user->profile_fields[$user_ident]));

- }

- else

- {

- if ($preview && $profile_row['field_default_value'] == 'now')

- {

- $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);

- list($day, $month, $year) = explode('-', ((!isset($user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $user->profile_fields[$user_ident]));

- }

- else

- {

- $day = request_var($profile_row['field_ident'] . '_day', 0);

- $month = request_var($profile_row['field_ident'] . '_month', 0);

- $year = request_var($profile_row['field_ident'] . '_year', 0);

- }

- }

-

- $profile_row['s_day_options'] = '<option value="0"' . ((!$day) ? ' selected="selected"' : '') . '>--</option>';

- for ($i = 1; $i < 32; $i++)

- {

- $profile_row['s_day_options'] .= '<option value="' . $i . '"' . (($i == $day) ? ' selected="selected"' : '') . ">$i</option>";

- }

-

- $profile_row['s_month_options'] = '<option value="0"' . ((!$month) ? ' selected="selected"' : '') . '>--</option>';

- for ($i = 1; $i < 13; $i++)

- {

- $profile_row['s_month_options'] .= '<option value="' . $i . '"' . (($i == $month) ? ' selected="selected"' : '') . ">$i</option>";

- }

-

- $profile_row['s_year_options'] = '<option value="0"' . ((!$year) ? ' selected="selected"' : '') . '>--</option>';

- for ($i = $now['year'] - 100; $i <= $now['year'] + 100; $i++)

- {

- $profile_row['s_year_options'] .= '<option value="' . $i . '"' . (($i == $year) ? ' selected="selected"' : '') . ">$i</option>";

- }

- unset($now);

-

- $profile_row['field_value'] = 0;

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

- }

-

- /**

- * Process bool-type

- * @access private

- */

- function generate_bool($profile_row, $preview = false)

- {

- global $template;

-

- $value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);

-

- $profile_row['field_value'] = $value;

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

-

- if ($profile_row['field_length'] == 1)

- {

- if (!isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))

- {

- $this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_BOOL, $preview);

- }

-

- foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)

- {

- $template->assign_block_vars('bool.options', array(

- 'OPTION_ID' => $option_id,

- 'CHECKED' => ($value == $option_id) ? ' checked="checked"' : '',

- 'VALUE' => $option_value)

- );

- }

- }

- }

-

- /**

- * Process string-type

- * @access private

- */

- function generate_string($profile_row, $preview = false)

- {

- global $template;

-

- $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

- }

-

- /**

- * Process text-type

- * @access private

- */

- function generate_text($profile_row, $preview = false)

- {

- global $template;

- global $user, $phpEx, $phpbb_root_path;

-

- $field_length = explode('|', $profile_row['field_length']);

- $profile_row['field_rows'] = $field_length[0];

- $profile_row['field_cols'] = $field_length[1];

-

- $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview);

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

- }

-

- /**

- * Process dropdown-type

- * @access private

- */

- function generate_dropdown($profile_row, $preview = false)

- {

- global $user, $template;

-

- $value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);

-

- if (!isset($this->options_lang[$profile_row['field_id']]) || !isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))

- {

- $this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview);

- }

-

- $profile_row['field_value'] = $value;

- $template->assign_block_vars($this->profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER));

-

- foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value)

- {

- $template->assign_block_vars('dropdown.options', array(

- 'OPTION_ID' => $option_id,

- 'SELECTED' => ($value == $option_id) ? ' selected="selected"' : '',

- 'VALUE' => $option_value)

- );

- }

- }

-

- /**

- * Return Templated value/field. Possible values for $mode are:

- * change == user is able to set/enter profile values; preview == just show the value

- * @access private

- */

- function process_field_row($mode, $profile_row)

- {

- global $template;

-

- $preview = ($mode == 'preview') ? true : false;

-

- // set template filename

- $template->set_filenames(array(

- 'cp_body' => 'custom_profile_fields.html')

- );

-

- // empty previously filled blockvars

- foreach ($this->profile_types as $field_case => $field_type)

- {

- $template->destroy_block_vars($field_type);

- }

-

- // Assign template variables

- $type_func = 'generate_' . $this->profile_types[$profile_row['field_type']];

- $this->$type_func($profile_row, $preview);

-

- // Return templated data

- return $template->assign_display('cp_body');

- }

-

- /**

- * Build Array for user insertion into custom profile fields table

- */

- function build_insert_sql_array($cp_data)

- {

- global $db, $user, $auth;

-

- $sql_not_in = array();

- foreach ($cp_data as $key => $null)

- {

- $sql_not_in[] = (strncmp($key, 'pf_', 3) === 0) ? substr($key, 3) : $key;

- }

-

- $sql = 'SELECT f.field_type, f.field_ident, f.field_default_value, l.lang_default_value

- FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f

- WHERE l.lang_id = ' . $user->get_iso_lang_id() . '

- ' . ((sizeof($sql_not_in)) ? ' AND ' . $db->sql_in_set('f.field_ident', $sql_not_in, true) : '') . '

- AND l.field_id = f.field_id';

- $result = $db->sql_query($sql);

-

- while ($row = $db->sql_fetchrow($result))

- {

- if ($row['field_default_value'] == 'now' && $row['field_type'] == FIELD_DATE)

- {

- $now = getdate();

- $row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);

- }

- else if ($row['field_default_value'] === '' && $row['field_type'] == FIELD_INT)

- {

- // We cannot insert an empty string into an integer column.

- $row['field_default_value'] = NULL;

- }

-

- $cp_data['pf_' . $row['field_ident']] = (in_array($row['field_type'], array(FIELD_TEXT, FIELD_STRING))) ? $row['lang_default_value'] : $row['field_default_value'];

- }

- $db->sql_freeresult($result);

-

- return $cp_data;

- }

-

- /**

- * Get profile field value on submit

- * @access private

- */

- function get_profile_field($profile_row)

- {

- global $phpbb_root_path, $phpEx;

- global $config;

- global $request;

-

- $var_name = 'pf_' . $profile_row['field_ident'];

-

- switch ($profile_row['field_type'])

- {

- case FIELD_DATE:

-

- if (!isset($_REQUEST[$var_name . '_day']))

- {

- if ($profile_row['field_default_value'] == 'now')

- {

- $now = getdate();

- $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']);

- }

- list($day, $month, $year) = explode('-', $profile_row['field_default_value']);

- }

- else

- {

- $day = request_var($var_name . '_day', 0);

- $month = request_var($var_name . '_month', 0);

- $year = request_var($var_name . '_year', 0);

- }

-

- $var = sprintf('%2d-%2d-%4d', $day, $month, $year);

- break;

-

- case FIELD_BOOL:

- // Checkbox

- if ($profile_row['field_length'] == 2)

- {

- $var = (isset($_REQUEST[$var_name])) ? 1 : 0;

- }

- else

- {

- $var = request_var($var_name, (int) $profile_row['field_default_value']);

- }

- break;

-

- case FIELD_STRING:

- case FIELD_TEXT:

- $var = utf8_normalize_nfc(request_var($var_name, (string) $profile_row['field_default_value'], true));

- break;

-

- case FIELD_INT:

- if (isset($_REQUEST[$var_name]) && $request->variable($var_name, '') === '')

- {

- $var = NULL;

- }

- else

- {

- $var = request_var($var_name, (int) $profile_row['field_default_value']);

- }

- break;

-

- case FIELD_DROPDOWN:

- $var = request_var($var_name, (int) $profile_row['field_default_value']);

- break;

-

- default:

- $var = request_var($var_name, $profile_row['field_default_value']);

- break;

- }

-

- return $var;

- }

-}

-

-/**

-* Custom Profile Fields ACP

-* @package phpBB3

-*/

-class custom_profile_admin extends custom_profile

-{

- var $vars = array();

-

- /**

- * Return possible validation options

- */

- function validate_options()

- {

- global $user;

-

- $validate_ary = array('CHARS_ANY' => '.*', 'NUMBERS_ONLY' => '[0-9]+', 'ALPHA_ONLY' => '[\w]+', 'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');

-

- $validate_options = '';

- foreach ($validate_ary as $lang => $value)

- {

- $selected = ($this->vars['field_validation'] == $value) ? ' selected="selected"' : '';

- $validate_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';

- }

-

- return $validate_options;

- }

-

- /**

- * Get string options for second step in ACP

- */

- function get_string_options()

- {

- global $user;

-

- $options = array(

- 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),

- 1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),

- 2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input type="number" min="0" size="5" value="' . $this->vars['field_maxlen'] . '" />'),

- 3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')

- );

-

- return $options;

- }

-

- /**

- * Get text options for second step in ACP

- */

- function get_text_options()

- {

- global $user;

-

- $options = array(

- 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . $user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" name="columns" size="5" value="' . $this->vars['columns'] . '" /> ' . $user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" />'),

- 1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),

- 2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),

- 3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')

- );

-

- return $options;

- }

-

- /**

- * Get int options for second step in ACP

- */

- function get_int_options()

- {

- global $user;

-

- $options = array(

- 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),

- 1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'], 'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),

- 2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'], 'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),

- 3 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => '<input type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')

- );

-

- return $options;

- }

-

- /**

- * Get bool options for second step in ACP

- */

- function get_bool_options()

- {

- global $user, $config, $lang_defs;

-

- $default_lang_id = $lang_defs['iso'][$config['default_lang']];

-

- $profile_row = array(

- 'var_name' => 'field_default_value',

- 'field_id' => 1,

- 'lang_name' => $this->vars['lang_name'],

- 'lang_explain' => $this->vars['lang_explain'],

- 'lang_id' => $default_lang_id,

- 'field_default_value' => $this->vars['field_default_value'],

- 'field_ident' => 'field_default_value',

- 'field_type' => FIELD_BOOL,

- 'field_length' => $this->vars['field_length'],

- 'lang_options' => $this->vars['lang_options']

- );

-

- $options = array(

- 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['CHECKBOX'] . '</label>'),

- 1 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row))

- );

-

- return $options;

- }

-

- /**

- * Get dropdown options for second step in ACP

- */

- function get_dropdown_options()

- {

- global $user, $config, $lang_defs;

-

- $default_lang_id = $lang_defs['iso'][$config['default_lang']];

-

- $profile_row[0] = array(

- 'var_name' => 'field_default_value',

- 'field_id' => 1,

- 'lang_name' => $this->vars['lang_name'],

- 'lang_explain' => $this->vars['lang_explain'],

- 'lang_id' => $default_lang_id,

- 'field_default_value' => $this->vars['field_default_value'],

- 'field_ident' => 'field_default_value',

- 'field_type' => FIELD_DROPDOWN,

- 'lang_options' => $this->vars['lang_options']

- );

-

- $profile_row[1] = $profile_row[0];

- $profile_row[1]['var_name'] = 'field_novalue';

- $profile_row[1]['field_ident'] = 'field_novalue';

- $profile_row[1]['field_default_value'] = $this->vars['field_novalue'];

-

- $options = array(

- 0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row[0])),

- 1 => array('TITLE' => $user->lang['NO_VALUE_OPTION'], 'EXPLAIN' => $user->lang['NO_VALUE_OPTION_EXPLAIN'], 'FIELD' => $this->process_field_row('preview', $profile_row[1]))

- );

-

- return $options;

- }

-

- /**

- * Get date options for second step in ACP

- */

- function get_date_options()

- {

- global $user, $config, $lang_defs;

-

- $default_lang_id = $lang_defs['iso'][$config['default_lang']];

-

- $profile_row = array(

- 'var_name' => 'field_default_value',

- 'lang_name' => $this->vars['lang_name'],

- 'lang_explain' => $this->vars['lang_explain'],

- 'lang_id' => $default_lang_id,

- 'field_default_value' => $this->vars['field_default_value'],

- 'field_ident' => 'field_default_value',

- 'field_type' => FIELD_DATE,

- 'field_length' => $this->vars['field_length']

- );

-

- $always_now = request_var('always_now', -1);

- if ($always_now == -1)

- {

- $s_checked = ($this->vars['field_default_value'] == 'now') ? true : false;

- }

- else

- {

- $s_checked = ($always_now) ? true : false;

- }

-

- $options = array(

- 0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)),

- 1 => array('TITLE' => $user->lang['ALWAYS_TODAY'], 'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['NO'] . '</label>'),

- );

-

- return $options;

- }

-}

- global $phpbb_dispatcher;

- 'user_occ' => '',

- 'user_interests' => '',

- if (!class_exists('custom_profile'))

- {

- include_once($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

- }

-

- $cp = new custom_profile();

- 'OCCUPATION' => (!empty($row['user_occ'])) ? $row['user_occ'] : '',

- 'INTERESTS' => (!empty($row['user_interests'])) ? $row['user_interests'] : '',

-

- global $user, $template, $auth, $db, $cache;

- if (!class_exists('custom_profile'))

- {

- include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

- }

- $cp = new custom_profile();

- 'AUTHOR_FROM' => (!empty($user_info['user_from'])) ? $user_info['user_from'] : '',

- global $request;

- global $phpbb_container;

- if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], $user->data['user_password']))

- if (!phpbb_check_hash($data['cur_password'], $user->data['user_password']))

- 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'],

- if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], $user->data['user_password']))

- include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

-

- $cp = new custom_profile();

- 'location' => utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)),

- 'occupation' => utf8_normalize_nfc(request_var('occupation', $user->data['user_occ'], true)),

- 'interests' => utf8_normalize_nfc(request_var('interests', $user->data['user_interests'], true)),

- 'location' => array('string', true, 2, 100),

- 'occupation' => array('string', true, 2, 500),

- 'interests' => array('string', true, 2, 500),

- 'user_from' => $data['location'],

- 'user_occ' => $data['occupation'],

- 'user_interests'=> $data['interests'],

- 'LOCATION' => $data['location'],

- 'OCCUPATION'=> $data['occupation'],

- 'INTERESTS' => $data['interests'],

- include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);

-

- $cp = new custom_profile();

- 'user_password' => phpbb_hash($data['new_password']),

- global $db, $user, $auth, $template;

- SET user_newpasswd = '" . $db->sql_escape(phpbb_hash($user_password)) . "', user_actkey = '" . $db->sql_escape($user_actkey) . "'

- 'phpbb_version' => '3.1.0-a2',

- array('user_interests', 'users.user_interests', array('function1' => 'phpbb_set_encoding')),

- array('user_occ', 'users.user_occ', array('function1' => 'phpbb_set_encoding')),

- array('user_from', 'users.user_from', array('function1' => 'phpbb_set_encoding')),

- forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,

- field_type INTEGER DEFAULT 0 NOT NULL,

- user_id INTEGER DEFAULT 0 NOT NULL

- field_type INTEGER DEFAULT 0 NOT NULL,

- user_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,

- user_from VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,

- user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,

- user_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,

- [forum_password] [varchar] (40) DEFAULT ('') NOT NULL ,

- [field_type] [int] DEFAULT (0) NOT NULL ,

- [user_id] [int] DEFAULT (0) NOT NULL

- [field_type] [int] DEFAULT (0) NOT NULL ,

- [user_password] [varchar] (40) DEFAULT ('') NOT NULL ,

- [user_from] [varchar] (100) DEFAULT ('') NOT NULL ,

- [user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,

- [user_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,