diff options
47 files changed, 1796 insertions, 156 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3018418 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +language: php +phps: + - 5.3 +script: cd tests && phpunit . +notifications: + irc: "irc.freenode.org#semanticscuttle" + +before_script: + - mysql -e 'create database semanticscuttle_test;' + - mysql semanticscuttle_test < data/tables.sql + - cat data/config.php.dist | sed "s/'username'/'root'/" | sed "s/'password'/''/" | sed "s/'scuttle'/'semanticscuttle_test'/" | sed "s/'mysql4'/'mysqli'/" > data/config.php + - pyrus install pear/HTTP_Request2 + - pyrus install pear/PEAR + - pyrus install pear/Stream_Var + - phpenv rehash @@ -28,6 +28,34 @@ <property name="sffilepath" value="s/se/semanticscuttle/" /> <property name="svnpath" value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" /> + <fileset id="fs.zip" dir="."> + <include name="data/**"/> + <include name="doc/**"/> + <include name="src/**"/> + <include name="www/**"/> + <include name="scripts/avahi-export.php"/> + <include name="scripts/fix-unfiled-tags.php"/> + <exclude name="**/.gitignore/"/> + <exclude name="**/.svn/"/> + <exclude name="data/config.php"/> + <exclude name="data/config.testing.php"/> + <exclude name="data/config.testing-tmp.php"/> + <exclude name="data/locales/messages.po"/> + <exclude name="data/locales/*/LC_MESSAGES/messages.po"/> + <exclude name="src/php-gettext/examples/" /> + <exclude name="src/php-gettext/tests/"/> + </fileset> + + <fileset id="fs.doc" dir="doc"> + <include name="ChangeLog"/> + <include name="**.txt"/> + <include name="**.rst"/> + <include name="**/*.rst"/> + <exclude name="LICENSE.txt"/> + <exclude name="developers/TODO.rst"/> + <exclude name="allinone.rst"/> + </fileset> + <taskdef name="rST" classname="phing.tasks.ext.rSTTask" /> <taskdef name="d51pearpkg2" classname="phing.tasks.ext.d51PearPkg2Task" /> @@ -43,23 +71,7 @@ <echo msg="Creating distribution zip for SemanticScuttle ${version}"/> <delete file="${distfile}" failonerror="false"/> <zip destfile="${distfile}" prefix="${phing.project.name}-${version}/"> - <fileset dir="."> - <include name="data/**"/> - <include name="doc/**"/> - <include name="src/**"/> - <include name="www/**"/> - <include name="scripts/avahi-export.php"/> - <include name="scripts/fix-unfiled-tags.php"/> - <exclude name="**/.gitignore/"/> - <exclude name="**/.svn/"/> - <exclude name="data/config.php"/> - <exclude name="data/config.testing.php"/> - <exclude name="data/config.testing-tmp.php"/> - <exclude name="data/locales/messages.po"/> - <exclude name="data/locales/*/LC_MESSAGES/messages.po"/> - <exclude name="src/php-gettext/examples/" /> - <exclude name="src/php-gettext/tests/"/> - </fileset> + <fileset refid="fs.zip"/> </zip> </target> @@ -93,6 +105,15 @@ channel="pear.php.net" minimum_version="0.4.0" /> + <!-- unit tests: --> + <package name="HTML_Request2" + channel="pear.php.net" + minimum_version="2.0.0" + /> + <package name="Stream_Var" + channel="pear.php.net" + minimum_version="1.1.0" + /> </dependencies> @@ -288,15 +309,7 @@ <rST format="html" uptodate="true" toolparam="--stylesheet=res/docs/style.css" > - <fileset dir="doc"> - <include name="ChangeLog"/> - <include name="**.txt"/> - <include name="**.rst"/> - <include name="**/*.rst"/> - <exclude name="LICENSE.txt"/> - <exclude name="developers/TODO.rst"/> - <exclude name="allinone.rst"/> - </fileset> + <fileset refid="fs.doc"/> <mapper type="regexp" from="^doc/(.+?)(.rst|.txt)?$" to="dist/docs/\1.html"/> <!-- <filterchain> @@ -308,6 +321,10 @@ </rST> </target> + <target name="clean-docs" description="delete rendered documentation files"> + <delete dir="dist/docs" includeemptydirs="yes"/> + </target> + <target name="release" depends="check,zip,package,deploy-sf" description="Release the version on sourceforge" diff --git a/data/locales/tr_TR/LC_MESSAGES/messages.mo b/data/locales/tr_TR/LC_MESSAGES/messages.mo Binary files differnew file mode 100755 index 0000000..8b2a0f1 --- /dev/null +++ b/data/locales/tr_TR/LC_MESSAGES/messages.mo diff --git a/data/locales/tr_TR/LC_MESSAGES/messages.po b/data/locales/tr_TR/LC_MESSAGES/messages.po new file mode 100644 index 0000000..b2da3e7 --- /dev/null +++ b/data/locales/tr_TR/LC_MESSAGES/messages.po @@ -0,0 +1,1511 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Semantic Scuttle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-05-11 17:51+0200\n" +"PO-Revision-Date: 2011-07-27 14:38+0200\n" +"Last-Translator: Yalçın Can <ylcncn@gmail.com>\n" +"Language-Team: <ylcncn@gmail.com>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n>1)\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: src/SemanticScuttle/functions.php:189 +msgid "message_die() was called multiple times." +msgstr "message_die() fonksiyonu birden fazla çağrıldı." + +#: src/SemanticScuttle/functions.php:201 +msgid "SQL Error" +msgstr "SQL Hatası" + +#: src/SemanticScuttle/functions.php:207 +msgid "Line" +msgstr "Satır" + +#: src/SemanticScuttle/functions.php:207 +#: data/templates/importDelicious.tpl.php:8 +#: data/templates/importNetscape.tpl.php:9 +#: data/templates/importStructure.tpl.php:10 +msgid "File" +msgstr "Dosya" + +#: src/SemanticScuttle/functions.php:215 +msgid "Information" +msgstr "Bilgi" + +#: src/SemanticScuttle/functions.php:220 +msgid "Critical Information" +msgstr "Önemli Bilgi" + +#: src/SemanticScuttle/functions.php:225 +msgid "An error occured" +msgstr "Bir hata oluştu" + +#: src/SemanticScuttle/functions.php:228 +msgid "General Error" +msgstr "Genel Hata" + +#: src/SemanticScuttle/functions.php:236 +msgid "An critical error occured" +msgstr "Önemli bir hata oluştu" + +#: src/SemanticScuttle/functions.php:239 +msgid "Critical Error" +msgstr "Kritik Hata" + +#: src/SemanticScuttle/functions.php:248 +msgid "DEBUG MODE" +msgstr "GELİŞTİRİCİ KİPİ" + +#: data/templates/about.tpl.php:6 +msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere." +msgstr "Tüm beğendiğiniz bağlantıları tek yerde ve her yerden erişilebilecek bir şekilde <strong>saklayın</strong>" + +#: data/templates/about.tpl.php:7 +msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private." +msgstr "Yerimlerinizi arkadaşlarınızla, izleme listenizle isterseniz herkesle <strong>paylaşın</strong>, isterseniz gizli tutun." + +#: data/templates/about.tpl.php:8 +msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders." +msgstr "Yerimlerinizi dosyalara bölmenize gerek yok, yerimlerinizi istediğiniz kadar <strong>etiket</strong>le etiketleyin." + +#: data/templates/about.tpl.php:9 +msgid "Register now" +msgstr "Şimdi kaydoldun" + +#: data/templates/about.tpl.php:9 +#, php-format +msgid " to start using %s!" +msgstr "%s'i kullanmaya başlamak için!" + +#: data/templates/about.tpl.php:12 +msgid "Geek Stuff" +msgstr "Geek Şeyler" + +#: data/templates/about.tpl.php:14 +msgid "is licensed under the " +msgstr "koruma latın olduğu lisans" + +#: data/templates/about.tpl.php:14 +msgid "you can freely host it on your own web server." +msgstr "kendi sunucunuzda özgürce kullanabilirsiniz." + +#: data/templates/about.tpl.php:15 +#, php-format +msgid "%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it." +msgstr "%1$s birçok <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>'sini desteklemektedir. Delicious için yapılmış tüm güzel uygulamalar düzenlenerek %1$s ile çalışması sağlanabilir. API adresini değiştirecek bir araç bulamadıysanız, programın yaratıcısından yardım isteyin. Kim bilir, hemen ekleyebilirler." + +#: data/templates/about.tpl.php:24 +msgid "Tips" +msgstr "İpuçları" + +#: data/templates/about.tpl.php:26 +msgid "Add search plugin into your browser:" +msgstr "Arama eklentisini tarayıcınıza yükleyin:" + +#: data/templates/about.tpl.php:27 +msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags." +msgstr "\"system:unfiled\" gizli etiketi etiketsiz olan yerimlerinizi bulmanızda yardımcı olur." + +#: data/templates/about.tpl.php:28 +msgid "The secret tag \"system:imported\" allows you to find imported bookmarks." +msgstr "\"system:imported\" gizli etiketi içe aktarılmış olan yerimlerinizi bulmanızda yardımcı olur." + +#: data/templates/admin.tpl.php:5 +msgid "Users management" +msgstr "Kullanıcı Yönetimi" + +#: data/templates/admin.tpl.php:14 +msgid "Public/Shared/Private" +msgstr "Genel/Paylaşılmış/Gizli" + +#: data/templates/admin.tpl.php:14 +#: data/templates/bookmarks.tpl.php:113 +msgid "bookmark(s)" +msgstr "yer imi" + +#: data/templates/admin.tpl.php:19 +#: data/templates/tag2tagadd.tpl.php:21 +#: data/templates/tag2tagdelete.tpl.php:13 +#: data/templates/tag2tagedit.tpl.php:14 +#: data/templates/tag2tagedit.tpl.php:35 +#: data/templates/tagdelete.tpl.php:6 +#: www/jsScuttle.php:23 +msgid "Are you sure?" +msgstr "Emini misiniz?" + +#: data/templates/admin.tpl.php:19 +#: data/templates/bookmarks.tpl.php:300 +msgid "Delete" +msgstr "Sil" + +#: data/templates/admin.tpl.php:27 +msgid "Other actions" +msgstr "Diğer eylemler" + +#: data/templates/admin.tpl.php:29 +msgid "Check all URLs (May take some time)" +msgstr "Tüm bağlantıları kontrol edin (Uzun sürebilir)" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:16 +msgid "Collaborative description: these fields can be viewed and modified by every users" +msgstr "İmece tanım: Bu alanlar tüm kullancılar tarafından görülebilir ve değiştirilebilir." + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:18 +#: data/templates/bookmarks.tpl.php:157 +#: data/templates/editbookmark.tpl.php:51 +msgid "Title" +msgstr "Başlık" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:23 +#: data/templates/editbookmark.tpl.php:57 +#: data/templates/editprofile.tpl.php:45 +#: data/templates/profile.tpl.php:33 +#: data/templates/tagcommondescriptionedit.tpl.php:13 +#: data/templates/tagedit.tpl.php:12 +msgid "Description" +msgstr "Tanım" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:31 +#: data/templates/tagcommondescriptionedit.tpl.php:21 +msgid "Last modification:" +msgstr "Son değiştirilme:" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:43 +#: data/templates/tagcommondescriptionedit.tpl.php:33 +#: data/templates/tagedit.tpl.php:18 +msgid "Update" +msgstr "Güncelle" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:44 +#: data/templates/editbookmark.tpl.php:111 +#: data/templates/tag2tagadd.tpl.php:24 +#: data/templates/tag2tagedit.tpl.php:38 +#: data/templates/tagcommondescriptionedit.tpl.php:34 +#: data/templates/tagedit.tpl.php:19 +#: data/templates/tagrename.tpl.php:25 +msgid "Cancel" +msgstr "İptal" + +#: data/templates/bookmarklet.inc.php:1 +msgid "Bookmarklet" +msgstr "Bookmarklet" + +#: data/templates/bookmarklet.inc.php:11 +#, php-format +msgid "Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s" +msgstr "Aşağıdaki bookmarklet'lerden birine tıklayarak tarayıcınızda %s'e link eklemenizi kolaylaştıracak bir buton oluşturun." + +#: data/templates/bookmarklet.inc.php:20 +#, php-format +msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s" +msgstr "" + +#: data/templates/bookmarklet.inc.php:67 +#: data/templates/bookmarklet.inc.php:100 +#, php-format +msgid "Post to %s" +msgstr "%s'e gönder" + +#: data/templates/bookmarklet.inc.php:93 +#: data/templates/bookmarklet.inc.php:110 +#, php-format +msgid "Post to %s (Pop-up)" +msgstr "%s'e gönder (Açılır pencere)" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24 +#, php-format +msgid "Voting <span class=\"voting\">%d</span>" +msgstr "Oy <span class=\"voting\">%d</span>" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32 +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35 +msgid "Vote for" +msgstr "Beğen" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43 +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46 +msgid "Vote against" +msgstr "Kötüle" + +#: data/templates/bookmarks.tpl.php:42 +msgid "Bookmarks on this page are managed by an admin user." +msgstr "Bu sayfadaki yerimleri bir yönetici tarafından yönetilebilir. " + +#: data/templates/bookmarks.tpl.php:71 +#: data/templates/bookmarks.tpl.php:72 +msgid "Edit the common description of this tag" +msgstr "Bu etiketin genel tanımını düzenleyin" + +#: data/templates/bookmarks.tpl.php:75 +#: data/templates/bookmarks.tpl.php:76 +msgid "Edit the common description of this bookmark" +msgstr "Bu yeriminin genel tanımını düzenleyin" + +#: data/templates/bookmarks.tpl.php:96 +#: data/templates/bookmarks.tpl.php:97 +msgid "Edit your personal description of this tag" +msgstr "Bu etiketin kişisel tanımını değiştirin" + +#: data/templates/bookmarks.tpl.php:113 +#: data/templates/tags.tpl.php:10 +#: data/templates/users.tpl.php:8 +msgid "Sort by:" +msgstr "Sırala:" + +#: data/templates/bookmarks.tpl.php:155 +msgid "Date" +msgstr "Tarih" + +#: data/templates/bookmarks.tpl.php:160 +msgid "Voting" +msgstr "Oy" + +#: data/templates/bookmarks.tpl.php:169 +msgid "Bookmarks from other users for this tag" +msgstr "Bu etiketteki diğer kullanıcıların yerimleri" + +#: data/templates/bookmarks.tpl.php:174 +msgid "Only your bookmarks for this tag" +msgstr "Bu etiketteki yerimleriniz" + +#: data/templates/bookmarks.tpl.php:197 +#: data/templates/bookmarks.tpl.php:203 +msgid "First" +msgstr "İlk" + +#: data/templates/bookmarks.tpl.php:198 +#: data/templates/bookmarks.tpl.php:204 +msgid "Previous" +msgstr "Önceki" + +#: data/templates/bookmarks.tpl.php:211 +#: data/templates/bookmarks.tpl.php:214 +msgid "Next" +msgstr "Sonraki" + +#: data/templates/bookmarks.tpl.php:212 +#: data/templates/bookmarks.tpl.php:215 +msgid "Last" +msgstr "Son" + +#: data/templates/bookmarks.tpl.php:228 +#, php-format +msgid "Page %d of %d" +msgstr "Sayfa %d / %d" + +#: data/templates/bookmarks.tpl.php:290 +msgid "Tags:" +msgstr "Etiketler:" + +#: data/templates/bookmarks.tpl.php:297 +msgid "Edit" +msgstr "Düzenle" + +#: data/templates/bookmarks.tpl.php:305 +msgid "Last update" +msgstr "Son güncelleme" + +#: data/templates/bookmarks.tpl.php:308 +msgid "by" +msgstr "tarafından" + +#: data/templates/bookmarks.tpl.php:312 +msgid "you" +msgstr "siz" + +#: data/templates/bookmarks.tpl.php:328 +#, php-format +msgid " and %s1 other%s" +msgstr "ve %s1 diğer%s" + +#: data/templates/bookmarks.tpl.php:331 +#, fuzzy, php-format +msgid " and %2$s%1$s others%3$s" +msgstr "Tüm Diğerleri" + +#: data/templates/bookmarks.tpl.php:345 +msgid "Copy this bookmark to YOUR bookmarks." +msgstr "Bu yer imini kendi yer imlerinize kopyalayın." + +#: data/templates/bookmarks.tpl.php:346 +msgid "Copy" +msgstr "Kopyala" + +#: data/templates/bookmarks.tpl.php:366 +msgid "This bookmark is certified by an admin user." +msgstr "Bu yer imi bir yönetici tarafından onaylanmıştır." + +#: data/templates/bookmarks.tpl.php:419 +msgid "Private Note on this bookmark" +msgstr "Bu yer imindeki özel notunuz" + +#: data/templates/bookmarks.tpl.php:433 +msgid "Come back to the top of this page." +msgstr "Bu sayfanın en başına gidin." + +#: data/templates/bookmarks.tpl.php:433 +msgid "Top of the page" +msgstr "Sayfanın üstü" + +#: data/templates/bookmarks.tpl.php:439 +msgid "No bookmarks available" +msgstr "Yerimi mevcut değil" + +#: data/templates/bottom.inc.php:5 +#: data/templates/toolbar.inc.php:15 +#: data/templates/toolbar.inc.php:28 +#: www/about.php:23 +#: www/about.php:24 +msgid "About" +msgstr "Hakkında" + +#: data/templates/bottom.inc.php:7 +msgid "Propulsed by " +msgstr "Altyapı:" + +#: data/templates/dynamictags.inc.php:56 +#: data/templates/sidebar.block.common.php:19 +#: data/templates/sidebar.block.popular.php:34 +#: data/templates/sidebar.block.recent.php:29 +#: data/templates/tags.tpl.php:19 +msgid "bookmark" +msgid_plural "bookmarks" +msgstr[0] "yer imi" +msgstr[1] "yerimi" + +#: data/templates/dynamictags.inc.php:105 +#: data/templates/sidebar.block.common.php:9 +#: data/templates/sidebar.block.menu.php:74 +#: data/templates/sidebar.block.popular.php:23 +#: data/templates/sidebar.block.recent.php:34 +#: data/templates/toolbar.inc.php:27 +#: www/populartags.php:46 +msgid "Popular Tags" +msgstr "Popüler Etiketler" + +#: data/templates/dynamictags.inc.php:108 +msgid "Popular Tags From All Users" +msgstr "Tüm kullanıcıların En Popüler Etiketleri" + +#: data/templates/editbookmark.tpl.php:46 +msgid "Address" +msgstr "Adres" + +#: data/templates/editbookmark.tpl.php:48 +#: data/templates/editbookmark.tpl.php:53 +#: data/templates/editprofile.tpl.php:29 +#: data/templates/tagrename.tpl.php:14 +#: data/templates/tagrename.tpl.php:19 +msgid "Required" +msgstr "Gerekli" + +#: data/templates/editbookmark.tpl.php:58 +msgid "Add Note" +msgstr "Not Ekle" + +#: data/templates/editbookmark.tpl.php:61 +msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] " +msgstr "" + +#: data/templates/editbookmark.tpl.php:64 +msgid "Suggested anchors: " +msgstr "Önerilen çapalar(anchor):" + +#: data/templates/editbookmark.tpl.php:76 +msgid "Private Note" +msgstr "Gizli Not" + +#: data/templates/editbookmark.tpl.php:78 +msgid "Just visible by you and your contacts." +msgstr "Sadece siz ve arkadaşlarınız tarafından görülebilir." + +#: data/templates/editbookmark.tpl.php:82 +#: data/templates/toolbar.inc.php:10 +#: www/tags.php:45 +#: www/tags.php:67 +msgid "Tags" +msgstr "Etiketler" + +#: data/templates/editbookmark.tpl.php:86 +msgid "Comma-separated" +msgstr "Virgülle ayrılmış" + +#: data/templates/editbookmark.tpl.php:90 +#: data/templates/tag2tagadd.tpl.php:9 +msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" +msgstr "" + +#: data/templates/editbookmark.tpl.php:94 +#: data/templates/tag2tagadd.tpl.php:8 +msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" +msgstr "" + +#: data/templates/editbookmark.tpl.php:97 +#: data/templates/importDelicious.tpl.php:15 +#: data/templates/importNetscape.tpl.php:16 +msgid "Privacy" +msgstr "Gizlilik" + +#: data/templates/editbookmark.tpl.php:100 +#: data/templates/importDelicious.tpl.php:18 +#: data/templates/importNetscape.tpl.php:19 +msgid "Public" +msgstr "Açık" + +#: data/templates/editbookmark.tpl.php:101 +msgid "Shared with Watch List" +msgstr "İzleme listesiyle paylaşılanlar" + +#: data/templates/editbookmark.tpl.php:102 +#: data/templates/importDelicious.tpl.php:20 +#: data/templates/importNetscape.tpl.php:21 +msgid "Private" +msgstr "Gizli" + +#: data/templates/editbookmark.tpl.php:115 +msgid "Delete Bookmark" +msgstr "Yerimini Sil" + +#: data/templates/editbookmark.tpl.php:120 +msgid "edit common description" +msgstr "genel tanımı düzenle" + +#: data/templates/editbookmark.tpl.php:212 +#: data/templates/importDelicious.tpl.php:26 +#: data/templates/importNetscape.tpl.php:27 +#: data/templates/importStructure.tpl.php:16 +msgid "Import" +msgstr "İçeri Aktar" + +#: data/templates/editbookmark.tpl.php:214 +msgid "Import bookmarks from bookmark file" +msgstr "Bağlantılarınızı bir yerimi dosyasından içeri aktarın" + +#: data/templates/editbookmark.tpl.php:214 +msgid "Internet Explorer, Mozilla Firefox and Netscape" +msgstr "Internet Explorer, Mozilla Firefox ve Netscape" + +#: data/templates/editbookmark.tpl.php:215 +msgid "Import bookmarks from del.icio.us" +msgstr "Bağlantılarınızı del.icio.us'dan içeri aktarın" + +#: data/templates/editprofile-sslclientcerts.tpl.php:11 +msgid "SSL client certificates" +msgstr "SSL istemci sertifikaları" + +#: data/templates/editprofile-sslclientcerts.tpl.php:17 +msgid "Serial" +msgstr "Seri No" + +#: data/templates/editprofile-sslclientcerts.tpl.php:18 +#: data/templates/editprofile.tpl.php:37 +#: data/templates/profile.tpl.php:17 +msgid "Name" +msgstr "İsim" + +#: data/templates/editprofile-sslclientcerts.tpl.php:19 +#: data/templates/profile.tpl.php:11 +msgid "Email" +msgstr "Eposta" + +#: data/templates/editprofile-sslclientcerts.tpl.php:20 +msgid "Issuer" +msgstr "" + +#: data/templates/editprofile-sslclientcerts.tpl.php:30 +msgid "delete" +msgstr "sil" + +#: data/templates/editprofile-sslclientcerts.tpl.php:43 +msgid "No certificates registered" +msgstr "Hİçbir sertifika kaydedilmedi" + +#: data/templates/editprofile-sslclientcerts.tpl.php:48 +msgid "Your current certificate is already registered with your account." +msgstr "Geçerli sertifika zaten hesabınıza kaydolmuş durumda." + +#: data/templates/editprofile-sslclientcerts.tpl.php:53 +msgid "Register current certificate to automatically login." +msgstr "Sertifikayı kaydederek otomatik bir şekilde giriş yapabilirsiniz." + +#: data/templates/editprofile-sslclientcerts.tpl.php:59 +msgid "Your browser does not provide a certificate." +msgstr "Tarayıcınız bir sertifika sunmuyor." + +#: data/templates/editprofile.tpl.php:8 +msgid "Account Details" +msgstr "Hesap Ayrıntıları" + +#: data/templates/editprofile.tpl.php:12 +#: data/templates/login.tpl.php:21 +#: data/templates/password.tpl.php:10 +#: data/templates/profile.tpl.php:6 +#: data/templates/register.tpl.php:16 +msgid "Username" +msgstr "Kullanıcı Adı" + +#: data/templates/editprofile.tpl.php:17 +msgid "New Password" +msgstr "Yeni Parola" + +#: data/templates/editprofile.tpl.php:22 +msgid "Confirm Password" +msgstr "Parolayı tekrarla" + +#: data/templates/editprofile.tpl.php:27 +#: data/templates/password.tpl.php:14 +#: data/templates/register.tpl.php:26 +msgid "E-mail" +msgstr "E-posta" + +#: data/templates/editprofile.tpl.php:33 +msgid "Personal Details" +msgstr "Kullanıcı Ayrıntıları" + +#: data/templates/editprofile.tpl.php:41 +#: data/templates/profile.tpl.php:23 +msgid "Homepage" +msgstr "Ana Sayfa" + +#: data/templates/editprofile.tpl.php:50 +#: www/edit.php:113 +msgid "Save Changes" +msgstr "Değişiklikleri Kaydet" + +#: data/templates/editprofile.tpl.php:55 +#: data/templates/sidebar.block.tagactions.php:17 +#: data/templates/sidebar.block.watchstatus.php:18 +msgid "Actions" +msgstr "Eylemler" + +#: data/templates/editprofile.tpl.php:58 +msgid "Export bookmarks" +msgstr "Yer İmlerini dışarı aktar" + +#: data/templates/editprofile.tpl.php:60 +msgid "HTML file (for browsers)" +msgstr "HTML dosyası (tarayıcılar için)" + +#: data/templates/editprofile.tpl.php:61 +msgid "XML file (like del.icio.us)" +msgstr "XML dosyası (del.icio.us'ın sağladığı gibi)" + +#: data/templates/editprofile.tpl.php:62 +msgid "CSV file (for spreadsheet tools)" +msgstr "CSV dosyası (excel programları için)" + +#: data/templates/error.404.tpl.php:5 +msgid "Not Found" +msgstr "Bulunamadı" + +#: data/templates/error.404.tpl.php:6 +msgid "The requested URL was not found on this server" +msgstr "İstenilen adres bu sunucuda bulunamadı" + +#: data/templates/error.500.tpl.php:5 +msgid "General server error" +msgstr "Genel sunucu hatası" + +#: data/templates/error.500.tpl.php:6 +msgid "The requested URL could not be processed" +msgstr "İstenen adres işlenemedi" + +#: data/templates/importDelicious.tpl.php:19 +#: data/templates/importNetscape.tpl.php:20 +msgid "Shared with Watchlist" +msgstr "İzleme listesiyle Paylaşılanlar" + +#: data/templates/importDelicious.tpl.php:31 +#: data/templates/importNetscape.tpl.php:32 +#: data/templates/importStructure.tpl.php:21 +msgid "Instructions" +msgstr "Talimatlar" + +#: data/templates/importDelicious.tpl.php:33 +msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>" +msgstr "del.icio.us'a giriş yapıp <a href=\"http://del.icio.us/api/posts/all\">dışarı aktar sayfasına girin</a>" + +#: data/templates/importDelicious.tpl.php:34 +msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer" +msgstr "Sonuç <abbr title=\"Extensible Markup Language\">XML</abbr> dosyasını bilgisayarınıza kaydedin" + +#: data/templates/importDelicious.tpl.php:35 +msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB" +msgstr "<kbd>Gözat...</kbd>'a basarak bilgisayarınızdan bir dosya seçin. Dosya boyutu en fazla 1 MB olabilir." + +#: data/templates/importDelicious.tpl.php:36 +#: data/templates/importNetscape.tpl.php:43 +msgid "Select the default privacy setting for your imported bookmarks" +msgstr "" + +#: data/templates/importDelicious.tpl.php:37 +#: data/templates/importNetscape.tpl.php:44 +msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute" +msgstr "" + +#: data/templates/importNetscape.tpl.php:35 +msgid "Export your bookmarks from your browser to a file" +msgstr "" + +#: data/templates/importNetscape.tpl.php:37 +msgid "Internet Explorer: <kbd>File > Import and Export... > Export Favorites" +msgstr "Internet Explorer: <kbd> DOsya > İçe Aktar ve Dışa Aktar... > Favorileri Dışarı Aktar" + +#: data/templates/importNetscape.tpl.php:38 +msgid "Mozilla Firefox: <kbd>Bookmarks > Manage Bookmarks... > File > Export..." +msgstr "Mozilla Firefox: <kbd>Yerimleri > Yerimlerini Yönet... > Dosya > Dışarı Aktar..." + +#: data/templates/importNetscape.tpl.php:39 +msgid "Netscape: <kbd>Bookmarks > Manage Bookmarks... > Tools > Export..." +msgstr "" + +#: data/templates/importNetscape.tpl.php:42 +msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB" +msgstr "" + +#: data/templates/importStructure.tpl.php:24 +msgid "Create your structure into a simple text file and following this model:" +msgstr "" + +#: data/templates/importStructure.tpl.php:35 +msgid "Then import the file. The tags and their relations will be added to your profile." +msgstr "" + +#: data/templates/login.tpl.php:13 +msgid "Please activate cookies" +msgstr "Lütfen çerezleri etkinleştirin" + +#: data/templates/login.tpl.php:26 +#: data/templates/register.tpl.php:21 +msgid "Password" +msgstr "Şifre" + +#: data/templates/login.tpl.php:28 +msgid "Don't ask for my password for 2 weeks" +msgstr "Şifremi 2 hafta boyunca sorma" + +#: data/templates/login.tpl.php:32 +#: data/templates/toolbar.inc.php:29 +#: www/login.php:57 +msgid "Log In" +msgstr "Giriş" + +#: data/templates/login.tpl.php:36 +msgid "Forgotten your password?" +msgstr "Parolanızı mı unuttunuz?" + +#: data/templates/password.tpl.php:5 +#, php-format +msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you." +msgstr "" + +#: data/templates/password.tpl.php:19 +msgid "Generate Password" +msgstr "Rastgele bir şifre oluştur" + +#: data/templates/profile.tpl.php:28 +msgid "Member Since" +msgstr "Üyelik Tarihi:" + +#: data/templates/profile.tpl.php:40 +#: data/templates/sidebar.block.watchlist.php:30 +msgid "Watching" +msgstr "İzleniyor" + +#: data/templates/profile.tpl.php:55 +#: data/templates/sidebar.block.watchlist.php:52 +msgid "Watched By" +msgstr "İzleyenler" + +#: data/templates/profile.tpl.php:68 +#: data/templates/toolbar.inc.php:9 +msgid "Bookmarks" +msgstr "Yer imleri" + +#: data/templates/profile.tpl.php:69 +msgid "Go to bookmarks" +msgstr "Yer imlerine git" + +#: data/templates/register.tpl.php:11 +#, php-format +msgid "Sign up here to create a free %s account. All the information requested below is required" +msgstr "" + +#: data/templates/register.tpl.php:18 +msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)" +msgstr "" + +#: data/templates/register.tpl.php:28 +msgid " to send you your password if you forget it" +msgstr "" + +#: data/templates/register.tpl.php:33 +msgid "Antispam question" +msgstr "Spam belirleyici soru" + +#: data/templates/register.tpl.php:41 +#: data/templates/toolbar.inc.php:31 +#: www/register.php:99 +msgid "Register" +msgstr "Kaydol" + +#: data/templates/search.menu.php:27 +msgid "Search..." +msgstr "Ara..." + +#: data/templates/search.menu.php:28 +msgid "in" +msgstr "şurada" + +#: data/templates/search.menu.php:34 +msgid "this user's bookmarks" +msgstr "bu kullanıcının yerimleri" + +#: data/templates/search.menu.php:39 +msgid "my bookmarks" +msgstr "yer imlerim" + +#: data/templates/search.menu.php:40 +msgid "my watchlist" +msgstr "izleme listem" + +#: data/templates/search.menu.php:44 +msgid "all bookmarks" +msgstr "tüm yer imleri" + +#: data/templates/search.menu.php:54 +msgid "Search" +msgstr "Ara" + +#: data/templates/sidebar.block.linked.php:23 +msgid "Linked Tags" +msgstr "Bağlantılı Etiketler" + +#: data/templates/sidebar.block.linked.php:28 +#: data/templates/sidebar.block.menu.php:46 +msgid "Add new link" +msgstr "Yeni bağlantı ekle" + +#: data/templates/sidebar.block.linked.php:29 +#: data/templates/sidebar.block.menu.php:47 +msgid "Delete link" +msgstr "Bağlantıyı sil" + +#: data/templates/sidebar.block.menu.php:35 +#, fuzzy, php-format +msgid "Tags included into the tag '%s'" +msgstr "Geany etiket dosyaları (*.tags)" + +#: data/templates/sidebar.block.menu.php:35 +msgid "Menu Tags" +msgstr "Vitrin Etiketleri" + +#: data/templates/sidebar.block.menu.php:68 +msgid "See all your tags" +msgstr "Tüm etiketlerinizi görün" + +#: data/templates/sidebar.block.menu.php:68 +msgid "all your tags" +msgstr "tüm etiketleriniz" + +#: data/templates/sidebar.block.menu.php:70 +msgid "See all tags from this user" +msgstr "Bu kullanıcının tüm etiketlerine bak" + +#: data/templates/sidebar.block.menu.php:70 +msgid "all tags from this user" +msgstr "bu kullanıcının tüm etiketleri" + +#: data/templates/sidebar.block.menu.php:74 +msgid "See popular tags" +msgstr "Popüler etiketlere bak" + +#: data/templates/sidebar.block.menu2.php:21 +msgid "Featured Menu Tags" +msgstr "Vitrin Etiketleri" + +#: data/templates/sidebar.block.menu2.php:25 +msgid "This menu is composed of keywords (tags) organized by admins." +msgstr "" + +#: data/templates/sidebar.block.recent.php:18 +msgid "Recent Tags" +msgstr "Son Etiketler" + +#: data/templates/sidebar.block.related.php:26 +msgid "Related Tags" +msgstr "İlgili Etiketler" + +#: data/templates/sidebar.block.search.php:28 +msgid "Last Searches" +msgstr "Son Aramalar" + +#: data/templates/sidebar.block.search.php:40 +#, fuzzy +msgid "Number of bookmarks for this query" +msgstr "Bu albüme yüklenebilecek maksimum resim sayısı:" + +#: data/templates/sidebar.block.tagactions.php:9 +#: www/tagrename.php:72 +msgid "Rename Tag" +msgid_plural "Rename Tags" +msgstr[0] "Etiketi Düzenle" +msgstr[1] "Etiketi Düzenle" + +#: data/templates/sidebar.block.tagactions.php:22 +#: www/tagdelete.php:54 +msgid "Delete Tag" +msgstr "Etiketi sil" + +#: data/templates/sidebar.block.tagactions.php:24 +#: www/tagedit.php:61 +msgid "Edit Tag Description" +msgstr "Etiket Tanımını Düzenle" + +#: data/templates/sidebar.block.tagactions.php:26 +#: www/tagcommondescriptionedit.php:76 +msgid "Edit Tag Common Description" +msgstr "Genel Etiket Tanımını Düzenleyin" + +#: data/templates/sidebar.block.tagactions.php:28 +msgid "Create a link to another tag" +msgstr "Başka bir etikete bağlantı yarat" + +#: data/templates/sidebar.block.users.php:14 +msgid "New Users" +msgstr "Yeni Kullanıcılar" + +#: data/templates/sidebar.block.users.php:23 +#: data/templates/users.tpl.php:24 +msgid "bookmarks" +msgstr "yer imleri" + +#: data/templates/sidebar.block.users.php:30 +msgid "See all users" +msgstr "TÜm kullanıcıları gör" + +#: data/templates/sidebar.block.users.php:30 +msgid "All users" +msgstr "Tüm Kullanıcılar" + +#: data/templates/sidebar.block.watchlist.php:19 +msgid "Close contacts are mutual contacts" +msgstr "" + +#: data/templates/sidebar.block.watchlist.php:19 +msgid "Close contacts" +msgstr "Yakın kişiler" + +#: data/templates/sidebar.block.watchlist.php:36 +msgid "Add a contact..." +msgstr "Bir kişi ekle..." + +#: data/templates/sidebar.block.watchlist.php:36 +msgid "Type a username to add it to your contacts." +msgstr "Kişilerinize eklemek için bir kullanıcı adı yazın." + +#: data/templates/sidebar.block.watchlist.php:44 +msgid "Remove this contact" +msgstr "Bu kişiyi sil" + +#: data/templates/sidebar.block.watchstatus.php:11 +msgid "Remove from Watchlist" +msgstr "İzleme listesinden sil" + +#: data/templates/sidebar.block.watchstatus.php:13 +msgid "Add to Watchlist" +msgstr "İzleme listesine ekle" + +#: data/templates/sidebar.linkedtags.inc.php:18 +msgid "Edit link" +msgstr "Bağlantıyı düzenle" + +#: data/templates/sidebar.linkedtags.inc.php:47 +msgid "Synonyms:" +msgstr "Eş anlamlılar" + +#: data/templates/tag2tagadd.tpl.php:12 +msgid "Create new link:" +msgstr "Yeni bağlantı ekle:" + +#: data/templates/tag2tagadd.tpl.php:19 +#, php-format +msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" +msgstr "" + +#: data/templates/tag2tagadd.tpl.php:23 +#: data/templates/tag2tagedit.tpl.php:37 +msgid "Create" +msgstr "Oluştur" + +#: data/templates/tag2tagadd.tpl.php:35 +#: data/templates/tag2tagdelete.tpl.php:27 +#: data/templates/tag2tagedit.tpl.php:51 +msgid "Existing links:" +msgstr "Geçmiş Bağlantılar" + +#: data/templates/tag2tagadd.tpl.php:53 +#: data/templates/tag2tagdelete.tpl.php:45 +#: data/templates/tag2tagedit.tpl.php:69 +msgid "No links" +msgstr "Yer imi yok" + +#: data/templates/tag2tagdelete.tpl.php:15 +#: data/templates/tag2tagedit.tpl.php:16 +#: data/templates/tagdelete.tpl.php:8 +#: www/jsScuttle.php:23 +msgid "Yes" +msgstr "Evet" + +#: data/templates/tag2tagdelete.tpl.php:16 +#: data/templates/tag2tagedit.tpl.php:17 +#: data/templates/tagdelete.tpl.php:9 +#: www/jsScuttle.php:23 +msgid "No" +msgstr "Hayır" + +#: data/templates/tag2tagedit.tpl.php:6 +msgid "Delete the link" +msgstr "Bağlantıyı sil" + +#: data/templates/tag2tagedit.tpl.php:29 +msgid "Create new link" +msgstr "Yeni bağlantı ekle" + +#: data/templates/tagrename.tpl.php:12 +msgid "Old" +msgstr "Eski" + +#: data/templates/tagrename.tpl.php:17 +msgid "New" +msgstr "Yeni" + +#: data/templates/tagrename.tpl.php:24 +msgid "Rename" +msgstr "Yeniden Adlandır" + +#: data/templates/tags.tpl.php:11 +#: data/templates/users.tpl.php:9 +msgid "Alphabet" +msgstr "Abece" + +#: data/templates/tags.tpl.php:12 +#: data/templates/users.tpl.php:10 +msgid "Popularity" +msgstr "Popülarite" + +#: data/templates/toolbar.inc.php:8 +#: data/templates/toolbar.inc.php:26 +msgid "Home" +msgstr "Başlangıç" + +#: data/templates/toolbar.inc.php:11 +#: www/watchlist.php:106 +msgid "Watchlist" +msgstr "İzleme listesi" + +#: data/templates/toolbar.inc.php:12 +#: www/profile.php:67 +msgid "Profile" +msgstr "Profil" + +#: data/templates/toolbar.inc.php:13 +#: www/bookmarks.php:215 +msgid "Add a Bookmark" +msgstr "Yer imi ekle" + +#: data/templates/toolbar.inc.php:14 +msgid "Log Out" +msgstr "Çıkış" + +#: data/templates/toolbar.inc.php:17 +msgid "Admin" +msgstr "Yönetici" + +#: data/templates/top.inc.php:55 +msgid "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in \"Normal Mode\" and hide debugging messages, change $debugMode to false into config.php." +msgstr "" + +#: data/templates/users.tpl.php:20 +msgid "profile" +msgstr "profil" + +#: data/templates/users.tpl.php:21 +#, fuzzy +msgid "created in" +msgstr " (paket içinde):" + +#: www/admin.php:32 +msgid "Manage users" +msgstr "Kullanıcıları yönet" + +#: www/admin.php:68 +#, php-format +msgid "%s and all his bookmarks and tags were deleted." +msgstr "" + +#: www/admin.php:75 +msgid "Problem with " +msgstr "Şurada problem:" + +#: www/ajaxDelete.php:37 +msgid "You are not allowed to delete this bookmark" +msgstr "Bu yerimini silmek için yetkiniz yok." + +#: www/ajaxDelete.php:41 +#: www/edit.php:103 +msgid "Failed to delete bookmark" +msgstr "Yer iminin silinmesi başarısız oldu" + +#: www/alltags.php:50 +msgid "All Tags" +msgstr "Tüm etiketler" + +#: www/alltags.php:56 +#: www/bookmarks.php:99 +#: www/populartags.php:52 +#: www/profile.php:51 +#: www/rss.php:82 +#: www/search.php:111 +#: www/watch.php:45 +#: www/watchlist.php:61 +#, php-format +msgid "User with username %s was not found" +msgstr "" + +#: www/bookmarkcommondescriptionedit.php:51 +#: www/tag2tagadd.php:37 +#: www/tag2tagdelete.php:41 +#: www/tag2tagedit.php:33 +#: www/tagcommondescriptionedit.php:51 +#: www/tagedit.php:43 +msgid "Permission denied." +msgstr "İzin verilmedi." + +#: www/bookmarkcommondescriptionedit.php:60 +msgid "Bookmark common description updated" +msgstr "" + +#: www/bookmarkcommondescriptionedit.php:63 +msgid "Failed to update the bookmark common description" +msgstr "" + +#: www/bookmarkcommondescriptionedit.php:71 +msgid "Edit Bookmark Common Description" +msgstr "" + +#: www/bookmarks.php:114 +#: www/tags.php:47 +msgid "Remove the tag from the selection" +msgstr "Seçili öğeden etiketi çıkar" + +#: www/bookmarks.php:134 +#: www/edit.php:65 +msgid "Your bookmark must have a title and an address" +msgstr "" + +#: www/bookmarks.php:139 +msgid "This bookmark URL may not be added" +msgstr "Bu yerimi adresi eklenmeyebilir" + +#: www/bookmarks.php:158 +#: www/edit.php:83 +#: www/edit.php:86 +msgid "Bookmark saved" +msgstr "Yer imi kaydedildi" + +#: www/bookmarks.php:158 +msgid "(Come back to previous page.)" +msgstr "(Önceki sayfaya geri git.)" + +#: www/bookmarks.php:165 +#: www/import.php:106 +#: www/importNetscape.php:108 +msgid "There was an error saving your bookmark. Please try again or contact the administrator." +msgstr "" + +#: www/bookmarks.php:222 +msgid "Add Bookmark" +msgstr "Yer imi ekle" + +#: www/bookmarks.php:225 +msgid "You must be logged in before you can add bookmarks." +msgstr "" + +#: www/bookmarks.php:280 +#: www/bookmarks.php:281 +msgid "My Bookmarks" +msgstr "Yer İmlerim" + +#: www/edit.php:44 +#: www/edit.php:45 +msgid "Edit Bookmark" +msgstr "Yer İmini Düzenle" + +#: www/edit.php:51 +#, php-format +msgid "Bookmark with id %s not was not found" +msgstr "" + +#: www/edit.php:57 +msgid "You are not allowed to edit this bookmark" +msgstr "Bu yer imini düzenlemek için yetkiniz yok." + +#: www/edit.php:77 +msgid "Error while saving your bookmark" +msgstr "Yeriminizi kaydederken bir sorun yaşandı" + +#: www/history.php:61 +msgid "History" +msgstr "Geçmiş" + +#: www/history.php:62 +#, php-format +msgid "History for %s" +msgstr "%s için geçmiş" + +#: www/history.php:84 +msgid "Address was not found" +msgstr "Adres bulunamadı" + +#: www/import.php:47 +msgid "Could not open XML input" +msgstr "XML girdisi açılamadı" + +#: www/import.php:51 +#, php-format +msgid "XML error: %s at line %d" +msgstr "XML hatası: %s, %d satırında" + +#: www/import.php:60 +msgid "Import Bookmarks from del.icio.us" +msgstr "Bağlantılarınızı del.icio.us'dan içeri aktarın" + +#: www/import.php:93 +msgid "You have already submitted this bookmark." +msgstr "Bu yer imini önceden kaydetmişsiniz." + +#: www/import.php:104 +msgid "Bookmark imported." +msgstr "Yer imi içeri aktarıldı" + +#: www/importNetscape.php:95 +msgid "You have already submitted some of these bookmarks." +msgstr "" + +#: www/importNetscape.php:115 +msgid "Bookmarks found: " +msgstr "Yerimleri bulundu:" + +#: www/importNetscape.php:116 +msgid "Bookmarks imported: " +msgstr "Yerimleri içe aktarıldı:" + +#: www/importNetscape.php:117 +#: www/importNetscape.php:122 +msgid "Import Bookmarks from Browser File" +msgstr "Yer imlerinizi Tarayıcı Dosyasından İçeri Aktarın" + +#: www/importStructure.php:61 +msgid "Bad indentation" +msgstr "Geçersiz Girinti" + +#: www/importStructure.php:67 +msgid "New links between tags: " +msgstr "Etiketler arasında yeni bağlantılar:" + +#: www/importStructure.php:72 +msgid "Import Structure" +msgstr "Yapıyı İçeri Aktar" + +#: www/index.php:38 +msgid "You have now logged out" +msgstr "Çıkış yapmış bulunuyorsunuz" + +#: www/index.php:45 +#, php-format +msgid "%s: Recent bookmarks" +msgstr "%s: En son yer imleri" + +#: www/index.php:75 +msgid "Store, share and tag your favourite links" +msgstr "Favori yer imlerinizi saklayın, paylaşın ve etiketleyin" + +#: www/index.php:76 +msgid "All Bookmarks" +msgstr "Tüm yer imleri" + +#: www/jsScuttle.php:70 +msgid "Available" +msgstr "Uygun" + +#: www/jsScuttle.php:73 +msgid "Not Available" +msgstr "Uygun Değil" + +#: www/login.php:48 +msgid "The details you have entered are incorrect. Please try again." +msgstr "" + +#: www/password.php:36 +msgid "You must enter your username." +msgstr "Kullanıcı adınızı girmeniz gerekiyor." + +#: www/password.php:40 +msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address." +msgstr "" + +#: www/password.php:48 +msgid "No matches found for that username." +msgstr "" + +#: www/password.php:51 +msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address." +msgstr "" + +#: www/password.php:59 +msgid "There was an error while generating your new password. Please try again." +msgstr "" + +#: www/password.php:63 +msgid "Your new password is:" +msgstr "Yeni parolanız:" + +#: www/password.php:63 +msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in." +msgstr "" + +#: www/password.php:66 +#, php-format +msgid "%s Account Information" +msgstr "%s Hesap Bilgileri" + +#: www/password.php:68 +#, php-format +msgid "New password generated and sent to %s" +msgstr "" + +#: www/password.php:75 +msgid "Forgotten Password" +msgstr "Şifremi Unuttum" + +#: www/profile.php:59 +#: www/watchlist.php:119 +msgid "Username was not specified" +msgstr "Kullanıcı adı belirtilmedi" + +#: www/profile.php:65 +msgid "My Profile" +msgstr "Profilim" + +#: www/profile.php:89 +msgid "Invalid Token" +msgstr "Geçersiz belirteç" + +#: www/profile.php:94 +msgid "Password and confirmation do not match." +msgstr "" + +#: www/profile.php:98 +msgid "Password must be at least 6 characters long." +msgstr "Şifre en az 6 karakter uzunluğunda olmalıdır." + +#: www/profile.php:102 +msgid "E-mail address is not valid." +msgstr "Eposta adresi geçersiz." + +#: www/profile.php:106 +msgid "An error occurred while saving your changes." +msgstr "Ayarlarınız kaydedilirken bir hata oluştu." + +#: www/profile.php:108 +msgid "Changes saved." +msgstr "Değişiklikler kaydedildi." + +#: www/profile.php:121 +msgid "You do not have a valid SSL client certificate" +msgstr "Geçerli bir SSL istemci sertifikasına sahip değilsiniz" + +#: www/profile.php:123 +msgid "This certificate is already registered" +msgstr "Bu sertifika zaten yüklü" + +#: www/profile.php:125 +msgid "Failed to register SSL client certificate." +msgstr "SSL istemci sertifikasının kaydedilmesi başarısız oldu." + +#: www/profile.php:127 +msgid "SSL client certificate registered." +msgstr "SSL istemci sertifikası kaydedildi." + +#: www/profile.php:136 +msgid "Certificate not found." +msgstr "Sertifika bulunamadı." + +#: www/profile.php:138 +msgid "The certificate does not belong to you." +msgstr "Sertifika size ait değil." + +#: www/profile.php:140 +msgid "Failed to delete SSL client certificate." +msgstr "SSL istemci sertifikasının silinmesi başarısız oldu" + +#: www/profile.php:142 +msgid "SSL client certificate deleted." +msgstr "SSL istemci sertifikası silindi." + +#: www/register.php:52 +msgid "You <em>must</em> enter a username, password and e-mail address." +msgstr "Bir kullanıcı adı, şifre ve eposta adresi girmeniz <em>zorunludur</em>." + +#: www/register.php:56 +msgid "This username has been reserved, please make another choice." +msgstr "Bu kullanıcı adı rezerve edilmiş, lütfen başka bir seçim yapın." + +#: www/register.php:60 +msgid "This username already exists, please make another choice." +msgstr "Bu kullanıcı adı önceden alınmış, lütfen başka bir seçim yapın." + +#: www/register.php:64 +msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice." +msgstr "Bu kullanıcı adı geçerli değil (çok kısa, çok uzun, yasaklı karakterler...), lütfen farklı bir ad seçin." + +#: www/register.php:68 +msgid "E-mail address is not valid. Please try again." +msgstr "Eposta adresi geçerli değil. Lütfen tekrar deneyin." + +#: www/register.php:72 +msgid "Antispam answer is not valid. Please try again." +msgstr "Çöp ileti engelleyici cevabı geçersiz." + +#: www/register.php:90 +msgid "You have successfully registered. Enjoy!" +msgstr "Başarılı bir şekilde kaydoldunuz. İyi eğlenceler!" + +#: www/register.php:92 +msgid "Registration failed. Please try again." +msgstr "Kaydınız başarısız oldu. Lütfen tekrar deneyin." + +#: www/rss.php:99 +#, php-format +msgid "Recent bookmarks posted to %s" +msgstr "%s'e son kaydedilen yerimleri" + +#: www/search.php:83 +#: www/search.php:147 +msgid "Search Bookmarks" +msgstr "Yer İmlerinde Ara " + +#: www/search.php:89 +msgid "Search Results" +msgstr "Sonuçlarda Ara" + +#: www/search.php:137 +msgid "Unsatisfied? You can also try our " +msgstr "Memnun kalmadınız mı? Şunu da deneyebilirsiniz:" + +#: www/tag2tagadd.php:54 +msgid "Tag link created" +msgstr "Etiket bağlantısı oluşturuldu" + +#: www/tag2tagadd.php:57 +msgid "Failed to create the link" +msgstr "Bağlantı oluşturulamadı" + +#: www/tag2tagadd.php:69 +msgid "Add Tag Link" +msgstr "Etiket Bağlantısı Oluştur" + +#: www/tag2tagdelete.php:66 +msgid "Tag link deleted" +msgstr "Etiket bağlantısı silindi" + +#: www/tag2tagdelete.php:69 +msgid "Failed to delete the link" +msgstr "Bağlantının silinmesi başarısız" + +#: www/tag2tagdelete.php:81 +msgid "Delete Link Between Tags" +msgstr "Etiketleri Arasındaki Bağlantıyı Sil" + +#: www/tag2tagedit.php:55 +msgid "Edit Link Between Tags" +msgstr "Etiketler arasındaki bağlantıyı düzenle" + +#: www/tagcommondescriptionedit.php:62 +msgid "Tag common description updated" +msgstr "Etiketin genel tanımı güncellendi" + +#: www/tagcommondescriptionedit.php:67 +msgid "Failed to update the tag common description" +msgstr "Etiketin genel tanımının güncellenmesi başarısız oldu" + +#: www/tagdelete.php:43 +msgid "Tag deleted" +msgstr "Etiket silindi" + +#: www/tagdelete.php:46 +msgid "Failed to delete the tag" +msgstr "Etiketin silinemedi" + +#: www/tagedit.php:52 +msgid "Tag description updated" +msgstr "Etiket tanımı güncellendi" + +#: www/tagedit.php:55 +msgid "Failed to update the tag description" +msgstr "Etiket tanımının güncellenmesi başarısız oldu" + +#: www/tagrename.php:63 +msgid "Tag renamed" +msgstr "Etiket yeniden adlandırıldı" + +#: www/tagrename.php:66 +msgid "Failed to rename the tag" +msgstr "Etiket yeniden adlandırılamadı" + +#: www/users.php:31 +msgid "Users" +msgstr "Kullanıcılar" + +#: www/watch.php:54 +msgid "User removed from your watchlist" +msgstr "Kullancıı izleme listenizden silindi" + +#: www/watch.php:56 +msgid "User added to your watchlist" +msgstr "Kullancıı izleme listenize eklendi" + +#: www/watchlist.php:104 +msgid "My Watchlist" +msgstr "İzleme Listem" + +#: www/api/httpauth.inc.php:30 +msgid "Use of the API calls requires authentication." +msgstr "" + +#: www/gsearch/index.php:27 +msgid "Come back to " +msgstr "Geri dön" + +#: www/gsearch/index.php:32 +msgid "Admin tips: " +msgstr "Yönetici ipuçları:" + +#: www/gsearch/index.php:33 +msgid "To refresh manually Google Custom Search Engine, goes to: " +msgstr "" + +#: www/gsearch/index.php:37 +msgid "If no result appears, check that all the urls are valid in the admin section." +msgstr "" + diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php index 8cf07c1..c2ab6d4 100644 --- a/data/templates/default/dynamictags.inc.php +++ b/data/templates/default/dynamictags.inc.php @@ -25,13 +25,13 @@ $b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag'); $logged_on_userid = $userservice->getCurrentUserId(); //tags from current user -$userPopularTags =& $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid); -$userPopularTagsCloud =& $b2tservice->tagCloud($userPopularTags, 5, 90, 175); +$userPopularTags = $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid); +$userPopularTagsCloud = $b2tservice->tagCloud($userPopularTags, 5, 90, 175); $userPopularTagsCount = count($userPopularTags); //tags from all users -$allPopularTags =& $b2tservice->getPopularTags(null, 5, $logged_on_userid); -$allPopularTagsCloud =& $b2tservice->tagCloud($allPopularTags, 5, 90, 175); +$allPopularTags = $b2tservice->getPopularTags(null, 5, $logged_on_userid); +$allPopularTagsCloud = $b2tservice->tagCloud($allPopularTags, 5, 90, 175); $allPopularTagsCount = count($allPopularTags); diff --git a/data/templates/default/register.tpl.php b/data/templates/default/register.tpl.php index 62cebad..6cfddd7 100644 --- a/data/templates/default/register.tpl.php +++ b/data/templates/default/register.tpl.php @@ -23,6 +23,11 @@ window.onload = function() { <td></td> </tr> <tr> + <th align="left"><label for="password2"><?php echo T_('Repeat Password'); ?></label></th> + <td><input type="password" id="password2" name="password2" size="20" class="required" /></td> + <td></td> +</tr> +<tr> <th align="left"><label for="email"><?php echo T_('E-mail'); ?></label></th> <td><input type="text" id="email" name="email" size="40" class="required" value="<?php echo htmlspecialchars(POST_MAIL); ?>" /></td> <td><?php echo '←'.T_(' to send you your password if you forget it')?></td> diff --git a/data/templates/default/sidebar.block.common.php b/data/templates/default/sidebar.block.common.php index 951ed80..dfc83ef 100644 --- a/data/templates/default/sidebar.block.common.php +++ b/data/templates/default/sidebar.block.common.php @@ -1,7 +1,7 @@ <?php $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); -$commonTags =& $b2tservice->getRelatedTagsByHash($hash); -$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); +$commonTags = $b2tservice->getRelatedTagsByHash($hash); +$commonTags = $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); if ($commonTags && count($commonTags) > 0) { ?> diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php index 50756c0..842aa60 100644 --- a/data/templates/default/sidebar.block.popular.php +++ b/data/templates/default/sidebar.block.popular.php @@ -14,8 +14,8 @@ $logged_on_userid = $userservice->getCurrentUserId(); if ($logged_on_userid === false) { $logged_on_userid = NULL; } -$popularTags =& $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid); -$popularTags =& $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); +$popularTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid); +$popularTags = $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); if ($popularTags && count($popularTags) > 0) { ?> diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php index 1ffeb4d..80ae71c 100644 --- a/data/templates/default/sidebar.block.recent.php +++ b/data/templates/default/sidebar.block.recent.php @@ -10,7 +10,7 @@ if ($logged_on_userid === false) { $logged_on_userid = NULL; } $recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']); -$recentTags =& $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); +$recentTags = $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); if ($recentTags && count($recentTags) > 0) { ?> diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index 953dc63..7868191 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -2,6 +2,7 @@ SemanticScuttle installation ============================ +.. contents:: Prerequisites ============= @@ -11,8 +12,11 @@ To run SemanticScuttle, you need: - A web server, for example Apache -Installation instructions -========================= +Standard installation instructions +================================== +If you've downloaded a ``SemanticScuttle-x.y.z.zip`` file from SourceForge, +then this instructions are for you. + 1. Create a new MySQL database 2. Import ``data/tables.sql`` into that database, i.e. run :: @@ -42,7 +46,7 @@ Installation instructions Ugly www directory in URLs -========================== +-------------------------- In case point 5 of the installation instructions cannot be put into practice by you because you are not able to change the web server configuration, you are not lost! There is a way to get rid of @@ -85,3 +89,58 @@ with :: require_once '../../semanticscuttle/src/SemanticScuttle/header.php'; + + +PEAR package installation +========================= +Apart from the normal installation, you may install the SemanticScuttle PEAR +package - it gives you the ability to upgrade to the next version with a single +command, without manually unzipping files. + +0. The SemanticScuttle PEAR channel is available at + http://semanticscuttle.sourceforge.net/pirum.html + +1. Make sure you have the PEAR installer (or Pyrus) available and working. + You can check that by running :: + + $ pear version + PEAR Version: 1.9.2 + PHP Version: 5.3.6-13ubuntu3.2 + Zend Engine Version: 2.3.0 + Running on: Linux bogo 3.0.0-12-generic #20-Ubuntu SMP Fri Oct 7 14:56:25 UTC 2011 x86_64 + +2. Discover the channel if you haven't done so yet:: + + $ pear channel-discover semanticscuttle.sourceforge.net + + Verify that the channel has been added with:: + + $ pear list-channels + Registered Channels: + ==================== + Channel Alias Summary + ... + semanticscuttle.sourceforge.net sc SemanticScuttle PEAR channel + ... + +3. Install SemanticScuttle:: + + $ pear install sc/semanticscuttle-beta + +4. Find out where it got installed to:: + + $ pear list-files sc/semanticscuttle + +5. Generally, the directory you need to point your web server's ``DocumentRoot`` to + is the *PEAR www directory* + ``/SemanticScuttle/``. Find the www directory with:: + + $ pear config-get www_dir + /usr/share/php/htdocs + +6. The configuration file is located in *PEAR's data directory* + ``/SemanticScuttle/``:: + + $ pear config-get data_dir + /usr/share/php/data + + In ``$data_dir/SemanticScuttle/``, copy ``config.php.dist`` to + ``config.php`` and continue with configuration_. diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst index 74f4bbd..de2c4e3 100644 --- a/doc/developers/release-new-version.rst +++ b/doc/developers/release-new-version.rst @@ -14,9 +14,18 @@ How to release a new version of SemanticScuttle The build script takes care for most of the tasks. Run "``phing release``", and it will upload the release to - sourceforge and create a svn tag. -7. Write announcement mail to the SemanticScuttle mailing list - semanticscuttle-devel@lists.sourceforge.net -8. Announce the new release in the sourceforge project news - https://sourceforge.net/apps/trac/sourceforge/wiki/News - + sourceforge. +7. Create a git tag and push it +8. Create the PEAR package and test it: + Run ``phing package``, then + ``pear upgrade dist/pear/SemanticScuttle-0.xx.tgz`` +9. Publish the PEAR package: ``phing deploy-sf-pear`` +10. Publish the documentation: ``phing deploy-docs`` +11. Write announcement mail to the SemanticScuttle mailing list + semanticscuttle-devel@lists.sourceforge.net +12. Announce the new release in the sourceforge project news + https://sourceforge.net/news/submit.php?group_id=211356 + Help about the process is available in + https://sourceforge.net/apps/trac/sourceforge/wiki/News +13. Set the default file in + https://sourceforge.net/projects/semanticscuttle/files/SemanticScuttle/ diff --git a/res/docs/header.tpl.html b/res/docs/header.tpl.html new file mode 100644 index 0000000..ee0650f --- /dev/null +++ b/res/docs/header.tpl.html @@ -0,0 +1,8 @@ +<ul class="menu"> + <li><a href="index.html">Index</a></li> + <li><a href="INSTALL.html">Installation</a></li> + <li><a href="UPGRADE.html">Upgrade</a></li> + <li><a href="ChangeLog.html">ChangeLog</a></li> + <li><a href="http://semanticscuttle.sourceforget.net/">Homepage</a></li> + <li><a href="https://sourceforget.net/projects/semanticscuttle">Project page</a></li> +</ul> diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 17ab7ba..faeecc2 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -90,7 +90,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService . ' "' . $this->db->sql_escape($value) .'"' . $range; - if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) { + if (!($dbresult = $this->db->sql_query_limit($query, 1, 0))) { message_die( GENERAL_ERROR, 'Could not get bookmark', '', __LINE__, __FILE__, @@ -148,7 +148,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService . $query_2 .' WHERE B.bId = '. $this->db->sql_escape($bid); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { message_die( GENERAL_ERROR, 'Could not get bookmark', '', __LINE__, __FILE__, $sql, $this->db @@ -630,7 +630,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService . ' WHERE bId = ' . intval($bId); $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die( GENERAL_ERROR, 'Could not update bookmark', diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 3e5c533..6505a5a 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -200,7 +200,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $sql = 'INSERT INTO '. $this->getTableName() . ' ' . $this->db->sql_build_array('INSERT', $values); - if (!($dbresult =& $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die( GENERAL_ERROR, 'Could not attach tags', @@ -222,7 +222,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query.= ' AND '. $bs->getTableName() .'.uId = '. $uId; $query.= ' AND '. $this->getTableName() .'.tag = "'. $this->db->sql_escape($tag) .'"'; - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -238,7 +238,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query = 'DELETE FROM '. $this->getTableName() .' WHERE bId = '. intval($bookmarkid); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -258,7 +258,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $GLOBALS['tableprefix'].'bookmarks', $uId); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -370,7 +370,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query .= ' WHERE '. $this->db->sql_build_array('SELECT', $conditions) .' AND LEFT(T.tag, 7) <> "system:" GROUP BY T.tag ORDER BY bCount DESC, tag'; - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -418,7 +418,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query_5 = ' AND LEFT(T0.tag, 7) <> "system:" GROUP BY T0.tag ORDER BY bCount DESC, T0.tag'; $query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5; - if (! ($dbresult =& $this->db->sql_query_limit($query, $limit)) ){ + if (! ($dbresult = $this->db->sql_query_limit($query, $limit)) ){ message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -448,7 +448,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query = 'SELECT T.tag, COUNT(T.tag) AS bCount FROM '.$GLOBALS['tableprefix'].'bookmarks AS B LEFT JOIN '.$GLOBALS['tableprefix'].'bookmarks2tags AS T ON B.bId = T.bId WHERE B.bHash = \''. $this->db->sql_escape($hash) .'\' '. $privacy .'AND LEFT(T.tag, 7) <> "system:" GROUP BY T.tag ORDER BY bCount DESC'; - if (!($dbresult =& $this->db->sql_query_limit($query, $limit))) { + if (!($dbresult = $this->db->sql_query_limit($query, $limit))) { message_die(GENERAL_ERROR, 'Could not get related tags for this hash', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -622,12 +622,12 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService function hasTag($bookmarkid, $tag) { $query = 'SELECT COUNT(*) AS tCount FROM '. $this->getTableName() .' WHERE bId = '. intval($bookmarkid) .' AND tag ="'. $this->db->sql_escape($tag) .'"'; - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die(GENERAL_ERROR, 'Could not find tag', '', __LINE__, __FILE__, $query, $this->db); return false; } - if ($row =& $this->db->sql_fetchrow($dbresult)) { + if ($row = $this->db->sql_fetchrow($dbresult)) { if ($row['tCount'] > 0) { $output = true; } @@ -645,8 +645,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return false; // Find bookmarks with old tag - $bookmarksInfo =& $bookmarkservice->getBookmarks(0, NULL, $userid, $old); - $bookmarks =& $bookmarksInfo['bookmarks']; + $bookmarksInfo = $bookmarkservice->getBookmarks(0, NULL, $userid, $old); + $bookmarks = $bookmarksInfo['bookmarks']; // Delete old tag $this->deleteTag($userid, $old); @@ -655,7 +655,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $new = $tagservice->normalize($new); foreach(array_keys($bookmarks) as $key) { - $row =& $bookmarks[$key]; + $row = $bookmarks[$key]; $this->attachTags($row['bId'], $new, $fromApi, NULL, false); } diff --git a/src/SemanticScuttle/Service/CommonDescription.php b/src/SemanticScuttle/Service/CommonDescription.php index 0fffd32..d03b34a 100644 --- a/src/SemanticScuttle/Service/CommonDescription.php +++ b/src/SemanticScuttle/Service/CommonDescription.php @@ -62,7 +62,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $values = array('tag'=>$tag, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime); $sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); - if (!($dbresult =& $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add tag description', '', __LINE__, __FILE__, $sql, $this->db); return false; @@ -79,7 +79,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query.= ' WHERE tag=\'' . $this->db->sql_escape($tag) . "'"; $query.= " ORDER BY cdDatetime DESC"; - if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) { + if (!($dbresult = $this->db->sql_query_limit($query, 1, 0))) { message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -99,7 +99,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query.= ' WHERE tag=\'' . $this->db->sql_escape($tag) . "'"; $query.= " ORDER BY cdDatetime DESC"; - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -114,12 +114,12 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query.= " FROM `". $this->getTableName() ."`"; $query.= ' WHERE cdId=\'' . $this->db->sql_escape($cdId) . "'"; - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db); return false; } - if ($row =& $this->db->sql_fetchrow($dbresult)) { + if ($row = $this->db->sql_fetchrow($dbresult)) { $this->db->sql_freeresult($dbresult); return $row; } else { @@ -140,7 +140,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $values = array('bHash'=>$bHash, 'cdTitle'=>$title, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime); $sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); - if (!($dbresult =& $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add bookmark description', '', __LINE__, __FILE__, $sql, $this->db); return false; @@ -154,7 +154,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query.= ' WHERE bHash=\'' . $this->db->sql_escape($bHash) . "'"; $query.= " ORDER BY cdDatetime DESC"; - if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) { + if (!($dbresult = $this->db->sql_query_limit($query, 1, 0))) { message_die(GENERAL_ERROR, 'Could not get bookmark description', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -174,7 +174,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query.= ' WHERE bHash=\'' . $this->db->sql_escape($bHash) . "'"; $query.= " ORDER BY cdDatetime DESC"; - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get bookmark descriptions', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -188,7 +188,7 @@ class SemanticScuttle_Service_CommonDescription extends SemanticScuttle_DbServic $query = 'DELETE FROM '. $this->getTableName() . ' WHERE uId = '. intval($uId); $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not delete user descriptions', '', __LINE__, __FILE__, $query, $this->db); diff --git a/src/SemanticScuttle/Service/SearchHistory.php b/src/SemanticScuttle/Service/SearchHistory.php index a056ce2..ac0b1c7 100644 --- a/src/SemanticScuttle/Service/SearchHistory.php +++ b/src/SemanticScuttle/Service/SearchHistory.php @@ -198,7 +198,7 @@ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService { $sql = 'SELECT COUNT(*) AS `total` FROM '. $this->getTableName(); if (!($dbresult = $this->db->sql_query($sql)) - || (!($row = & $this->db->sql_fetchrow($dbresult))) + || (!($row = $this->db->sql_fetchrow($dbresult))) ) { message_die( GENERAL_ERROR, 'Could not get total searches', diff --git a/src/SemanticScuttle/Service/Tag.php b/src/SemanticScuttle/Service/Tag.php index 2476608..39147b8 100644 --- a/src/SemanticScuttle/Service/Tag.php +++ b/src/SemanticScuttle/Service/Tag.php @@ -54,7 +54,7 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService $query.= ' WHERE tag = \''. $this->db->sql_escape($tag) . "'"; $query.= ' AND uId = ' . intval($uId); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -74,7 +74,7 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService $query.= ' WHERE tag = \'' . $this->db->sql_escape($tag) . "'"; $query.= ' AND uId = "' . intval($uId) . '"'; - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -93,7 +93,7 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService $query.= ' FROM '.$this->getTableName(); $query.= ' WHERE tag = \''. $this->db->sql_escape($tag) . "'"; - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -114,7 +114,7 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService } $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not delete bookmarks', '', __LINE__, __FILE__, $query, $this->db); return false; diff --git a/src/SemanticScuttle/Service/Tag2Tag.php b/src/SemanticScuttle/Service/Tag2Tag.php index 33d211b..9dddc44 100644 --- a/src/SemanticScuttle/Service/Tag2Tag.php +++ b/src/SemanticScuttle/Service/Tag2Tag.php @@ -43,9 +43,9 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService } - function __construct(&$db) + function __construct($db) { - $this->db =& $db; + $this->db =$db; $this->tablename = $GLOBALS['tableprefix'] .'tags2tags'; } @@ -173,7 +173,7 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService $query.= " AND uId = '".intval($uId)."'"; } //die($query); - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -312,7 +312,7 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService $query.= " LIMIT 0," . intval($limit); } - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -337,7 +337,7 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService $query.= " ORDER BY count DESC"; $query.= " LIMIT 0, " . intval($GLOBALS['maxSizeMenuBlock']); - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -393,7 +393,7 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService $query.= strlen($relationType)>0 ? ' AND relationType = \''. $this->db->sql_escape($relationType) . "'" : ''; $query.= strlen($uId)>0 ? ' AND uId = '. intval($uId) : ''; - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not remove tag relation', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -410,7 +410,7 @@ class SemanticScuttle_Service_Tag2Tag extends SemanticScuttle_DbService $query = 'DELETE FROM '. $this->getTableName(); $query.= ' WHERE uId = '. intval($uId); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not remove tag relation', '', __LINE__, __FILE__, $query, $this->db); return false; } diff --git a/src/SemanticScuttle/Service/TagCache.php b/src/SemanticScuttle/Service/TagCache.php index b0ddfa6..0fdb986 100644 --- a/src/SemanticScuttle/Service/TagCache.php +++ b/src/SemanticScuttle/Service/TagCache.php @@ -72,7 +72,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $query.= " AND uId = " . intval($uId); //die($query); - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -101,7 +101,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> '>', 'uId'=> $uId); $query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); //die($query); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add tag cache inference', '', __LINE__, __FILE__, $query, $this->db); return false; @@ -122,7 +122,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $query.= ' AND relationType = ">"'; $query.= strlen($uId)>0 ? ' AND uId = ' . intval($uId) : ''; - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not remove tag cache inference', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -215,7 +215,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> '=', 'uId'=> $uId); $query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); //die($query); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add tag cache synonymy', '', __LINE__, __FILE__, $query, $this->db); return false; @@ -232,7 +232,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $query.= ' AND relationType = "="'; $query.= ' AND uId = ' . intval($uId); - if (!($dbresult =& $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not remove tag cache inference', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -295,7 +295,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $query.= " AND uId = " . intval($uId); //die($query); - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -323,7 +323,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService $query.= " AND uId = " . intval($uId); $query.= $tagExcepted!=''?" AND tag2!='" . $this->db->sql_escape($tagExcepted) . "'" : ''; - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -371,7 +371,7 @@ class SemanticScuttle_Service_TagCache extends SemanticScuttle_DbService function deleteByUser($uId) { $query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete user tags cache', '', __LINE__, __FILE__, $query, $this->db); return false; } diff --git a/src/SemanticScuttle/Service/TagStat.php b/src/SemanticScuttle/Service/TagStat.php index 23ebbc9..af8d110 100644 --- a/src/SemanticScuttle/Service/TagStat.php +++ b/src/SemanticScuttle/Service/TagStat.php @@ -67,7 +67,7 @@ class SemanticScuttle_Service_TagStat extends SemanticScuttle_DbService $query.= " AND relationType = '". $relationType ."'"; $query.= " AND uId = '".$uId."'"; - $dbresults =& $this->db->sql_query($query); + $dbresults = $this->db->sql_query($query); $row = $this->db->sql_fetchrow($dbresults); $this->db->sql_freeresult($dbresults); if($row['nb'] == null) { @@ -83,7 +83,7 @@ class SemanticScuttle_Service_TagStat extends SemanticScuttle_DbService $query.= " AND relationType = '". $relationType ."'"; $query.= " AND uId = '".$uId."'"; - $dbresults =& $this->db->sql_query($query); + $dbresults = $this->db->sql_query($query); $row = $this->db->sql_fetchrow($dbresults); $this->db->sql_freeresult($dbresults); if($row['depth'] == null) { @@ -99,7 +99,7 @@ class SemanticScuttle_Service_TagStat extends SemanticScuttle_DbService $query.= " AND relationType = '". $relationType ."'"; $query.= " AND uId = '".$uId."'"; - $dbresults =& $this->db->sql_query($query); + $dbresults = $this->db->sql_query($query); $row = $this->db->sql_fetchrow($dbresults); $this->db->sql_freeresult($dbresults); if($row['nbupdate'] == null) { @@ -161,7 +161,7 @@ class SemanticScuttle_Service_TagStat extends SemanticScuttle_DbService //die($query); - if (! ($dbresult =& $this->db->sql_query($query)) ){ + if (! ($dbresult = $this->db->sql_query($query)) ){ message_die(GENERAL_ERROR, 'Could not update stats', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -215,7 +215,7 @@ class SemanticScuttle_Service_TagStat extends SemanticScuttle_DbService function deleteTagStatForUser($uId) { $query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete tag stats', '', __LINE__, __FILE__, $query, $this->db); return false; diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index 7550ed2..434e6b7 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -120,12 +120,12 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService if($nb>0) { $query .= ' LIMIT 0, '.$nb; } - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die(GENERAL_ERROR, 'Could not get user', '', __LINE__, __FILE__, $query, $this->db); return false; } - while ($row = & $this->db->sql_fetchrow($dbresult)) { + while ($row = $this->db->sql_fetchrow($dbresult)) { $users[] = $row; } $this->db->sql_freeresult($dbresult); @@ -149,7 +149,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService $query .= ' LIMIT 0, ' . intval($nb); } - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die( GENERAL_ERROR, 'Could not get user', '', __LINE__, __FILE__, $query, $this->db @@ -158,7 +158,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService } $users = array(); - while ($row = & $this->db->sql_fetchrow($dbresult)) { + while ($row = $this->db->sql_fetchrow($dbresult)) { $users[] = new SemanticScuttle_Model_User( $row[$this->getFieldName('primary')], $row[$this->getFieldName('username')] @@ -434,7 +434,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService ')) = \''.$this->db->sql_escape($cook[1]).'\' AND '. $this->getFieldName('primary'). ' = '. $this->db->sql_escape($cook[0]); - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die( GENERAL_ERROR, 'Could not get user', '', __LINE__, __FILE__, $query, $this->db @@ -596,7 +596,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService // Gets the list of user IDs being watched by the given user. $query = 'SELECT watched FROM '. $GLOBALS['tableprefix'] .'watched WHERE uId = '. intval($uId); - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die(GENERAL_ERROR, 'Could not get watchlist', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -606,7 +606,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService $this->db->sql_freeresult($dbresult); return $arrWatch; } - while ($row =& $this->db->sql_fetchrow($dbresult)) { + while ($row = $this->db->sql_fetchrow($dbresult)) { $arrWatch[] = $row['watched']; } $this->db->sql_freeresult($dbresult); @@ -668,7 +668,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService // Returns true if the current user is watching the given user, and false otherwise. $query = 'SELECT watched FROM '. $GLOBALS['tableprefix'] .'watched AS W INNER JOIN '. $this->getTableName() .' AS U ON U.'. $this->getFieldName('primary') .' = W.watched WHERE U.'. $this->getFieldName('primary') .' = '. intval($watcheduser) .' AND W.uId = '. intval($currentuser); - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die(GENERAL_ERROR, 'Could not get watchstatus', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -690,7 +690,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService if ($watched) { $sql = 'DELETE FROM '. $GLOBALS['tableprefix'] .'watched WHERE uId = '. intval($currentUserID) .' AND watched = '. intval($subjectUserID); - if (!($dbresult =& $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add user to watch list', '', __LINE__, __FILE__, $sql, $this->db); return false; @@ -701,7 +701,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService 'watched' => intval($subjectUserID) ); $sql = 'INSERT INTO '. $GLOBALS['tableprefix'] .'watched '. $this->db->sql_build_array('INSERT', $values); - if (!($dbresult =& $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die(GENERAL_ERROR, 'Could not add user to watch list', '', __LINE__, __FILE__, $sql, $this->db); return false; @@ -743,7 +743,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService // Execute the statement. $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die( GENERAL_ERROR, 'Could not insert user', @@ -826,7 +826,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService // Execute the statement. $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); message_die( GENERAL_ERROR, 'Could not update user', '', @@ -845,7 +845,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService function getAllUsers ( ) { $query = 'SELECT * FROM '. $this->getTableName(); - if (! ($dbresult =& $this->db->sql_query($query)) ) { + if (! ($dbresult = $this->db->sql_query($query)) ) { message_die(GENERAL_ERROR, 'Could not get users', '', __LINE__, __FILE__, $query, $this->db); return false; } @@ -872,7 +872,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService function deleteUser($uId) { $query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId); - if (!($dbresult = & $this->db->sql_query($query))) { + if (!($dbresult = $this->db->sql_query($query))) { message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $query, $this->db); return false; } diff --git a/src/SemanticScuttle/functions.php b/src/SemanticScuttle/functions.php index 09f7cf3..802a7f1 100644 --- a/src/SemanticScuttle/functions.php +++ b/src/SemanticScuttle/functions.php @@ -276,4 +276,17 @@ function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', echo "<html>\n<body>\n". $msg_title ."\n<br /><br />\n". $msg_text ."</body>\n</html>"; exit; } + +/** + * Calls reset() on the given arg, without the E_STRICT error + * "Only variables should be passed by reference" + * + * @param array $arg Array to return first element of + * + * @return mixed First element of the array + */ +function rreset($array) +{ + return reset($array); +} ?> diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 694df54..1f2f12c 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -32,18 +32,15 @@ $cfg = new SemanticScuttle_Config(); list($configfile, $defaultfile) = $cfg->findFiles(); if ($defaultfile === null) { header('HTTP/1.0 500 Internal Server Error'); - die( - 'No default configuration file config.default.php found.' + echo 'No default configuration file config.default.php found.' . ' This is really, really strange' - . "\n" - ); + . "\n"; + exit(1); } if ($configfile === null) { header('HTTP/1.0 500 Internal Server Error'); - die( - 'Please copy "config.php.dist" to "config.php" in data/ folder.' - . "\n" - ); + echo 'Please copy "config.php.dist" to "config.php" in data/ folder.' . "\n"; + exit(1); } set_include_path( get_include_path() . PATH_SEPARATOR @@ -58,7 +55,8 @@ if (isset($_GET['unittestMode']) && $_GET['unittestMode'] == 1 ) { if ($allowUnittestMode !== true) { header('HTTP/1.0 400 Bad Request'); - die("Unittestmode is not allowed\n"); + echo "Unittestmode is not allowed\n"; + exit(2); } define('HTTP_UNIT_TEST_MODE', true); diff --git a/tests/Api/ExportCsvTest.php b/tests/Api/ExportCsvTest.php index 681f0de..a0a9eae 100644 --- a/tests/Api/ExportCsvTest.php +++ b/tests/Api/ExportCsvTest.php @@ -64,7 +64,7 @@ class Api_ExportCsvTest extends TestBaseApi */ public function testMimeTypeFilename() { - $res = reset($this->getAuthRequest())->send(); + $res = rreset($this->getAuthRequest())->send(); $this->assertEquals(200, $res->getStatus()); //verify MIME content type @@ -253,7 +253,7 @@ class Api_ExportCsvTest extends TestBaseApi $ar[] = $arl; } } - if (count(end($ar)) == 1 && reset(end($ar)) == '') { + if (count(end($ar)) == 1 && rreset(end($ar)) == '') { unset($ar[key($ar)]); } return $ar; diff --git a/tests/Api/OpenSearchTest.php b/tests/Api/OpenSearchTest.php index f438b46..09166da 100644 --- a/tests/Api/OpenSearchTest.php +++ b/tests/Api/OpenSearchTest.php @@ -12,7 +12,7 @@ class Api_OpenSearchTest extends TestBaseApi $xhtml = $req->send()->getBody(); $xml = simplexml_load_string($xhtml); - $xml->registerXPathNamespace('h', reset($xml->getDocNamespaces())); + $xml->registerXPathNamespace('h', rreset($xml->getDocNamespaces())); $this->assertInstanceOf( 'SimpleXMLElement', $xml, @@ -58,7 +58,7 @@ class Api_OpenSearchTest extends TestBaseApi { $xml = $this->getRequest('api/opensearch.php')->send()->getBody(); $x = simplexml_load_string($xml); - $x->registerXPathNamespace('os', reset($x->getDocNamespaces())); + $x->registerXPathNamespace('os', rreset($x->getDocNamespaces())); $arElements = $x->xpath('//os:Url[@type="text/html"]'); $this->assertEquals( diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php index 44a82d9..c436859 100644 --- a/tests/BookmarkTest.php +++ b/tests/BookmarkTest.php @@ -129,9 +129,9 @@ class BookmarkTest extends TestBase $bs = $this->bs; $bs->addBookmark("http://site1.com", "title", "éèüaàê", "status", array('tag1'), null, false, false, 1); - $bookmarks =& $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeaae"); //void + $bookmarks = $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeaae"); //void $this->assertEquals(0, $bookmarks['total']); - $bookmarks =& $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeuaae"); + $bookmarks = $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeuaae"); $this->assertEquals(1, $bookmarks['total']); }*/ diff --git a/tests/TestBase.php b/tests/TestBase.php index 2914749..4bffd1b 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -87,7 +87,7 @@ class TestBase extends PHPUnit_Framework_TestCase protected function addUser( $username = null, $password = null, $privateKey = null ) { - return reset($this->addUserData($username, $password, $privateKey)); + return rreset($this->addUserData($username, $password, $privateKey)); } diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index 1052ae7..ff3b695 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -55,7 +55,7 @@ class TestBaseApi extends TestBase protected function setUp() { if ($GLOBALS['unittestUrl'] === null) { - $this->assertTrue(false, 'Unittest URL not set in config'); + $this->markTestSkipped('Unittest URL not set in config'); } if ($this->urlPart === null) { $this->assertTrue(false, 'Set the urlPart variable'); diff --git a/www/admin.php b/www/admin.php index f9b9b8d..034872a 100644 --- a/www/admin.php +++ b/www/admin.php @@ -70,7 +70,7 @@ if ($action } break; case 'checkUrl' : - $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL, NULL, getSortOrder()); + $bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, NULL, NULL, getSortOrder()); foreach($bookmarks['bookmarks'] as $bookmark) { if(!checkUrl($bookmark['bAddress'])) { $tplVars['error'].= T_('Problem with ').$bookmark['bAddress'].' ('. $bookmark['username'] .')<br/>'; @@ -83,13 +83,13 @@ if ($action } $templatename = 'admin.tpl'; -$users =& $userservice->getObjectUsers(); +$users = $userservice->getObjectUsers(); if ( !is_array($users) ) { $users = array(); } -$tplVars['users'] =& $users; +$tplVars['users'] = $users; $templateservice->loadTemplate($templatename, $tplVars); ?> diff --git a/www/alltags.php b/www/alltags.php index 43ad1cb..16af7fd 100644 --- a/www/alltags.php +++ b/www/alltags.php @@ -63,8 +63,8 @@ if (isset($user) && $user != '') { $userid = NULL; } -$tags =& $b2tservice->getTags($userid); -$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder()); +$tags = $b2tservice->getTags($userid); +$tplVars['tags'] = $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder()); $tplVars['user'] = $user; if (isset($userid)) { diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php index 9c0d85c..06ab217 100644 --- a/www/api/export_gcs.php +++ b/www/api/export_gcs.php @@ -36,7 +36,7 @@ else $tag = NULL; // Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortOrder()); +$bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortOrder()); // Set up the plain file and output all the posts. diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php index 47ffc96..45cbf14 100644 --- a/www/api/export_sioc.php +++ b/www/api/export_sioc.php @@ -61,7 +61,7 @@ No page for usergroup (users/admin) for the moment <?php //bookmarks are described using Annotea ontology -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL); +$bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, NULL); ?> <?php foreach($bookmarks['bookmarks'] as $bookmark): ?> diff --git a/www/api/posts_all.php b/www/api/posts_all.php index 2d274f4..7204b60 100644 --- a/www/api/posts_all.php +++ b/www/api/posts_all.php @@ -19,7 +19,7 @@ else $tag = NULL; // Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag); +$bookmarks = $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag); // Set up the XML file and output all the posts. echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; diff --git a/www/api/posts_public.php b/www/api/posts_public.php index 4258550..0a09187 100644 --- a/www/api/posts_public.php +++ b/www/api/posts_public.php @@ -20,7 +20,7 @@ else $tag = NULL; // Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag); +$bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, $tag); // Set up the XML file and output all the posts. echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; diff --git a/www/api/tags_get.php b/www/api/tags_get.php index 06a40d9..c0fb83d 100644 --- a/www/api/tags_get.php +++ b/www/api/tags_get.php @@ -13,7 +13,7 @@ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); // Get the tags relevant to the passed-in variables. -$tags =& $b2tservice->getTags($userservice->getCurrentUserId()); +$tags = $b2tservice->getTags($userservice->getCurrentUserId()); // Set up the XML file and output all the tags. echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; diff --git a/www/bookmarks.php b/www/bookmarks.php index fe12310..bf06fb6 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -100,7 +100,7 @@ if ($user) { $templateservice->loadTemplate('error.404.tpl', $tplVars); exit(); } else { - $userid =& $userinfo['uId']; + $userid = $userinfo['uId']; } } $pagetitle .= ': '. $user; @@ -173,7 +173,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { if (GET_ACTION == "add") { // If the bookmark exists already, edit the original if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) { - $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS))); + $bookmark = $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS))); $popup = (GET_POPUP!='') ? '?popup=1' : ''; header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup)); exit(); @@ -250,7 +250,7 @@ if ($templatename == 'editbookmark.tpl') { //$tplVars['sidebar_blocks'][] = 'popular'; $tplVars['userid'] = $userid; - $tplVars['userinfo'] =& $userinfo; + $tplVars['userinfo'] = $userinfo; $tplVars['user'] = $user; $tplVars['range'] = 'user'; @@ -296,9 +296,9 @@ if ($templatename == 'editbookmark.tpl') { $tplVars['start'] = $start; $tplVars['bookmarkCount'] = $start + 1; - $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder()); + $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder()); $tplVars['total'] = $bookmarks['total']; - $tplVars['bookmarks'] =& $bookmarks['bookmarks']; + $tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['cat_url'] = createURL('bookmarks', '%s/%s'); $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); if ($userservice->isLoggedOn() && $user == $currentUsername) { diff --git a/www/edit.php b/www/edit.php index cbfa30b..cbdcbcc 100644 --- a/www/edit.php +++ b/www/edit.php @@ -108,7 +108,7 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) { } $tplVars['popup'] = (GET_POPUP) ? GET_POPUP : null; - $tplVars['row'] =& $row; + $tplVars['row'] = $row; $tplVars['formaction'] = createURL('edit', $bookmark); $tplVars['btnsubmit'] = T_('Save Changes'); $tplVars['showdelete'] = true; diff --git a/www/history.php b/www/history.php index 489d932..50cf3eb 100644 --- a/www/history.php +++ b/www/history.php @@ -55,9 +55,9 @@ if (intval(GET_PAGE) > 1) { $start = 0; } -if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) { +if ($bookmark = $bookmarkservice->getBookmarkByHash($hash)) { // Template variables - $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, NULL, NULL, $hash); + $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, NULL, NULL, $hash); $tplVars['pagetitle'] = T_('History') .': '. $bookmark['bAddress']; $tplVars['subtitle'] = sprintf(T_('History for %s'), $bookmark['bAddress']); $tplVars['loadjs'] = true; @@ -65,7 +65,7 @@ if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) { $tplVars['start'] = $start; $tplVars['bookmarkCount'] = $start + 1; $tplVars['total'] = $bookmarks['total']; - $tplVars['bookmarks'] =& $bookmarks['bookmarks']; + $tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['hash'] = $hash; $tplVars['popCount'] = 50; $tplVars['sidebar_blocks'] = array('common'); diff --git a/www/index.php b/www/index.php index 7fbb84c..007aae0 100644 --- a/www/index.php +++ b/www/index.php @@ -100,7 +100,7 @@ $tplVars['bookmarkCount'] = $start + 1; $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); $tplVars['total'] = $bookmarks['total']; -$tplVars['bookmarks'] =& $bookmarks['bookmarks']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['nav_url'] = createURL('index', '%3$s'); $tplVars['summarizeLinkedTags'] = true; diff --git a/www/populartags.php b/www/populartags.php index 5b69b86..20b1b53 100644 --- a/www/populartags.php +++ b/www/populartags.php @@ -61,7 +61,7 @@ if (isset($user) && $user != '') { } $tags = $b2tservice->getPopularTags($userid, 150); -$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc')); +$tplVars['tags'] = $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc')); $tplVars['user'] = $user; if (isset($userid)) { diff --git a/www/profile.php b/www/profile.php index 63f4da8..6a4222e 100644 --- a/www/profile.php +++ b/www/profile.php @@ -56,7 +56,7 @@ if ($user) { $templateservice->loadTemplate('error.404.tpl', $tplVars); exit(); } else { - $userid =& $userinfo->getId(); + $userid = $userinfo->getId(); } } } else { diff --git a/www/register.php b/www/register.php index d78ede3..a607c17 100644 --- a/www/register.php +++ b/www/register.php @@ -34,6 +34,7 @@ if (!$GLOBALS['enableRegistration']) { isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', ''); isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', ''); isset($_POST['password']) ? define('POST_PASS', $_POST['password']): define('POST_PASS', ''); +isset($_POST['password2']) ? define('POST_PASS2', $_POST['password2']): define('POST_PASS2', ''); if (isset($_POST['email'])) { define('POST_MAIL', $_POST['email']); } else if (isset($_SERVER['SSL_CLIENT_S_DN_Email'])) { @@ -51,6 +52,10 @@ if (POST_SUBMITTED != '') { if (!($posteduser) || POST_PASS == '' || POST_MAIL == '') { $tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.'); + // Check if passwords match + } elseif (POST_PASS != POST_PASS2) { + $tplVars['error'] = T_('Those passwords do not match.'); + // Check if username is reserved } elseif ($userservice->isReserved($posteduser)) { $tplVars['error'] = T_('This username has been reserved, please make another choice.'); diff --git a/www/rss.php b/www/rss.php index 1f88944..6f376ec 100644 --- a/www/rss.php +++ b/www/rss.php @@ -82,7 +82,7 @@ if ($user && $user != 'all') { $userid = intval($user); } else { if ($userinfo = $userservice->getUserByUsername($user)) { - $userid =& $userinfo[$userservice->getFieldName('primary')]; + $userid = $userinfo[$userservice->getFieldName('primary')]; /* if user is not logged in and has valid privateKey */ if (!$userservice->isLoggedOn()) { if ($privateKey != null) { diff --git a/www/search.php b/www/search.php index a5c13e3..e4977ad 100644 --- a/www/search.php +++ b/www/search.php @@ -115,7 +115,7 @@ if (is_null($terms)) { } } -$bookmarks =& $bookmarkservice->getBookmarks( +$bookmarks = $bookmarkservice->getBookmarks( $start, $perpage, $s_user, NULL, $terms, getSortOrder(), $s_watchlist, $s_start, $s_end ); @@ -147,7 +147,7 @@ $tplVars['terms'] = $terms; $tplVars['pagetitle'] = T_('Search Bookmarks'); $tplVars['bookmarkCount'] = $start + 1; $tplVars['total'] = $bookmarks['total']; -$tplVars['bookmarks'] =& $bookmarks['bookmarks']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['nav_url'] = createURL('search', $range .'/'. $terms .'/%3$s'); diff --git a/www/tags.php b/www/tags.php index c56b97f..3e2cd5f 100644 --- a/www/tags.php +++ b/www/tags.php @@ -109,9 +109,9 @@ $tplVars['currenttag'] = $cat; $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular'); $tplVars['subtitlehtml'] = $pagetitle; $tplVars['bookmarkCount'] = $start + 1; -$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); +$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); $tplVars['total'] = $bookmarks['total']; -$tplVars['bookmarks'] =& $bookmarks['bookmarks']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['nav_url'] = createURL('tags', '%2$s%3$s'); diff --git a/www/users.php b/www/users.php index a357b56..9d6c655 100644 --- a/www/users.php +++ b/www/users.php @@ -49,7 +49,7 @@ $tplVars['loadjs'] = true; $tplVars['sidebar_blocks'] = array('recent', 'popular'); $tplVars['subtitle'] = filter($pagetitle); -$tplVars['users'] =& $userservice->getUsers(); +$tplVars['users'] = $userservice->getUsers(); //$tplVars['cat_url'] = createURL('tags', '%2$s'); //$tplVars['nav_url'] = createURL('tags', '%2$s%3$s'); diff --git a/www/watchlist.php b/www/watchlist.php index ded6782..667cbe9 100644 --- a/www/watchlist.php +++ b/www/watchlist.php @@ -62,7 +62,7 @@ if ($user) { $templateservice->loadTemplate('error.404.tpl', $tplVars); exit(); } else { - $userid =& $userinfo->getId(); + $userid = $userinfo->getId(); } } } @@ -73,7 +73,7 @@ $tplVars['loadjs'] = true; if ($user) { $tplVars['user'] = $user; $tplVars['userid'] = $userid; - $tplVars['userinfo'] =& $userinfo; + $tplVars['userinfo'] = $userinfo; // Pagination $perpage = getPerPageCount($currentUser); @@ -91,12 +91,12 @@ if ($user) { $tplVars['start'] = $start; $tplVars['bookmarkCount'] = $start + 1; - $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, NULL, NULL, getSortOrder(), true); + $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, $userid, NULL, NULL, getSortOrder(), true); $tplVars['sidebar_blocks'] = array('watchlist'); $tplVars['watched'] = true; $tplVars['total'] = $bookmarks['total']; - $tplVars['bookmarks'] =& $bookmarks['bookmarks']; + $tplVars['bookmarks'] = $bookmarks['bookmarks']; $tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['nav_url'] = createURL('watchlist', '%s/%s%s'); |