<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>PEAR_Server</tt></b> on <span id="info">MAIN</span></td></tr>
<tr><td><tt>Server/<a href="#file1">Backend.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.8">1.8</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file2">Exception.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.6">1.6</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Exception.php?r1=1.6&r2=1.7">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.7">1.7</a></td></tr>
<tr><td><tt> /<a href="#file3">Package.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Package.php?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.5">1.5</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file4">mysqlinstall.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.14">1.14</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/mysqlinstall.php?r1=1.14&r2=1.15">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.15">1.15</a></td></tr>
<tr><td><tt> /<a href="#file5">Backend.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.8">1.8</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file6">Exception.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.6">1.6</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Exception.php?r1=1.6&r2=1.7">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.7">1.7</a></td></tr>
<tr><td><tt> /<a href="#file7">Package.php</a></tt></td><td align="right" id="added">+5</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Package.php?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.5">1.5</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file8">mysqlinstall.php</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.14">1.14</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/mysqlinstall.php?r1=1.14&r2=1.15">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.15">1.15</a></td></tr>
<tr><td><tt>Server/Backend/<a href="#file9">DBDataObject.php</a></tt></td><td align="right" id="added">+24</td><td align="right" id="removed">-41</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.23">1.23</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend/DBDataObject.php?r1=1.23&r2=1.24">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.24">1.24</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file10">DBDataObject.php</a></tt></td><td align="right" id="added">+24</td><td align="right" id="removed">-41</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.23">1.23</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend/DBDataObject.php?r1=1.23&r2=1.24">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.24">1.24</a></td></tr>
<tr><td><tt>Server/Frontend/<a href="#file11">HTMLQuickForm.php</a></tt></td><td align="right" id="added">+10</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.8">1.8</a></td></tr>
<tr class="alt"><td><tt> /<a href="#file12">HTMLQuickForm.php</a></tt></td><td align="right" id="added">+10</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.8">1.8</a></td></tr>
<tr><td><tt>data/DBDataObject/<a href="#file13">pearserver.ini</a></tt></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/data/DBDataObject/pearserver.ini?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/data/DBDataObject/pearserver.ini?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/data/DBDataObject/pearserver.ini?r=1.5">1.5</a></td></tr>
<tr><td></td><td align="right" id="added">+92</td><td align="right" id="removed">-102</td><td></td></tr>
</table>
<small id="info">13 modified files</small><br />
<pre class="comment">
REST generation/deletion is fully tested
implement and test deletePackage()
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Backend.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.8">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- Backend.php 21 Apr 2005 03:39:50 -0000 1.7
+++ Backend.php 22 Apr 2005 02:31:14 -0000 1.8
@@ -30,7 +30,7 @@
</small></pre><pre class="diff" id="context">
abstract public function savePackageREST($package);
</pre><pre class="diff" id="removed">- abstract public function deletePackageREST($package);
</pre><pre class="diff" id="added">+ abstract public function deletePackageREST($package<span id="addedchars">, $category</span>);
</pre><pre class="diff" id="context">
abstract public function saveCategoryREST($category);
</pre><pre class="diff"><small id="info">@@ -95,7 +95,7 @@
</small></pre><pre class="diff" id="context"> */
abstract public function addPackage($package);
</pre><pre class="diff" id="removed">- abstract public function deletePackage($packagename<span id="removedchars">, $category</span>);
</pre><pre class="diff" id="added">+ abstract public function deletePackage($packagename);
</pre><pre class="diff" id="context">
/**
* @param Chiara_PEAR_Server_Package
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Exception.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.6">1.6</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Exception.php?r1=1.6&r2=1.7">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.7">1.7</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.6 -r1.7
--- Exception.php 21 Apr 2005 03:39:50 -0000 1.6
+++ Exception.php 22 Apr 2005 02:31:14 -0000 1.7
@@ -248,9 +248,9 @@
</small></pre><pre class="diff" id="context">
class Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases extends Chiara_PEAR_Server_Exception
{
</pre><pre class="diff" id="removed">- protected $_message = 'Package %p% in channel %c cannot be deleted, delete all releases first';
</pre><pre class="diff" id="added">+ protected $_message = 'Package %p% in channel %c<span id="addedchars">%</span> cannot be deleted, delete all releases first';
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- public function __construct($package, $channel)
</pre><pre class="diff" id="added">+ public function __construct($package, $channel<span id="addedchars">, $msg = false</span>)
</pre><pre class="diff" id="context"> {
$this->_data = array('p' => $package, 'c' => $channel);
parent::__construct($msg ? $msg : $this->_message);
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Package.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Package.php?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.5">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- Package.php 17 Apr 2005 21:14:38 -0000 1.4
+++ Package.php 22 Apr 2005 02:31:14 -0000 1.5
@@ -68,11 +68,14 @@
</small></pre><pre class="diff" id="context">
public function __set($var, $value)
{
</pre><pre class="diff" id="added">+ if (is_string($value)) {
+ $value = trim($value);
+ }
</pre><pre class="diff" id="context"> if ($var == 'maintainer') {
</pre><pre class="diff" id="removed">- $this-><span id="removedchars">$this-></span>properties['maintainers'][$value[0]] = $value;
</pre><pre class="diff" id="added">+ $this->properties['maintainers'][$value[0]] = $value;
</pre><pre class="diff" id="context"> }
if ($var == 'maintainers') {
</pre><pre class="diff" id="removed">- $this-><span id="removedchars">$this-></span>properties['maintainers'] = $value;
</pre><pre class="diff" id="added">+ $this->properties['maintainers'] = $value;
</pre><pre class="diff" id="context"> }
if (isset($this->properties[$var])) {
if ($value === null) {
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>mysqlinstall.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.14">1.14</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/mysqlinstall.php?r1=1.14&r2=1.15">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.15">1.15</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.14 -r1.15
--- mysqlinstall.php 20 Apr 2005 04:06:18 -0000 1.14
+++ mysqlinstall.php 22 Apr 2005 02:31:14 -0000 1.15
@@ -540,7 +540,7 @@
</small></pre><pre class="diff" id="context"> $type . '://' . $this->user . ':' . $this->password . '@' . $this->dbhost .
'/' . $this->db . '\')';
$contents = '<?php
</pre><pre class="diff" id="removed">-<span id="removedchars">' . $extraconf . '</span>require_once \'Chiara/PEAR/Server.php\';
</pre><pre class="diff" id="added">+require_once \'Chiara/PEAR/Server.php\';
</pre><pre class="diff" id="context"> require_once \'Chiara/PEAR/Server/Backend/DBDataObject.php\';
require_once \'Chiara/PEAR/Server/Frontend/Xmlrpc5.php\';
$backend = new Chiara_PEAR_Server_Backend_DBDataObject(\'' . $this->channel . '\', false, '
</pre><pre class="diff"><small id="info">@@ -580,7 +580,7 @@
</small></pre><pre class="diff" id="context"> require_once \'Chiara/PEAR/Server/Backend/DBDataObject.php\';
require_once \'Chiara/PEAR/Server/Frontend/HTMLQuickForm.php\';
$backend = new Chiara_PEAR_Server_Backend_DBDataObject(\'' . $this->channel . '\',
</pre><pre class="diff" id="removed">- \'' . $answers['docroot'] . DIRECTORY_SEPARATOR . 'Chiara_PEAR_Server_REST<span id="removedchars">' . '</span>\', ' . $config . ');
</pre><pre class="diff" id="added">+ \'' . $answers['docroot'] . DIRECTORY_SEPARATOR . 'Chiara_PEAR_Server_REST\', ' . $config . ');
</pre><pre class="diff" id="context"> $frontend = new Chiara_PEAR_Server_Frontend_HTMLQuickForm(\'' . $this->channel .
'\', new HTML_QuickForm(\'channel\'),
\'' . $answers['frontendphp'] . '\', \'' . $answers['uploadpath'] . '\');
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Backend.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend.php?r=1.8">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- Backend.php 21 Apr 2005 03:39:50 -0000 1.7
+++ Backend.php 22 Apr 2005 02:31:14 -0000 1.8
@@ -30,7 +30,7 @@
</small></pre><pre class="diff" id="context">
abstract public function savePackageREST($package);
</pre><pre class="diff" id="removed">- abstract public function deletePackageREST($package);
</pre><pre class="diff" id="added">+ abstract public function deletePackageREST($package<span id="addedchars">, $category</span>);
</pre><pre class="diff" id="context">
abstract public function saveCategoryREST($category);
</pre><pre class="diff"><small id="info">@@ -95,7 +95,7 @@
</small></pre><pre class="diff" id="context"> */
abstract public function addPackage($package);
</pre><pre class="diff" id="removed">- abstract public function deletePackage($packagename<span id="removedchars">, $category</span>);
</pre><pre class="diff" id="added">+ abstract public function deletePackage($packagename);
</pre><pre class="diff" id="context">
/**
* @param Chiara_PEAR_Server_Package
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Exception.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.6">1.6</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Exception.php?r1=1.6&r2=1.7">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Exception.php?r=1.7">1.7</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.6 -r1.7
--- Exception.php 21 Apr 2005 03:39:50 -0000 1.6
+++ Exception.php 22 Apr 2005 02:31:14 -0000 1.7
@@ -248,9 +248,9 @@
</small></pre><pre class="diff" id="context">
class Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases extends Chiara_PEAR_Server_Exception
{
</pre><pre class="diff" id="removed">- protected $_message = 'Package %p% in channel %c cannot be deleted, delete all releases first';
</pre><pre class="diff" id="added">+ protected $_message = 'Package %p% in channel %c<span id="addedchars">%</span> cannot be deleted, delete all releases first';
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- public function __construct($package, $channel)
</pre><pre class="diff" id="added">+ public function __construct($package, $channel<span id="addedchars">, $msg = false</span>)
</pre><pre class="diff" id="context"> {
$this->_data = array('p' => $package, 'c' => $channel);
parent::__construct($msg ? $msg : $this->_message);
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>Package.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Package.php?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Package.php?r=1.5">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- Package.php 17 Apr 2005 21:14:38 -0000 1.4
+++ Package.php 22 Apr 2005 02:31:14 -0000 1.5
@@ -68,11 +68,14 @@
</small></pre><pre class="diff" id="context">
public function __set($var, $value)
{
</pre><pre class="diff" id="added">+ if (is_string($value)) {
+ $value = trim($value);
+ }
</pre><pre class="diff" id="context"> if ($var == 'maintainer') {
</pre><pre class="diff" id="removed">- $this-><span id="removedchars">$this-></span>properties['maintainers'][$value[0]] = $value;
</pre><pre class="diff" id="added">+ $this->properties['maintainers'][$value[0]] = $value;
</pre><pre class="diff" id="context"> }
if ($var == 'maintainers') {
</pre><pre class="diff" id="removed">- $this-><span id="removedchars">$this-></span>properties['maintainers'] = $value;
</pre><pre class="diff" id="added">+ $this->properties['maintainers'] = $value;
</pre><pre class="diff" id="context"> }
if (isset($this->properties[$var])) {
if ($value === null) {
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a><br /></span>
<div class="fileheader"><big><b>mysqlinstall.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.14">1.14</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/mysqlinstall.php?r1=1.14&r2=1.15">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/mysqlinstall.php?r=1.15">1.15</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.14 -r1.15
--- mysqlinstall.php 20 Apr 2005 04:06:18 -0000 1.14
+++ mysqlinstall.php 22 Apr 2005 02:31:14 -0000 1.15
@@ -540,7 +540,7 @@
</small></pre><pre class="diff" id="context"> $type . '://' . $this->user . ':' . $this->password . '@' . $this->dbhost .
'/' . $this->db . '\')';
$contents = '<?php
</pre><pre class="diff" id="removed">-<span id="removedchars">' . $extraconf . '</span>require_once \'Chiara/PEAR/Server.php\';
</pre><pre class="diff" id="added">+require_once \'Chiara/PEAR/Server.php\';
</pre><pre class="diff" id="context"> require_once \'Chiara/PEAR/Server/Backend/DBDataObject.php\';
require_once \'Chiara/PEAR/Server/Frontend/Xmlrpc5.php\';
$backend = new Chiara_PEAR_Server_Backend_DBDataObject(\'' . $this->channel . '\', false, '
</pre><pre class="diff"><small id="info">@@ -580,7 +580,7 @@
</small></pre><pre class="diff" id="context"> require_once \'Chiara/PEAR/Server/Backend/DBDataObject.php\';
require_once \'Chiara/PEAR/Server/Frontend/HTMLQuickForm.php\';
$backend = new Chiara_PEAR_Server_Backend_DBDataObject(\'' . $this->channel . '\',
</pre><pre class="diff" id="removed">- \'' . $answers['docroot'] . DIRECTORY_SEPARATOR . 'Chiara_PEAR_Server_REST<span id="removedchars">' . '</span>\', ' . $config . ');
</pre><pre class="diff" id="added">+ \'' . $answers['docroot'] . DIRECTORY_SEPARATOR . 'Chiara_PEAR_Server_REST\', ' . $config . ');
</pre><pre class="diff" id="context"> $frontend = new Chiara_PEAR_Server_Frontend_HTMLQuickForm(\'' . $this->channel .
'\', new HTML_QuickForm(\'channel\'),
\'' . $answers['frontendphp'] . '\', \'' . $answers['uploadpath'] . '\');
</pre></div>
<hr /><a name="file9" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server/Backend">Backend</a><br /></span>
<div class="fileheader"><big><b>DBDataObject.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.23">1.23</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend/DBDataObject.php?r1=1.23&r2=1.24">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.24">1.24</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.23 -r1.24
--- DBDataObject.php 21 Apr 2005 03:50:18 -0000 1.23
+++ DBDataObject.php 22 Apr 2005 02:31:15 -0000 1.24
@@ -176,7 +176,7 @@
</small></pre><pre class="diff" id="context"> if ($ret) {
$this->savePackageREST($releasedata->package);
$this->saveReleaseREST($releasedata->package, $releasedata->version);
</pre><pre class="diff" id="removed">- $this->saveAllReleasesREST();
</pre><pre class="diff" id="added">+ $this->saveAllReleasesREST(<span id="addedchars">$releasedata->package</span>);
</pre><pre class="diff" id="context"> }
return $ret;
}
</pre><pre class="diff"><small id="info">@@ -191,12 +191,12 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$releasedata = DB_DataObject::factory('releases');
$releasedata->channel = $this->_channel;
$releasedata->package = $package;
</pre><pre class="diff" id="removed">- $releasedata->orderby('releasedate');
</pre><pre class="diff" id="added">+ $releasedata->orderby('releasedate<span id="addedchars"> DESC</span>');
</pre><pre class="diff" id="context"> if (!$releasedata->find(false)) {
return;
}
</pre><pre class="diff"><small id="info">@@ -232,7 +232,7 @@
</small></pre><pre class="diff" id="context"> DIRECTORY_SEPARATOR . 'allreleases.xml', 0666);
file_put_contents($rdir . DIRECTORY_SEPARATOR . $package .
</pre><pre class="diff" id="removed">- DIRECTORY_SEPARATOR . 'latest.txt', $<span id="removedchars">version</span>);
</pre><pre class="diff" id="added">+ DIRECTORY_SEPARATOR . 'latest.txt', $<span id="addedchars">latest</span>);
</pre><pre class="diff" id="context"> @chmod($rdir . DIRECTORY_SEPARATOR . $package .
DIRECTORY_SEPARATOR . 'latest.txt', 0666);
if (isset($stable)) {
</pre><pre class="diff"><small id="info">@@ -262,12 +262,6 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
</pre><pre class="diff" id="context"> $rdir = $this->_restdir . DIRECTORY_SEPARATOR . 'r';
if (!file_exists($rdir . DIRECTORY_SEPARATOR . $package)) {
return;
</pre><pre class="diff"><small id="info">@@ -290,7 +284,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$releasedata = DB_DataObject::factory('releases');
$releasedata->channel = $this->_channel;
</pre><pre class="diff"><small id="info">@@ -309,7 +303,7 @@
</small></pre><pre class="diff" id="context">
$info = '<?xml version="1.0"?>
<r>
</pre><pre class="diff" id="removed">- <p xlink:href="' . $extra . 'p/' . urlencode($release['package']) . '">' . $release['package'] . '</<span id="removedchars">n</span>>
</pre><pre class="diff" id="added">+ <p xlink:href="' . $extra . 'p/' . urlencode($release['package']) . '">' . $release['package'] . '</<span id="addedchars">p</span>>
</pre><pre class="diff" id="context"> <c>' . $release['channel'] . '</c>
<v>' . $version . '</v>
<s>' . $release['state'] . '</s>
</pre><pre class="diff"><small id="info">@@ -455,7 +449,7 @@
</small></pre><pre class="diff" id="context"> 'alias' => 'Default',
);
}
</pre><pre class="diff" id="removed">- throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($<span id="removedchars">id</span>, $channel);
</pre><pre class="diff" id="added">+ throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($<span id="addedchars">category</span>, $channel);
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -499,8 +493,6 @@
</small></pre><pre class="diff" id="context"> }
$category = DB_DataObject::factory('categories');
$category->channel = $this->_channel;
</pre><pre class="diff" id="removed">- $save = clone $category;
- $category = $save;
</pre><pre class="diff" id="context"> $category->name = $cat->name;
if ($category->find()) {
throw new Chiara_PEAR_Server_ExceptionCategoryExists($cat->name, $this->_channel);
</pre><pre class="diff"><small id="info">@@ -520,20 +512,13 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
</pre><pre class="diff" id="context"> $cdir = $this->_restdir . DIRECTORY_SEPARATOR . 'c';
</pre><pre class="diff" id="removed">- $category = $this->categoryInfo($category);
- if (!file_exists($cdir . DIRECTORY_SEPARATOR . urlencode($category['name']))) {
</pre><pre class="diff" id="added">+ if (!file_exists($cdir . DIRECTORY_SEPARATOR . urlencode($category))) {
</pre><pre class="diff" id="context"> return;
}
// remove all category info
System::rm(array('-r', $this->_restdir . DIRECTORY_SEPARATOR . 'c'
</pre><pre class="diff" id="removed">- . DIRECTORY_SEPARATOR . urlencode($category<span id="removedchars">['name']</span>)));
</pre><pre class="diff" id="added">+ . DIRECTORY_SEPARATOR . urlencode($category)));
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -547,7 +532,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$cdir = $this->_restdir . DIRECTORY_SEPARATOR . 'c';
$category = $this->categoryInfo($category);
</pre><pre class="diff"><small id="info">@@ -589,13 +574,6 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
-
</pre><pre class="diff" id="context"> // remove all package and release info for the package
System::rm(array('-r', $this->_restdir . DIRECTORY_SEPARATOR . 'p'
. DIRECTORY_SEPARATOR . $package));
</pre><pre class="diff"><small id="info">@@ -616,7 +594,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$packages = DB_DataObject::factory('packages');
$packages->channel = $this->_channel;
</pre><pre class="diff"><small id="info">@@ -641,12 +619,12 @@
</small></pre><pre class="diff" id="context"> }
if ($package['deprecated_package']) {
if ($package['deprecated_channel'] == $this->_channel) {
</pre><pre class="diff" id="removed">- $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc
</pre><pre class="diff" id="added">+ $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc<span id="addedchars">></span>
</pre><pre class="diff" id="context"> <dp href="' . $extra . 'p/' . $package['deprecated_package'] . '"> ' .
$package['deprecated_package'] . '</dp>
';
} else {
</pre><pre class="diff" id="removed">- $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc
</pre><pre class="diff" id="added">+ $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc<span id="addedchars">></span>
</pre><pre class="diff" id="context"> <dp> ' . $package['deprecated_package'] . '</dp>
';
}
</pre><pre class="diff"><small id="info">@@ -748,19 +726,24 @@
</small></pre><pre class="diff" id="context"> if (!$packages->find(true)) {
throw new Chiara_PEAR_Server_ExceptionPackageDoesntExist($package, $this->_channel);
}
</pre><pre class="diff" id="removed">- $categories = DB_DataObject::factory('categories');
- $categories->channel = $this->_channel;
- $categories->id = $packages->category_id;
- $categories->find(true);
</pre><pre class="diff" id="added">+ if ($packages->category_id === '0') {
+ $catname = 'Default';
+ } else {
+ $categories = DB_DataObject::factory('categories');
+ $categories->channel = $this->_channel;
+ $categories->id = $packages->category_id;
+ $categories->find(true);
+ $catname = $categories->name;
+ }
</pre><pre class="diff" id="context"> $releases = DB_DataObject::factory('releases');
$releases->channel = $this->_channel;
$releases->package = $packagename;
if ($releases->find()) {
</pre><pre class="diff" id="removed">- throw new Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases($package, $this->_channel);
</pre><pre class="diff" id="added">+ throw new Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases($package<span id="addedchars">name</span>, $this->_channel);
</pre><pre class="diff" id="context"> }
$ret = $packages->delete() !== false;
if ($ret) {
</pre><pre class="diff" id="removed">- $this->deletePackageREST($packagename, $cat<span id="removedchars">egories-></span>name);
</pre><pre class="diff" id="added">+ $this->deletePackageREST($packagename, $catname);
</pre><pre class="diff" id="context"> }
return $ret;
}
</pre></div>
<hr /><a name="file10" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server/Backend">Backend</a><br /></span>
<div class="fileheader"><big><b>DBDataObject.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.23">1.23</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Backend/DBDataObject.php?r1=1.23&r2=1.24">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Backend/DBDataObject.php?r=1.24">1.24</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.23 -r1.24
--- DBDataObject.php 21 Apr 2005 03:50:18 -0000 1.23
+++ DBDataObject.php 22 Apr 2005 02:31:15 -0000 1.24
@@ -176,7 +176,7 @@
</small></pre><pre class="diff" id="context"> if ($ret) {
$this->savePackageREST($releasedata->package);
$this->saveReleaseREST($releasedata->package, $releasedata->version);
</pre><pre class="diff" id="removed">- $this->saveAllReleasesREST();
</pre><pre class="diff" id="added">+ $this->saveAllReleasesREST(<span id="addedchars">$releasedata->package</span>);
</pre><pre class="diff" id="context"> }
return $ret;
}
</pre><pre class="diff"><small id="info">@@ -191,12 +191,12 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$releasedata = DB_DataObject::factory('releases');
$releasedata->channel = $this->_channel;
$releasedata->package = $package;
</pre><pre class="diff" id="removed">- $releasedata->orderby('releasedate');
</pre><pre class="diff" id="added">+ $releasedata->orderby('releasedate<span id="addedchars"> DESC</span>');
</pre><pre class="diff" id="context"> if (!$releasedata->find(false)) {
return;
}
</pre><pre class="diff"><small id="info">@@ -232,7 +232,7 @@
</small></pre><pre class="diff" id="context"> DIRECTORY_SEPARATOR . 'allreleases.xml', 0666);
file_put_contents($rdir . DIRECTORY_SEPARATOR . $package .
</pre><pre class="diff" id="removed">- DIRECTORY_SEPARATOR . 'latest.txt', $<span id="removedchars">version</span>);
</pre><pre class="diff" id="added">+ DIRECTORY_SEPARATOR . 'latest.txt', $<span id="addedchars">latest</span>);
</pre><pre class="diff" id="context"> @chmod($rdir . DIRECTORY_SEPARATOR . $package .
DIRECTORY_SEPARATOR . 'latest.txt', 0666);
if (isset($stable)) {
</pre><pre class="diff"><small id="info">@@ -262,12 +262,6 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
</pre><pre class="diff" id="context"> $rdir = $this->_restdir . DIRECTORY_SEPARATOR . 'r';
if (!file_exists($rdir . DIRECTORY_SEPARATOR . $package)) {
return;
</pre><pre class="diff"><small id="info">@@ -290,7 +284,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$releasedata = DB_DataObject::factory('releases');
$releasedata->channel = $this->_channel;
</pre><pre class="diff"><small id="info">@@ -309,7 +303,7 @@
</small></pre><pre class="diff" id="context">
$info = '<?xml version="1.0"?>
<r>
</pre><pre class="diff" id="removed">- <p xlink:href="' . $extra . 'p/' . urlencode($release['package']) . '">' . $release['package'] . '</<span id="removedchars">n</span>>
</pre><pre class="diff" id="added">+ <p xlink:href="' . $extra . 'p/' . urlencode($release['package']) . '">' . $release['package'] . '</<span id="addedchars">p</span>>
</pre><pre class="diff" id="context"> <c>' . $release['channel'] . '</c>
<v>' . $version . '</v>
<s>' . $release['state'] . '</s>
</pre><pre class="diff"><small id="info">@@ -455,7 +449,7 @@
</small></pre><pre class="diff" id="context"> 'alias' => 'Default',
);
}
</pre><pre class="diff" id="removed">- throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($<span id="removedchars">id</span>, $channel);
</pre><pre class="diff" id="added">+ throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($<span id="addedchars">category</span>, $channel);
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -499,8 +493,6 @@
</small></pre><pre class="diff" id="context"> }
$category = DB_DataObject::factory('categories');
$category->channel = $this->_channel;
</pre><pre class="diff" id="removed">- $save = clone $category;
- $category = $save;
</pre><pre class="diff" id="context"> $category->name = $cat->name;
if ($category->find()) {
throw new Chiara_PEAR_Server_ExceptionCategoryExists($cat->name, $this->_channel);
</pre><pre class="diff"><small id="info">@@ -520,20 +512,13 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
</pre><pre class="diff" id="context"> $cdir = $this->_restdir . DIRECTORY_SEPARATOR . 'c';
</pre><pre class="diff" id="removed">- $category = $this->categoryInfo($category);
- if (!file_exists($cdir . DIRECTORY_SEPARATOR . urlencode($category['name']))) {
</pre><pre class="diff" id="added">+ if (!file_exists($cdir . DIRECTORY_SEPARATOR . urlencode($category))) {
</pre><pre class="diff" id="context"> return;
}
// remove all category info
System::rm(array('-r', $this->_restdir . DIRECTORY_SEPARATOR . 'c'
</pre><pre class="diff" id="removed">- . DIRECTORY_SEPARATOR . urlencode($category<span id="removedchars">['name']</span>)));
</pre><pre class="diff" id="added">+ . DIRECTORY_SEPARATOR . urlencode($category)));
</pre><pre class="diff" id="context"> }
}
</pre><pre class="diff"><small id="info">@@ -547,7 +532,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$cdir = $this->_restdir . DIRECTORY_SEPARATOR . 'c';
$category = $this->categoryInfo($category);
</pre><pre class="diff"><small id="info">@@ -589,13 +574,6 @@
</small></pre><pre class="diff" id="context"> $channel->channel = $this->_channel;
$channel->find(true);
if ($channel->rest_support) {
</pre><pre class="diff" id="removed">- $channelinfo = parse_url($this->_channel);
- if (isset($channelinfo['host'])) {
- $extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
- } else {
- $extra = '/Chiara_PEAR_Server_REST';
- }
-
</pre><pre class="diff" id="context"> // remove all package and release info for the package
System::rm(array('-r', $this->_restdir . DIRECTORY_SEPARATOR . 'p'
. DIRECTORY_SEPARATOR . $package));
</pre><pre class="diff"><small id="info">@@ -616,7 +594,7 @@
</small></pre><pre class="diff" id="context"> if (isset($channelinfo['host'])) {
$extra = $channelinfo['path'] . '/Chiara_PEAR_Server_REST/';
} else {
</pre><pre class="diff" id="removed">- $extra = '/Chiara_PEAR_Server_REST';
</pre><pre class="diff" id="added">+ $extra = '/Chiara_PEAR_Server_REST<span id="addedchars">/</span>';
</pre><pre class="diff" id="context"> }
$packages = DB_DataObject::factory('packages');
$packages->channel = $this->_channel;
</pre><pre class="diff"><small id="info">@@ -641,12 +619,12 @@
</small></pre><pre class="diff" id="context"> }
if ($package['deprecated_package']) {
if ($package['deprecated_channel'] == $this->_channel) {
</pre><pre class="diff" id="removed">- $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc
</pre><pre class="diff" id="added">+ $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc<span id="addedchars">></span>
</pre><pre class="diff" id="context"> <dp href="' . $extra . 'p/' . $package['deprecated_package'] . '"> ' .
$package['deprecated_package'] . '</dp>
';
} else {
</pre><pre class="diff" id="removed">- $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc
</pre><pre class="diff" id="added">+ $deprecated = '<dc>' . $package['deprecated_channel'] . '</dc<span id="addedchars">></span>
</pre><pre class="diff" id="context"> <dp> ' . $package['deprecated_package'] . '</dp>
';
}
</pre><pre class="diff"><small id="info">@@ -748,19 +726,24 @@
</small></pre><pre class="diff" id="context"> if (!$packages->find(true)) {
throw new Chiara_PEAR_Server_ExceptionPackageDoesntExist($package, $this->_channel);
}
</pre><pre class="diff" id="removed">- $categories = DB_DataObject::factory('categories');
- $categories->channel = $this->_channel;
- $categories->id = $packages->category_id;
- $categories->find(true);
</pre><pre class="diff" id="added">+ if ($packages->category_id === '0') {
+ $catname = 'Default';
+ } else {
+ $categories = DB_DataObject::factory('categories');
+ $categories->channel = $this->_channel;
+ $categories->id = $packages->category_id;
+ $categories->find(true);
+ $catname = $categories->name;
+ }
</pre><pre class="diff" id="context"> $releases = DB_DataObject::factory('releases');
$releases->channel = $this->_channel;
$releases->package = $packagename;
if ($releases->find()) {
</pre><pre class="diff" id="removed">- throw new Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases($package, $this->_channel);
</pre><pre class="diff" id="added">+ throw new Chiara_PEAR_Server_ExceptionCannotDeleteHasReleases($package<span id="addedchars">name</span>, $this->_channel);
</pre><pre class="diff" id="context"> }
$ret = $packages->delete() !== false;
if ($ret) {
</pre><pre class="diff" id="removed">- $this->deletePackageREST($packagename, $cat<span id="removedchars">egories-></span>name);
</pre><pre class="diff" id="added">+ $this->deletePackageREST($packagename, $catname);
</pre><pre class="diff" id="context"> }
return $ret;
}
</pre></div>
<hr /><a name="file11" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server/Frontend">Frontend</a><br /></span>
<div class="fileheader"><big><b>HTMLQuickForm.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.8">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- HTMLQuickForm.php 20 Apr 2005 04:06:19 -0000 1.7
+++ HTMLQuickForm.php 22 Apr 2005 02:31:15 -0000 1.8
@@ -373,7 +373,13 @@
</small></pre><pre class="diff" id="context"> if ($this->_server->deleteRelease($this->_channel, $package, $_REQUEST['deleteRelease']));
}
if (isset($_REQUEST['deletePackage'])) {
</pre><pre class="diff" id="removed">- if ($this->_backend->deletePackage($package));
</pre><pre class="diff" id="added">+ if (!$this->_backend->deletePackage($package)) {
+ throw new Chiara_PEAR_Server_ExceptionPackageDoesntExist($package, $this->_channel);
+ }
+ $this->_quickForm->addElement('header', '', 'Package "' . $package
+ . '" deleted successfully');
+ echo $this->_quickForm->toHtml();
+ return;
</pre><pre class="diff" id="context"> }
$delete = '<a href="' . $this->_index . '?f=' .
$this->_server->getMethodIndex('deletePackage') . '&managepackage=' . $package;
</pre><pre class="diff"><small id="info">@@ -429,6 +435,7 @@
</small></pre><pre class="diff" id="context"> $this->_quickForm->addElement('text', 'deprecated_channel', 'New Package Channel');
$this->_quickForm->addElement('text', 'deprecated_package', 'New Package Name');
$this->_quickForm->addElement('submit', 'submitted', 'Save Changes');
</pre><pre class="diff" id="added">+ $this->_quickForm->addElement('submit', 'deletePackage', 'Delete Package');
</pre><pre class="diff" id="context"> $this->_quickForm->addRule('name', 'Required', 'required');
$this->_quickForm->addRule('license', 'Required', 'required');
$this->_quickForm->addRule('summary', 'Required', 'required');
</pre><pre class="diff"><small id="info">@@ -455,7 +462,8 @@
</small></pre><pre class="diff" id="context"> if (!$this->_backend->deleteCategory($category)) {
throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($_REQUEST, $this->_channel);
}
</pre><pre class="diff" id="removed">- $this->_quickForm->addElement('header', '', 'Category "' .<span id="removedchars">$category. '" deleted successfully');</span>
</pre><pre class="diff" id="added">+ $this->_quickForm->addElement('header', '', 'Category "' .<span id="addedchars"> $category.</span>
+ '" deleted successfully');
</pre><pre class="diff" id="context"> echo $this->_quickForm->toHtml();
return;
}
</pre></div>
<hr /><a name="file12" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server">Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/Server/Frontend">Frontend</a><br /></span>
<div class="fileheader"><big><b>HTMLQuickForm.php</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.7">1.7</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r1=1.7&r2=1.8">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/Server/Frontend/HTMLQuickForm.php?r=1.8">1.8</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.7 -r1.8
--- HTMLQuickForm.php 20 Apr 2005 04:06:19 -0000 1.7
+++ HTMLQuickForm.php 22 Apr 2005 02:31:15 -0000 1.8
@@ -373,7 +373,13 @@
</small></pre><pre class="diff" id="context"> if ($this->_server->deleteRelease($this->_channel, $package, $_REQUEST['deleteRelease']));
}
if (isset($_REQUEST['deletePackage'])) {
</pre><pre class="diff" id="removed">- if ($this->_backend->deletePackage($package));
</pre><pre class="diff" id="added">+ if (!$this->_backend->deletePackage($package)) {
+ throw new Chiara_PEAR_Server_ExceptionPackageDoesntExist($package, $this->_channel);
+ }
+ $this->_quickForm->addElement('header', '', 'Package "' . $package
+ . '" deleted successfully');
+ echo $this->_quickForm->toHtml();
+ return;
</pre><pre class="diff" id="context"> }
$delete = '<a href="' . $this->_index . '?f=' .
$this->_server->getMethodIndex('deletePackage') . '&managepackage=' . $package;
</pre><pre class="diff"><small id="info">@@ -429,6 +435,7 @@
</small></pre><pre class="diff" id="context"> $this->_quickForm->addElement('text', 'deprecated_channel', 'New Package Channel');
$this->_quickForm->addElement('text', 'deprecated_package', 'New Package Name');
$this->_quickForm->addElement('submit', 'submitted', 'Save Changes');
</pre><pre class="diff" id="added">+ $this->_quickForm->addElement('submit', 'deletePackage', 'Delete Package');
</pre><pre class="diff" id="context"> $this->_quickForm->addRule('name', 'Required', 'required');
$this->_quickForm->addRule('license', 'Required', 'required');
$this->_quickForm->addRule('summary', 'Required', 'required');
</pre><pre class="diff"><small id="info">@@ -455,7 +462,8 @@
</small></pre><pre class="diff" id="context"> if (!$this->_backend->deleteCategory($category)) {
throw new Chiara_PEAR_Server_ExceptionCategoryDoesntExist($_REQUEST, $this->_channel);
}
</pre><pre class="diff" id="removed">- $this->_quickForm->addElement('header', '', 'Category "' .<span id="removedchars">$category. '" deleted successfully');</span>
</pre><pre class="diff" id="added">+ $this->_quickForm->addElement('header', '', 'Category "' .<span id="addedchars"> $category.</span>
+ '" deleted successfully');
</pre><pre class="diff" id="context"> echo $this->_quickForm->toHtml();
return;
}
</pre></div>
<hr /><a name="file13" /><div class="file">
<span class="pathname"><a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server">PEAR_Server</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/data">data</a>/<a href="http://cvs.phpdoc.org/cvs.php/PEAR_Server/data/DBDataObject">DBDataObject</a><br /></span>
<div class="fileheader"><big><b>pearserver.ini</b></big> <small id="info"><a href="http://cvs.phpdoc.org/co.php/PEAR_Server/data/DBDataObject/pearserver.ini?r=1.4">1.4</a> <a href="http://cvs.phpdoc.org/diff.php/PEAR_Server/data/DBDataObject/pearserver.ini?r1=1.4&r2=1.5">-></a> <a href="http://cvs.phpdoc.org/co.php/PEAR_Server/data/DBDataObject/pearserver.ini?r=1.5">1.5</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.4 -r1.5
--- pearserver.ini 19 Apr 2005 04:04:27 -0000 1.4
+++ pearserver.ini 22 Apr 2005 02:31:15 -0000 1.5
@@ -37,7 +37,9 @@
</small></pre><pre class="diff" id="context"> count = 129
channel = 130
package = 130
</pre><pre class="diff" id="added">+category_id = 129
</pre><pre class="diff" id="context"> license = 130
</pre><pre class="diff" id="added">+licenseuri = 130
</pre><pre class="diff" id="context"> summary = 194
description = 194
parent = 130
</pre></div>
</body></html><pre>