R55600 - in /trunk: addressbook/inc/ calendar/inc/ infolog/inc/ phpgwapi/inc/

ralfbecker_sf 2016-04-02 08:40:34 UTC #1

Author: ralfbecker
New Revision: 55600

URL: http://svn.stylite.de/viewvc/egroupware?rev=55600&view=rev
Log:
fix all IDE warnings, before moving classes to api, in case we want to merge it back to 14.x

Modified:
trunk/addressbook/inc/class.addressbook_groupdav.inc.php
trunk/calendar/inc/class.calendar_groupdav.inc.php
trunk/infolog/inc/class.infolog_groupdav.inc.php
trunk/phpgwapi/inc/class.groupdav.inc.php
trunk/phpgwapi/inc/class.groupdav_handler.inc.php
trunk/phpgwapi/inc/class.groupdav_hooks.inc.php
trunk/phpgwapi/inc/class.groupdav_principals.inc.php

Modified: trunk/addressbook/inc/class.addressbook_groupdav.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_groupdav.inc.php?rev=55600&r1=55599&r2=55600&view=diff

— trunk/addressbook/inc/class.addressbook_groupdav.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_groupdav.inc.php Sat Apr 2 10:40:34 2016
@@ -1,6 +1,6 @@

<?php /** - * EGroupware: GroupDAV access: addressbook handler + * EGroupware: CalDAV/CardDAV/GroupDAV access: Addressbook handler * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License @@ -21,8 +21,6 @@ * * Permanent error_log() calls should use $this->groupdav->log($str) instead, to be send to PHP error_log() * and our request-log (prefixed with "### " after request and response, like exceptions). - * - * @todo check/fix contacts in LDAP (no carddav_name column!) */ class addressbook_groupdav extends groupdav_handler { @@ -106,7 +104,7 @@ * @param array &$options * @param array &$files * @param int $user account_id - * @param string $id='' + * @param string $id ='' * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') */ function propfind($path,&$options,&$files,$user,$id='') @@ -127,6 +125,7 @@ if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null; // process REPORT filters or multiget href's + $nresults = null; if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options,$filter,$id, $nresults)) { return false; @@ -188,7 +187,7 @@ * * @param string $path * @param array& $filter - * @param array|boolean $start=false false=return all or array(start,num) + * @param array|boolean $start =false false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true) @@ -384,6 +383,7 @@ $options['filters']['attrs']['test'] : 'anyof'; $prop_filters = array(); + $matches = $prop_test = $column = null; foreach($options['filters'] as $n => $filter) { if (!is_int($n)) continue; // eg. attributes of filter xml element @@ -464,7 +464,7 @@ if ($prop_filters) { $filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))'; - if ($this->debug) error_log(__METHOD__."($path,...) sql-filter: $filter"); + if ($this->debug) error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter"); } } // parse limit from $options['other'] @@ -537,11 +537,13 @@ * * @param array &$options * @param int $id - * @param int $user=null account_id + * @param int $user =null account_id * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') */ function get(&$options,$id,$user=null) { + unset($user); // not used, but required by function signature + if (!is_array($contact = $this->_common_get_put_delete('GET',$options,$id))) { return $contact; @@ -561,8 +563,8 @@ * * @param array &$options * @param int $id - * @param int $user=null account_id of owner, default null - * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook) + * @param int $user =null account_id of owner, default null + * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook) * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') */ function put(&$options,$id,$user=null,$prefix=null) @@ -577,9 +579,9 @@ } $handler = self::_get_handler(); - $vCard = htmlspecialchars_decode($options['content']); // Fix for Apple Addressbook - $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', $vCard); + $vCard = preg_replace('/item\d\.(ADR|TEL|EMAIL|URL)/', '\1', + htmlspecialchars_decode($options['content'])); $charset = null; if (!empty($options['content_type'])) { @@ -733,8 +735,10 @@ { $new_members = array($new_members); } - foreach($new_members as &$uid) $uid = substr($uid,9); // cut off "urn:uuid:" prefix - + foreach($new_members as &$uid) + { + $uid = substr($uid,9); // cut off "urn:uuid:" prefix + } if ($oldContact) { $to_add = array_diff($new_members,$oldContact['members']); @@ -809,6 +813,7 @@ $lists_ctag = $this->bo->lists_ctag($user); } //error_log(__METHOD__."('$path', ".array2string($user_in).") --> user=".array2string($user)." --> ctag=$ctag=".date('Y-m-d H:i:s',$ctag).", lists_ctag=".($lists_ctag ? $lists_ctag.'='.date('Y-m-d H:i:s',$lists_ctag) : '').' returning '.max($ctag,$lists_ctag)); + unset($user_in); return $ctags[$path] = max($ctag, $accounts_ctag, $lists_ctag); } @@ -830,14 +835,16 @@ * * @link http://www.mail-archive.com/calendarserver-users@lists.macosforge.org/msg01156.html * - * @param array $props=array() regular props by the groupdav handler + * @param array $props =array() regular props by the groupdav handler * @param string $displayname - * @param string $base_uri=null base url of handler - * @param int $user=null account_id of owner of collection + * @param string $base_uri =null base url of handler + * @param int $user =null account_id of owner of collection * @return array */ - public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null) - { + public function extra_properties(array $props, $displayname, $base_uri=null, $user=null) + { + unset($displayname, $base_uri, $user); // not used, but required by function signature + if (!isset($props['addressbook-description'])) { // default addressbook description: can be overwritten via PROPPATCH, in which case it's already set @@ -889,6 +896,7 @@ $databaseFields['X-ABSHOWAS'] = $supportedFields['X-ABSHOWAS'] = array('fileas_type'); // Horde vCard class uses uppercase prop-names! // Apple Addressbook pre Lion (OS X 10.7) messes up CLASS and CATEGORIES (Lion cant set them but leaves them alone) + $matches = null; if (preg_match('|CFNetwork/([0-9]+)|i', $_SERVER['HTTP_USER_AGENT'],$matches) && $matches[1] < 520 || // iOS 5.1.1 does not display CLASS or CATEGORY, but wrongly escapes multiple, comma-separated categories // and appends CLASS: PUBLIC to an empty NOTE: field --> leaving them out for iOS @@ -946,17 +954,17 @@ * the same UID and/or carddav_name as not deleted contacts and would block access to valid entries * * @param string|int $id - * @param string $path=null + * @param string $path =null * @return array|boolean array with entry, false if no read rights, null if $id does not exist */ function read($id, $path=null) { - static $non_deleted_tids; + static $non_deleted_tids=null; if (is_null($non_deleted_tids)) { - $non_deleted_tids = $this->bo->content_types; - unset($non_deleted_tids[Api\Contacts::DELETED_TYPE]); - $non_deleted_tids = array_keys($non_deleted_tids); + $tids = $this->bo->content_types; + unset($tids[Api\Contacts::DELETED_TYPE]); + $non_deleted_tids = array_keys($tids); } $contact = $this->bo->read(array(self::$path_attr => $id, 'tid' => $non_deleted_tids)); @@ -1044,7 +1052,7 @@ /** * Return calendars/addressbooks shared from other users with the current one * - * @param boolean $ignore_all_in_one=false if true, return selected addressbooks and not array() for all-in-one + * @param boolean $ignore_all_in_one =false if true, return selected addressbooks and not array() for all-in-one * @return array account_id => account_lid pairs */ function get_shared($ignore_all_in_one=false) @@ -1065,7 +1073,7 @@ $this->home_set_pref[$key] = $id; } } - foreach($this->bo->get_addressbooks(EGW_ACL_READ) as $id => $label) + foreach(array_keys($this->bo->get_addressbooks(EGW_ACL_READ)) as $id) { if (($id || !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) && $GLOBALS['egw_info']['user']['account_id'] != $id && // no current user and no accounts, if disabled in ab prefs Modified: trunk/calendar/inc/class.calendar_groupdav.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_groupdav.inc.php?rev=55600&r1=55599&r2=55600&view=diff ============================================================================== --- trunk/calendar/inc/class.calendar_groupdav.inc.php (original) +++ trunk/calendar/inc/class.calendar_groupdav.inc.php Sat Apr 2 10:40:34 2016 @@ -1,13 +1,13 @@ <?php /** - * EGroupware: CalDAV / GroupDAV access: calendar handler + * EGroupware: CalDAV/CardDAV/GroupDAV access: Calendar handler * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package calendar * @subpackage groupdav * @author Ralf Becker - * @copyright (c) 2007-15 by Ralf Becker + * @copyright (c) 2007-16 by Ralf Becker * @version $Id$ */ Modified: trunk/infolog/inc/class.infolog_groupdav.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/infolog/inc/class.infolog_groupdav.inc.php?rev=55600&r1=55599&r2=55600&view=diff ============================================================================== --- trunk/infolog/inc/class.infolog_groupdav.inc.php (original) +++ trunk/infolog/inc/class.infolog_groupdav.inc.php Sat Apr 2 10:40:34 2016 @@ -1,13 +1,13 @@ <?php /** - * EGroupware: GroupDAV access: infolog handler + * EGroupware: CalDAV/CardDAV/GroupDAV access: InfoLog handler * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package infolog * @subpackage groupdav * @author Ralf Becker - * @copyright (c) 2007-15 by Ralf Becker + * @copyright (c) 2007-16 by Ralf Becker * @version $Id$ */ @@ -146,6 +146,7 @@ $filter = $this->get_infolog_filter($path, $user); // process REPORT filters or multiget href's + $nresults = null; if (($id || $options['root']['name'] != 'propfind') && !$this->_report_filters($options, $filter, $id, $nresults)) { // return empty collection, as iCal under iOS 5 had problems with returning "404 Not found" status @@ -217,7 +218,7 @@ * * @param string $path * @param array $filter - * @param array|boolean $start=false false=return all or array(start,num) + * @param array|boolean $start =false false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ function &propfind_callback($path,array $filter,$start=false) @@ -234,6 +235,7 @@ $order = 'info_datemodified'; $sort = 'DESC'; + $matches = null; if (preg_match('/^([a-z0-9_]+)( DESC| ASC)?$/i', $filter['order'], $matches)) { $order = $matches[1]; @@ -337,8 +339,6 @@ { if ($options['filters']) { - $cal_filters_in = $cal_filters; // remember filter, to be able to reset standard open-filter, if client sets own filters - foreach($options['filters'] as $filter) { switch($filter['name']) @@ -508,7 +508,7 @@ "NOT info_datecompleted > 0". (isset($end) ? " AND info_created < $end" : ''). ')'; $sql = '('.implode(' OR ', $to_or).')'; - if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range={$filter['attrs']['start']}-{$filter['attrs']['end']} --> $sql"); + if ($this->debug > 1) error_log(__FILE__ . __METHOD__.'('.array2string($attrs).") time-range=$attrs[start]-$attrs[end] --> $sql"); return $sql; } @@ -517,11 +517,13 @@ * * @param array &$options * @param int $id - * @param int $user=null account_id + * @param int $user =null account_id * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') */ function get(&$options,$id,$user=null) { + unset($user); // not used, but required by function signature + if (!is_array($task = $this->_common_get_put_delete('GET',$options,$id))) { return $task; @@ -539,12 +541,14 @@ * * @param array &$options * @param int $id - * @param int $user=null account_id of owner, default null - * @param string $prefix=null user prefix from path (eg. /ralf from /ralf/addressbook) + * @param int $user =null account_id of owner, default null + * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook) * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found') */ function put(&$options,$id,$user=null,$prefix=null) { + unset($prefix); // not used, but required by function signature + if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true)); $oldTask = $this->_common_get_put_delete('PUT',$options,$id); @@ -584,9 +588,9 @@ // send evtl. necessary respose headers: Location, etag, ... // but only for new entries, as X-INFOLOG-STATUS get's not updated on client, if we confirm with an etag - if ($retval !== true && (!$path_attr_is_name || + if ($retval !== true) // POST with add-member query parameter - $_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member']))) + //$_SERVER['REQUEST_METHOD'] == 'POST' && isset($_GET['add-member']))) { $this->put_response_headers($infoId, $options['path'], $retval, self::$path_attr == 'caldav_name'); } @@ -609,7 +613,7 @@ * Callback for infolog_ical::importVTODO to implement infolog-cat-action * * @param array $task - * @param array $oldTask=null + * @param array $oldTask =null * @return array modified task data */ public function cat_action(array $task, $oldTask=null) @@ -768,14 +772,16 @@ /** * Add extra properties for calendar collections * - * @param array $props=array() regular props by the groupdav handler + * @param array $props =array() regular props by the groupdav handler * @param string $displayname - * @param string $base_uri=null base url of handler - * @param int $user=null account_id of owner of collection + * @param string $base_uri =null base url of handler + * @param int $user =null account_id of owner of collection * @return array */ - public function extra_properties(array $props=array(), $displayname, $base_uri=null,$user=null) - { + public function extra_properties(array $props, $displayname, $base_uri=null,$user=null) + { + unset($base_uri); // not used, but required by function signature + // calendar description $displayname = translation::convert(lang('Tasks of'),translation::charset(),'utf-8').' '.$displayname; $props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); Modified: trunk/phpgwapi/inc/class.groupdav.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.groupdav.inc.php?rev=55600&r1=55599&r2=55600&view=diff ============================================================================== --- trunk/phpgwapi/inc/class.groupdav.inc.php (original) +++ trunk/phpgwapi/inc/class.groupdav.inc.php Sat Apr 2 10:40:34 2016 @@ -252,7 +252,7 @@ $this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'], $this->dav_powered_by); - parent::__Construct(); + parent::__construct(); // hack to allow to use query parameters in WebDAV, which HTTP_WebDAV_Server interprets as part of the path list($this->_SERVER['REQUEST_URI']) = explode('?',$this->_SERVER['REQUEST_URI']); /*if (substr($this->_SERVER['REQUEST_URI'],-13) == '/;add-member/') @@ -306,6 +306,8 @@ */ function OPTIONS($path, &$dav, &$allow) { + unset($allow); // not used, but required by function signature + // locking support if (!in_array('2', $dav)) $dav[] = '2'; @@ -361,6 +363,7 @@ $this->propfind_options = $options; // parse path in form [/account_lid]/app[/more] + $id = $app = $user = $user_prefix = null; if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0) { if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!"); @@ -435,9 +438,9 @@ * Add a collection to a PROPFIND request * * @param string $path - * @param array $props=array() extra properties 'resourcetype' is added anyway, name => value pairs or name => HTTP_WebDAV_Server([namespace,]name,value) - * @param array $privileges=array('read') values for current-user-privilege-set - * @param array $supported_privileges=null default $this->supported_privileges + * @param array $props =array() extra properties 'resourcetype' is added anyway, name => value pairs or name => HTTP_WebDAV_Server([namespace,]name,value) + * @param array $privileges =array('read') values for current-user-privilege-set + * @param array $supported_privileges =null default $this->supported_privileges * @return array with values for keys 'path' and 'props' */ public function add_collection($path, array $props = array(), array $privileges=array('read','read-acl','read-current-user-privilege-set'), array $supported_privileges=null) @@ -454,9 +457,9 @@ * Add a resource to a PROPFIND request * * @param string $path - * @param array $props=array() extra properties 'resourcetype' is added anyway, name => value pairs or name => HTTP_WebDAV_Server([namespace,]name,value) - * @param array $privileges=array('read') values for current-user-privilege-set - * @param array $supported_privileges=null default $this->supported_privileges + * @param array $props =array() extra properties 'resourcetype' is added anyway, name => value pairs or name => HTTP_WebDAV_Server([namespace,]name,value) + * @param array $privileges =array('read') values for current-user-privilege-set + * @param array $supported_privileges =null default $this->supported_privileges * @return array with values for keys 'path' and 'props' */ public function add_resource($path, array $props = array(), array $privileges=array('read','read-current-user-privilege-set'), array $supported_privileges=null) @@ -529,7 +532,7 @@ * * @param string $name name of privilege * @param string|array $data string with describtion or array with agregated privileges plus value for key '*description*', '*ns*', '*only*' - * @param string $path=null path to match with $data['*only*'] + * @param string $path =null path to match with $data['*only*'] * @return array of self::mkprop() arrays */ protected function supported_privilege($name, $data, $path=null) @@ -557,8 +560,8 @@ * Checks if a given property was requested in propfind request * * @param string $name property name - * @param string $ns=null namespace, if that is to be checked too - * @param boolean $return_prop=false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children' + * @param string $ns =null namespace, if that is to be checked too + * @param boolean $return_prop =false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children' * @return boolean|string|array true: $name explicitly requested (or autoindex), "all": allprop or "names": propname requested, false: $name was not requested */ function prop_requested($name, $ns=null, $return_prop=false) @@ -686,14 +689,14 @@ * * @param array &$files * @param string $path / or // - * @param int $depth=0 + * @param int $depth =0 * @return string|boolean http status or true|false */ protected function add_resources_collection(array &$files, $path, $depth=0) { if (!isset($GLOBALS['egw_info']['user']['apps']['resources'])) { - if ($this->debug) error_log(__CLASS__."::$method(path=$path) 403 Forbidden: no app rights for 'resources'"); + if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'"); return "403 Forbidden: no app rights for 'resources'"; // no rights for the given app } list(,$what) = explode('/', $path); @@ -707,7 +710,7 @@ } if ($depth) { - foreach(groupdav_principals::get_resources() as $res_id => $resource) + foreach(groupdav_principals::get_resources() as $resource) { if ($is_location == groupdav_principals::resource_is_location($resource)) { @@ -788,9 +791,9 @@ * Add an application collection to a user home or the root * * @param string $app - * @param boolean $no_extra_types=false should the GroupDAV and CalDAV types be added (KAddressbook has problems with it in self URL) - * @param int $user=null owner of the collection, default current user - * @param string $path='/' + * @param boolean $no_extra_types =false should the GroupDAV and CalDAV types be added (KAddressbook has problems with it in self URL) + * @param int $user =null owner of the collection, default current user + * @param string $path ='/' * @return array with values for keys 'path' and 'props' */ protected function add_app($app,$no_extra_types=false,$user=null,$path='/') @@ -800,6 +803,7 @@ if (is_string($user) && $user[0] == 'r' && ($resource = groupdav_principals::read_resource(substr($user, 1)))) { $is_location = groupdav_principals::resource_is_location($resource); + $displayname = null; list($principalType, $account_lid) = explode('/', groupdav_principals::resource2name($resource, $is_location, $displayname)); } elseif ($user) @@ -857,6 +861,7 @@ } // add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props + $ns = null; foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value) { unset($ns); @@ -972,6 +977,7 @@ { if ($this->debug) error_log(__METHOD__.'('.array2string($options).')'); + $id = $app = $user = null; if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals') { return $this->autoindex($options); @@ -1031,6 +1037,7 @@ //'DAV:sync-token' => 'sync-token', ); $n = 0; + $collection_props = null; foreach($files['files'] as $file) { if (!isset($collection_props)) @@ -1042,7 +1049,10 @@ if(!$n++) { echo "\n\t\n\t\t\n\t\t"; - foreach($props2show as $label) echo "\t\t\n"; + foreach($props2show as $label) + { + echo "\t\t\n"; + } echo "\t\n"; } $props = $this->props2array($file['props']); @@ -1083,9 +1093,9 @@ foreach($collection_props as $name => $value) { $class = $class == 'row_on' ? 'row_off' : 'row_on'; - $ns = explode(':',$name); - $name = array_pop($ns); - $ns = implode(':',$ns); + $parts = explode(':', $name); + $name = array_pop($parts); + $ns = implode(':', $parts); echo "\t\n\t\t\n"; echo "\t\t\n\t\n"; } @@ -1132,14 +1142,13 @@ { $value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/','/').')?([^<]+)\<\/(D:)?href\>/i','<\\1href>\\3',$value); } - $value = $value[0] == '<' || strpos($value, "\n") !== false ? '

'.htmlspecialchars($value).'

' : htmlspecialchars($value); + $ret = $value[0] == '<' || strpos($value, "\n") !== false ? '

'.htmlspecialchars($value).'

#	".lang('Name')."	".lang($label)."	".lang($label)."
".htmlspecialchars($ns)."	".htmlspecialchars($name)."	".$value."