From: <var...@us...> - 2015-01-09 15:48:22
|
Revision: 9459 http://sourceforge.net/p/phpwiki/code/9459 Author: vargenau Date: 2015-01-09 15:48:19 +0000 (Fri, 09 Jan 2015) Log Message: ----------- Remove nusoap Modified Paths: -------------- trunk/SOAP.php trunk/lib/Google.php trunk/locale/.exclude trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/update-makefile.sh trunk/locale/zh/LC_MESSAGES/phpwiki.mo Removed Paths: ------------- trunk/lib/nusoap/ Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/SOAP.php 2015-01-09 15:48:19 UTC (rev 9459) @@ -19,8 +19,6 @@ include_once './index.php'; include_once 'lib/main.php'; -if (!loadExtension('soap')) - require_once 'lib/nusoap/nusoap.php'; /* // bypass auth and request loop for now. Modified: trunk/lib/Google.php =================================================================== --- trunk/lib/Google.php 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/lib/Google.php 2015-01-09 15:48:19 UTC (rev 9459) @@ -169,7 +169,6 @@ return false; } else $this->license_key = GOOGLE_LICENSE_KEY; - require_once 'lib/nusoap/nusoap.php'; $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl"); $this->proxy = $this->soapclient->getProxy(); Modified: trunk/locale/.exclude =================================================================== --- trunk/locale/.exclude 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/.exclude 2015-01-09 15:48:19 UTC (rev 9459) @@ -1,26 +1 @@ -lib/template_lite/ -lib/pear/ lib/WikiDB/adodb/ -lib/nusoap/ -lib/fpdf/ -lib/XMLRPC/ -lib/AccessLog.php -lib/ASCIIMathPHP/ -lib/WikiDB/backend/cvsclient.php -lib/weather_class_inc.php -lib/plugin/NewUserWelcomePage.php -lib/plugin/GridTable.php -lib/plugin/RdfDefinition.php -lib/plugin/WikiAccessRestrictions.php -lib/plugin/WikiAdminSetAclSimple.php -lib/plugin/WikiAdminMassRevert.php -lib/plugin/WikiSettings.php -lib/plugin/WikiUserAdministration.php -lib/plugin/BlockQuote.php -lib/plugin/SpecialTag.php -themes/default/tiny_mce/ -themes/wikilens/templates/newuserwelcomepage.tmpl -themes/wikilens/templates/categorypage.tmpl -themes/archX/ -themes/film/ -themes/AVL/ Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/Makefile 2015-01-09 15:48:19 UTC (rev 9459) @@ -70,6 +70,8 @@ mo: zh/LC_MESSAGES/phpwiki.mo # ${POT_FILE}: ../lib/ArchiveCleaner.php +${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php +${POT_FILE}: ../lib/ASCIIMathPHP/ASCIIMathPHP.class.php ${POT_FILE}: ../lib/AtomParser.php ${POT_FILE}: ../lib/BlockParser.php ${POT_FILE}: ../lib/CachedMarkup.php @@ -237,6 +239,7 @@ ${POT_FILE}: ../lib/plugin/WikiAdminSearchReplace.php ${POT_FILE}: ../lib/plugin/WikiAdminSelect.php ${POT_FILE}: ../lib/plugin/WikiAdminSetAcl.php +${POT_FILE}: ../lib/plugin/WikiAdminSetAclSimple.php ${POT_FILE}: ../lib/plugin/WikiAdminSetExternal.php ${POT_FILE}: ../lib/plugin/WikiAdminUtils.php ${POT_FILE}: ../lib/plugin/WikiBlog.php @@ -342,6 +345,7 @@ ${POT_FILE}: ../lib/XmlParser.php ${POT_FILE}: ../lib/XmlRpcClient.php ${POT_FILE}: ../lib/XmlRpcServer.php +${POT_FILE}: ../lib/XMLRPC/utils.php ${POT_FILE}: ../lib/ziplib.php ${POT_FILE}: ../themes/alphatest.php ${POT_FILE}: ../themes/blog/lib/RecentChanges.php @@ -483,8 +487,10 @@ ${POT_FILE}: ../themes/SpaceWiki/lib/RecentChanges.php ${POT_FILE}: ../themes/SpaceWiki/themeinfo.php ${POT_FILE}: ../themes/wikilens/templates/body.tmpl +${POT_FILE}: ../themes/wikilens/templates/categorypage.tmpl ${POT_FILE}: ../themes/wikilens/templates/head.tmpl ${POT_FILE}: ../themes/wikilens/templates/navbar.tmpl +${POT_FILE}: ../themes/wikilens/templates/newuserwelcomepage.tmpl ${POT_FILE}: ../themes/wikilens/templates/ratings.tmpl ${POT_FILE}: ../themes/wikilens/templates/top.tmpl ${POT_FILE}: ../themes/wikilens/themeinfo.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/de.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -769,23 +769,6 @@ msgid "User %s removed page %s" msgstr "Seite gelöscht %s von Benutzer %s" -msgid "E-mail address confirmation" -msgstr "E-Mail Bestätigung" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Datenbank wird optimiert" @@ -3815,6 +3798,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind." +msgid "E-mail address confirmation" +msgstr "E-Mail Bestätigung" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/es.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -753,23 +753,6 @@ msgid "User %s removed page %s" msgstr "El usuarios %s eliminado página %s" -msgid "E-mail address confirmation" -msgstr "Verificación Del Email" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Base de datos óptima" @@ -3710,6 +3693,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "Verificación Del Email" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/fr.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -753,23 +753,6 @@ msgid "User %s removed page %s" msgstr "L'utilisateur %s a supprimé la page %s" -msgid "E-mail address confirmation" -msgstr "Vérification de l'adresse électronique" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Optimisation de la base de données" @@ -3769,6 +3752,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "Vérification de l'adresse électronique" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/it.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -741,23 +741,6 @@ msgid "User %s removed page %s" msgstr "Utente %s pagina %s rimossa" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "Base di dati d'ottimizzazione" @@ -3679,6 +3662,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/ja.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -730,23 +730,6 @@ msgid "User %s removed page %s" msgstr "ページをロックしました。" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - #, fuzzy msgid "Optimizing database" msgstr "%s を最適化中です" @@ -3738,6 +3721,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/nl.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -732,23 +732,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3671,6 +3654,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/phpwiki.pot 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -726,23 +726,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3663,6 +3646,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/sv.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -727,23 +727,6 @@ msgid "User %s removed page %s" msgstr "" -msgid "E-mail address confirmation" -msgstr "" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - msgid "Optimizing database" msgstr "" @@ -3664,6 +3647,9 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +msgid "E-mail address confirmation" +msgstr "" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/po/zh.po 2015-01-09 15:48:19 UTC (rev 9459) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-19 14:34+0100\n" +"POT-Creation-Date: 2015-01-09 16:45+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -758,24 +758,6 @@ msgstr "頁面已被鎖定" #, fuzzy -msgid "E-mail address confirmation" -msgstr "Email 驗證" - -#, php-format -msgid "" -"Someone, probably you from IP address %s, has registered an\n" -"account \"%s\" with this e-mail address on %s.\n" -"\n" -"To confirm that this account really does belong to you and activate\n" -"e-mail features on %s, open this link in your browser:\n" -"\n" -"%s\n" -"\n" -"If this is *not* you, don't follow the link. This confirmation code\n" -"will expire at %s." -msgstr "" - -#, fuzzy msgid "Optimizing database" msgstr "最佳化 %s" @@ -3827,6 +3809,10 @@ msgid "Purge all empty, unreferenced Pages" msgstr "" +#, fuzzy +msgid "E-mail address confirmation" +msgstr "Email 驗證" + msgid "Convert cached_html" msgstr "" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/update-makefile.sh =================================================================== --- trunk/locale/update-makefile.sh 2015-01-09 15:40:00 UTC (rev 9458) +++ trunk/locale/update-makefile.sh 2015-01-09 15:48:19 UTC (rev 9459) @@ -35,11 +35,10 @@ # Find all php and html source code which should be scanned # by xgettext() for localizeable strings. # find ../lib fails on cygwin -# TODO: autogenerate .exclude list from CVS/Entries pot_file_deps () { - test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude; echo lib/nusoap/ > .exclude ) - (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)\|\(^lib/nusoap\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) | - egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)|(^lib/nusoap)' | + test -f .exclude || ( echo lib/pear/ > .exclude; echo lib/WikiDB/adodb/ > .exclude ) + (cd ..; find lib themes \( -type d -regex '\(^lib/pear\)\|\(^lib/WikiDB/adodb\)' \) -prune -o \( -type f -a -name \*.php -o -name \*.tmpl \)) | + egrep -v '(^lib/pear)|(^lib/WikiDB/adodb)' | grep -v -f .exclude | sed 's|^|${POT_FILE}: ../|;' | sort Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |