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

minor changes #3

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion inc/HTTPClient.php
Expand Up @@ -161,7 +161,7 @@ function get($url,$sloppy304=false){
* will be correctly encoded and added to the given base URL.
*
* @param string $url The URL to fetch
* @param string $data Associative array of parameters
* @param array $data Associative array of parameters
* @param bool $sloppy304 Return body on 304 not modified
* @author Andreas Gohr <andi@splitbrain.org>
*/
Expand Down
2 changes: 1 addition & 1 deletion inc/TarLib.class.php
Expand Up @@ -399,7 +399,7 @@ function Add($p_filelist, $p_add = '', $p_rem = '') {
*
* This function attempts to get the list of the files stored in the
* archive, and return either an error code or an indexed array of
* associative array containing for each file the following informations :
* associative array containing for each file the following information :
*
* checksum Tar Checksum of the file
* filename The full name of the stored file (up to 100 c.)
Expand Down
4 changes: 2 additions & 2 deletions inc/auth/ad.class.php
Expand Up @@ -26,7 +26,7 @@
* $conf['auth']['ad']['use_ssl'] = 1;
* $conf['auth']['ad']['debug'] = 1;
*
* // get additional informations to the userinfo array
* // get additional information to the userinfo array
* // add a list of comma separated ldap contact fields.
* $conf['auth']['ad']['additional'] = 'field1,field2';
*
Expand Down Expand Up @@ -155,7 +155,7 @@ function getUserData($user){
$info['uid'] = $result[0]['samaccountname'][0];
$info['dn'] = $result[0]['dn'];

// additional informations
// additional information
foreach ($this->cnf['additional'] as $field) {
if (isset($result[0][strtolower($field)])) {
$info[$field] = $result[0][strtolower($field)][0];
Expand Down
4 changes: 2 additions & 2 deletions inc/httputils.php
Expand Up @@ -14,13 +14,13 @@
* Checks and sets HTTP headers for conditional HTTP requests
*
* @author Simon Willison <swillison@gmail.com>
* @link http://simon.incutio.com/archive/2003/04/23/conditionalGet
* @link http://simonwillison.net/2003/Apr/23/conditionalGet/
* @param timestamp $timestamp lastmodified time of the cache file
* @returns void or exits with previously header() commands executed
*/
function http_conditionalRequest($timestamp){
// A PHP implementation of conditional get, see
// http://fishbowl.pastiche.org/archives/001132.html
// http://fishbowl.pastiche.org/2002/10/21/http_conditional_get_for_rss_hackers/
$last_modified = substr(gmdate('r', $timestamp), 0, -5).'GMT';
$etag = '"'.md5($last_modified).'"';
// Send the headers
Expand Down
2 changes: 1 addition & 1 deletion inc/parserutils.php
Expand Up @@ -531,7 +531,7 @@ function p_sort_modes($a, $b){
/**
* Renders a list of instruction to the specified output mode
*
* In the $info array are informations from the renderer returned
* In the $info array is information from the renderer returned
*
* @author Harry Fuecks <hfuecks@gmail.com>
* @author Andreas Gohr <andi@splitbrain.org>
Expand Down
2 changes: 1 addition & 1 deletion inc/subscription.php
Expand Up @@ -65,7 +65,7 @@ function subscription_unlock($id) {
/**
* Set subscription information
*
* Allows to set subscription informations for permanent storage in meta files.
* Allows to set subscription information for permanent storage in meta files.
* Subscriptions consist of a target object, a subscribing user, a subscribe
* style and optional data.
* A subscription may be deleted by specifying an empty subscribe style.
Expand Down