Use OC.filePath to locate ajax entry points

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index f9393acdc1a8e11b49d81be8ff52559be36a78f8..9e16ad61dad6f0d4e93fc5875be969bfbd8dec79 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -124,7 +124,7 @@ Calendar={
                        $('#'+this.currentview + "_radio").removeClass('active');
                        this.currentview = view;
                        //sending ajax request on every change view
-                       $("#sysbox").load(oc_webroot + "/apps/calendar/ajax/changeview.php?v="+view);
+                       $("#sysbox").load(OC.filePath('calendar', 'ajax', 'changeview.php') + "?v="+view);
                        //not necessary to check whether the response is true or not
                        switch(view) {
                                case "onedayview":
@@ -178,7 +178,7 @@ Calendar={
                        if( typeof (this.events[year]) == "undefined") {
                                this.events[year] = []
                        }
-                       $.getJSON(oc_webroot + "/apps/calendar/ajax/getcal.php?year=" + year, function(jsondata, status) {
+                       $.getJSON(OC.filePath('calendar', 'ajax', 'getcal.php') + "?year=" + year, function(jsondata, status) {
                                if(status == "nosession") {
                                        alert("You are not logged in. That can happen if you don't use owncloud for a long time.");
                                        document.location(oc_webroot);
@@ -292,7 +292,7 @@ Calendar={
                                // TODO: save event
                                $('#event').dialog('destroy').remove();
                        }else{
-                               $('#dialog_holder').load(oc_webroot + '/apps/calendar/ajax/neweventform.php?d=' + date + '&t=' + time, Calendar.UI.startEventDialog);
+                               $('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'neweventform.php') + '?d=' + date + '&t=' + time, Calendar.UI.startEventDialog);
                        }
                },
                editEvent:function(event){
@@ -303,7 +303,7 @@ Calendar={
                                // TODO: save event
                                $('#event').dialog('destroy').remove();
                        }else{
-                               $('#dialog_holder').load(oc_webroot + '/apps/calendar/ajax/editeventform.php?id=' + id, Calendar.UI.startEventDialog);
+                               $('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'editeventform.php') + '?id=' + id, Calendar.UI.startEventDialog);
                        }
                },
                submitDeleteEventForm:function(url){
@@ -431,7 +431,7 @@ Calendar={
                        if(check == false){
                                return false;
                        }else{
-                               $.post(oc_webroot + "/apps/calendar/ajax/deletecalendar.php", { calendarid: calid},
+                               $.post(OC.filePath('calendar', 'ajax', 'deletecalendar.php'), { calendarid: calid},
                                  function(data) {
                                        Calendar.UI.loadEvents();
                                        $('#choosecalendar_dialog').dialog('destroy').remove();
@@ -444,7 +444,7 @@ Calendar={
                                if($('#choosecalendar_dialog').dialog('isOpen') == true){
                                        $('#choosecalendar_dialog').dialog('moveToTop');
                                }else{
-                                       $('#dialog_holder').load(oc_webroot + '/apps/calendar/ajax/choosecalendar.php', function(){
+                                       $('#dialog_holder').load(OC.filePath('calendar', 'ajax', 'choosecalendar.php'), function(){
                                                $('#choosecalendar_dialog').dialog({
                                                        width : 600,
                                                        close : function(event, ui) {
@@ -456,7 +456,7 @@ Calendar={
                        },
                        activation:function(checkbox, calendarid)
                        {
-                               $.post(oc_webroot + "/apps/calendar/ajax/activation.php", { calendarid: calendarid, active: checkbox.checked?1:0 },
+                               $.post(OC.filePath('calendar', 'ajax', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
                                  function(data) {
                                        checkbox.checked = data == 1;
                                        Calendar.UI.loadEvents();
@@ -464,12 +464,12 @@ Calendar={
                        },
                        newCalendar:function(object){
                                var tr = $(document.createElement('tr'))
-                                       .load(oc_webroot + "/apps/calendar/ajax/newcalendar.php");
+                                       .load(OC.filePath('calendar', 'ajax', 'newcalendar.php'));
                                $(object).closest('tr').after(tr).hide();
                        },
                        edit:function(object, calendarid){
                                var tr = $(document.createElement('tr'))
-                                       .load(oc_webroot + "/apps/calendar/ajax/editcalendar.php?calendarid="+calendarid);
+                                       .load(OC.filePath('calendar', 'ajax', 'editcalendar.php') + "?calendarid="+calendarid);
                                $(object).closest('tr').after(tr).hide();
                        },
                        submit:function(button, calendarid){

diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
index 90876389858523f44c451e6fbc1d9ede52c33e40..7c24fb0963f4092e4c191bc9e6d6c4e679633f2d 100644 (file)
--- a/apps/calendar/js/settings.js
+++ b/apps/calendar/js/settings.js
@@ -3,7 +3,7 @@ $(document).ready(function(){
                OC.msg.startSaving('#calendar .msg')
                // Serialize the data
                var post = $( "#timezone" ).serialize();
-               $.post( oc_webroot + '/apps/calendar/ajax/settimezone.php', post, function(data){
+               $.post( OC.filePath('calendar', 'ajax', 'settimezone.php'), post, function(data){
                        OC.msg.finishedSaving('#calendar .msg', data);
                });
                return false;