port linkto and serverHost

6 files changed, 6 insertions, 6 deletions

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index e42358422cf..9a60aaeeb95 100755
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -18,7 +18,7 @@ OC_App::register( array(
 OC_App::addNavigationEntry( array(
   'id' => 'calendar_index',
   'order' => 10,
-  'href' => OC_Helper::linkTo( 'calendar', 'index.php' ),
+  'href' => OCP\Util::linkTo( 'calendar', 'index.php' ),
   'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ),
   'name' => $l->t('Calendar')));
 OC_App::registerPersonal('calendar', 'settings');
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 321f4c73ba0..2aba83d32a3 100644..100755
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -241,7 +241,7 @@ class OC_Calendar_Calendar{
 
 	public static function getEventSourceInfo($calendar){
 		return array(
-			'url' => OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
+			'url' => OCP\Util::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'],
 			'backgroundColor' => $calendar['calendarcolor'],
 			'borderColor' => '#888',
 			'textColor' => 'black',
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index fc544314359..fae2da3b029 100755
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -36,7 +36,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
 					}else{
 						$info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
 					}
-					$link = OC_Helper::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
+					$link = OCP\Util::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
 					$results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type
 				}
 			}
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 4a3c653d6f1..f8bd91640e5 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -19,7 +19,7 @@
 				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
 				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
 				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
-				var totalurl = '<?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?>/calendars';
+				var totalurl = '<?php echo OCP\Util::linkToAbsolute('calendar', 'caldav.php'); ?>/calendars';
 				var firstDay = '<?php echo (OC_Preferences::getValue(OCP\USER::getUser(), 'calendar', 'firstday', 'mo') == 'mo' ? '1' : '0'); ?>';
 				$(document).ready(function() {
 				<?php
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 3488fec0187..ac32b79215f 100644..100755
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -47,6 +47,6 @@
         </table>
 
         <?php echo $l->t('Calendar CalDAV syncing address:');?>
-        <code><?php echo OC_Helper::linkToAbsolute('calendar', 'caldav.php'); ?></code><br />
+        <code><?php echo OCP\Util::linkToAbsolute('calendar', 'caldav.php'); ?></code><br />
         </fieldset>
 </form>
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index cd44988af90..b11a4ef94cf 100755
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -73,5 +73,5 @@ echo html_select_options($allgroups, array());
 </ul>
 <div id="public">
 	<input type="checkbox" id="publish" <?php echo ($public['share'])?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br>
-	<input type="text" id="public_token" value="<?php echo OC_Helper::linkToAbsolute('apps/calendar', 'share.php?t=' . $public['share'], null, true) ; ?>" onmouseover="$('#public_token').select();" style="<?php echo (!$public['share'])?'display:none':'' ?>">
+	<input type="text" id="public_token" value="<?php echo OCP\Util::linkToAbsolute('apps/calendar', 'share.php?t=' . $public['share'], null, true) ; ?>" onmouseover="$('#public_token').select();" style="<?php echo (!$public['share'])?'display:none':'' ?>">
 </div>
\ No newline at end of file