From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 22 Apr 2012 11:19:12 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.0.0beta~168^2~43
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c2cf35050032002d01978f53201723330ebfe16;p=nextcloud-server.git

fix merge conflicts
---

4c2cf35050032002d01978f53201723330ebfe16
diff --cc apps/calendar/ajax/changeview.php
index 707c8c59ebf,76e29cbe265..736a5625530
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@@ -5,8 -5,8 +5,6 @@@
   * later.
   * See the COPYING-README file.
   */
--
-  
 -require_once ('../../../lib/base.php');
  OC_JSON::checkLoggedIn();
  OC_JSON::checkAppEnabled('calendar');
  $view = $_GET['v'];
diff --cc apps/calendar/ajax/events.php
index 0cfee0dbdc1,3c990422f0c..3aa487fd231
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -6,25 -6,8 +6,8 @@@
   * See the COPYING-README file.
   */
  
 -require_once ('../../../lib/base.php');
 + 
  require_once('when/When.php');
- $l = OC_L10N::get('calendar');
- $unnamed = $l->t('unnamed');
- function create_return_event($event, $vevent){
- 	$return_event = array();
- 	global $unnamed;
- 	$return_event['id'] = (int)$event['id'];
- 	$return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: $unnamed);
- 	$return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
- 	$last_modified = $vevent->__get('LAST-MODIFIED');
- 	if ($last_modified){
- 		$lastmodified = $last_modified->getDateTime()->format('U');
- 	}else{
- 		$lastmodified = 0;
- 	}
- 	$return_event['lastmodified'] = (int)$lastmodified;
- 	return $return_event;
- }
  
  OC_JSON::checkLoggedIn();
  OC_JSON::checkAppEnabled('calendar');
diff --cc apps/calendar/ajax/import/import.php
index 95294948f75,4d5e7340aef..5848cac448d
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@@ -7,11 -7,12 +7,11 @@@
   */
  //check for calendar rights or create new one
  ob_start();
-  
 -require_once ('../../../../lib/base.php');
  OC_JSON::checkLoggedIn();
  OC_Util::checkAppEnabled('calendar');
- $nl = "\n\r";
- $progressfile = OC::$APPSROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
+ $nl="\r\n";
+ $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
+ $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
  if(is_writable('import_tmp/')){
  	$progressfopen = fopen($progressfile, 'w');
  	fwrite($progressfopen, '10');
diff --cc apps/files/templates/admin.php
index 9bcc40e9361,00000000000..01fe1105260
mode 100644,000000..100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@@ -1,15 -1,0 +1,19 @@@
 +<?php OC_Util::addScript('files','admin'); ?>
 +
 +<form name="filesForm" action='#' method='post'>
 +	<fieldset class="personalblock">
 +		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
 +		<?php if($_['htaccessWorking']):?>
 +			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
 +		<?php endif;?>
 +		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>
- 		<fieldset class="personalblock">
- 			<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files:' ); ?> </label><input name="maxZipInputSize" id="maxZipInputSize" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /><br/>
- 		</fieldset>
++
++			<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> />
++			<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
++
 +		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
 +	</fieldset>
 +</form>
++
++
++