Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling and php doc #3

Merged
merged 2 commits into from
Dec 15, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@
string)
* Fixed: Sabre_DAV_ObjectTree::nodeExist always returned false for the
root node.
* Added: Global way to easily supply new resourcetypes for cetain node
* Added: Global way to easily supply new resourcetypes for certain node
classes.
* Fixed: Issue 59: Allowing the user to override the authentication realm
in Sabre_CalDAV_Server.
* Update: Issue 97: Looser time-range checking if there's a reccurrence
* Update: Issue 97: Looser time-range checking if there's a recurrence
rule in an event. This fixes 'missing recurring events'.

1.3.0 (2010-10-14)
Expand Down Expand Up @@ -302,14 +302,14 @@
private.

1.2.0beta3 (2010-05-14)
* Fixed: Custom properties were not propertly sent back for allprops
* Fixed: Custom properties were not properly sent back for allprops
requests.
* Fixed: Issue 49, incorrect parsing of PROPPATCH, affecting Office 2007.
* Changed: Removed CalDAV items from includes.php, and added a few missing
ones.

1.2.0beta2 (2010-05-04)
* Fixed: Issue 46: Fatal error for some non-existant nodes.
* Fixed: Issue 46: Fatal error for some non-existent nodes.
* Updated: some example sql to include email address.
* Added: 208 and 508 statuscodes from RFC5842.
* Added: Apache2 configuration examples
Expand Down Expand Up @@ -576,7 +576,7 @@
authentication. (Issue 11)
* Changed: Made more methods in Sabre_DAV_Server public.
* Fixed: TemporaryFileFilter plugin now intercepts HTTP LOCK requests
to non-existant files. (Issue 12)
to non-existent files. (Issue 12)
* Added: Central list of defined xml namespace prefixes. This can reduce
Bandwidth and legibility for xml bodies with user-defined namespaces.
* Added: now a PEAR-compatible package again, thanks to Michael Gauthier
Expand All @@ -591,7 +591,7 @@
into a separate plugin.
* Changed: TemporaryFileFilter is now a plugin.
* Added: Comes with an autoloader script. This can be used instead of
the includer script, and is preferered by some people.
the includer script, and is preferred by some people.
* Added: AWS Authentication class.
* Added: simpleserversetup.py script. This will quickly get a fileserver
up and running.
Expand Down Expand Up @@ -675,7 +675,7 @@
file streams. This should allow easy implementation of for example a
WebDAV to FTP proxy.
* Added: HTTP Basic Authentication helper class.
* Added: Sabre_HTTP_Reponse class. This centralizes HTTP operations and
* Added: Sabre_HTTP_Response class. This centralizes HTTP operations and
will be a start towards the creating of a testing framework.
* Updated: Backwards compatibility break: all require_once() statements
are removed
Expand All @@ -697,15 +697,15 @@
* Added: Custom property support
* Added: Shared lock support
* Added: Depth support to locks
* Added: Locking on unmapped urls (non-existant nodes)
* Added: Locking on unmapped urls (non-existent nodes)
* Fixed: Advertising as WebDAV class 3 support

0.3-alpha (2008-06-29)
* Fully working in MS Windows clients.
* Added: temporary file filter: support for smultron files.
* Added: Phing build scripts
* Added: PEAR package
* Fixed: MOVE bug identied using finder.
* Fixed: MOVE bug identified using finder.
* Fixed: Using gzuncompress instead of gzdecode in the temporary file
filter. This seems more common.

Expand Down
22 changes: 11 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the SabreDAV nor the names of its contributors
may be used to endorse or promote products derived from this software
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion bin/googlecode_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def upload(file, project_name, user_name, password, summary, labels=None):

Returns: a tuple:
http_status: 201 if the upload succeeded, something else if an
error occured.
error occurred.
http_reason: The human-readable string associated with http_status
file_url: If the upload succeeded, the URL of the file on Google
Code, None otherwise.
Expand Down
10 changes: 5 additions & 5 deletions bin/gwdg.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function getClassTree($classNames) {

}

}
}
return $classTree;

}
Expand Down Expand Up @@ -158,7 +158,7 @@ function createDoc($className, $extendedBy) {
}
echo "\n";
echo "This interface is implemented by the following classes:\n";
} else {
} else {
echo "This class is extended by the following classes:\n";
}
foreach($extendedBy as $className) {
Expand All @@ -169,7 +169,7 @@ function createDoc($className, $extendedBy) {
echo "\n";

}
echo "\n";
echo "\n";

echo "==Properties==\n";

Expand Down Expand Up @@ -227,7 +227,7 @@ function createMethodDoc($rMethod, $rClass) {
} elseif (isset($docs['param'][$parameter->name])) {
echo $docs['param'][$parameter->name] . " ";
}

echo '$' . $parameter->name;

if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
Expand Down Expand Up @@ -285,7 +285,7 @@ function createPropertyDoc($rProperty) {
if ($rProperty->isPrivate()) $visibility = 'private';

echo "{{{\n";
echo $visibility . " " . $rProperty->class . "::$" . $rProperty->getName();
echo $visibility . " " . $rProperty->class . "::$" . $rProperty->getName();
echo "\n}}}\n";
echo "\n";

Expand Down
20 changes: 10 additions & 10 deletions bin/naturalselection.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import os
from optparse import OptionParser
import time
import time

def getfreespace(path):
stat = os.statvfs(path)
Expand All @@ -25,7 +25,7 @@ def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
if (bytes>0):
print "Bytes to go before we hit treshhold:", bytes
else:
print "Treshold exceeded with:", -bytes, "bytes"
print "Treshold exceeded with:", -bytes, "bytes"
dir = os.listdir(cacheDir)
dir2 = []
for file in dir:
Expand All @@ -37,7 +37,7 @@ def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
})

dir2.sort(lambda x,y: int(x["atime"]-y["atime"]))

filesunlinked = 0
gainedspace = 0

Expand All @@ -59,21 +59,21 @@ def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
left = int(left - file["size"])
gainedspace = gainedspace + file["size"]
filesunlinked = filesunlinked + 1

if(left<0):
break

print "%d files deleted (%d bytes)" % (filesunlinked, gainedspace)


time.sleep(sleep)



def main():
parser = OptionParser(
version="naturalselecton v0.3",
description="Cache directory manager. Deletes cache entries based on accesstime and free space tresholds.\n" +
description="Cache directory manager. Deletes cache entries based on accesstime and free space tresholds.\n" +
"This utility is distributed alongside SabreDAV.",
usage="usage: %prog [options] cacheDirectory",
)
Expand Down Expand Up @@ -108,15 +108,15 @@ def main():
'-m', '--min-erase',
help="Minimum number of bytes to erase when the treshold is reached. " +
"Setting this option higher will reduce the amount of times the cache directory will need to be scanned. " +
"(the default is 1073741824, which is 1GB.)",
"(the default is 1073741824, which is 1GB.)",
type="int",
dest="min_erase",
default=1073741824
)

options,args = parser.parse_args()
if len(args)<1:
parser.error("This utility requires at least 1 argument")
parser.error("This utility requires at least 1 argument")
cacheDir = args[0]

print "Natural Selection"
Expand Down
18 changes: 9 additions & 9 deletions bin/pearpackage3.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
case 'Sabre' :
$summary = 'Sabretooth base package.';
$description = <<<TEXT
The base package provides some functionality used by all packages.
The base package provides some functionality used by all packages.

Currently this is only an autoloader
TEXT;
Expand Down Expand Up @@ -119,7 +119,7 @@
case 'Sabre_CalDAV' :
$summary = 'Sabre_CalDAV provides CalDAV extensions to SabreDAV';
$description = <<<TEXT
Sabre_CalDAV provides RFC4791 (CalDAV) support to Sabre_DAV.
Sabre_CalDAV provides RFC4791 (CalDAV) support to Sabre_DAV.

Feature list:
* Multi-user Calendar Server
Expand Down Expand Up @@ -161,7 +161,7 @@
case 'Sabre_CardDAV' :
$summary = 'Sabre_CardDAV provides CardDAV extensions to SabreDAV';
$description = <<<TEXT
Sabre_CardDAV provides CardDAV support to Sabre_DAV.
Sabre_CardDAV provides CardDAV support to Sabre_DAV.

Feature list:
* Multi-user addressbook server
Expand Down Expand Up @@ -207,7 +207,7 @@
$description = <<<TEXT
Sabre_VObject is an intuitive reader for iCalendar and vCard objects.

It provides a natural array/object accessor interface to the parsed tree, much like
It provides a natural array/object accessor interface to the parsed tree, much like
simplexml for XML files.
TEXT;
$dependencies[] = array(
Expand Down Expand Up @@ -248,7 +248,7 @@ function parsePath($fullPath, $role, $padding = 4) {
if ($subPath==='.' || $subPath==='..') continue;
$fileList .= parsePath($fullPath. '/' . $subPath,$role, $padding+2);
}
$fileList .= str_repeat(' ', $padding) . "</dir><!-- {$file} -->\n";
$fileList .= str_repeat(' ', $padding) . "</dir><!-- {$file} -->\n";
} elseif (is_file($fullPath)) {
$fileList .= str_repeat(' ', $padding) . "<file name=\"{$file}\" role=\"{$role}\" />\n";
}
Expand Down Expand Up @@ -277,8 +277,8 @@ function parsePath($fullPath, $role, $padding = 4) {

$package = <<<XML
<?xml version="1.0"?>
<package version="2.0"
xmlns="http://pear.php.net/dtd/package-2.0">
<package version="2.0"
xmlns="http://pear.php.net/dtd/package-2.0">

<name>{$packageName}</name>
<channel>{$channel}</channel>
Expand All @@ -303,7 +303,7 @@ function parsePath($fullPath, $role, $padding = 4) {
<notes>{$notes}</notes>
<contents>
<dir name="/">{$fileList}
</dir>
</dir>
</contents>
<dependencies>
<required>{$dependenciesXML}
Expand All @@ -312,7 +312,7 @@ function parsePath($fullPath, $role, $padding = 4) {
<phprelease />
</package>
XML;

if (isset($argv) && in_array('make',$argv)) {
file_put_contents($rootDir . '/package.xml',$package);
} else {
Expand Down
8 changes: 4 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<property name="sabredav.apidocspath" value="docs/api" />

<target name="build" depends="init, test, clean">
<mkdir dir="build" />
<mkdir dir="build" />

<echo msg="Building Sabre pear package" />
<mkdir dir="build/Sabre" />
<copy todir="build/Sabre">
Expand Down Expand Up @@ -188,15 +188,15 @@
</fileset>
</copy>
<mkdir dir="build/SabreDAV/tests/temp" />
<zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />
<zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />

</target>

<target name="clean" depends="init">
<echo msg="Removing build files (cleaning up distribution)" />
<delete dir="docs/api" />
<delete dir="build" />
</target>
</target>

<target name="release" depends="init,clean,test,build">
<echo>Creating Mercurial release tag</echo>
Expand Down
10 changes: 5 additions & 5 deletions examples/addressbookserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
}
set_error_handler("exception_error_handler");

// Autoloader
// Autoloader
require_once 'lib/Sabre/autoload.php';

// Backends
$authBackend = new Sabre_DAV_Auth_Backend_PDO($pdo);
$principalBackend = new Sabre_DAVACL_PrincipalBackend_PDO($pdo);
$carddavBackend = new Sabre_CardDAV_Backend_PDO($pdo);
//$caldavBackend = new Sabre_CalDAV_Backend_PDO($pdo);
$carddavBackend = new Sabre_CardDAV_Backend_PDO($pdo);
//$caldavBackend = new Sabre_CalDAV_Backend_PDO($pdo);

// Setting up the directory tree //
// Setting up the directory tree //
$nodes = array(
new Sabre_DAVACL_PrincipalCollection($principalBackend),
// new Sabre_CalDAV_CalendarRootNode($authBackend, $caldavBackend),
Expand All @@ -45,7 +45,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
$server = new Sabre_DAV_Server($nodes);
$server->setBaseUri($baseUri);

// Plugins
// Plugins
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'SabreDAV'));
$server->addPlugin(new Sabre_DAV_Browser_Plugin());
//$server->addPlugin(new Sabre_CalDAV_Plugin());
Expand Down
4 changes: 1 addition & 3 deletions examples/basicauth.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// !!!! Make sure the Sabre directory is in the include_path !!!
// example:
// set_include_path('lib/' . PATH_SEPARATOR . get_include_path());
// set_include_path('lib/' . PATH_SEPARATOR . get_include_path());

// settings
date_default_timezone_set('Canada/Eastern');
Expand All @@ -24,5 +24,3 @@
die();

}

?>
Loading