diff options
56 files changed, 356 insertions, 137 deletions
@@ -10,30 +10,13 @@ <property file="html.properties" /> <property name="version-m" value="0.98" /> - <property name="version" value="0.98.0" /> + <property name="version" value="0.98.3" /> <property name="stability" value="beta" /> - <property name="releasenotes" value="- Switch to jQuery and drop dojo -- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton) -- Implement request #3164348: Configurable default privacy (Brett Dee) -- Implement request #1989987: Theming support -- Implement request #3054906: Show user's full name instead of nickname -- Implement patch #3059829: update ``FR_CA`` translation -- Fix bug #3187177: Wrong URL / Export XML Bookmarks -- Fix bug #3097187: Using opensearch with two tags does not work in Firefox -- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks -- Fix bug #3168521: Title of tag-filtered RSS Feed is broken -- Fix bug #2853627: Javascript warning -- Fix bug in ``getTagsForBookmarks()`` that fetched all tags -- Fix privacy issue when fetching tags of several users -- Fix Google custom search XML -- Show error message on mysqli connection errors -- Update php-gettext library to 1.0.10 -- ``api/posts/add`` respects the 'replace' parameter now -- Only URLs with an allowed protocol may be added to the database -- Support HTTPS connections when ``$root`` is not configured -- SQL schema version table to ease future database upgrades -- Documentation is written with rST (reStructuredText) now -- Support per-host configuration files + <property name="releasenotes" value=" +- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php + +The script was only missing in the .zip file; the PEAR package +contained it - thus no 0.98.3 PEAR package. " /> <property name="zipfile" value="${phing.project.name}-${version}.zip" /> <property name="pkgfile" value="${phing.project.name}-${version}.tgz" /> @@ -43,6 +26,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" /> @@ -58,21 +69,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/**"/> - <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> @@ -113,6 +110,7 @@ <dirroles key="www">www</dirroles> <dirroles key="data">data</dirroles> <dirroles key="doc">doc</dirroles> + <dirroles key="scripts">doc</dirroles> <dirroles key="src">php</dirroles> <dirroles key="tests">test</dirroles> @@ -127,7 +125,6 @@ <ignore>data/locales/messages.po</ignore> <ignore>data/locales/*/LC_MESSAGES/messages.po</ignore> <ignore>dist/**</ignore> - <ignore>scripts/**</ignore> <ignore>src/php-gettext/examples/**</ignore> <ignore>src/php-gettext/tests/**</ignore> <ignore>*.properties</ignore> @@ -153,7 +150,47 @@ type="pear-config" from="@data_dir@" to="data_dir" /> - <changelog version="0.97" date="2010-06-09" license="GPL"> + <changelog version="0.98.2" date="2011-08-08" license="GPL"> +- Fix bug #3385724: Rename tag ends with XML Parsing Error +- Fix bug #3386178: "system:unfiled" secret tag does not work +- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem +- Fix bug #3382126: Linked tags does not work for tags with spaces +- Fix delicious API help page link + </changelog> + + <changelog version="0.98.1" date="2011-08-01" license="GPL"> +- Fix bug #3375635: XML parsing problem in top.inc.php +- Fix bug #3375428: Forgot to remove some old dojo files +- Fix bug #3160512: Make SemanticScuttle work with FastCGI +- Fix bug #3376618: Broken tag completion for private bookmarks + </changelog> + + <changelog version="0.98.0" date="2011-07-21" license="GPL"> +- Switch to jQuery and drop dojo +- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton) +- Implement request #3164348: Configurable default privacy (Brett Dee) +- Implement request #1989987: Theming support +- Implement request #3054906: Show user's full name instead of nickname +- Implement patch #3059829: update ``FR_CA`` translation +- Fix bug #3187177: Wrong URL / Export XML Bookmarks +- Fix bug #3097187: Using opensearch with two tags does not work in Firefox +- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks +- Fix bug #3168521: Title of tag-filtered RSS Feed is broken +- Fix bug #2853627: Javascript warning +- Fix bug in ``getTagsForBookmarks()`` that fetched all tags +- Fix privacy issue when fetching tags of several users +- Fix Google custom search XML +- Show error message on mysqli connection errors +- Update php-gettext library to 1.0.10 +- ``api/posts/add`` respects the 'replace' parameter now +- Only URLs with an allowed protocol may be added to the database +- Support HTTPS connections when ``$root`` is not configured +- SQL schema version table to ease future database upgrades +- Documentation is written with rST (reStructuredText) now +- Support per-host configuration files + </changelog> + + <changelog version="0.97.0" date="2010-06-09" license="GPL"> - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames - Do not highlight admin bookmarks when $enableAdminColors is disabled @@ -229,15 +266,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> @@ -249,6 +278,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/config.default.php b/data/config.default.php index c850521..9c2f7f3 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -81,13 +81,15 @@ $theme = 'default'; /** * SemanticScuttle root directory. - * * Set to NULL to autodetect the root url of the website. * * If your installation is in a subdirectory like * "http://www.example.com/semanticscuttle/" then * replace NULL by your address (between "" and with trailing '/') * + * The autodetection works for both HTTP and HTTPS urls. + * If you offer HTTP *only*, then set your root url here. + * * @var string */ $root = null; diff --git a/data/locales/de_AT/LC_MESSAGES/messages.mo b/data/locales/de_AT/LC_MESSAGES/messages.mo Binary files differindex 18a19ab..5ba02ab 100644 --- a/data/locales/de_AT/LC_MESSAGES/messages.mo +++ b/data/locales/de_AT/LC_MESSAGES/messages.mo diff --git a/data/locales/de_AT/LC_MESSAGES/messages.po b/data/locales/de_AT/LC_MESSAGES/messages.po index be0fb17..174c902 100644 --- a/data/locales/de_AT/LC_MESSAGES/messages.po +++ b/data/locales/de_AT/LC_MESSAGES/messages.po @@ -571,8 +571,8 @@ msgstr "Sie können es selbst frei auf Ihrem Webserver oder Webspace installiere #: ../../../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 unterstützt die meisten der <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programmierung Interface\">-API </ abbr> </ a>. Fast alle netten Tools, die für dieses System kreiert wurden, können für %1$s geändert und adaptiert werden. Wenn Sie eine Applikation finden, deren API-Adresse Sie nicht einfach ändern können, so fragen Sie doch einfach bei dem/der Entwickler/in nach, um dies zu adaptieren bzw. zu addieren. Man kann nie wissen, eventuell werden jene dies einfach bewerkstelligen."
+msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programmierung Interface\">-API </ abbr> </ a>. Fast alle netten Tools, die für dieses System kreiert wurden, können für %1$s geändert und adaptiert werden. Wenn Sie eine Applikation finden, deren API-Adresse Sie nicht einfach ändern können, so fragen Sie doch einfach bei dem/der Entwickler/in nach, um dies zu adaptieren bzw. zu addieren. Man kann nie wissen, eventuell werden jene dies einfach bewerkstelligen."
#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:15
#: ../../../templates/bookmarks.tpl.php:67
diff --git a/data/locales/de_DE/LC_MESSAGES/messages.mo b/data/locales/de_DE/LC_MESSAGES/messages.mo Binary files differindex 6473497..b75e365 100644 --- a/data/locales/de_DE/LC_MESSAGES/messages.mo +++ b/data/locales/de_DE/LC_MESSAGES/messages.mo diff --git a/data/locales/de_DE/LC_MESSAGES/messages.po b/data/locales/de_DE/LC_MESSAGES/messages.po index 10d1925..c82298c 100644 --- a/data/locales/de_DE/LC_MESSAGES/messages.po +++ b/data/locales/de_DE/LC_MESSAGES/messages.po @@ -100,8 +100,8 @@ msgstr "Sie können es selbst auf Ihrem Webserver oder Webspace installieren" #: 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 unterstützt die meisten der <a href=\"http://del.icio.us/doc/api\">del.icio.us-<abbr title=\"Application Programming Interface\">API</abbr></a>. Fast alle coolen Tools, die für dieses System erstellt wurden, können für %1$s geändert und adaptiert werden. Wenn Sie ein Programm finden, bei dem Sie die API-Adresse nicht ändern können, so fragen Sie doch einfach beim Entwickler nach. Man kann nie wissen, vielleicht machen sie es einfach." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api\">del.icio.us-<abbr title=\"Application Programming Interface\">API</abbr></a>. Fast alle coolen Tools, die für dieses System erstellt wurden, können für %1$s geändert und adaptiert werden. Wenn Sie ein Programm finden, bei dem Sie die API-Adresse nicht ändern können, so fragen Sie doch einfach beim Entwickler nach. Man kann nie wissen, vielleicht machen sie es einfach." #: data/templates/about.tpl.php:24 msgid "Tips" diff --git a/data/locales/dk_DK/LC_MESSAGES/messages.mo b/data/locales/dk_DK/LC_MESSAGES/messages.mo Binary files differindex a46c715..4966a54 100644 --- a/data/locales/dk_DK/LC_MESSAGES/messages.mo +++ b/data/locales/dk_DK/LC_MESSAGES/messages.mo diff --git a/data/locales/dk_DK/LC_MESSAGES/messages.po b/data/locales/dk_DK/LC_MESSAGES/messages.po index 3d06851..02f9eaf 100644 --- a/data/locales/dk_DK/LC_MESSAGES/messages.po +++ b/data/locales/dk_DK/LC_MESSAGES/messages.po @@ -444,8 +444,8 @@ msgstr "%s er baseret på <a href=\"http://sourceforge.net/projects/scuttle/\">e #: ..\..\..\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 understøtter de fleste <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Forbindelsesflade imellem forskellige programmer \">API</abbr></a>. Næsten alle de værktøjer udviklet til det system kan modificeres til at fungere med %1$s i stedet for. Hvis du finder et værktøj som ikke tillader at du fortager ændringer i API adresse, kunne du jo spørge udviklerne. Man ved aldrig det kunne jo være de ville." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 understøtter de fleste <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Forbindelsesflade imellem forskellige programmer \">API</abbr></a>. Næsten alle de værktøjer udviklet til det system kan modificeres til at fungere med %1$s i stedet for. Hvis du finder et værktøj som ikke tillader at du fortager ændringer i API adresse, kunne du jo spørge udviklerne. Man ved aldrig det kunne jo være de ville." #: ..\..\..\templates\bookmarks.tpl.php:17 #: ..\..\..\templates\tags.tpl.php:7 diff --git a/data/locales/en_GB/LC_MESSAGES/messages.mo b/data/locales/en_GB/LC_MESSAGES/messages.mo Binary files differindex 309f732..818af5b 100644 --- a/data/locales/en_GB/LC_MESSAGES/messages.mo +++ b/data/locales/en_GB/LC_MESSAGES/messages.mo diff --git a/data/locales/en_GB/LC_MESSAGES/messages.po b/data/locales/en_GB/LC_MESSAGES/messages.po index 0deecb3..9176c4f 100644 --- a/data/locales/en_GB/LC_MESSAGES/messages.po +++ b/data/locales/en_GB/LC_MESSAGES/messages.po @@ -639,13 +639,13 @@ msgstr "you can freely host it on your own web server." #: ../../../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 " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 " diff --git a/data/locales/es_ES/LC_MESSAGES/messages.mo b/data/locales/es_ES/LC_MESSAGES/messages.mo Binary files differindex 7812d22..0929a72 100644 --- a/data/locales/es_ES/LC_MESSAGES/messages.mo +++ b/data/locales/es_ES/LC_MESSAGES/messages.mo diff --git a/data/locales/es_ES/LC_MESSAGES/messages.po b/data/locales/es_ES/LC_MESSAGES/messages.po index 73567fb..1451d64 100644 --- a/data/locales/es_ES/LC_MESSAGES/messages.po +++ b/data/locales/es_ES/LC_MESSAGES/messages.po @@ -455,8 +455,8 @@ msgstr "%s esta basado en <a href=\"http://sourceforge.net/projects/scuttle/\">u #: ..\..\..\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 esta basado en la <a href=\"http://del.icio.us/doc/api\"><abbr title=\"Application Programming Interface\">API</abbr></a> de <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. La mayoría de las herramientas utilizadas para construir este sistema se pueden modificar para trabajar con %1$s. Si usted encuentra una herramienta en la que no puede modificar la direccion de la API, pregunte al creador si puede cambiar esta configuración. Nunca se sabe, puede que ya se haya cambiado esa configuración." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 esta basado en la <a href=\"http://www.delicious.com/help/api\"><abbr title=\"Application Programming Interface\">API</abbr></a> de <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. La mayoría de las herramientas utilizadas para construir este sistema se pueden modificar para trabajar con %1$s. Si usted encuentra una herramienta en la que no puede modificar la direccion de la API, pregunte al creador si puede cambiar esta configuración. Nunca se sabe, puede que ya se haya cambiado esa configuración." #: ..\..\..\templates\bookmarks.tpl.php:17 #: ..\..\..\templates\tags.tpl.php:7 diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.mo b/data/locales/fr_CA/LC_MESSAGES/messages.mo Binary files differindex b750f12..6d70af6 100644 --- a/data/locales/fr_CA/LC_MESSAGES/messages.mo +++ b/data/locales/fr_CA/LC_MESSAGES/messages.mo diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po index ae74c4b..d7b2712 100644 --- a/data/locales/fr_CA/LC_MESSAGES/messages.po +++ b/data/locales/fr_CA/LC_MESSAGES/messages.po @@ -114,13 +114,13 @@ msgstr "vous pouvez librement l'installer sur votre serveur Web" #: 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 " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr " +"%1$s supporte la plupart de l'<a href=\"http://www.delicious.com/help/api\"><abbr " "title=\"Application Programming Interface\">API</abbr> del.icio.us</a>." #: data/templates/about.tpl.php:24 diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.mo b/data/locales/fr_FR/LC_MESSAGES/messages.mo Binary files differindex 392adf5..764b38f 100644 --- a/data/locales/fr_FR/LC_MESSAGES/messages.mo +++ b/data/locales/fr_FR/LC_MESSAGES/messages.mo diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po index 0aa8be1..992a248 100644 --- a/data/locales/fr_FR/LC_MESSAGES/messages.po +++ b/data/locales/fr_FR/LC_MESSAGES/messages.po @@ -114,13 +114,13 @@ msgstr "vous pouvez librement l'installer sur votre serveur Web" #: 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 " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr " +"%1$s supporte la plupart de l'<a href=\"http://www.delicious.com/help/api\"><abbr " "title=\"Application Programming Interface\">API</abbr> del.icio.us</a>." #: data/templates/about.tpl.php:24 diff --git a/data/locales/hi_IN/LC_MESSAGES/messages.mo b/data/locales/hi_IN/LC_MESSAGES/messages.mo Binary files differindex 77f7c1e..a6e91ed 100644 --- a/data/locales/hi_IN/LC_MESSAGES/messages.mo +++ b/data/locales/hi_IN/LC_MESSAGES/messages.mo diff --git a/data/locales/hi_IN/LC_MESSAGES/messages.po b/data/locales/hi_IN/LC_MESSAGES/messages.po index af6b412..ba4e542 100644 --- a/data/locales/hi_IN/LC_MESSAGES/messages.po +++ b/data/locales/hi_IN/LC_MESSAGES/messages.po @@ -446,8 +446,8 @@ msgstr "%s एक <a href=\"http://sourceforge.net/projects/scuttle/\">मुक #: ..\..\..\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 में प्रायः सभी <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">एपीआई</abbr></a> का समर्थन मिलता है. उस तंत्र के लिए बनाए गए प्रायः सभी औजारों को %1$s के लिए कार्य करने लायक परिवर्धित किया जा सकता है. यदि आपको कोई औजार ऐसा मिलता है जो आपको एपीआई पता बदलने नहीं देता है तो उसके सृजक को इस विन्यास को जोड़ने के लिए कहें. कौन जाने वे ऐसा भी कर लें." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 में प्रायः सभी <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">एपीआई</abbr></a> का समर्थन मिलता है. उस तंत्र के लिए बनाए गए प्रायः सभी औजारों को %1$s के लिए कार्य करने लायक परिवर्धित किया जा सकता है. यदि आपको कोई औजार ऐसा मिलता है जो आपको एपीआई पता बदलने नहीं देता है तो उसके सृजक को इस विन्यास को जोड़ने के लिए कहें. कौन जाने वे ऐसा भी कर लें." #: ..\..\..\templates\bookmarks.tpl.php:17 #: ..\..\..\templates\tags.tpl.php:7 diff --git a/data/locales/it_IT/LC_MESSAGES/messages.mo b/data/locales/it_IT/LC_MESSAGES/messages.mo Binary files differindex 7662e54..cca9902 100644 --- a/data/locales/it_IT/LC_MESSAGES/messages.mo +++ b/data/locales/it_IT/LC_MESSAGES/messages.mo diff --git a/data/locales/it_IT/LC_MESSAGES/messages.po b/data/locales/it_IT/LC_MESSAGES/messages.po index 46d86d3..7db0fed 100644 --- a/data/locales/it_IT/LC_MESSAGES/messages.po +++ b/data/locales/it_IT/LC_MESSAGES/messages.po @@ -476,8 +476,8 @@ msgstr "%s è basato su <a href=\"http://sourceforge.net/projects/scuttle/\">un #: ..\..\..\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 supporta la maggioranza delle <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Praticamente tutti i tools progettati per de.icio.us possono essere modificati per funzionare con %1$s. Se trovi un tool che non lascia variare indirizzo API, chiedi a chiedi a chi lo ha realizzato di aggiungere questo settaggio." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supporta la maggioranza delle <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Praticamente tutti i tools progettati per de.icio.us possono essere modificati per funzionare con %1$s. Se trovi un tool che non lascia variare indirizzo API, chiedi a chiedi a chi lo ha realizzato di aggiungere questo settaggio." #: ..\..\..\templates\bookmarks.tpl.php:17 #: ..\..\..\templates\tags.tpl.php:7 diff --git a/data/locales/ja_JP/LC_MESSAGES/messages.mo b/data/locales/ja_JP/LC_MESSAGES/messages.mo Binary files differindex f04d53f..f419241 100644 --- a/data/locales/ja_JP/LC_MESSAGES/messages.mo +++ b/data/locales/ja_JP/LC_MESSAGES/messages.mo diff --git a/data/locales/ja_JP/LC_MESSAGES/messages.po b/data/locales/ja_JP/LC_MESSAGES/messages.po index 4fd0637..72790c8 100644 --- a/data/locales/ja_JP/LC_MESSAGES/messages.po +++ b/data/locales/ja_JP/LC_MESSAGES/messages.po @@ -637,13 +637,13 @@ msgstr "あなたのウェブサーバーで自由に運営できます。" #: ../../../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 " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 はほとんどの <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr " +"%1$s はほとんどの <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr " "title=\"Application Programming Interface\">API</abbr></a> をサポートします。" "そのシステムのために作成された適切なツールのほぼ全ては、代わりにAAAAで動作す" "るように修正することができます。あなたが API アドレスを変更することができない" diff --git a/data/locales/lt_LT/LC_MESSAGES/messages.mo b/data/locales/lt_LT/LC_MESSAGES/messages.mo Binary files differindex 216b01f..221eb42 100644 --- a/data/locales/lt_LT/LC_MESSAGES/messages.mo +++ b/data/locales/lt_LT/LC_MESSAGES/messages.mo diff --git a/data/locales/lt_LT/LC_MESSAGES/messages.po b/data/locales/lt_LT/LC_MESSAGES/messages.po index 90cd169..65c8125 100644 --- a/data/locales/lt_LT/LC_MESSAGES/messages.po +++ b/data/locales/lt_LT/LC_MESSAGES/messages.po @@ -444,8 +444,8 @@ msgstr "<strong>%s</strong> veikia pagal <a href=\"http://www.gnu.org/copyleft/g #: ..\..\..\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 "<strong>%1$s</strong> palaiko <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Daugumą šiai sistemai skirtų įrankių galiama pakoreguoti taip, kad jie veiktų su <strong>%1$s</strong>. Jei radote įrankį, kuriame negalima pakeisti API adreso, paprašykite jo kūrėjų tai padaryti. Jie tikrai neatsilaikys Jūsų kerams." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "<strong>%1$s</strong> palaiko <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Daugumą šiai sistemai skirtų įrankių galiama pakoreguoti taip, kad jie veiktų su <strong>%1$s</strong>. Jei radote įrankį, kuriame negalima pakeisti API adreso, paprašykite jo kūrėjų tai padaryti. Jie tikrai neatsilaikys Jūsų kerams." #: ..\..\..\templates\bookmarks.tpl.php:17 #: ..\..\..\templates\tags.tpl.php:7 diff --git a/data/locales/messages.po b/data/locales/messages.po index 1c77f0e..01d32c2 100644 --- a/data/locales/messages.po +++ b/data/locales/messages.po @@ -107,7 +107,7 @@ msgstr "" #: 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 " +"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 " diff --git a/data/locales/nl_NL/LC_MESSAGES/messages.po b/data/locales/nl_NL/LC_MESSAGES/messages.po index 1dd6526..95431a4 100644 --- a/data/locales/nl_NL/LC_MESSAGES/messages.po +++ b/data/locales/nl_NL/LC_MESSAGES/messages.po @@ -476,7 +476,7 @@ msgstr "" #: ..\..\..\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." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "" #: ..\..\..\templates\bookmarks.tpl.php:17 diff --git a/data/locales/pt_BR/LC_MESSAGES/messages.mo b/data/locales/pt_BR/LC_MESSAGES/messages.mo Binary files differindex 4faf24a..4afb1d3 100644 --- a/data/locales/pt_BR/LC_MESSAGES/messages.mo +++ b/data/locales/pt_BR/LC_MESSAGES/messages.mo diff --git a/data/locales/pt_BR/LC_MESSAGES/messages.po b/data/locales/pt_BR/LC_MESSAGES/messages.po index 36df105..abace6c 100644 --- a/data/locales/pt_BR/LC_MESSAGES/messages.po +++ b/data/locales/pt_BR/LC_MESSAGES/messages.po @@ -440,8 +440,8 @@ msgstr "O %s é baseado em <a href=\"http://sourceforge.net/projects/scuttle/\"> #: ..\..\..\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 "O %1$s suporta a maior parte do <a href=\"http://del.icio.us/doc/api\"><abbr title=\"Application Programming Interface\">API</abbr> do del.icio.us</a>. Quase todas as adoráveis ferramentas desenvolvidas para aquele sistema podem ser modificadas para funcionar com o %1$s. Se você encontrar uma ferramenta que não permita a mudança de seu endereço de API, solicite a seu criador para que adicione esta configuração. Nunca se sabe. Ele pode simplesmente atender a seu pedido." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "O %1$s suporta a maior parte do <a href=\"http://www.delicious.com/help/api\"><abbr title=\"Application Programming Interface\">API</abbr> do del.icio.us</a>. Quase todas as adoráveis ferramentas desenvolvidas para aquele sistema podem ser modificadas para funcionar com o %1$s. Se você encontrar uma ferramenta que não permita a mudança de seu endereço de API, solicite a seu criador para que adicione esta configuração. Nunca se sabe. Ele pode simplesmente atender a seu pedido." #: ..\..\..\templates\bookmarks.tpl.php:10 #: ..\..\..\templates\tags.tpl.php:6 diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.mo b/data/locales/ru_RU/LC_MESSAGES/messages.mo Binary files differindex 7a68b6c..12839c5 100644 --- a/data/locales/ru_RU/LC_MESSAGES/messages.mo +++ b/data/locales/ru_RU/LC_MESSAGES/messages.mo diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.po b/data/locales/ru_RU/LC_MESSAGES/messages.po index 4bf666e..f52669f 100644 --- a/data/locales/ru_RU/LC_MESSAGES/messages.po +++ b/data/locales/ru_RU/LC_MESSAGES/messages.po @@ -641,8 +641,8 @@ msgstr "Вы можете свободно устанавливать его н #: ../../../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 поддерживает большинство <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Большинство инструментов сделаных для этой системы, могут быть изменены для работы с %1$s. Если Вы нашли инструмент, который не позволяет изменить адрес API, попросите авторов добавить эту настройку. Возможно они это сделают." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 поддерживает большинство <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Большинство инструментов сделаных для этой системы, могут быть изменены для работы с %1$s. Если Вы нашли инструмент, который не позволяет изменить адрес API, попросите авторов добавить эту настройку. Возможно они это сделают." #: ../../../templates/about.tpl.php:24 msgid "Tips" diff --git a/data/locales/vn_VN/LC_MESSAGES/messages.mo b/data/locales/vn_VN/LC_MESSAGES/messages.mo Binary files differindex afc69dc..113c6d6 100644 --- a/data/locales/vn_VN/LC_MESSAGES/messages.mo +++ b/data/locales/vn_VN/LC_MESSAGES/messages.mo diff --git a/data/locales/vn_VN/LC_MESSAGES/messages.po b/data/locales/vn_VN/LC_MESSAGES/messages.po index 114521e..9f43dd1 100644 --- a/data/locales/vn_VN/LC_MESSAGES/messages.po +++ b/data/locales/vn_VN/LC_MESSAGES/messages.po @@ -101,8 +101,8 @@ msgstr "Bạn có thể thoải mái cài đặt nó trên Web server của bạ #: 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 hỗ trợ phần lớn từ'<a href=\"http://del.icio.us/doc/api\"><abbr title=\"Ứng dụng lập trình giao diện\">API</abbr> del.icio.us</a>." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 hỗ trợ phần lớn từ'<a href=\"http://www.delicious.com/help/api\"><abbr title=\"Ứng dụng lập trình giao diện\">API</abbr> del.icio.us</a>." #: data/templates/about.tpl.php:24 msgid "Tips" diff --git a/data/locales/zh_CN/LC_MESSAGES/messages.po b/data/locales/zh_CN/LC_MESSAGES/messages.po index b6aadcb..2ee0b11 100644 --- a/data/locales/zh_CN/LC_MESSAGES/messages.po +++ b/data/locales/zh_CN/LC_MESSAGES/messages.po @@ -457,7 +457,7 @@ msgstr "" #: ..\..\..\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." +msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "" #: ..\..\..\templates\bookmarks.tpl.php:17 diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php index 8a9b206..bd9348c 100644 --- a/data/templates/default/about.tpl.php +++ b/data/templates/default/about.tpl.php @@ -12,12 +12,12 @@ $this->includeTemplate($GLOBALS['top_include']); <h3><?php echo T_('Geek Stuff'); ?></h3> <ul> <li><a href="http://sourceforge.net/projects/semanticscuttle/">Semantic Scuttle</a> <?php echo T_('is licensed under the ');?> <a href="http://www.gnu.org/copyleft/gpl.html"><acronym title="GNU\'s Not Unix">GNU</acronym> General Public License</a> (<?php echo T_('you can freely host it on your own web server.'); ?>)</li> -<li><?php echo sprintf(T_('%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.'), $GLOBALS['sitename']); ?></li> +<li><?php echo sprintf(T_('%1$s supports most of the <a href="http://www.delicious.com/help/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.'), $GLOBALS['sitename']); ?></li> <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?> -<li>SemanticScuttle v0.98.0</li> +<li>SemanticScuttle v0.98.3</li> <?php endif ?> </ul> diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php index 0ed9c1d..2a3d169 100644 --- a/data/templates/default/bookmarks.tpl.php +++ b/data/templates/default/bookmarks.tpl.php @@ -39,9 +39,9 @@ include('search.menu.php'); <?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?> <div style="width:70%;text-align:center;"> - <img src="<?php $theme->resource('images/logo_24.gif'); ?>" width="12px"/> + <img src="<?php echo $theme->resource('images/logo_24.gif'); ?>" width="12px"/> <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?> - <img src="<?php $theme->resource('images/logo_24.gif'); ?>" width="12px"/> + <img src="<?php echo $theme->resource('images/logo_24.gif'); ?>" width="12px"/> </div> <?php endif?> @@ -107,7 +107,7 @@ if($userservice->isLoggedOn()) { } ?> -<?php if (count($bookmarks) > 0) { ?> +<?php if (isset($bookmarks) && count($bookmarks) > 0) { ?> <script type="text/javascript"> window.onload = playerLoad; </script> @@ -358,7 +358,7 @@ if ($currenttag!= '') { $rel = ' rel="nofollow"'; } - $address = filter($row['bAddress']); + $address = $row['bAddress']; $oaddress = $address; // Redirection option if ($GLOBALS['useredir']) { @@ -418,7 +418,7 @@ if ($currenttag!= '') { } echo ' <div class="description">'. nl2br($bkDescription) ."</div>\n"; - echo ' <div class="address">' . shortenString($oaddress) . "</div>\n"; + echo ' <div class="address">' . htmlspecialchars(shortenString($oaddress)) . "</div>\n"; echo ' <div class="meta">' . $cats . "\n" diff --git a/data/templates/default/sidebar.block.linked.php b/data/templates/default/sidebar.block.linked.php index 9aa3cc0..d3a25a5 100644 --- a/data/templates/default/sidebar.block.linked.php +++ b/data/templates/default/sidebar.block.linked.php @@ -14,7 +14,7 @@ require_once('sidebar.linkedtags.inc.php'); /* Manage input */ $user = isset($user)?$user:''; $userid = isset($userid)?$userid:0; -$currenttag = isset($currenttag)?$currenttag:''; +$currenttag = isset($currenttag) ? str_replace('+', ',', $currenttag) : ''; //$summarizeLinkedTags = isset($summarizeLinkedTags)?$summarizeLinkedTags:false; $logged_on_userid = $userservice->getCurrentUserId(); diff --git a/data/templates/default/sidebar.tpl.php b/data/templates/default/sidebar.tpl.php index e823af5..b4fac96 100644 --- a/data/templates/default/sidebar.tpl.php +++ b/data/templates/default/sidebar.tpl.php @@ -1,4 +1,6 @@ -<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?> +<?php if ($GLOBALS['enableAdminColors'] != false + && isset($userid) && $userservice->isAdmin($userid) +): ?> <div id="sidebar" class="adminBackground"> <?php else: ?> <div id="sidebar"> @@ -8,9 +10,11 @@ <?php echo $GLOBALS['sidebarTopMessage'].' '; -$size = count($sidebar_blocks); -for ($i = 0; $i < $size; $i++) { - $this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]); +if (isset($sidebar_blocks) && count($sidebar_blocks)) { + $size = count($sidebar_blocks); + for ($i = 0; $i < $size; $i++) { + $this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]); + } } echo $GLOBALS['sidebarBottomMessage']; diff --git a/data/templates/default/tagrename.tpl.php b/data/templates/default/tagrename.tpl.php index 894b964..e3d0467 100644 --- a/data/templates/default/tagrename.tpl.php +++ b/data/templates/default/tagrename.tpl.php @@ -28,7 +28,6 @@ window.onload = function() { </tr> </table> -</p> <?php if (isset($referrer)): ?> <div><input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /></div> diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php index 17ec982..240e5b2 100644 --- a/data/templates/default/top.inc.php +++ b/data/templates/default/top.inc.php @@ -48,8 +48,10 @@ if(!isset($_GET['popup'])) { ?></div> <?php -if (isset($subtitle)) { - echo '<h2>'. $subtitle ."</h2>\n"; +if (isset($subtitlehtml)) { + echo '<h2>' . $subtitlehtml . "</h2>\n"; +} else if (isset($subtitle)) { + echo '<h2>' . htmlspecialchars($subtitle) . "</h2>\n"; } if(DEBUG_MODE) { echo '<p class="error">'. T_('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.') ."</p>\n"; diff --git a/doc/ChangeLog b/doc/ChangeLog index f963ca2..7e3a064 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,11 +3,40 @@ ChangeLog for SemantiScuttle .. contents:: -0.98.1 - 2011-XX-XX +0.98.4 - 2011-XX-XX +------------------- +- Fix bug: URLs were escaped too often in bookmark list +- Fix bug: Subtitle was not escaped +- Fix bug #3393951: Logo images missing on bookmark page +- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions + + +0.98.3 - 2011-08-09 +------------------- +- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php + +The script was only missing in the .zip file; the PEAR package +contained it - thus no 0.98.3 PEAR package. + + +0.98.2 - 2011-08-08 +------------------- +- Fix bug #3385724: Rename tag ends with XML Parsing Error +- Fix bug #3386178: "system:unfiled" secret tag does not work +- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem +- Fix bug #3382126: Linked tags does not work for tags with spaces +- Fix delicious API help page link + +Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the +``system:unfiled`` tags. + + +0.98.1 - 2011-08-01 ------------------- - Fix bug #3375635: XML parsing problem in top.inc.php - Fix bug #3375428: Forgot to remove some old dojo files - Fix bug #3160512: Make SemanticScuttle work with FastCGI +- Fix bug #3376618: Broken tag completion for private bookmarks 0.98.0 - 2011-07-21 diff --git a/doc/README.rst b/doc/README.rst index 7702400..a8ef83e 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -1,6 +1,6 @@ -==================== -SemanticScuttle 0.98 -==================== +====================== +SemanticScuttle 0.98.3 +====================== A social bookmarking tool experimenting with new features like structured tags or collaborative descriptions of tags. @@ -46,7 +46,6 @@ Links - `suggestions`_ for SemanticScuttle - `bug reports`_ - `feature requests`_ -- `patches`_ __ http://semanticscuttle.wiki.sourceforge.net/ __ http://sourceforge.net/forum/forum.php?forum_id=759510 @@ -54,7 +53,6 @@ __ https://sourceforge.net/mailarchive/forum.php?forum_name=semanticscuttle-deve .. _suggestions: http://sourceforge.net/forum/forum.php?forum_id=759511 .. _bug reports: http://sourceforge.net/tracker/?group_id=211356&atid=1017430 .. _feature requests: https://sourceforge.net/tracker/?group_id=211356&atid=1017433 -.. _patches: https://sourceforge.net/tracker/?group_id=211356&atid=1017432 diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt index b144af2..511748e 100644 --- a/doc/UPGRADE.txt +++ b/doc/UPGRADE.txt @@ -4,6 +4,12 @@ Upgrading SemanticScuttle from a previous version .. contents:: +From version 0.94-0.98.1 to 0.98.3 +================================== +Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the +``system:unfiled`` tags. + + From version 0.97 to 0.98 ========================= Database updates diff --git a/doc/configuration.rst b/doc/configuration.rst index f457ebb..c8a8bd9 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -2,6 +2,8 @@ Configuration files =================== +.. contents:: + SemanticScuttle uses at least two configuration files: 1. Default configuration file ``config.default.php`` @@ -56,3 +58,24 @@ per-host configuration files: - ``data/config.$hostname.php`` - ``/etc/semanticscuttle/config.$hostname.php`` + + +Configuration options +===================== +``$root`` URL +------------- +Normally, this configuration setting is detected automatically and will +work for both HTTP and HTTPS installations. + +If your installation is available on **HTTP only**, then you need to configure +it. + +The value is the full URL to your installation, including a trailing +slash:: + + $root = "http://homepage.example.org/semanticscuttle/"; + +or:: + + $root = "http://bookmarks.example.org/"; + diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst index a5e77dc..de2c4e3 100644 --- a/doc/developers/release-new-version.rst +++ b/doc/developers/release-new-version.rst @@ -4,7 +4,7 @@ How to release a new version of SemanticScuttle 0. Run unit tests and verify that all of them pass 1. Update ``doc/ChangeLog`` 2. Update ``doc/UPGRADE.txt`` -3. Update version in ``data/templates/about.tpl.php``, +3. Update version in ``data/templates/default/about.tpl.php``, ``build.xml`` and ``doc/README.rst`` 4. Create a release zip file via the build script: Just type "``phing``". @@ -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/scripts/fix-unfiled-tags.php b/scripts/fix-unfiled-tags.php new file mode 100644 index 0000000..8a5238e --- /dev/null +++ b/scripts/fix-unfiled-tags.php @@ -0,0 +1,35 @@ +<?php +/** + * SemanticScuttle from approximately 0.94 up to 0.98.2, system:unfiled + * tags were not created when adding new bookmarks with the web interface. + * + * This script adds system:unfiled tags for all bookmarks that have no + * tags. + */ +require_once dirname(__FILE__) . '/../src/SemanticScuttle/header-standalone.php'; + +//needed to load the database object +$bt = SemanticScuttle_Service_Factory::get('Bookmark2Tag'); +$db = SemanticScuttle_Service_Factory::getDb(); + +$query = <<<SQL +SELECT b.bId +FROM sc_bookmarks AS b + LEFT JOIN sc_bookmarks2tags AS bt ON b.bId = bt.bId +WHERE bt.bId IS NULL +SQL; + +if (!($dbresult = $db->sql_query($query))) { + die('Strange SQL error'); +} +while ($row = $db->sql_fetchrow($dbresult)) { + $db->sql_query( + 'INSERT INTO ' . $bt->getTableName() . ' ' + . $db->sql_build_array( + 'INSERT', + array('bId' => $row['bId'], 'tag' => 'system:unfiled') + ) + ); +} +$db->sql_freeresult($dbresult); +?>
\ No newline at end of file diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 04ee43d..3e5c533 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -271,10 +271,11 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * Retrieves all tags for a given bookmark except system tags. * * @param integer $bookmarkid ID of the bookmark + * @param boolean $systemTags Return "system:*" tags or not * * @return array Array of tags */ - public function getTagsForBookmark($bookmarkid) + public function getTagsForBookmark($bookmarkid, $systemTags = false) { if (!is_numeric($bookmarkid)) { message_die( @@ -285,9 +286,11 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService } $query = 'SELECT tag FROM ' . $this->getTableName() - . ' WHERE bId = ' . intval($bookmarkid) - . ' AND LEFT(tag, 7) <> "system:"' - . ' ORDER BY id ASC'; + . ' WHERE bId = ' . intval($bookmarkid); + if (!$systemTags) { + $query .= ' AND LEFT(tag, 7) <> "system:"'; + } + $query .= ' ORDER BY id ASC'; if (!($dbresult = $this->db->sql_query($query))) { message_die( @@ -552,13 +555,6 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $user = null, $limit = 30, $logged_on_user = null, $days = null, $beginsWith = null ) { - // Only count the tags that are visible to the current user. - if (($user != $logged_on_user) || is_null($user) || ($user === false)) { - $privacy = ' AND B.bStatus = 0'; - } else { - $privacy = ''; - } - $query = 'SELECT' . ' T.tag, COUNT(T.bId) AS bCount' . ' FROM ' @@ -566,20 +562,30 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService . ', ' . $GLOBALS['tableprefix'] . 'bookmarks AS B' . ' WHERE'; - if (is_null($user) || ($user === false)) { + if (is_null($user) || $user === false) { $query .= ' B.bId = T.bId AND B.bStatus = 0'; } else if (is_array($user)) { $query .= ' (1 = 0'; //tricks foreach ($user as $u) { - if (is_numeric($u)) { - $query .= ' OR B.uId = ' . $this->db->sql_escape($u) - . ' AND B.bId = T.bId'; + if (!is_numeric($u)) { + continue; } + $query .= ' OR (' + . ' B.uId = ' . $this->db->sql_escape($u) + . ' AND B.bId = T.bId'; + if ($u !== $logged_on_user) { + //public bookmarks of others + $query .= ' AND B.bStatus = 0'; + } + $query .= ')'; } - $query .= ' )' . $privacy; + $query .= ' )'; } else { $query .= ' B.uId = ' . $this->db->sql_escape($user) - . ' AND B.bId = T.bId' . $privacy; + . ' AND B.bId = T.bId'; + if ($user !== $logged_on_user) { + $query .= ' AND B.bStatus = 0'; + } } if (is_int($days)) { diff --git a/src/SemanticScuttle/Service/Tag.php b/src/SemanticScuttle/Service/Tag.php index 8325285..2476608 100644 --- a/src/SemanticScuttle/Service/Tag.php +++ b/src/SemanticScuttle/Service/Tag.php @@ -143,6 +143,7 @@ class SemanticScuttle_Service_Tag extends SemanticScuttle_DbService if(!is_array($tags)) { $tags = utf8_strtolower(trim($tags)); } else { + $tags = array_filter($tags);//remove empty values for($i=0; $i<count($tags); $i++) { $tags[$i] = utf8_strtolower(trim($tags[$i])); } diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 0236a5f..f466a7d 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -71,6 +71,26 @@ class Bookmark2TagTest extends TestBase + public function testAttachTagsWithoutTagsAddsSystemUnfiled() + { + $bid = $this->addBookmark(null, null, 0, array()); + $this->assertEquals( + array('system:unfiled'), + $this->b2ts->getTagsForBookmark($bid, true) + ); + } + + public function testAttachTagsWithArrayWithEmptyStringAddsSystemUnfiled() + { + $bid = $this->addBookmark(null, null, 0, array('')); + $this->assertEquals( + array('system:unfiled'), + $this->b2ts->getTagsForBookmark($bid, true) + ); + } + + + /** * Test getTagsForBookmark() when the bookmark has no tags * @@ -500,6 +520,31 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); } + /** + * Should return the logged on user's public, protected and private tags + * as well as public ones of other specified users. + * + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsUserPrivatesAndOthersWhenLoggedIn() + { + $user1 = $this->addUser(); + $user2 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('one')); + $this->addBookmark($user1, null, 1, array('one', 'two')); + $this->addBookmark($user1, null, 2, array('thr')); + $this->addBookmark($user2, null, 0, array('fou')); + $this->addBookmark($user2, null, 1, array('fiv')); + $this->addBookmark($user2, null, 2, array('six')); + + $arTags = $this->b2ts->getPopularTags(array($user2, $user1), 10, $user1); + $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'fou', 'bCount' => '1'), $arTags); + $this->assertEquals(4, count($arTags)); + } + /** * @covers SemanticScuttle_Service_Bookmark2Tag::getAdminTags diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php index ae82118..ac549d8 100755 --- a/tests/www/bookmarksTest.php +++ b/tests/www/bookmarksTest.php @@ -124,5 +124,33 @@ class www_bookmarksTest extends TestBaseApi $this->assertNotContains('privateKey=', (string)$elements[0]['href']); }//end testVerifyPrivateRSSLinkDoesNotExist + + + /** + * We once had the bug that URLs with special characters were escaped too + * often. & -> & + */ + public function testAddressEncoding() + { + $this->addBookmark(null, 'http://example.org?foo&bar=baz'); + + //get rid of bookmarks.php + $this->url = $GLOBALS['unittestUrl']; + + $html = $this->getRequest()->send()->getBody(); + $x = simplexml_load_string($html); + $ns = $x->getDocNamespaces(); + $x->registerXPathNamespace('ns', reset($ns)); + + $elements = $x->xpath('//ns:a[@class="taggedlink"]'); + $this->assertEquals( + 1, count($elements), 'Number of links is not 1' + ); + $this->assertEquals( + 'http://example.org?foo&bar=baz', + (string)$elements[0]['href'] + ); + } + }//end class www_bookmarksTest ?> diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php index d8ddb5b..9bb3b1f 100644 --- a/www/ajax/getlinkedtags.php +++ b/www/ajax/getlinkedtags.php @@ -1,13 +1,12 @@ <?php /** - * Returns a list of tags linked to the given one, + * Returns a list of tags linked to the given one(s), * suitable for jsTree consumption. * * Accepted GET parameters: * * @param string $tag Tag for which the children tags shall be returned - * Multiple tags (separated with space or "+") are - * supported. + * Multiple tags (separated with comma) are supported. * If no tag is given, all top-level tags are loaded. * @param integer $uId User ID to fetch the tags for * @param boolean $parent Load parent tags @@ -32,7 +31,7 @@ $tag = isset($_GET['tag']) ? $_GET['tag'] : null; $uId = isset($_GET['uId']) ? (int)$_GET['uId'] : 0; $loadParentTags = isset($_GET['parent']) ? (bool)$_GET['parent'] : false; -$tags = explode(' ', trim($tag)); +$tags = explode(',', trim($tag)); if (count($tags) == 1 && $tags[0] == '') { //no tags $tags = array(); diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php index 8bdfd70..47ffc96 100644 --- a/www/api/export_sioc.php +++ b/www/api/export_sioc.php @@ -67,9 +67,9 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL); <?php foreach($bookmarks['bookmarks'] as $bookmark): ?> <bm:Bookmark rdf:about="<?php echo createUrl('history', $bookmark['bHash']) ?>"> <dc:title><?php echo filter($bookmark['bTitle']) ?></dc:title> - <dc:created><?php echo filter($bookmark['bCreated']) ?></dc:created> + <dc:created><?php echo filter($bookmark['bDatetime']) ?></dc:created> <dc:description><?php echo filter(strip_tags($bookmark['bDescription'])) ?></dc:description> - <dc:date><?php echo $bookmark['bDateTime'] ?></dc:date> + <dc:date><?php echo $bookmark['bModified'] ?></dc:date> <bm:recalls rdf:resource="<?php echo filter($bookmark['bAddress']) ?>"/> <sioc:owner_of rdf:resource="<?php echo createUrl('profile', $usersArray[$bookmark['uId']]) ?>"/> <?php foreach($bookmark['tags'] as $tag): ?> diff --git a/www/bookmarks.php b/www/bookmarks.php index 72c063e..54daed2 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -303,7 +303,7 @@ if ($templatename == 'editbookmark.tpl') { $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); if ($userservice->isLoggedOn() && $user == $currentUsername) { $tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle; - $tplVars['subtitle'] = T_('My Bookmarks') . $catTitleWithUrls; + $tplVars['subtitlehtml'] = T_('My Bookmarks') . $catTitleWithUrls; } else { $tplVars['pagetitle'] = $user.': '.$cat; $tplVars['subtitle'] = $pagetitle; diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php index d660451..3f4af8c 100644 --- a/www/tag2tagadd.php +++ b/www/tag2tagadd.php @@ -59,7 +59,7 @@ if (POST_CONFIRM != '') { exit(); } } elseif (POST_CANCEL) { - header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags)); + header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1)); } $tplVars['links'] = $tag2tagservice->getLinks($currentUser->getId()); diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php index c1e52cd..06fea98 100644 --- a/www/tag2tagdelete.php +++ b/www/tag2tagdelete.php @@ -71,7 +71,7 @@ if (POST_CONFIRM) { exit(); } } elseif (POST_CANCEL) { - header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags)); + header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1)); } $tplVars['links'] = $tag2tagservice->getLinks($currentUser->getId()); diff --git a/www/tagrename.php b/www/tagrename.php index b07d49d..18e26ab 100644 --- a/www/tagrename.php +++ b/www/tagrename.php @@ -67,7 +67,7 @@ if (POST_CONFIRM) { $template = 'error.500.tpl'; } } elseif (POST_CANCEL) { - header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags)); + header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag)); } else { $tplVars['subtitle'] = T_('Rename Tag') .': '. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; diff --git a/www/tags.php b/www/tags.php index 127f6c5..c56b97f 100644 --- a/www/tags.php +++ b/www/tags.php @@ -107,7 +107,7 @@ $tplVars['start'] = $start; $tplVars['popCount'] = 25; $tplVars['currenttag'] = $cat; $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular'); -$tplVars['subtitle'] = $pagetitle; +$tplVars['subtitlehtml'] = $pagetitle; $tplVars['bookmarkCount'] = $start + 1; $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); $tplVars['total'] = $bookmarks['total']; |