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

Merge branch 'master' into navigation

Browse Source
This commit is contained in:
Jan-Christoph Borchardt 2013-02-02 11:01:53 +01:00
commit cc97112e06
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appinfo/info.xml
View File

@ -6,6 +6,6 @@
<licence>AGPL</licence> <licence>AGPL</licence>
<author>Arthur Schiwon, Marvin Thomas Rabe</author> <author>Arthur Schiwon, Marvin Thomas Rabe</author>
<standalone/> <standalone/>
<require>4.9</require> <require>4.91</require>
<shipped>true</shipped> <shipped>true</shipped>
</info> </info>

22
l10n/sr.php
View File

@ -3,30 +3,30 @@
"Bookmarks" => "Обележивачи", "Bookmarks" => "Обележивачи",
"Tags" => "Ознаке", "Tags" => "Ознаке",
"Filter by tag" => "Филтрирај по ознаци", "Filter by tag" => "Филтрирај по ознаци",
"Edit bookmark" => "Промени обележивач", "Edit bookmark" => "Уреди обележивач",
"Are you sure you want to remove this tag from every entry?" => "Да ли сигурно желите да уклоните ову ознаку из сваког уноса?", "Are you sure you want to remove this tag from every entry?" => "Желите ли да уклоните ову ознаку из сваког уноса?",
"Warning" => "Упозорење", "Warning" => "Упозорење",
"Import completed successfully." => "Увоз је успешан.", "Import completed successfully." => "Увоз је успешно завршен.",
"Uploading..." => "Отпремам...", "Uploading..." => "Отпремам…",
"Bookm." => "Обеле.", "Bookm." => "Обележ.",
"Add a bookmark" => "Додај обележивач", "Add a bookmark" => "Додај обележивач",
"Close" => "Затвори", "Close" => "Затвори",
"The title of the page" => "Наслов странице", "The title of the page" => "Наслов странице",
"The address of the page" => "Адреса странице", "The address of the page" => "Адреса странице",
"Description of the page" => "Опис странице", "Description of the page" => "Опис странице",
"Save" => "Сними", "Save" => "Сачувај",
"Delete" => "Обриши", "Delete" => "Обриши",
"Edit" => "Уреди", "Edit" => "Уреди",
"Cancel" => "Откажи", "Cancel" => "Откажи",
"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у ваш прегледач и кликните уколико желите да обележите ову веб страницу на брзину:", "Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Превуците ово у прегледач и кликните ако на брзину желите да обележите веб страницу:",
"Read later" => "Прочитаћу касније", "Read later" => "Прочитаћу касније",
"Address" => "Адреса", "Address" => "Адреса",
"Add" => "Додај", "Add" => "Додај",
"Related Tags" => "Повезане ознаке", "Related Tags" => "Сродне ознаке",
"Settings" => "Подешавања", "Settings" => "Поставке",
"You have no bookmarks" => "Немате обележиваче", "You have no bookmarks" => "Немате обележиваче",
"You can also try to import a bookmark file" => "Можете такође пробати са увозом датотеке са обележивачима", "You can also try to import a bookmark file" => "Можете да пробате да увезете и датотеку са обележивачима",
"Bookmarklet" => "Маркер", "Bookmarklet" => "Активан обележивач",
"Export & Import" => "Извоз и увоз", "Export & Import" => "Извоз и увоз",
"Export" => "Извези", "Export" => "Извези",
"Import" => "Увези" "Import" => "Увези"

7
lib/bookmarks.php
View File

@ -53,6 +53,7 @@ class OC_Bookmarks_Bookmarks{
} }
public static function findOneBookmark($id) { public static function findOneBookmark($id) {
$CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' );
if($CONFIG_DBTYPE == 'pgsql') { if($CONFIG_DBTYPE == 'pgsql') {
$group_fct = 'array_agg(tag)'; $group_fct = 'array_agg(tag)';
} }
@ -314,13 +315,11 @@ class OC_Bookmarks_Bookmarks{
$is_public = $is_public ? 1 : 0; $is_public = $is_public ? 1 : 0;
$enc_url = htmlspecialchars_decode($url); $enc_url = htmlspecialchars_decode($url);
$_ut = self::getNowValue(); $_ut = self::getNowValue();
// Change lastmodified date if the record if already exists // Change lastmodified date if the record if already exists
$sql = "SELECT * from *PREFIX*bookmarks WHERE url = ? and user_id = ?"; $sql = "SELECT * from *PREFIX*bookmarks WHERE url = ? and user_id = ?";
$query = OCP\DB::prepare($sql, 1); $query = OCP\DB::prepare($sql, 1);
$result = $query->execute(array($enc_url, OCP\USER::getUser())); $result = $query->execute(array($enc_url, OCP\USER::getUser()));
if(count($result) != 0) { if ($row = $result->fetchRow()){
$row = $result->fetchRow();
$params = array(); $params = array();
$title_str = ''; $title_str = '';
if(trim($title) != '') { // Do we replace the old title if(trim($title) != '') { // Do we replace the old title
@ -339,8 +338,6 @@ class OC_Bookmarks_Bookmarks{
$query->execute($params); $query->execute($params);
return $row['id']; return $row['id'];
} }
$query = OCP\DB::prepare(" $query = OCP\DB::prepare("
INSERT INTO *PREFIX*bookmarks INSERT INTO *PREFIX*bookmarks
(url, title, user_id, public, added, lastmodified, description) (url, title, user_id, public, added, lastmodified, description)