CVSROOT: /cvsroot/phpgwapi Module name: phpgwapi Changes by: Caeies <Caeies> 06/10/11 15:36:36
Modified files: inc : class.vfs_dav.inc.php Log message: indent, E_ALL fix, debug added CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.vfs_dav.inc.php?cvsroot=phpgwapi&r1=1.11&r2=1.12 Patches: Index: class.vfs_dav.inc.php =================================================================== RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.vfs_dav.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- class.vfs_dav.inc.php 20 Sep 2006 15:52:21 -0000 1.11 +++ class.vfs_dav.inc.php 11 Oct 2006 15:36:36 -0000 1.12 @@ -7,7 +7,7 @@ * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General Public License * @package phpgwapi * @subpackage vfs - * @version $Id: class.vfs_dav.inc.php,v 1.11 2006/09/20 15:52:21 Caeies Exp $ + * @version $Id: class.vfs_dav.inc.php,v 1.12 2006/10/11 15:36:36 Caeies Exp $ */ /** @@ -333,7 +333,7 @@ { $rarray=$this->dav_client->collapse($result); } - $rrarray=$this->dav_client->revert($rarray); + $rrarray=array_reverse($rarray); return $rrarray; } @@ -456,6 +456,11 @@ { $owner_id = $prop[$p2->real_full_path]['owner_id']; } + else + { + $this->debug('No owner know, please check why !'); + $owner_id = 0; + } } } else @@ -1061,7 +1066,8 @@ } else { - $status=$this->dav_client->copy($this->dav_path($f->real_full_path), $t->real_full_path,True, 'Infinity', $this->override_locks[$t->real_full_path]); + $status=$this->dav_client->copy($this->dav_path($f->real_full_path), $t->real_full_path,True, 'Infinity', isset($this->override_locks[$t->real_full_path]) ? $this->override_locks[$t->real_full_path] : ''); + $result = $status == 204 || $status==201; if (!$result) { @@ -1307,7 +1313,7 @@ } } else { //we can do a server-side copy if both files are on the server - $status=$this->dav_client->move($this->dav_path($f->real_full_path), $t->real_full_path,True, 'infinity', $this->override_locks[$p->real_full_path]); + $status=$this->dav_client->move($this->dav_path($f->real_full_path), $t->real_full_path,True, 'infinity', isset($this->override_locks[$p->real_full_path]) ? $this->override_locks[$p->real_full_path] : ''); $result = ($status==201 || $status==204); } @@ -1383,7 +1389,7 @@ } else { - $rr=$this->dav_client->delete($this->dav_path($p->real_full_path), 0, $this->override_locks[$p->real_full_path]); + $rr=$this->dav_client->delete($this->dav_path($p->real_full_path), 0, isset($this->override_locks[$p->real_full_path]) ? $this->override_locks[$p->real_full_path] : ''); return $rr == 204; } } @@ -1719,7 +1725,7 @@ */ function file_type ($data) { -$this->debug('file_type'); + $this->debug('file_type'); $default_values = array ( 'relatives' => array (RELATIVE_CURRENT) @@ -1750,8 +1756,8 @@ $tmp_prop=$this->get_properties($p->real_full_path,0); $this->debug('tmpprop: '.$p->real_full_path); $this->debug($tmp_prop); - $mime_type=$tmp_prop[$p->real_full_path]['mime_type']; - if ($mime_type == 'httpd/unix-directory' || $tmp_prop[$p->real_full_path]['is_dir']== '1') + $mime_type=isset($tmp_prop[$p->real_full_path]['mime_type']) ? $tmp_prop[$p->real_full_path]['mime_type'] : ''; + if ($mime_type == 'httpd/unix-directory' || (isset($tmp_prop[$p->real_full_path]['is_dir']) && $tmp_prop[$p->real_full_path]['is_dir'] == '1')) { $mime_type='Directory'; } @@ -1869,7 +1875,7 @@ $value = $prop[$p->real_full_path]; $value['directory'] = $p->fake_leading_dirs; - if($value['is_dir']) $value['mime_type']='Directory'; + if(isset($value['is_dir'])) $value['mime_type']='Directory'; $rarray[0] = $value; if ( DEBUG_LS ) _debug_array($rarray); $this->debug('ls returning 1:',DEBUG_LS); _______________________________________________ Phpgroupware-cvs mailing list Phpgroupware-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs