EGroupware / egroupware

importexport/inc/class.importexport_import_ui.inc.php

Indentation +4 added lines, -4 removed lines

@@ -40,8 +40,8 @@ 
 		}
 
 		/**
-		*  Step user through importing their file
-		*/
+		 *  Step user through importing their file
+		 */
 		public function import_dialog($content = array()) {
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
@@ -223,8 +223,8 @@ 
 		}
 
 		/**
-		* Get options for select boxes
-		*/
+		 * Get options for select boxes
+		 */
 		public static function get_select_options(Array $data) {
 			$options = array(
 				'delimiter' => array(

api/src/CalDAV.php

Indentation +1 added lines, -1 removed lines

@@ -2033,7 +2033,7 @@
 	 *
 	 * Reimplemented to add logging
 	 *
-     * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	 */
 	function ServeRequest($prefix=null)
 	{

admin/apcu.php

Indentation +77 added lines, -77 removed lines

@@ -217,25 +217,25 @@ 
 header("Pragma: no-cache");                                    // HTTP/1.0
 
 function duration($ts) {
-    global $time;
-    $years = (int)((($time - $ts)/(7*86400))/52.177457);
-    $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
-    $weeks = (int)(($rem)/(7*86400));
-    $days = (int)(($rem)/86400) - $weeks*7;
-    $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
-    $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
-    $str = '';
-    if($years==1) $str .= "$years year, ";
-    if($years>1) $str .= "$years years, ";
-    if($weeks==1) $str .= "$weeks week, ";
-    if($weeks>1) $str .= "$weeks weeks, ";
-    if($days==1) $str .= "$days day,";
-    if($days>1) $str .= "$days days,";
-    if($hours == 1) $str .= " $hours hour and";
-    if($hours>1) $str .= " $hours hours and";
-    if($mins == 1) $str .= " 1 minute";
-    else $str .= " $mins minutes";
-    return $str;
+	global $time;
+	$years = (int)((($time - $ts)/(7*86400))/52.177457);
+	$rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
+	$weeks = (int)(($rem)/(7*86400));
+	$days = (int)(($rem)/86400) - $weeks*7;
+	$hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
+	$mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
+	$str = '';
+	if($years==1) $str .= "$years year, ";
+	if($years>1) $str .= "$years years, ";
+	if($weeks==1) $str .= "$weeks week, ";
+	if($weeks>1) $str .= "$weeks weeks, ";
+	if($days==1) $str .= "$days day,";
+	if($days>1) $str .= "$days days,";
+	if($hours == 1) $str .= " $hours hour and";
+	if($hours>1) $str .= " $hours hours and";
+	if($mins == 1) $str .= " 1 minute";
+	else $str .= " $mins minutes";
+	return $str;
 }
 
 // create graphics
@@ -420,18 +420,18 @@ 
 				if($block['offset']!=$ptr) {       // Used block
 					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
 					if ($h>0) {
-                                                $j++;
+												$j++;
 						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
-                                        }
+												else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+										}
 					$y+=$h;
 				}
 				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
 				if ($h>0) {
-                                        $j++;
+										$j++;
 					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
 					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
-                                }
+								}
 				$y+=$h;
 				$ptr = $block['offset']+$block['size'];
 			}
@@ -781,7 +781,7 @@ 
 	$apcversion = phpversion('apcu');
 	$phpversion = phpversion();
 	$number_vars = $cache['num_entries'];
-    $size_vars = bsize($cache['mem_size']);
+	$size_vars = bsize($cache['mem_size']);
 	$i=0;
 	echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
@@ -883,9 +883,9 @@ 
 				++$nseg;
 			}
 			$ptr = $block['offset'] + $block['size'];
-                        /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
+						/* Only consider blocks <5M for the fragmentation % */
+						if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+						$freetotal+=$block['size'];
 		}
 		$freeseg += count($mem['block_lists'][$i]);
 	}
@@ -907,15 +907,15 @@ 
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
-            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
-          }
-        }
-        echo <<<EOB
+		if(isset($mem['adist'])) {
+		  foreach($mem['adist'] as $i=>$v) {
+			$cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
+			if($i==0) $range = "1";
+			else $range = "$cur - $nxt";
+			echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
+		  }
+		}
+		echo <<<EOB
 		</tbody></table>
 		</div>
 EOB;
@@ -928,7 +928,7 @@ 
 // -----------------------------------------------
 case OB_USER_CACHE:
 	if (!$AUTHENTICATED) {
-    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
+	echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
 		put_login_link("Login now!");
 		echo '</div>';
 		break;
@@ -973,7 +973,7 @@ 
 		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
 		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
 		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+	'&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
 		'&nbsp;<input type=submit value="GO!">',
 		'</form></div>';
 
@@ -982,8 +982,8 @@ 
    // regular expression subpattern.
    $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
    if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
-     echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
-     break;
+	 echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
+	 break;
    }
   }
 
@@ -1037,45 +1037,45 @@ 
 		// output list
 		$i=0;
 		foreach($list as $k => $entry) {
-      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+	  if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
 		$sh=md5($entry["info"]);
-        $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
-        echo
-          '<tr id="key-'. $sh .'" class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"#key-". $sh ."\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['num_hits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
-
-        if($fieldname=='info') {
-          if($entry['ttl'])
-            echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
-          else
-            echo '<td class="td-n center">None</td>';
-        }
-        if ($entry['deletion_time']) {
-
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
-        } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
-
-          echo '<td class="td-last center">';
-          echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
-          echo '</td>';
-        } else {
-          echo '<td class="td-last center"> &nbsp; </td>';
-        }
-        echo '</tr>';
+		$field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
+		echo
+		  '<tr id="key-'. $sh .'" class=tr-',$i%2,'>',
+		  "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"#key-". $sh ."\">",$field_value,'</a></td>',
+		  '<td class="td-n center">',$entry['num_hits'],'</td>',
+		  '<td class="td-n right">',$entry['mem_size'],'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
+
+		if($fieldname=='info') {
+		  if($entry['ttl'])
+			echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
+		  else
+			echo '<td class="td-n center">None</td>';
+		}
+		if ($entry['deletion_time']) {
+
+		  echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
+		} else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
+
+		  echo '<td class="td-last center">';
+		  echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
+		  echo '</td>';
+		} else {
+		  echo '<td class="td-last center"> &nbsp; </td>';
+		}
+		echo '</tr>';
 		if ($sh == $MYREQUEST["SH"]) {
 			echo '<tr>';
 			echo '<td colspan="7"><pre>'.htmlentities(print_r(apcu_fetch($entry['info']), 1)).'</pre></td>';
 			echo '</tr>';
 		}
-        $i++;
-        if ($i == $MYREQUEST['COUNT'])
-          break;
-      }
+		$i++;
+		if ($i == $MYREQUEST['COUNT'])
+		  break;
+	  }
 		}
 
 	} else {
@@ -1106,10 +1106,10 @@ 
 		</tr>
 EOB;
   if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
+	$ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
   } else {
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
+	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
   }
 	if (!$rss) {
 		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';

calendar/inc/class.calendar_wizard_import_ical.inc.php

Indentation +5 added lines, -5 removed lines

@@ -15,17 +15,17 @@
 class calendar_wizard_import_ical
 {
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step55' => 'calendar.import.conditions'
 	);
-    /**
+	/**
 	 * constructor
 	 */
 	function __construct()

calendar/inc/class.calendar_import_ical.inc.php

Indentation +30 added lines, -30 removed lines

@@ -64,8 +64,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -94,8 +94,8 @@ 
 	protected $errors = array();
 
 	/**
-	* List of actions, and how many times that action was taken
-	*/
+	 * List of actions, and how many times that action was taken
+	 */
 	protected $results = array();
 
 	/**
@@ -228,38 +228,38 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 }
\ No newline at end of file

calendar/inc/class.calendar_wizard_import_csv.inc.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 class calendar_wizard_import_csv extends importexport_wizard_basic_import_csv
 {
 
-    /**
+	/**
 	 * constructor
 	 */
 	function __construct()

admin/inc/class.admin_customfields.inc.php

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 {
 
 	/**
-	* appname of app which want to add / edit its customfields
-	*
-	* @var string
-	*/
+	 * appname of app which want to add / edit its customfields
+	 *
+	 * @var string
+	 */
 	var $appname;
 
 	/**
@@ -44,10 +44,10 @@ 
 	protected $use_private = false;
 
 	/**
-	* userdefiened types e.g. type of infolog
-	*
-	* @var array
-	*/
+	 * userdefiened types e.g. type of infolog
+	 *
+	 * @var array
+	 */
 	var $types2 = array();
 	var $content_types,$fields;
 
@@ -507,8 +507,8 @@ 
 	}
 
 	/**
-	* deletes custom field from customfield definitions
-	*/
+	 * deletes custom field from customfield definitions
+	 */
 	function delete_field(&$content)
 	{
 		unset($this->fields[key($content['fields']['delete'])]);
@@ -525,8 +525,8 @@ 
 	}
 
 	/**
-	* create a new custom field
-	*/
+	 * create a new custom field
+	 */
 	function create_field(&$content)
 	{
 		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
@@ -587,8 +587,8 @@ 
 	}
 
 	/**
-	* save changes to repository
-	*/
+	 * save changes to repository
+	 */
 	function save_repository()
 	{
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
@@ -601,25 +601,25 @@ 
 	}
 
 	/**
-	* get customfields of using application
-	*
-	* @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @param boolean $all_private_too =false should all the private fields be returned too
-	* @return array with customfields
-	*/
+	 * get customfields of using application
+	 *
+	 * @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @param boolean $all_private_too =false should all the private fields be returned too
+	 * @return array with customfields
+	 */
 	function get_customfields($all_private_too=false)
 	{
 		return Api\Storage\Customfields::get($this->appname,$all_private_too);
 	}
 
 	/**
-	* get_content_types of using application
-	*
-	* @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @return array with content-types
-	*/
+	 * get_content_types of using application
+	 *
+	 * @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @return array with content-types
+	 */
 	function get_content_types()
 	{
 		return Api\Config::get_content_types($this->appname);

api/src/Vfs/WebDAV.php

Indentation +196 added lines, -196 removed lines

@@ -52,13 +52,13 @@ 
 	var $debug = 0;
 
 	/**
-	* Serve a webdav request
-	*
-	* Reimplemented to not check our vfs base path with realpath and connect to mysql DB
-	*
-	* @access public
-    * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
-	*/
+	 * Serve a webdav request
+	 *
+	 * Reimplemented to not check our vfs base path with realpath and connect to mysql DB
+	 *
+	 * @access public
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 */
 	function ServeRequest($prefix=null)
 	{
 		// special treatment for litmus compliance test
@@ -73,11 +73,11 @@ 
 	}
 
 	/**
-	* DELETE method handler
-	*
-	* @param  array  general parameter passing array
-	* @return bool   true on success
-	*/
+	 * DELETE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
 	function DELETE($options)
 	{
 		$path = $this->base . $options['path'];
@@ -110,117 +110,117 @@ 
 		return '204 No Content';
 	}
 
-    /**
-     * MKCOL method handler
-     *
-     * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MKCOL($options)
-    {
-        $path   = $this->_unslashify($this->base .$options["path"]);
-        $parent = Vfs::dirname($path);
-
-        if (!file_exists($parent)) {
-            return "409 Conflict";
-        }
-
-        if (!is_dir($parent)) {
-            return "403 Forbidden";
-        }
-
-        if ( file_exists($path) ) {
-            return "405 Method not allowed";
-        }
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        $stat = mkdir($path, 0777);
-        if (!$stat) {
-            return "403 Forbidden";
-        }
-
-        return ("201 Created");
-    }
+	/**
+	 * MKCOL method handler
+	 *
+	 * Reimplemented to NOT use dirname/basename, which has problems with utf-8 chars
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MKCOL($options)
+	{
+		$path   = $this->_unslashify($this->base .$options["path"]);
+		$parent = Vfs::dirname($path);
+
+		if (!file_exists($parent)) {
+			return "409 Conflict";
+		}
+
+		if (!is_dir($parent)) {
+			return "403 Forbidden";
+		}
+
+		if ( file_exists($path) ) {
+			return "405 Method not allowed";
+		}
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		$stat = mkdir($path, 0777);
+		if (!$stat) {
+			return "403 Forbidden";
+		}
+
+		return ("201 Created");
+	}
 
 	/**
-     * COPY method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function COPY($options, $del=false)
-    {
-        // TODO Property updates still broken (Litmus should detect this?)
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
-            return "502 bad gateway";
-        }
-
-        $source = $this->base .$options["path"];
-        if (!file_exists($source)) return "404 Not found";
-
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
-            }
-        }
-
-        $dest         = $this->base . $options["dest"];
-        $destdir      = dirname($dest);
-
-        if (!file_exists($destdir) || !is_dir($destdir)) {
-            return "409 Conflict";
-        }
-
-        $new          = !file_exists($dest);
-        $existing_col = false;
-
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
-                    return "412 precondition failed";
-                }
-                $dest .= basename($source);
-                if (file_exists($dest)) {
-                    $options["dest"] .= basename($source);
-                } else {
-                    $new          = true;
-                    $existing_col = true;
-                }
-            }
-        }
-
-        if (!$new) {
-            if ($options["overwrite"]) {
-                $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
-                    return $stat;
-                }
-            } else {
-                return "412 precondition failed";
-            }
-        }
-
-        if ($del) {
+	 * COPY method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function COPY($options, $del=false)
+	{
+		// TODO Property updates still broken (Litmus should detect this?)
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		// no copying to different WebDAV Servers yet
+		if (isset($options["dest_url"])) {
+			return "502 bad gateway";
+		}
+
+		$source = $this->base .$options["path"];
+		if (!file_exists($source)) return "404 Not found";
+
+		if (is_dir($source)) { // resource is a collection
+			switch ($options["depth"]) {
+			case "infinity": // valid
+				break;
+			case "0": // valid for COPY only
+				if ($del) { // MOVE?
+					return "400 Bad request";
+				}
+				break;
+			case "1": // invalid for both COPY and MOVE
+			default:
+				return "400 Bad request";
+			}
+		}
+
+		$dest         = $this->base . $options["dest"];
+		$destdir      = dirname($dest);
+
+		if (!file_exists($destdir) || !is_dir($destdir)) {
+			return "409 Conflict";
+		}
+
+		$new          = !file_exists($dest);
+		$existing_col = false;
+
+		if (!$new) {
+			if ($del && is_dir($dest)) {
+				if (!$options["overwrite"]) {
+					return "412 precondition failed";
+				}
+				$dest .= basename($source);
+				if (file_exists($dest)) {
+					$options["dest"] .= basename($source);
+				} else {
+					$new          = true;
+					$existing_col = true;
+				}
+			}
+		}
+
+		if (!$new) {
+			if ($options["overwrite"]) {
+				$stat = $this->DELETE(array("path" => $options["dest"]));
+				if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+					return $stat;
+				}
+			} else {
+				return "412 precondition failed";
+			}
+		}
+
+		if ($del) {
 			try {
 				if (!rename($source, $dest)) {
 					return "500 Internal server error";
@@ -229,51 +229,51 @@ 
 			catch (Exception\ProtectedDirectory $e) {
 				return "403 Forbidden: ".$e->getMessage();
 			}
-        } else {
-            if (is_dir($source) && $options['depth'] == 'infinity') {
-            	$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
-            } else {
-                $files = array($source);
-            }
-
-            if (!is_array($files) || empty($files)) {
-                return "500 Internal server error";
-            }
-
-
-            foreach ($files as $file) {
-                if (is_dir($file)) {
-                    $file = $this->_slashify($file);
-                }
-
-                $destfile = str_replace($source, $dest, $file);
-
-                if (is_dir($file)) {
-                    if (!is_dir($destfile)) {
-                        // TODO "mkdir -p" here? (only natively supported by PHP 5)
-                        if (!@mkdir($destfile)) {
-                            return "409 Conflict";
-                        }
-                    }
-                } else {
-                    if (!@copy($file, $destfile)) {
-                        return "409 Conflict";
-                    }
-                }
-            }
-        }
-        // adding Location header as shown in example in rfc2518 section 8.9.5
+		} else {
+			if (is_dir($source) && $options['depth'] == 'infinity') {
+				$files = Vfs::find($source,array('depth' => true,'url' => true));	// depth=true: return dirs first, url=true: allow urls!
+			} else {
+				$files = array($source);
+			}
+
+			if (!is_array($files) || empty($files)) {
+				return "500 Internal server error";
+			}
+
+
+			foreach ($files as $file) {
+				if (is_dir($file)) {
+					$file = $this->_slashify($file);
+				}
+
+				$destfile = str_replace($source, $dest, $file);
+
+				if (is_dir($file)) {
+					if (!is_dir($destfile)) {
+						// TODO "mkdir -p" here? (only natively supported by PHP 5)
+						if (!@mkdir($destfile)) {
+							return "409 Conflict";
+						}
+					}
+				} else {
+					if (!@copy($file, $destfile)) {
+						return "409 Conflict";
+					}
+				}
+			}
+		}
+		// adding Location header as shown in example in rfc2518 section 8.9.5
 		header('Location: '.$this->base_uri.$options['dest']);
 
-        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
-    }
+		return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+	}
 
-    /**
-	* Get properties for a single file/resource
-	*
-	* @param  string  $_path resource path
-	* @return array   resource properties
-	*/
+	/**
+	 * Get properties for a single file/resource
+	 *
+	 * @param  string  $_path resource path
+	 * @return array   resource properties
+	 */
 	function fileinfo($_path)
 	{
 		// internally we require some url-encoding, as vfs_stream_wrapper uses URL's internally
@@ -301,9 +301,9 @@ 
 		$info['props'][] = self::mkprop	('creationdate',    filectime($fspath));
 		$info['props'][] = self::mkprop	('getlastmodified', filemtime($fspath));
 
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = self::mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = self::mkprop("ishidden",        Vfs::is_hidden($fspath));
 
 		// type and size (caller already made sure that path exists)
 		if (is_dir($fspath)) {
@@ -441,38 +441,38 @@ 
 	}
 
  	/**
-	 * Used eg. by get
-	 *
-	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
-	 * @param string $path
-	 * @return string
-	 */
+ 	 * Used eg. by get
+ 	 *
+ 	 * @todo replace all calls to _mimetype with Vfs::mime_content_type()
+ 	 * @param string $path
+ 	 * @return string
+ 	 */
 	function _mimetype($path)
 	{
 		return Vfs::mime_content_type($path);
 	}
 
-    /**
-     * Check if path is readable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return Vfs::is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return Vfs::is_writable($fspath);
-    }
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return Vfs::is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return Vfs::is_writable($fspath);
+	}
 
 	/**
 	 * PROPPATCH method handler
@@ -615,13 +615,13 @@ 
 	 * @param  string  directory path
 	 * @return void    function has to handle HTTP response itself
 	 */
-    function GetDir($fspath, &$options)
-    {
+	function GetDir($fspath, &$options)
+	{
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.Api\Translation::charset());
 
 		parent::GetDir($fspath, $options);
-    }
+	}
 
 	private $force_download = false;
 

timesheet/inc/class.timesheet_import_csv.inc.php

Indentation +25 added lines, -25 removed lines

@@ -72,8 +72,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if a record has changed
-	*/
+	 * For figuring out if a record has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -97,8 +97,8 @@ 
 	protected $errors = array();
 
 	/**
-	* List of actions, and how many times that action was taken
-	*/
+	 * List of actions, and how many times that action was taken
+	 */
 	protected $results = array();
 
 	/**
@@ -526,39 +526,39 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings()
 	{
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors()
 	{
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results()
 	{
 			return $this->results;