phpwebsite-comm-cvs-commits — Read-Only CVS commits log list

[phpws-comm-commits] modules/article/templates/history list.tpl,NONE,1.1 row.tpl,NONE,1.1

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/templates/history
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/templates/history

Added Files:
	list.tpl row.tpl 
Log Message:
2.5 Release Files

--- NEW FILE: row.tpl ---
<tr{ROW_CLASS}>
<td align="center">
[{VERSION}]
</td>
<td>
{ARCHIVED_DATE}
</td>
<td align="center">
{DIFF}
</td>
<td align="center">
{PICK}
</td>
<td align="center">
{USERNAME}
</td>
</tr>

--- NEW FILE: list.tpl ---
<h2>{TITLE1}</h2>
<br />
<div style="float:right"><i>{NAV_INFO}</i></div>
<b>{TITLE2}&#160;</b>
<div style="clear:both"></div>
<form name="ARTICLE_view_diff" action="index.php" method="post">
<input name="module" value="article" type="hidden">
<input name="viewdiff" value="{ID}" type="hidden">
<table border="0" width="100%" cellspacing="1" cellpadding="6" align="center">
<tr class="bg_dark">
<td align="center" nowrap="nowrap"><b>{VERSION_LABEL}&#160;{VERSION_ORDER_LINK}</b></td>
<td align="center" nowrap="nowrap"><b>{UPDATED_LABEL}&#160;{ARCHIVED_DATE_ORDER_LINK}</b></td>
<td align="center" nowrap="nowrap" colspan="2"><b>{DIFF_LABEL}{DIFF_HELP}</b></td>
<td align="center" nowrap="nowrap"><b>{EDITOR_LABEL}&#160;{USERNAME_ORDER_LINK}</b></td>
</tr>
{LIST_ITEMS}
<tr>
<td></td>
<td></td>
<td align="right" colspan="2"><input name="IMGLib_op" value="{COMPARE_BTN}" type="submit"></td>
<td></td>
</tr>
</table><br />
</form>
<!-- BEGIN navigation -->
<div align="center">{NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}<br />{NAV_LIMITS}</div>
<!-- END navigation -->

[phpws-comm-commits] modules/article/lib/pear/Text/Diff Renderer.php,NONE,1.1

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/lib/pear/Text/Diff

Added Files:
	Renderer.php 
Log Message:
2.5 Release Files

--- NEW FILE: Renderer.php ---
<?php
/**
 * A class to render Diffs in different formats.
 *
 * This class renders the diff in classic diff format. It is intended
 * that this class be customized via inheritance, to obtain fancier
 * outputs.
 *
 * $Horde: framework/Text_Diff/Diff/Renderer.php,v 1.2 2004/01/09 21:46:30 chuck Exp $
 *
 * @package Text_Diff
 */
class Text_Diff_Renderer {

    /**
     * Number of leading context "lines" to preserve.
     *
     * This should be left at zero for this class, but subclasses
     * may want to set this to other values.
     */
    var $_leading_context_lines = 0;

    /**
     * Number of trailing context "lines" to preserve.
     *
     * This should be left at zero for this class, but subclasses
     * may want to set this to other values.
     */
    var $_trailing_context_lines = 0;

    /**
     * Render a diff.
     *
     * @param $diff object Text_Diff  A Text_Diff object.
     *
     * @return string  The formatted output.
     */
    function render($diff)
    {
        $xi = $yi = 1;
        $block = false;
        $context = array();

        $nlead = $this->_leading_context_lines;
        $ntrail = $this->_trailing_context_lines;

        $this->_startDiff();

        foreach ($diff->getDiff() as $edit) {
            if (is_a($edit, 'Text_Diff_Op_copy')) {
                if (is_array($block)) {
                    if (count($edit->orig) <= $nlead + $ntrail) {
                        $block[] = $edit;
                    } else {
                        if ($ntrail) {
                            $context = array_slice($edit->orig, 0, $ntrail);
                            $block[] = &new Text_Diff_Op_copy($context);
                        }
                        $this->_block($x0, $ntrail + $xi - $x0,
                                      $y0, $ntrail + $yi - $y0,
                                      $block);
                        $block = false;
                    }
                }
                $context = $edit->orig;
            } else {
                if (!is_array($block)) {
                    $context = array_slice($context, count($context) - $nlead);
                    $x0 = $xi - count($context);
                    $y0 = $yi - count($context);
                    $block = array();
                    if ($context) {
                        $block[] = &new Text_Diff_Op_copy($context);
                    }
                }
                $block[] = $edit;
            }

            if ($edit->orig) {
                $xi += count($edit->orig);
            }
            if ($edit->final) {
                $yi += count($edit->final);
            }
        }

        if (is_array($block)) {
            $this->_block($x0, $xi - $x0,
                          $y0, $yi - $y0,
                          $block);
        }

        return $this->_endDiff();
    }

    function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
    {
        $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
        foreach ($edits as $edit) {
            switch (get_class($edit)) {
            case 'text_diff_op_copy':
                $this->_context($edit->orig);
                break;

            case 'text_diff_op_add':
                $this->_added($edit->final);
                break;

            case 'text_diff_op_delete':
                $this->_deleted($edit->orig);
                break;

            case 'text_diff_op_change':
                $this->_changed($edit->orig, $edit->final);
                break;

            default:
                trigger_error("Unknown edit type", E_USER_ERROR);
            }
            $this->_endBlock();
        }
    }

    function _startDiff()
    {
        ob_start();
    }

    function _endDiff()
    {
        $val = ob_get_contents();
        ob_end_clean();
        return $val;
    }

    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
    {
        if ($xlen > 1) {
            $xbeg .= ',' . ($xbeg + $xlen - 1);
        }
        if ($ylen > 1) {
            $ybeg .= ',' . ($ybeg + $ylen - 1);
        }

        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
    }

    function _startBlock($header)
    {
        echo $header . "\n";
    }

    function _endBlock()
    {
    }

    function _lines($lines, $prefix = ' ')
    {
        foreach ($lines as $line) {
            echo "$prefix$line\n";
        }
    }

    function _context($lines)
    {
        $this->_lines($lines);
    }

    function _added($lines)
    {
        $this->_lines($lines, '>');
    }

    function _deleted($lines)
    {
        $this->_lines($lines, '<');
    }

    function _changed($orig, $final)
    {
        $this->_deleted($orig);
        echo "---\n";
        $this->_added($final);
    }

}

[phpws-comm-commits] modules/article/lib/pear/Text/Diff/Renderer unified.php,NONE,1.1

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff/Renderer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/lib/pear/Text/Diff/Renderer

Added Files:
	unified.php 
Log Message:
2.5 Release Files

--- NEW FILE: unified.php ---
<?php
/**
 * "Unified" diff renderer.
 *
 * This class renders the diff in classic "unified diff" format.
 *
 * $Horde: framework/Text_Diff/Diff/Renderer/unified.php,v 1.2 2004/01/09 21:46:30 chuck Exp $
 *
 * @package Text_Diff
 */
class Text_Diff_Renderer_unified extends Text_Diff_Renderer {

    function Text_Diff_Renderer_unified($context_lines = 4)
    {
        $this->_leading_context_lines = $context_lines;
        $this->_trailing_context_lines = $context_lines;
    }

    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
    {
        if ($xlen != 1) {
            $xbeg .= ',' . $xlen;
        }
        if ($ylen != 1) {
            $ybeg .= ',' . $ylen;
        }
        return "@@ -$xbeg +$ybeg @@";
    }

    function _added($lines)
    {
        $this->_lines($lines, '+');
    }

    function _deleted($lines)
    {
        $this->_lines($lines, '-');
    }

    function _changed($orig, $final)
    {
        $this->_deleted($orig);
        $this->_added($final);
    }

}

[phpws-comm-commits] modules/article/lib/pear/Text Diff.php,NONE,1.1 Diff3.php,NONE,1.1

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29156/lib/pear/Text

Added Files:
	Diff.php Diff3.php 
Log Message:
2.5 Release Files

--- NEW FILE: Diff.php ---
<?php
/**
 * Text_Diff
 *
 * General API for generating and formatting diffs - the differences
 * between two sequences of strings.
 *
 * The PHP diff code used in this package was originally written by
 * Geoffrey T. Dairiki and is used with his permission.
 *
 * $Horde: framework/Text_Diff/Diff.php,v 1.6 2004/05/13 15:06:32 chuck Exp $
 *
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 */
class Text_Diff {

    /**
     * Array of changes.
     *
     * @var array $_edits
     */
    var $_edits;

    /**
     * Computes diff between sequences of strings.
     *
     * @param $from_lines array An array of strings.
     *        (Typically these are lines from a file.)
     * @param $to_lines array An array of strings.
     */
    function Text_Diff($from_lines, $to_lines)
    {
        array_walk($from_lines, array($this, '_trimNewlines'));
        array_walk($to_lines, array($this, '_trimNewlines'));

        if (extension_loaded('xdiff')) {
            $engine = &new Text_Diff_Engine_xdiff();
        } else {
            $engine = &new Text_Diff_Engine_native();
        }

        $this->_edits = $engine->diff($from_lines, $to_lines);
    }

    /**
     * Return the array of differences.
     */
    function getDiff()
    {
        return $this->_edits;
    }

    /**
     * Compute reversed diff.
     *
     * SYNOPSIS:
     *
     * $diff = &new Text_Diff($lines1, $lines2);
     * $rev = $diff->reverse();
     *
     * @return object  A Diff object representing the inverse of the
     *                 original diff. Note that we purposely don't return
     *                 a reference here, since this essentially is a
     *                 clone() method.
     */
    function reverse()
    {
        $rev = $this;
        $rev->_edits = array();
        foreach ($this->_edits as $edit) {
            $rev->_edits[] = $edit->reverse();
        }
        return $rev;
    }

    /**
     * Check for empty diff.
     *
     * @return boolean  True iff two sequences were identical.
     */
    function isEmpty()
    {
        foreach ($this->_edits as $edit) {
            if (!is_a($edit, 'Text_Diff_Op_copy')) {
                return false;
            }
        }
        return true;
    }

    /**
     * Compute the length of the Longest Common Subsequence (LCS).
     *
     * This is mostly for diagnostic purposed.
     *
     * @return int The length of the LCS.
     */
    function lcs()
    {
        $lcs = 0;
        foreach ($this->_edits as $edit) {
            if (is_a($edit, 'Text_Diff_Op_copy')) {
                $lcs += count($edit->orig);
            }
        }
        return $lcs;
    }

    /**
     * Get the original set of lines.
     *
     * This reconstructs the $from_lines parameter passed to the
     * constructor.
     *
     * @return array The original sequence of strings.
     */
    function getOriginal()
    {
        $lines = array();
        foreach ($this->_edits as $edit) {
            if ($edit->orig) {
                array_splice($lines, count($lines), 0, $edit->orig);
            }
        }
        return $lines;
    }

    /**
     * Get the final set of lines.
     *
     * This reconstructs the $to_lines parameter passed to the
     * constructor.
     *
     * @return array  The sequence of strings.
     */
    function getFinal()
    {
        $lines = array();
        foreach ($this->_edits as $edit) {
            if ($edit->final) {
                array_splice($lines, count($lines), 0, $edit->final);
            }
        }
        return $lines;
    }

    /**
     * Remove trailing newlines from a line of text. This is meant to
     * be used with array_walk().
     *
     * @param string  &$line  The line to trim.
     * @param integer $key    The index of the line in the array. Not used.
     */
    function _trimNewlines(&$line, $key)
    {
        $line = str_replace(array("\n", "\r", "\r\n"), '', $line);
    }

    /**
     * Check a diff for validity.
     *
     * This is here only for debugging purposes.
     */
    function _check($from_lines, $to_lines)
    {
        if (serialize($from_lines) != serialize($this->getOriginal())) {
            trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
        }
        if (serialize($to_lines) != serialize($this->getFinal())) {
            trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
        }

        $rev = $this->reverse();
        if (serialize($to_lines) != serialize($rev->getOriginal())) {
            trigger_error("Reversed original doesn't match", E_USER_ERROR);
        }
        if (serialize($from_lines) != serialize($rev->getFinal())) {
            trigger_error("Reversed final doesn't match", E_USER_ERROR);
        }

        $prevtype = null;
        foreach ($this->_edits as $edit) {
            if ($prevtype == get_class($edit)) {
                trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
            }
            $prevtype = get_class($edit);
        }

        return true;
    }

}

/**
 * $Horde: framework/Text_Diff/Diff.php,v 1.6 2004/05/13 15:06:32 chuck Exp $
 *
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 */
class Text_MappedDiff extends Text_Diff {

    /**
     * Computes a diff between sequences of strings.
     *
     * This can be used to compute things like case-insensitve diffs,
     * or diffs which ignore changes in white-space.
     *
     * @param $from_lines        array  An array of strings.
     * @param $to_lines          array  An array of strings.
     * @param $mapped_from_lines array  This array should
     *     have the same size number of elements as $from_lines.
     *     The elements in $mapped_from_lines and
     *     $mapped_to_lines are what is actually compared
     *     when computing the diff.
     * @param $mapped_to_lines   array  This array should
     *     have the same number of elements as $to_lines.
     */
    function Text_MappedDiff($from_lines, $to_lines,
                             $mapped_from_lines, $mapped_to_lines)
    {
        assert(count($from_lines) == count($mapped_from_lines));
        assert(count($to_lines) == count($mapped_to_lines));

        parent::Text_Diff($mapped_from_lines, $mapped_to_lines);

        $xi = $yi = 0;
        for ($i = 0; $i < count($this->edits); $i++) {
            $orig = &$this->edits[$i]->orig;
            if (is_array($orig)) {
                $orig = array_slice($from_lines, $xi, count($orig));
                $xi += count($orig);
            }

            $final = &$this->edits[$i]->final;
            if (is_array($final)) {
                $final = array_slice($to_lines, $yi, count($final));
                $yi += count($final);
            }
        }
    }

}

/**
 * Class used internally by Diff to actually compute the diffs.  This class
 * uses the xdiff PECL package (http://pecl.php.net/package/xdiff) to compute
 * the differences between the two input arrays.
 *
 * @author  Jon Parise <jo...@ho...>
 * @package Text_Diff
 * @access  private
 */
class Text_Diff_Engine_xdiff {

    function diff($from_lines, $to_lines)
    {
        /* Convert the two input arrays into strings for xdiff processing. */
        $from_string = implode("\n", $from_lines);
        $to_string = implode("\n", $to_lines);

        /* Diff the two strings and convert the result to an array. */
        $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
        $diff = explode("\n", $diff);

        /* Walk through the diff one line at a time.  We build the
         * $edits array of diff operations by reading the first
         * character of the xdiff output (which is in the "unified
         * diff" format).
         *
         * Note that we don't have enough information to detect
         * "changed" lines using this approach, so we can't add
         * Text_Diff_Op_changed instances to the $edits array.  The
         * result is still perfectly valid, albeit a little less
         * descriptive and efficient. */
        $edits = array();
        foreach ($diff as $line) {
            switch ($line[0]) {
            case ' ':
                $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
                break;

            case '+':
                $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
                break;

            case '-':
                $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
                break;
            }
        }

        return $edits;
    }

}

/**
 * Class used internally by Diff to actually compute the diffs.  This class
 * is implemented using native PHP code.
 *
 * 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 (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
 *
 * Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are
 * from Geoffrey T. Dairiki <da...@da...>. The original PHP
 * version of this code was writting by him, and is used/adapted with
 * his permission.
 *
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @package Text_Diff
 * @access  private
 */
class Text_Diff_Engine_native {

    function diff($from_lines, $to_lines)
    {
        $n_from = count($from_lines);
        $n_to = count($to_lines);

        $this->xchanged = $this->ychanged = array();
        $this->xv = $this->yv = array();
        $this->xind = $this->yind = array();
        unset($this->seq);
        unset($this->in_seq);
        unset($this->lcs);

        // Skip leading common lines.
        for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
            if ($from_lines[$skip] != $to_lines[$skip]) {
                break;
            }
            $this->xchanged[$skip] = $this->ychanged[$skip] = false;
        }

        // Skip trailing common lines.
        $xi = $n_from; $yi = $n_to;
        for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
            if ($from_lines[$xi] != $to_lines[$yi]) {
                break;
            }
            $this->xchanged[$xi] = $this->ychanged[$yi] = false;
        }

        // Ignore lines which do not exist in both files.
        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
            $xhash[$from_lines[$xi]] = 1;
        }
        for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
            $line = $to_lines[$yi];
            if (($this->ychanged[$yi] = empty($xhash[$line]))) {
                continue;
            }
            $yhash[$line] = 1;
            $this->yv[] = $line;
            $this->yind[] = $yi;
        }
        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
            $line = $from_lines[$xi];
            if (($this->xchanged[$xi] = empty($yhash[$line]))) {
                continue;
            }
            $this->xv[] = $line;
            $this->xind[] = $xi;
        }

        // Find the LCS.
        $this->_compareseq(0, count($this->xv), 0, count($this->yv));

        // Merge edits when possible.
        $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
        $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);

        // Compute the edit operations.
        $edits = array();
        $xi = $yi = 0;
        while ($xi < $n_from || $yi < $n_to) {
            assert($yi < $n_to || $this->xchanged[$xi]);
            assert($xi < $n_from || $this->ychanged[$yi]);

            // Skip matching "snake".
            $copy = array();
            while ($xi < $n_from && $yi < $n_to
                   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
                $copy[] = $from_lines[$xi++];
                ++$yi;
            }
            if ($copy) {
                $edits[] = &new Text_Diff_Op_copy($copy);
            }

            // Find deletes & adds.
            $delete = array();
            while ($xi < $n_from && $this->xchanged[$xi]) {
                $delete[] = $from_lines[$xi++];
            }

            $add = array();
            while ($yi < $n_to && $this->ychanged[$yi]) {
                $add[] = $to_lines[$yi++];
            }

            if ($delete && $add) {
                $edits[] = &new Text_Diff_Op_change($delete, $add);
            } elseif ($delete) {
                $edits[] = &new Text_Diff_Op_delete($delete);
            } elseif ($add) {
                $edits[] = &new Text_Diff_Op_add($add);
            }
        }

        return $edits;
    }

    /**
     * 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 is 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++) {
                $line = $flip ? $this->yv[$x] : $this->xv[$x];
                if (empty($ymatches[$line])) {
                    continue;
                }
                $matches = $ymatches[$line];
                foreach ($matches as $y) {
                    if (empty($this->in_seq[$y])) {
                        $k = $this->_lcsPos($y);
                        assert($k > 0);
                        $ymids[$k] = $ymids[$k-1];
                        break;
                    }
                }

                while (list($junk, $y) = each($matches)) {
                    if ($y > $this->seq[$k - 1]) {
                        assert($y < $this->seq[$k]);
                        // 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;
                    } elseif (empty($this->in_seq[$y])) {
                        $k = $this->_lcsPos($y);
                        assert($k > 0);
                        $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 _lcsPos($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;
            }
        }

        assert($ypos != $this->seq[$end]);

        $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 has 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 _shiftBoundaries($lines, &$changed, $other_changed)
    {
        $i = 0;
        $j = 0;

        assert('count($lines) == count($changed)');
        $len = count($lines);
        $other_len = count($other_changed);

        while (1) {
            /* Scan forward to find the beginning of another run of
             * changes. Also keep track of the corresponding point in
             * the other file.
             *
             * Throughout this code, $i and $j are adjusted together
             * so that the first $i elements of $changed and the first
             * $j elements of $other_changed both contain the same
             * number of zeros (unchanged lines).
             *
             * Furthermore, $j is always kept so that $j == $other_len
             * or $other_changed[$j] == false. */
            while ($j < $other_len && $other_changed[$j]) {
                $j++;
            }

            while ($i < $len && ! $changed[$i]) {
                assert('$j < $other_len && ! $other_changed[$j]');
                $i++; $j++;
                while ($j < $other_len && $other_changed[$j]) {
                    $j++;
                }
            }

            if ($i == $len) {
                break;
            }

            $start = $i;

            // Find the end of this run of changes.
            while (++$i < $len && $changed[$i]) {
                continue;
            }

            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 > 0 && $lines[$start - 1] == $lines[$i - 1]) {
                    $changed[--$start] = 1;
                    $changed[--$i] = false;
                    while ($start > 0 && $changed[$start - 1]) {
                        $start--;
                    }
                    assert('$j > 0');
                    while ($other_changed[--$j]) {
                        continue;
                    }
                    assert('$j >= 0 && !$other_changed[$j]');
                }

                /* 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 = $j < $other_len ? $i : $len;

                /* 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 ($i < $len && $changed[$i]) {
                        $i++;
                    }

                    assert('$j < $other_len && ! $other_changed[$j]');
                    $j++;
                    if ($j < $other_len && $other_changed[$j]) {
                        $corresponding = $i;
                        while ($j < $other_len && $other_changed[$j]) {
                            $j++;
                        }
                    }
                }
            } 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;
                assert('$j > 0');
                while ($other_changed[--$j]) {
                    continue;
                }
                assert('$j >= 0 && !$other_changed[$j]');
            }
        }
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff_Op {

    var $orig;
    var $final;

    function reverse()
    {
        trigger_error('Abstract method', E_USER_ERROR);
    }

    function norig()
    {
        return $this->orig ? count($this->orig) : 0;
    }

    function nfinal()
    {
        return $this->final ? count($this->final) : 0;
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff_Op_copy extends Text_Diff_Op {

    function Text_Diff_Op_copy($orig, $final = false)
    {
        if (!is_array($final)) {
            $final = $orig;
        }
        $this->orig = $orig;
        $this->final = $final;
    }

    function &reverse()
    {
        return new Text_Diff_Op_copy($this->final, $this->orig);
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff_Op_delete extends Text_Diff_Op {

    function Text_Diff_Op_delete($lines)
    {
        $this->orig = $lines;
        $this->final = false;
    }

    function &reverse()
    {
        return new Text_Diff_Op_add($this->orig);
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff_Op_add extends Text_Diff_Op {

    function Text_Diff_Op_add($lines)
    {
        $this->final = $lines;
        $this->orig = false;
    }

    function &reverse()
    {
        return new Text_Diff_Op_delete($this->final);
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff_Op_change extends Text_Diff_Op {

    function Text_Diff_Op_change($orig, $final)
    {
        $this->orig = $orig;
        $this->final = $final;
    }

    function &reverse()
    {
        return new Text_Diff_Op_change($this->final, $this->orig);
    }

}

--- NEW FILE: Diff3.php ---
<?php

require_once 'Text/Diff.php';

/**
 * A class for computing three way diffs.
 *
 * $Horde: framework/Text_Diff/Diff3.php,v 1.1 2004/03/19 18:53:11 chuck Exp $
 *
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 */
class Text_Diff3 extends Text_Diff {

    /**
     * Conflict counter.
     *
     * @var integer $_conflictCounter
     */
    var $_conflictingBlocks = 0;

    /**
     * Computes diff between 3 sequences of strings.
     *
     * @param array $orig    The original lines to use.
     * @param array $final1  The first version to compare to.
     * @param array $final2  The second version to compare to.
     */
    function Text_Diff3($orig, $final1, $final2)
    {
        if (extension_loaded('xdiff')) {
            $engine = &new Text_Diff_Engine_xdiff();
        } else {
            $engine = &new Text_Diff_Engine_native();
        }

        $this->_edits = $this->_diff3($engine->diff($orig, $final1),
                                      $engine->diff($orig, $final2));
    }

    function mergedOutput($label1 = false, $label2 = false)
    {
        $lines = array();
        foreach ($this->_edits as $edit) {
            if ($edit->isConflict()) {
                // FIXME: this should probably be moved somewhere
                // else.
                $lines = array_merge($lines,
                                     array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
                                     $edit->final1,
                                     array("======="),
                                     $edit->final2,
                                     array('>>>>>>>' . ($label2 ? ' ' . $label2 : '')));
                $this->_conflictingBlocks++;
            } else {
                $lines = array_merge($lines, $edit->merged());
            }
        }

        return $lines;
    }

    /**
     * @access private
     */
    function _diff3($edits1, $edits2)
    {
        $edits = array();
        $bb = &new Text_Diff3_BlockBuilder();

        $e1 = current($edits1);
        $e2 = current($edits2);
        while ($e1 || $e2) {
            if ($e1 && $e2 && is_a($e1, 'Text_Diff_Op_copy') && is_a($e2, 'Text_Diff_Op_copy')) {
                // We have copy blocks from both diffs. This is the
                // (only) time we want to emit a diff3 copy block.
                // Flush current diff3 diff block, if any.
                if ($edit = $bb->finish()) {
                    $edits[] = $edit;
                }

                $ncopy = min($e1->norig(), $e2->norig());
                assert($ncopy > 0);
                $edits[] = &new Text_Diff3_Op_copy(array_slice($e1->orig, 0, $ncopy));

                if ($e1->norig() > $ncopy) {
                    array_splice($e1->orig, 0, $ncopy);
                    array_splice($e1->final, 0, $ncopy);
                } else {
                    $e1 = next($edits1);
                }

                if ($e2->norig() > $ncopy) {
                    array_splice($e2->orig, 0, $ncopy);
                    array_splice($e2->final, 0, $ncopy);
                } else {
                    $e2 = next($edits2);
                }
            } else {
                if ($e1 && $e2) {
                    if ($e1->orig && $e2->orig) {
                        $norig = min($e1->norig(), $e2->norig());
                        $orig = array_splice($e1->orig, 0, $norig);
                        array_splice($e2->orig, 0, $norig);
                        $bb->input($orig);
                    }

                    if (is_a($e1, 'Text_Diff_Op_copy')) {
                        $bb->out1(array_splice($e1->final, 0, $norig));
                    }

                    if (is_a($e2, 'Text_Diff_Op_copy')) {
                        $bb->out2(array_splice($e2->final, 0, $norig));
                    }
                }

                if ($e1 && ! $e1->orig) {
                    $bb->out1($e1->final);
                    $e1 = next($edits1);
                }
                if ($e2 && ! $e2->orig) {
                    $bb->out2($e2->final);
                    $e2 = next($edits2);
                }
            }
        }

        if ($edit = $bb->finish()) {
            $edits[] = $edit;
        }

        return $edits;
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff3_Op {

    function Text_Diff3_Op($orig = false, $final1 = false, $final2 = false)
    {
        $this->orig = $orig ? $orig : array();
        $this->final1 = $final1 ? $final1 : array();
        $this->final2 = $final2 ? $final2 : array();
    }

    function merged()
    {
        if (!isset($this->_merged)) {
            if ($this->final1 === $this->final2) {
                $this->_merged = &$this->final1;
            } elseif ($this->final1 === $this->orig) {
                $this->_merged = &$this->final2;
            } elseif ($this->final2 === $this->orig) {
                $this->_merged = &$this->final1;
            } else {
                $this->_merged = false;
            }
        }

        return $this->_merged;
    }

    function isConflict()
    {
        return $this->merged() === false;
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff3_Op_copy extends Text_Diff3_Op {

    function Text_Diff3_Op_Copy($lines = false)
    {
        $this->orig = $lines ? $lines : array();
        $this->final1 = &$this->orig;
        $this->final2 = &$this->orig;
    }

    function merged()
    {
        return $this->orig;
    }

    function isConflict()
    {
        return false;
    }

}

/**
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <da...@da...>
 * @access  private
 */
class Text_Diff3_BlockBuilder {

    function Text_Diff3_BlockBuilder()
    {
        $this->_init();
    }

    function input($lines)
    {
        if ($lines) {
            $this->_append($this->orig, $lines);
        }
    }

    function out1($lines)
    {
        if ($lines) {
            $this->_append($this->final1, $lines);
        }
    }

    function out2($lines)
    {
        if ($lines) {
            $this->_append($this->final2, $lines);
        }
    }

    function isEmpty()
    {
        return !$this->orig && !$this->final1 && !$this->final2;
    }

    function finish()
    {
        if ($this->isEmpty()) {
            return false;
        } else {
            $edit = &new Text_Diff3_Op($this->orig, $this->final1, $this->final2);
            $this->_init();
            return $edit;
        }
    }

    function _init()
    {
        $this->orig = $this->final1 = $this->final2 = array();
    }

    function _append(&$array, $lines)
    {
        array_splice($array, sizeof($array), 0, $lines);
    }

}

[phpws-comm-commits] modules/article/templates/history - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/templates/history
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28299/history

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/templates/history added to the repository

[phpws-comm-commits] modules/article/lib/pear/Text/Diff/Renderer - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff/Renderer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28015/Renderer

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff/Renderer added to the repository

[phpws-comm-commits] modules/article/lib/pear/Text/Diff - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27905/Diff

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text/Diff added to the repository

[phpws-comm-commits] modules/article/lib/pear/Text - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27756/Text

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/lib/pear/Text added to the repository

[phpws-comm-commits] modules/article/lib/pear - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib/pear
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27607/pear

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/lib/pear added to the repository

[phpws-comm-commits] modules/article/lib - New directory

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25709/lib

Log Message:
Directory /cvsroot/phpwebsite-comm/modules/article/lib added to the repository

[phpws-comm-commits] CVSROOT avail,1.24,1.25

[Mike N. <mh...@us...>]

Update of /cvsroot/phpwebsite-comm/CVSROOT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14398

Modified Files:
	avail 
Log Message:
changed to rizzo

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** avail	27 Jul 2004 00:29:31 -0000	1.24
--- avail	17 Aug 2004 18:34:32 -0000	1.25
***************
*** 21,25 ****
  avail|spiggy|thebixlight
  
! avail|dtseiler|scripts/proj-admin
  
  # Global access for all project members
--- 21,25 ----
  avail|spiggy|thebixlight
  
! avail|rizzo|scripts/proj-admin
  
  # Global access for all project members

[phpws-comm-commits] l10n/de messages.po,NONE,1.1

[Thomas L. <tl...@us...>]

Update of /cvsroot/phpwebsite-comm/l10n/de
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4967/de

Added Files:
	messages.po 
Log Message:
First translation of the messages.po for phpWebSite 0.9.4 Alpha

--- NEW FILE: messages.po ---
# translation of messages.po to Deutsch
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
# Thomas Luft <tl...@we...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"POT-Creation-Date: 2004-07-23 12:36-0400\n"
"PO-Revision-Date: 2004-08-17 16:51+0200\n"
"Last-Translator: Thomas Luft <tl...@we...>\n"
"Language-Team: Deutsch <de...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms:  nplurals=2; plural=(n != 1);\n"

#: config/core/error.php:4
msgid "Unknown Error."
msgstr "Unbekannter Fehler."

#: config/core/error.php:5
msgid "File not found."
msgstr "Datei nicht gefunden."

#: config/core/error.php:6 config/core/error.php:36
msgid "Class does not exist."
msgstr "Klasse existiert nicht."

#: config/core/error.php:7 config/core/error.php:72
msgid "Directory is not writable."
msgstr "Verzeichnis ist nicht schreibbar."

#: config/core/error.php:8
msgid "Wrong variable type."
msgstr "Falscher Variablentyp."

#: config/core/error.php:9
msgid "Improperly formated text."
msgstr "Falsch formatierter Text."

#: config/core/error.php:10
msgid "Invalid value."
msgstr "Ungültiger Wert."

#: config/core/error.php:11
msgid "No active modules installed."
msgstr "Keine aktiven Module installiert."

#: config/core/error.php:12
msgid "Wrong data type."
msgstr "Falscher Datentyp."

#: config/core/error.php:13
msgid "Directories are not secure."
msgstr "Verzeichnisse sind nich sicher."

#: config/core/error.php:14
msgid "Unable to create file directory."
msgstr "Verzeichnis konnte nicht erstellt werden."

#: config/core/error.php:17
msgid "Table name not set."
msgstr "Tabellenname nicht gesetzt."

#: config/core/error.php:18
msgid "No values were set before the query"
msgstr "Es wurden vor der Abfrage keine Werte festgelegt."

#: config/core/error.php:19
msgid "No variables in object."
msgstr "Keine Variablen im Objekt."

#: config/core/error.php:20
msgid "Not an acceptable operator."
msgstr "Kein akzeptierter Operator."

#: config/core/error.php:21
msgid "Improper table name."
msgstr "Ungültiger Tabellenname."

#: config/core/error.php:22
msgid "Improper colume name."
msgstr "Ungültiger Spaltenname."

#: config/core/error.php:23
msgid "Missing column to select."
msgstr "Es wurde keine Spalte ausgewählt."

#: config/core/error.php:24
msgid "Expecting an object variable."
msgstr "Es wurde eine Objekt-Variable erwartet."

#: config/core/error.php:25
msgid "Class does not contain variables."
msgstr "Klasse enthält keine Variablen."

#: config/core/error.php:26
msgid "Function was expecting a 'where' parameter."
msgstr "Die Funktion hat ein 'where' Parameter erwartet."

#: config/core/error.php:30
msgid "Module not set."
msgstr "Modul nicht festgelegt."

#: config/core/error.php:31
msgid "Class not set."
msgstr "Klasse nicht festgelegt."

#: config/core/error.php:32
msgid "Table not set."
msgstr "Tabelle nicht festgelegt."

#: config/core/error.php:33
msgid "List columns not set."
msgstr ""

#: config/core/error.php:34
msgid "Name not set."
msgstr "Name nicht festgelegt."

#: config/core/error.php:35
msgid "Op not set."
msgstr "Op nicht festgelegt."

#: config/core/error.php:37
msgid "No items passed."
msgstr "Es wurden keine Items weitergegeben."

#: config/core/error.php:38
msgid "Database columns not set."
msgstr "Die Datenbankspalte wurde nicht festgelegt."

#: config/core/error.php:42
#, c-format
msgid "You may not use '%s' as a form element name."
msgstr "Sie dürfen '%s' nicht als Name eines Formulareelements benutzen."

#: config/core/error.php:43
#, c-format
msgid "Unable to find element '%s'."
msgstr "Element '%s' konnte nicht gefunden werden."

#: config/core/error.php:44
msgid "Input type not set."
msgstr "Eingabetyp nicht festgelegt."

#: config/core/error.php:45
msgid "Wrong element type for procedure."
msgstr "Falscher Elementtyp für die Prozedur."

#: config/core/error.php:46
msgid "Can't change name. Already in use."
msgstr "Der Name kann nicht geändert werden. Er wird bereits benutzt."

#: config/core/error.php:47
msgid "No form elements have been created."
msgstr "Es wurden keine Formularelemente erstellt."

#: config/core/error.php:48
msgid "The submitted template is not an array."
msgstr "Das übermittelte Template ist kein Array."

#: config/core/error.php:49
msgid "File not found in _FILES array."
msgstr "Datei wurde im _FILES Array nicht gefunden."

#: config/core/error.php:50
msgid "Unrecognized form type."
msgstr "Unbekannter Formulartyp."

#: config/core/error.php:51
msgid "Match for must be an array for a multiple input."
msgstr "Suche nach muss für eine Mehrfacheingabe ein Array sein."

#: config/core/error.php:55
msgid "Id and table not set."
msgstr "Id und Tabelle nicht festgelegt."

#: config/core/error.php:56
msgid "No result returned from database."
msgstr "Keine Ergebnisse aus der Datenbank."

#: config/core/error.php:59
msgid "Module not found in the database."
msgstr "Modul wurde in der Datenbank nicht gefunden."

#: config/core/error.php:62
msgid "No error message file found."
msgstr "Keine Datei für die Fehlernachricht gefunden."

#: config/core/error.php:65
msgid "Help option not found in help configuration file."
msgstr "Die Hilfeoption konnte in der Konfigurationsdatei für die Hilfe nicht gefunden werden."

#: config/core/error.php:68
msgid "PHPWS_File received an unknown construct."
msgstr "PHPWS_File hat ein unbekanntes Konstrukt erhalten."

#: config/core/error.php:69
msgid "Class not found."
msgstr "Klasse nicht gefunden."

#: config/core/error.php:70
msgid "Unable to delete file."
msgstr "Die Datei konnte nicht gelöscht werden."

#: config/core/error.php:71
msgid "Unable to delete directory."
msgstr "Das Verzeichnis konnte nicht gelöscht werden."

#: config/core/error.php:73
msgid "Cannot read file."
msgstr "Datei kann nicht gelesen werden."

#: config/core/error.php:74
msgid "_FILES array not present."
msgstr "_FILES Array ist nicht vorhanden."

#: config/core/error.php:75
msgid "Unable to save file in selected directory."
msgstr "Die Datei kann im ausgewählten Verzeichnis nicht gespeichert werden."

#: config/core/error.php:76
msgid "Upload directory not set in file object."
msgstr "Das Verzeichnis zum Hochladen wurde nicht als Dateiobjekt festgelegt."

#: config/core/error.php:79
msgid "Filename not set."
msgstr "Der Dateiname wurde nicht festgelegt."

#: config/core/error.php:80
msgid "Directory not set."
msgstr "Der Verzeichnisname wurde nicht festgelegt."

#: config/core/error.php:81
msgid "There was a problem loading the image file."
msgstr "Es gab beim Laden des Bildes ein Problem."

#: config/core/error.php:82
#, c-format
msgid "Image was larger than %dK size limit."
msgstr "Das Bild war größer als die maximale Größe von %dK."

#: config/core/error.php:83
#, c-format
msgid "Image width was larger than %d pixel limit."
msgstr "Das Bild war breiter als die maximale Bildbreite von %d Pixeln."

#: config/core/error.php:84
#, c-format
msgid "Image height was larger than %d pixel limit."
msgstr "Das Bild war höher als die maximale Bildhöhe von %d Pixeln."

#: config/core/error.php:85
msgid "Unacceptable image type."
msgstr "Nicht akzeptierter Bildtyp."

#: config/core/error.php:89
msgid "Function expected a string variable."
msgstr "Die Funktion hat eine String-Variable erwartet."

#: config/core/error.php:92
msgid "No pages found."
msgstr "Keine Seiten gefunden."

#: config/core/error.php:93
msgid "Module was not set."
msgstr "Das Modul wurde nicht festgelegt."

#: config/core/error.php:94
msgid "Template was not set."
msgstr "Die Vorlage wurde nicht festgelegt."

#: core/class/Database.php:224
msgid "DB Operator:"
msgstr "Datenbank-Operator:"

#: core/class/Database.php:939
msgid "Type"
msgstr "Typ"

#: core/class/Error.php:56
msgid "Error"
msgstr "Fehler"

#: core/class/Form.php:760 core/class/Form.php:766
msgid "Main"
msgstr "Haupt"

#: index.php:11
msgid "Fatal Error: Could not locate your configuration file."
msgstr "Kritischer Fehler: die Konfigurationsdatei konnte nicht gefunden werden."

#: javascript/htmlarea/default.php:5
msgid "Insert HTML"
msgstr "HTML einfügen"

#: javascript/htmlarea/default.php:6
msgid "Highlight Text"
msgstr "Text hervorheben"

#: setup/class/Setup.php:44
msgid "Your configuration file already exists."
msgstr "Ihre Konfigurationsdatei existiert bereits."

#: setup/class/Setup.php:45
msgid "Remove the following file and refresh to continue:"
msgstr "Entfernen Sie die folgende Datei und laden Sie die Seite neu um fortzusetzen."

#: setup/class/Setup.php:50
msgid "Your configuration file was written successfully!"
msgstr "Ihre Konfigurationsdatei wurde erfolgreich geschrieben!"

#: setup/class/Setup.php:51
msgid "Move on to Step 2"
msgstr "Weiter mit Schritt 2"

#: setup/class/Setup.php:53
msgid "Your configuration file could not be written into the following directory:"
msgstr "Ihre Konfigurationsdatei konnte nicht in das folgende Verzeichnis geschrieben werden:"

#: setup/class/Setup.php:55
msgid "Please check your directory permissions and try again."
msgstr "Bitte überprüfen Sie die Berechtigungen des Verzeichnisses und versuchen Sie es erneut."

#: setup/class/Setup.php:56 setup/class/Setup.php:351
msgid "Permission Help"
msgstr "Erlaubnis für Hilfe"

#: setup/class/Setup.php:84
msgid "Unable to locate the source directory:"
msgstr "Das Quellverzeichnis konnte nicht gefunden werden:"

#: setup/class/Setup.php:112
msgid "Missing a database user name."
msgstr "Es fehlt ein Benutzername für die Datenbank."

#: setup/class/Setup.php:119
msgid "Missing a database password."
msgstr "Sie müssen ein Passwort für die Datenbank angeben."

#: setup/class/Setup.php:124
msgid "Notice: Missing a host reference."
msgstr "Hinweis: der Datenbank-Rechner wurde nicht angegeben."

#: setup/class/Setup.php:131
msgid "Missing a database name."
msgstr "Der Datenbankname fehlt."

#: setup/class/Setup.php:139
msgid ""
"The Table Prefix may only consist of letters, numbers, and the underscore "
"character."
msgstr "Der Tabellen-Präfix darf nur aus Buchstaben, Zahlen oder dem Unterstrich bestehen."

#: setup/class/Setup.php:140
msgid "It also may not begin with a number."
msgstr "Kann auch mit einer Nummer beginnen."

#: setup/class/Setup.php:158
msgid "Unable to connect to the database with the information provided."
msgstr "Mit der angegebenen Benutzer/Passwort-Kombination konnte nicht auf die Datenbank zugegriffen werden."

#: setup/class/Setup.php:159
msgid "Database Help"
msgstr "Datenbank Hilfe"

#: setup/class/Setup.php:207
msgid "Use Pear files included with phpWebSite (recommended)."
msgstr "Pear-Bibliothek von phpWebSite benutzen (empfohlen)."

#: setup/class/Setup.php:208
msgid "Use server's Pear library files (not recommended)."
msgstr "Server Pear-Bibliothek benutzen (nicht empfohlen)."

#: setup/class/Setup.php:213
msgid "Source Directory"
msgstr "Quellverzeichnis"

#: setup/class/Setup.php:214
msgid "This is the directory where phpWebSite is installed."
msgstr "phpWebSite wird in folgendes Verzeichnis installiert."

#: setup/class/Setup.php:216
msgid "Site Hash"
msgstr "Site Hash"

#: setup/class/Setup.php:217
msgid ""
"The character string below differentiates your site from others on the same "
"server."
msgstr "Der angegebene Zeichen-String ermöglicht die Unterscheidung Ihrer Seite mit anderen auf dem selben Server."

#: setup/class/Setup.php:218
msgid "The example is randomly generated."
msgstr "Das Beispiel wurde zufällig erzeugt."

#: setup/class/Setup.php:219
msgid "You may change it if you wish."
msgstr "Sie können es bei Bedarf ändern."

#: setup/class/Setup.php:221
msgid "Pear Configuration"
msgstr "Pear-Konfiguration"

#: setup/class/Setup.php:222
msgid "phpWebSite uses the Pear library extensively."
msgstr "phpWebSite benutzt die Pear-Bibliothek sehr häufig."

#: setup/class/Setup.php:223
msgid "We suggest you use the library files included with phpWebSite."
msgstr "Es wird empfohlen die Pear-Bibliothek, die bei phpWebSite mitgeliefert wird, zu benutzen."

#: setup/class/Setup.php:236 setup/class/Setup.php:306
msgid "Continue"
msgstr "Fortsetzen"

#: setup/class/Setup.php:259
msgid "Database Type"
msgstr "Datenbanktyp"

#: setup/class/Setup.php:260
msgid ""
"phpWebSite supports several databases. Choose the type your server currently "
"is running."
msgstr "phpWebSite unterstützt verschiedene Datenbanken. Wählen Sie den Typ der auf Ihren Server zutrifft."

#: setup/class/Setup.php:262
msgid "Database User"
msgstr "Datenbankbenutzer"

#: setup/class/Setup.php:263
msgid "This is the user name that phpWebSite will use to access its database."
msgstr "Der Benutzername, den phpWebSite verwendet um auf die Datenbank zuzugreifen."

#: setup/class/Setup.php:264
msgid "Note: it is a good idea to give each phpWebSite installation its own user."
msgstr "Hinweis: jede phpWebSite-Installation sollte ihren eigenen Benutzernamen erhalten."

#: setup/class/Setup.php:266
msgid "Database Password"
msgstr "Datenbank-Kennwort"

#: setup/class/Setup.php:267
msgid "Enter the database's user password here."
msgstr "Tragen Sie hier das Kennwort für den Datenbankbenutzer ein."

#: setup/class/Setup.php:269
msgid "Host Specification"
msgstr "Datenbank-Rechner festlegen"

#: setup/class/Setup.php:270
msgid ""
"If your database is on the same server as your phpWebSite installation, "
"leave this as &#x22;localhost&#x22;."
msgstr "Wenn Ihre Datenbank auf dem selben Rechner liegt wie die phpWebSite-Installation belassen Sie den Wert &#x22;localhost&#x22;."

#: setup/class/Setup.php:271
msgid "Otherwise, enter the ip or dns to the database server."
msgstr "Andernfalls geben Sie die IP-Adresse oder den DNS-Namen des Datenbank-Servers ein."

#: setup/class/Setup.php:273
msgid "Host Specification Port"
msgstr "Port des Datenbank-Rechners"

#: setup/class/Setup.php:274
msgid ""
"If your host specification requires access via a specific port, enter it "
"here."
msgstr "Wenn Ihr Datenbank-Rechner auf einem speziellen Port hört, geben Sie ihn hier ein."

#: setup/class/Setup.php:276
msgid "Database Name"
msgstr "Datenbankname"

#: setup/class/Setup.php:277
msgid "The database's name into which you are installing phpWebSite."
msgstr "Tragen Sie hier den Namen der Datenbank ein, in die phpWebSite installiert wird."

#: setup/class/Setup.php:278
msgid ""
"Note: if you have not made this database yet, you should do so before "
"continuing."
msgstr "Hinweis: wenn Sie die Datenbank noch nicht erstellt haben, sollten Sie dies vor dem Fortsetzen der Installation tun."

#: setup/class/Setup.php:280
msgid "Table Prefix"
msgstr "Tabellen-Präfix"

#: setup/class/Setup.php:281
msgid ""
"If phpWebSite is sharing a database with another application, we suggest you "
"give the tables a prefix."
msgstr "Wenn phpWebSite sich die Datenbank mit anderen Anwendungen teilt, sollten Sie einen Präfix für die Tabellen angeben."

#: setup/class/Setup.php:342
msgid "The following directories need to be created:"
msgstr "Die folgenden Verzeichnisse müssen erstellt werden:"

#: setup/class/Setup.php:349
msgid "The following directories are not writable:"
msgstr "Die folgenden Verzeichnisse sind nicht beschreibbar:"

#: setup/class/Setup.php:357
msgid "Please make these changes and return."
msgstr "Bitte ändern Sie dies und kehren Sie anschließend zur Installation zurück."

#: setup/class/Setup.php:366
msgid "phpWebSite 0.9.4 Alpha Setup"
msgstr "phpWebSite 0.9.4 Alpha Installation"

#: setup/class/Setup.php:379
msgid "There is a problem with your sessions."
msgstr "Es gibt ein Problem mit Ihren Session-Daten."

#: setup/class/Setup.php:380
msgid "phpWebSite depends on sessions to move data between pages."
msgstr "phpWebSite benötigt Sessions um Daten zwischenzuspeichern."

#: setup/class/Setup.php:381
msgid "Sessions Help"
msgstr "Hilfe zu Sessions"

#: setup/class/Setup.php:405
msgid "Begin Installation"
msgstr "Installation starten"

#: setup/class/Setup.php:411
msgid "Importing core database file."
msgstr "Kern-Datenbankdatei importieren."

#: setup/class/Setup.php:418
msgid "Some errors occurred while creating the core database tables."
msgstr "Beim Erstellen der Kerntabellen in der Datenbank sind Fehler aufgetreten."

#: setup/class/Setup.php:419
msgid "Please check your error log file."
msgstr "Bitte überprüfen Sie die Datei error.log Ihres Webservers."

#: setup/class/Setup.php:424
msgid "Core installation successful."
msgstr "Programmkern wurde erfolgreich installiert."

#: setup/class/Setup.php:425
msgid "Continue to Module Installation"
msgstr "Weiter zur Modulinstallation"

#: setup/class/Setup.php:446
msgid "Installation of phpWebSite is complete."
msgstr "Die Installation von phpWebSite ist komplett."

#: setup/class/Setup.php:447
msgid "If you experienced any error messages, check your error.log file."
msgstr "Wenn Fehlermeldungen aufgetreten sind, überprüfen Sie bitte die Datei error.log Ihres Webservers."

#: setup/class/Setup.php:448
msgid "Go to my new website!"
msgstr "Gehe zur neu erstellen Webseite!"

#: setup/index.php:5
msgid "Unable to locate your pear library files."
msgstr "Ihre Pear-Bibliotheken konnte nicht gefunden werden."

#: setup/index.php:33
msgid "Directory Permissions"
msgstr "Verzeichnis-Berechtigungen"

#: setup/index.php:44
msgid "Create Config File"
msgstr "Konfigurationsdatei erzeugen"

#: setup/index.php:49
msgid "Create Core"
msgstr "Programmkern erzeugen"

#: setup/index.php:54
msgid "Install Modules"
msgstr "Module installieren"

[phpws-comm-commits] modules/uplink/lang uplink.en.lng,1.1.1.1,1.2

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31366/lang

Modified Files:
	uplink.en.lng 
Log Message:
Add rights checking, disallow duplicate uploads

Index: uplink.en.lng
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/lang/uplink.en.lng,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uplink.en.lng	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- uplink.en.lng	28 Jul 2004 00:55:36 -0000	1.2
***************
*** 31,32 ****
--- 31,34 ----
  a:|:You do not have permission to add or edit uplinks.:|:You do not have permission to add or edit uplinks.
  a:|:You do not have permission to delete uplinks.:|:You do not have permission to delete uplinks.
+ a:|:You have already uploaded the file:|:You have already uploaded the file
+ a:|:Resize Image:|:Resize Image

[phpws-comm-commits] modules/uplink/docs README.txt,1.2,1.3

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31366/docs

Modified Files:
	README.txt 
Log Message:
Add rights checking, disallow duplicate uploads

Index: README.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/docs/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README.txt	27 Jul 2004 00:41:12 -0000	1.2
--- README.txt	28 Jul 2004 00:55:35 -0000	1.3
***************
*** 78,80 ****
--- 78,82 ----
  VERSION HISTORY
  ------------------------------
+ 0.7.3	Access rights now tested correctly.
+ 		Module now catches and disallows upload of a duplicate file.
  0.7.2	Module lacks only proper access rights code.

[phpws-comm-commits] modules/uplink/class Uplink.php,1.2,1.3

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31366/class

Modified Files:
	Uplink.php 
Log Message:
Add rights checking, disallow duplicate uploads

Index: Uplink.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/class/Uplink.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Uplink.php	27 Jul 2004 00:41:12 -0000	1.2
--- Uplink.php	28 Jul 2004 00:55:34 -0000	1.3
***************
*** 152,156 ****
  			
  				if (is_file($file)) {	// if the file already exists, add a unique prefix
! 					$file = time() . "_" . $file;
  				}
  				
--- 152,159 ----
  			
  				if (is_file($file)) {	// if the file already exists, add a unique prefix
! 					$message = $_SESSION["translate"]->it("You have already uploaded the file") . " \"" . $_FILES["UPLNK_FILEPATH"]["name"] . "\".";
! 					$error = new PHPWS_Error("uplink", "PHPWS_Uplink::save()", $message, "continue", 0);
! 					$error->message("CNT_uplink");
! 					return $this->_edit();
  				}
  				

[phpws-comm-commits] modules/uplink/conf boost.php,1.2,1.3

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31366/conf

Modified Files:
	boost.php 
Log Message:
Add rights checking, disallow duplicate uploads

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	27 Jul 2004 00:41:12 -0000	1.2
--- boost.php	28 Jul 2004 00:55:35 -0000	1.3
***************
*** 8,12 ****
  
  /* The version of your module. Make sure to increment this on updates */
! $version = "0.7.2";
  
  /* The unix style name for your module */
--- 8,12 ----
  
  /* The version of your module. Make sure to increment this on updates */
! $version = "0.7.3";
  
  /* The unix style name for your module */

[phpws-comm-commits] modules/uplink/boost update.php,1.2,1.3

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31366/boost

Modified Files:
	update.php 
Log Message:
Add rights checking, disallow duplicate uploads

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/boost/update.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** update.php	27 Jul 2004 00:41:11 -0000	1.2
--- update.php	28 Jul 2004 00:55:20 -0000	1.3
***************
*** 20,25 ****
  $status = 1;
  
! if ($currentVersion < "0.7.2") {
! 	$content .= "Updating Uplink to version 0.7.2 .<br />";
  	
  	/* reload the help information if help system is loaded */
--- 20,25 ----
  $status = 1;
  
! if ($currentVersion < "0.7.3") {
! 	$content .= "Updating Uplink to version 0.7.3 .<br />";
  	
  	/* reload the help information if help system is loaded */
***************
*** 35,39 ****
  	}
  	
! 	$content .= "Update to version 0.7.2 finished.<br />"; 
  }
  
--- 35,39 ----
  	}
  	
! 	$content .= "Update to version 0.7.3 finished.<br />"; 
  }
  

[phpws-comm-commits] modules/staffman/docs README.txt,1.10,1.11

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18985/docs

Modified Files:
	README.txt 
Log Message:
minor mods to README and conf/boost

Index: README.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/docs/README.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** README.txt	3 Jun 2004 00:38:40 -0000	1.10
--- README.txt	27 Jul 2004 00:50:31 -0000	1.11
***************
*** 43,53 ****
  
  ------------------------------
- CUSTOMIZATION
- ------------------------------
- To turn OFF the search function, comment out the section of /boost/install.php
- that registers the module with the search module.  The beginning and end of the
- section are indicated by comments in the file.  Then re-install the staffman module.
- 
- ------------------------------
  UN-INSTALLATION
  ------------------------------
--- 43,46 ----
***************
*** 79,84 ****
  display the list, freeing administrators from having to know the operation value
  required.  Second, I have used the help module to provide help for key items in
! the interface.  Third, I have registered the module with the Search facility.
! Finally, I have included category (fatcat) support.
  
  I hope you will find staffman a useful example.  If you find errors, or wish to 
--- 72,76 ----
  display the list, freeing administrators from having to know the operation value
  required.  Second, I have used the help module to provide help for key items in
! the interface. 
  
  I hope you will find staffman a useful example.  If you find errors, or wish to 

[phpws-comm-commits] modules/staffman/conf boost.php,1.11,1.12

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/staffman/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18985/conf

Modified Files:
	boost.php 
Log Message:
minor mods to README and conf/boost

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/staffman/conf/boost.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** boost.php	1 Jun 2004 21:26:02 -0000	1.11
--- boost.php	27 Jul 2004 00:50:31 -0000	1.12
***************
*** 9,12 ****
--- 9,15 ----
  
  
+ /* This package's version number */
+ $version = "1.4-1";
+ /* Internal name of module, equals name of folder */
  $mod_title = "staffman";
  /* Name to appear in Module list and displays */
***************
*** 33,38 ****
  /* Whether or not the module is active */
  $active = "on";
- /* This package's version number */
- $version = "1.4-1";
  /* other modules on which this module depends */
  $depend = array("menuman", "search");
--- 36,39 ----

[phpws-comm-commits] modules/jobman/docs README.txt,1.7,1.8

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/jobman/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18715/docs

Modified Files:
	README.txt 
Log Message:
minor mods to README and conf/boost

Index: README.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/jobman/docs/README.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** README.txt	3 Jun 2004 00:39:40 -0000	1.7
--- README.txt	27 Jul 2004 00:49:46 -0000	1.8
***************
*** 42,52 ****
  
  ------------------------------
- CUSTOMIZATION
- ------------------------------
- To turn OFF the search function, comment out the section of /boost/install.php
- that registers the module with the search module.  The beginning and end of the
- section are indicated by comments in the file.  Then re-install the jobman module.
- 
- ------------------------------
  UN-INSTALLATION
  ------------------------------
--- 42,45 ----
***************
*** 80,85 ****
  display the list, freeing administrators from having to know the operation value
  required.  Second, I have used the help module to provide help for key items in
! the interface.  Third, I have registered the module with the Search facility.
! Finally, I have included category (fatcat) support.
  
  I hope you will find jobman a useful example.  If you find errors, or wish to 
--- 73,77 ----
  display the list, freeing administrators from having to know the operation value
  required.  Second, I have used the help module to provide help for key items in
! the interface.
  
  I hope you will find jobman a useful example.  If you find errors, or wish to 

[phpws-comm-commits] modules/jobman/conf boost.php,1.10,1.11

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/jobman/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18715/conf

Modified Files:
	boost.php 
Log Message:
minor mods to README and conf/boost

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/jobman/conf/boost.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** boost.php	1 Jun 2004 19:20:41 -0000	1.10
--- boost.php	27 Jul 2004 00:49:45 -0000	1.11
***************
*** 8,12 ****
   */
  
! 
  $mod_title = "jobman";
  /* Name to appear in Module list and displays */
--- 8,14 ----
   */
  
! /* This package's version number */
! $version = "1.5";
! /* Internal name of module, equals name of folder */
  $mod_title = "jobman";
  /* Name to appear in Module list and displays */
***************
*** 33,38 ****
  /* Whether or not the module is active */
  $active = "on";
- /* This package's version number */
- $version = "1.5";
  /* other modules on which this module depends */
  $depend = array("menuman", "search");
--- 35,38 ----

[phpws-comm-commits] modules/uplink/docs README.txt,1.1.1.1,1.2

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16778/docs

Modified Files:
	README.txt 
Log Message:
minor cosmetic changes made to source files

Index: README.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/docs/README.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README.txt	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- README.txt	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 21,25 ****
  		to a link in a web page, announcement, block, etc.
  	*	optionally re-sizes image files of type .jpg, .png and .gif to fit within
! 		a square of configurable size (default 300 x 300 pixels).
  I wrote this module to support teachers who want an easy way to upload a picture,
  PDF or HTML file and then provide a link to display or download it on a course
--- 21,25 ----
  		to a link in a web page, announcement, block, etc.
  	*	optionally re-sizes image files of type .jpg, .png and .gif to fit within
! 		a rectangle of configurable size (default 300 x 300 pixels).
  I wrote this module to support teachers who want an easy way to upload a picture,
  PDF or HTML file and then provide a link to display or download it on a course
***************
*** 70,74 ****
  to manage a list of items with an interface that conforms to others throughout phpWS.
  
! I hope you will find staffman a useful example.  If you find errors, or wish to 
  suggest improvements, please contact me directly.
  
--- 70,74 ----
  to manage a list of items with an interface that conforms to others throughout phpWS.
  
! I hope you will find uplink a useful example.  If you find errors, or wish to 
  suggest improvements, please contact me directly.
  

[phpws-comm-commits] modules/uplink/conf boost.php,1.1.1.1,1.2 config.php,1.1.1.1,1.2 controlpanel.php,1.1.1.1,1.2 layout.php,1.1.1.1,1.2 manager.php,1.1.1.1,1.2 users.php,1.1.1.1,1.2

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16778/conf

Modified Files:
	boost.php config.php controlpanel.php layout.php manager.php 
	users.php 
Log Message:
minor cosmetic changes made to source files

Index: controlpanel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/controlpanel.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** controlpanel.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- controlpanel.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 1,8 ****
  <?php
  /**
!  * Uplink control panel configuration file. Edit it to be used
!  * with you module.
   *
   * $Id$
   */
  
--- 1,8 ----
  <?php
  /**
!  * Uplink control panel configuration file.
   *
   * $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  
***************
*** 10,14 ****
  $image["alt"] = "Module Author: George Brackett";
  
! /* Create a link to your module */
  $link[] = array ("label"=>"Uplink Module",
  		 "module"=>"uplink",
--- 10,14 ----
  $image["alt"] = "Module Author: George Brackett";
  
! /* Create a link to the module */
  $link[] = array ("label"=>"Uplink Module",
  		 "module"=>"uplink",

Index: config.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/config.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- config.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 2,7 ****
  
  /*
!  * Uplink config file
   * @version $Id$
   */
  
--- 2,9 ----
  
  /*
!  * Uplink configuration file.
!  *
   * @version $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/boost.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boost.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- boost.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
   *
   * $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/manager.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** manager.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- manager.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
   *
   * $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  

Index: layout.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/layout.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** layout.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- layout.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
   *
   * $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  

Index: users.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/conf/users.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** users.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- users.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
   *
   * $Id$
+  * @author  George Brackett <gbr...@NO...>
   */
  

[phpws-comm-commits] modules/uplink/class Uplink.php,1.1.1.1,1.2 UplinkManager.php,1.1.1.1,1.2

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16778/class

Modified Files:
	Uplink.php UplinkManager.php 
Log Message:
minor cosmetic changes made to source files

Index: UplinkManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/class/UplinkManager.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** UplinkManager.php	26 Jul 2004 23:41:30 -0000	1.1.1.1
--- UplinkManager.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 1,4 ****
--- 1,11 ----
  <?php
  
+ /**
+  * UplinkManager class definition.  This class manages the list of uplink items.
+  *
+  * $Id$
+  * @author  George Brackett <gbr...@NO...>
+  */
+ 
  require_once(PHPWS_SOURCE_DIR . "core/Manager.php");
  include(PHPWS_SOURCE_DIR . "mod/uplink/conf/config.php");

Index: Uplink.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/class/Uplink.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Uplink.php	26 Jul 2004 23:41:29 -0000	1.1.1.1
--- Uplink.php	27 Jul 2004 00:41:12 -0000	1.2
***************
*** 1,3 ****
--- 1,10 ----
  <?php
+ /**
+  * PHPWS_Uplink class definition.  This class manages individual uplink items.
+  *
+  * $Id$
+  * @author  George Brackett <gbr...@NO...>
+  */
+ 
  
  require_once(PHPWS_SOURCE_DIR . "core/Item.php");

[phpws-comm-commits] modules/uplink/boost update.php,1.1.1.1,1.2

[George B. <gbr...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/uplink/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16778/boost

Modified Files:
	update.php 
Log Message:
minor cosmetic changes made to source files

Index: update.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/uplink/boost/update.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** update.php	26 Jul 2004 23:41:28 -0000	1.1.1.1
--- update.php	27 Jul 2004 00:41:11 -0000	1.2
***************
*** 4,8 ****
   * Update file for uplink
   *
!  * Reloads the uplink help data, which often changes between versions.
   *
   * @version $Id$
--- 4,8 ----
   * Update file for uplink
   *
!  * Reloads the uplink help data, which often change between versions.
   *
   * @version $Id$
***************
*** 21,25 ****
  
  if ($currentVersion < "0.7.2") {
! 	$content .= "Updating Uplink to version 0.7.1 .<br />";
  	
  	/* reload the help information if help system is loaded */
--- 21,25 ----
  
  if ($currentVersion < "0.7.2") {
! 	$content .= "Updating Uplink to version 0.7.2 .<br />";
  	
  	/* reload the help information if help system is loaded */
***************
*** 35,39 ****
  	}
  	
! 	$content .= "Update to version 0.7.1 finished.<br />"; 
  }
  
--- 35,39 ----
  	}
  	
! 	$content .= "Update to version 0.7.2 finished.<br />"; 
  }