extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix use of old egw_vfs class instead of new Api\Vfs

Browse Source
This commit is contained in:
Ralf Becker 2017-01-19 15:30:12 +01:00
parent 5bec908624
commit 0c8012374a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/inc/class.resources_bo.inc.php
View File

@ -340,7 +340,7 @@ class resources_bo
unset($resource['own_file']); unset($resource['own_file']);
break; break;
} }
elseif(@egw_vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME)) elseif(@Vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
{ {
break; break;
} }
@ -368,10 +368,10 @@ class resources_bo
} }
// Check for restore of deleted, restore held links // Check for restore of deleted, restore held links
if($old && $old['deleted'] && !$resource['deleted']) if($old && $old['deleted'] && !$resource['deleted'])
{ {
Link::restore('resources', $resource['res_id']); Link::restore('resources', $resource['res_id']);
} }
// delete old pictures // delete old pictures
if($resource['picture_src'] != 'own_src') if($resource['picture_src'] != 'own_src')
@ -521,15 +521,15 @@ class resources_bo
/** /**
* Search for resources for calendar to select as participants * Search for resources for calendar to select as participants
* *
* Search and options match Link::query() * Search and options match Link::query()
* *
* Resources return actual resources as well as categories that match * Resources return actual resources as well as categories that match
* *
* @param String $search - Search string * @param String $search - Search string
* @param Array $options - search options * @param Array $options - search options
* @see Link::query() * @see Link::query()
* *
* @return Array List of ID => Title entries matching search string * @return Array List of ID => Title entries matching search string
*/ */
public static function calendar_search($search, $options) public static function calendar_search($search, $options)
@ -556,7 +556,7 @@ class resources_bo
$cat_options['cat_id'] = $cat_id; $cat_options['cat_id'] = $cat_id;
$resources = $bo->link_query('',$cat_options); $resources = $bo->link_query('',$cat_options);
} }
// Edit dialog sends exec as an option, don't add categories // Edit dialog sends exec as an option, don't add categories
if(count($resources) && !$options['exec']) if(count($resources) && !$options['exec'])
{ {
@ -633,7 +633,7 @@ class resources_bo
) )
)); ));
} }
if(!is_array($res_id) && $res_id < 1) return; if(!is_array($res_id) && $res_id < 1) return;
$data = $this->so->search(array('res_id' => $res_id),self::TITLE_COLS.',useable'); $data = $this->so->search(array('res_id' => $res_id),self::TITLE_COLS.',useable');