rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-21 18:54:32 +01:00
Code Issues Releases Activity

Move Back ajax operation to the ajax folder

Browse Source
This commit is contained in:
Brice Maron 2012-07-01 21:17:27 +00:00
parent bf925e0ab9
commit b374301911
3 changed files with 15 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addBm.php
View File

@ -30,24 +30,6 @@ OCP\App::checkAppEnabled('bookmarks');
require_once('bookmarksHelper.php'); require_once('bookmarksHelper.php');
// If we go the dialog form submit
if(isset($_POST['url'])) {
$tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
$pub = isset($_POST['is_public']) ? true : false;
if(isset($_POST['record_id']) && is_numeric($_POST['record_id']) ) { //EDIT
$bm = $_POST['record_id'];
OC_Bookmarks_Bookmarks::editBookmark($bm, $_POST['url'], $_POST['title'], $tags, $_POST['desc'], $pub);
}
else {
$bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $_POST['title'], $tags, $_POST['desc'], $pub);
}
OCP\JSON::success(array('id'=>$bm));
exit();
}
// Prep screen if we come from the bookmarklet // Prep screen if we come from the bookmarklet
$url =''; $url ='';
if(isset($_GET['url']) ){ if(isset($_GET['url']) ){

71
ajax/editBookmark.php
View File

@ -27,64 +27,21 @@ OCP\JSON::callCheck();
OCP\JSON::checkAppEnabled('bookmarks'); OCP\JSON::checkAppEnabled('bookmarks');
$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" ); // If we go the dialog form submit
if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ if(isset($_POST['url'])) {
$_ut = "strftime('%s','now')"; $tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
} elseif($CONFIG_DBTYPE == 'pgsql') { $pub = isset($_POST['is_public']) ? true : false;
$_ut = 'date_part(\'epoch\',now())::integer';
} elseif($CONFIG_DBTYPE == 'oci') {
$_ut = '(oracletime - to_date(\'19700101\',\'YYYYMMDD\')) * 86400';
} else {
$_ut = "UNIX_TIMESTAMP()";
}
$bookmark_id = (int)$_POST["id"]; if(isset($_POST['record_id']) && is_numeric($_POST['record_id']) ) { //EDIT
$user_id = OCP\USER::getUser(); $bm = $_POST['record_id'];
OC_Bookmarks_Bookmarks::editBookmark($bm, $_POST['url'], $_POST['title'], $tags, $_POST['desc'], $pub);
//TODO check using CURRENT_TIMESTAMP? prepare already does magic when using now() }
$query = OCP\DB::prepare(' else {
UPDATE `*PREFIX*bookmarks` $bm = OC_Bookmarks_Bookmarks::addBookmark($_POST['url'], $_POST['title'], $tags, $_POST['desc'], $pub);
SET `url` = ?, `title` = ?, `lastmodified` = '.$_ut.'
WHERE `id` = ?
AND `user_id` = ?
');
$params=array(
htmlspecialchars_decode($_POST["url"]),
htmlspecialchars_decode($_POST["title"]),
$bookmark_id,
$user_id,
);
$result = $query->execute($params);
# Abort the operation if bookmark couldn't be set (probably because the user is not allowed to edit this bookmark)
if ($result->numRows() == 0) exit();
# Remove old tags and insert new ones.
$query = OCP\DB::prepare('
DELETE FROM `*PREFIX*bookmarks_tags`
WHERE `bookmark_id` = ?
');
$params=array(
$bookmark_id
);
$query->execute($params);
$query = OCP\DB::prepare('
INSERT INTO `*PREFIX*bookmarks_tags`
(`bookmark_id`, `tag`)
VALUES (?, ?)
');
$tags = explode(' ', urldecode($_POST["tags"]));
foreach ($tags as $tag) {
if(empty($tag)) {
//avoid saving blankspaces
continue; continue;
} }
$params = array($bookmark_id, trim($tag)); OCP\JSON::success(array('id'=>$bm));
$query->execute($params); exit();
} }
OC_JSON::error();
exit();

2
templates/addBm.php
View File

@ -1,4 +1,4 @@
<form class="addBm" method="post" action="<?php echo OCP\Util::linkToAbsolute('bookmarks', 'addBm.php');?>"> <form class="addBm" method="post" action="<?php echo OCP\Util::linkTo('bookmarks', 'ajax/editBookmark.php');?>">
<?php if(!isset($embedded) || !$embedded):?> <?php if(!isset($embedded) || !$embedded):?>
<script> <script>
var fullTags = <?php echo $_['tags'];?>; var fullTags = <?php echo $_['tags'];?>;