diff options
Diffstat (limited to 'apps/bookmarks')
-rw-r--r-- | apps/bookmarks/addBm.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/ajax/addBookmark.php | 4 | ||||
-rw-r--r-- | apps/bookmarks/ajax/delBookmark.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/ajax/editBookmark.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/ajax/recordClick.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/ajax/updateList.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/index.php | 2 | ||||
-rw-r--r-- | apps/bookmarks/js/bookmarks.js | 10 | ||||
-rw-r--r-- | apps/bookmarks/templates/list.php | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php index 861b677222d..27e01bb3baf 100644 --- a/apps/bookmarks/addBm.php +++ b/apps/bookmarks/addBm.php @@ -21,7 +21,7 @@ * */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index 8cda7f0f060..ceeb034ec9d 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -24,12 +24,12 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('bookmarks'); -require_once('../bookmarksHelper.php'); +require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php'); $id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']); OC_JSON::success(array('data' => $id));
\ No newline at end of file diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php index 4aef86e771b..655d9f825d9 100644 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php index 35f30ebcb7a..a834cd216e6 100644 --- a/apps/bookmarks/ajax/editBookmark.php +++ b/apps/bookmarks/ajax/editBookmark.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php index e6fdfe043e1..a542f636d8c 100644 --- a/apps/bookmarks/ajax/recordClick.php +++ b/apps/bookmarks/ajax/recordClick.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index 487e0d290e3..6aa951bbb65 100644 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -25,7 +25,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php index 50fea3fddbd..4d604a4fd55 100644 --- a/apps/bookmarks/index.php +++ b/apps/bookmarks/index.php @@ -21,7 +21,7 @@ * */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js index 16ed14c89b2..38b8c43eb7d 100644 --- a/apps/bookmarks/js/bookmarks.js +++ b/apps/bookmarks/js/bookmarks.js @@ -20,7 +20,7 @@ function getBookmarks() { } $.ajax({ - url: 'ajax/updateList.php', + url: OC.filePath('bookmarks', 'ajax', 'updateList.php'), data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting, success: function(bookmarks){ if (bookmarks.data.length) { @@ -63,7 +63,7 @@ function addOrEditBookmark(event) { if (id == 0) { $.ajax({ - url: 'ajax/addBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'addBookmark.php'), data: 'url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(response){ $('.bookmarks_input').val(''); @@ -75,7 +75,7 @@ function addOrEditBookmark(event) { } else { $.ajax({ - url: 'ajax/editBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'), data: 'id=' + id + '&url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(){ $('.bookmarks_input').val(''); @@ -92,7 +92,7 @@ function addOrEditBookmark(event) { function delBookmark(event) { var record = $(this).parent().parent(); $.ajax({ - url: 'ajax/delBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'delBookmark.php'), data: 'url=' + encodeURIComponent($(this).parent().parent().children('.bookmark_url:first').text()), success: function(data){ record.remove(); @@ -164,7 +164,7 @@ function updateOnBottom() { function recordClick(event) { $.ajax({ - url: 'ajax/recordClick.php', + url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'), data: 'url=' + encodeURIComponent($(this).attr('href')), }); } diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php index 1abdbb7f838..9fe9ee7a9a9 100644 --- a/apps/bookmarks/templates/list.php +++ b/apps/bookmarks/templates/list.php @@ -20,7 +20,7 @@ <div id="firstrun" style="display: none;"> <?php echo $l->t('You have no bookmarks'); - require_once('bookmarklet.php'); + require_once(OC::$APPSROOT . '/apps/bookmarks/templates/bookmarklet.php'); createBookmarklet(); ?> </div> |