From d1616f9f8ca7c5287b7269d2902445598ba64016 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 26 Sep 2014 17:02:59 +0000 Subject: [PATCH] Rename lib/WikiUserNew.php --> lib/WikiUser.php git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9128 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- SOAP.php | 2 +- lib/PagePerm.php | 2 +- lib/{WikiUserNew.php => WikiUser.php} | 0 lib/imagecache.php | 2 +- lib/main.php | 2 +- lib/plugin/UserRatings.php | 2 +- locale/Makefile | 2 +- locale/de/LC_MESSAGES/phpwiki.mo | Bin 100131 -> 100131 bytes locale/es/LC_MESSAGES/phpwiki.mo | Bin 41967 -> 41967 bytes locale/fr/LC_MESSAGES/phpwiki.mo | Bin 111040 -> 111040 bytes locale/it/LC_MESSAGES/phpwiki.mo | Bin 17346 -> 17346 bytes locale/ja/LC_MESSAGES/phpwiki.mo | Bin 13815 -> 13815 bytes locale/nl/LC_MESSAGES/phpwiki.mo | Bin 8192 -> 8192 bytes locale/po/de.po | 42 +++++++++++++------------- locale/po/es.po | 42 +++++++++++++------------- locale/po/fr.po | 42 +++++++++++++------------- locale/po/it.po | 42 +++++++++++++------------- locale/po/ja.po | 42 +++++++++++++------------- locale/po/nl.po | 42 +++++++++++++------------- locale/po/phpwiki.pot | 42 +++++++++++++------------- locale/po/sv.po | 42 +++++++++++++------------- locale/po/zh.po | 42 +++++++++++++------------- locale/sv/LC_MESSAGES/phpwiki.mo | Bin 8255 -> 8255 bytes locale/zh/LC_MESSAGES/phpwiki.mo | Bin 48873 -> 48873 bytes pgsrc/Help%2FPagePermissions | 4 +-- pgsrc/ReleaseNotes | 3 +- 26 files changed, 199 insertions(+), 198 deletions(-) rename lib/{WikiUserNew.php => WikiUser.php} (100%) diff --git a/SOAP.php b/SOAP.php index ddb7e24e1..ae4ede7c6 100644 --- a/SOAP.php +++ b/SOAP.php @@ -33,7 +33,7 @@ require_once 'lib/config.php'; class WikiRequest extends Request {} $request = new WikiRequest(); require_once 'lib/PagePerm.php'; -require_once 'lib/WikiUserNew.php'; +require_once 'lib/WikiUser.php'; require_once 'lib/WikiGroup.php'; */ diff --git a/lib/PagePerm.php b/lib/PagePerm.php index 1d6325db9..4dfea16b3 100644 --- a/lib/PagePerm.php +++ b/lib/PagePerm.php @@ -31,7 +31,7 @@ * optional master page ("."), and predefined default permissions, if "." * is not defined. * Pagenames starting with "." have special default permissions. - * For Authentication see WikiUserNew.php, WikiGroup.php and main.php + * For Authentication see WikiUser.php, WikiGroup.php and main.php * Page Permissions are in PhpWiki since v1.3.9 and enabled since v1.4.0 * * This file might replace the following functions from main.php: diff --git a/lib/WikiUserNew.php b/lib/WikiUser.php similarity index 100% rename from lib/WikiUserNew.php rename to lib/WikiUser.php diff --git a/lib/imagecache.php b/lib/imagecache.php index e58f8b8e2..15d607691 100644 --- a/lib/imagecache.php +++ b/lib/imagecache.php @@ -29,7 +29,7 @@ include_once 'lib/config.php'; require_once(dirname(__FILE__) . "/stdlib.php"); require_once 'lib/Request.php'; -require_once("lib/WikiUserNew.php"); +require_once("lib/WikiUser.php"); require_once 'lib/WikiDB.php'; require_once 'lib/WikiPluginCached.php'; diff --git a/lib/main.php b/lib/main.php index 930fbf58e..fa3249b6c 100644 --- a/lib/main.php +++ b/lib/main.php @@ -28,7 +28,7 @@ define ('USE_PREFS_IN_PAGE', true); require_once(dirname(__FILE__) . "/stdlib.php"); require_once 'lib/Request.php'; require_once 'lib/WikiDB.php'; -require_once 'lib/WikiUserNew.php'; +require_once 'lib/WikiUser.php'; require_once 'lib/WikiGroup.php'; if (ENABLE_PAGEPERM) require_once 'lib/PagePerm.php'; diff --git a/lib/plugin/UserRatings.php b/lib/plugin/UserRatings.php index e35ff3dcf..db1503124 100644 --- a/lib/plugin/UserRatings.php +++ b/lib/plugin/UserRatings.php @@ -23,7 +23,7 @@ require_once 'lib/PageList.php'; require_once 'lib/wikilens/Buddy.php'; require_once 'lib/wikilens/PageListColumns.php'; -require_once 'lib/WikiUserNew.php'; +require_once 'lib/WikiUser.php'; /** * Show a user's ratings in a table, using PageList. diff --git a/locale/Makefile b/locale/Makefile index 8fc5846ca..0b1475a85 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -342,11 +342,11 @@ ${POT_FILE}: ../lib/WikiUser/HttpAuthUpper.php ${POT_FILE}: ../lib/WikiUser/IMAP.php ${POT_FILE}: ../lib/WikiUser/LDAP.php ${POT_FILE}: ../lib/WikiUser/LdapUpper.php -${POT_FILE}: ../lib/WikiUserNew.php ${POT_FILE}: ../lib/WikiUser/OpenID.php ${POT_FILE}: ../lib/WikiUser/PdoDb.php ${POT_FILE}: ../lib/WikiUser/PearDb.php ${POT_FILE}: ../lib/WikiUser/PersonalPage.php +${POT_FILE}: ../lib/WikiUser.php ${POT_FILE}: ../lib/WikiUser/POP3.php ${POT_FILE}: ../lib/WikiUser/Session.php ${POT_FILE}: ../lib/WysiwygEdit/FCKeditor.php diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index 10667f8c25afbf626248b884d6d288cf2e3c6d67..ab2daf6eca42d58843594ad0fe178c1d72d7793c 100644 GIT binary patch delta 19 bcmZ47$F{hSZ3D|I7E3Dw!_6G8q~`(vN-+mQ delta 19 bcmZ47$F{hSZ3D|I77HsAB$! diff --git a/locale/es/LC_MESSAGES/phpwiki.mo b/locale/es/LC_MESSAGES/phpwiki.mo index 341d38d9097a7afe7192cddf2db62d1c74744dfe..c8729337198be363ac8d2d2d7f8ab0e81021f704 100644 GIT binary patch delta 19 bcmaEVoay~>rVSFwES6RVhMQ%QFFODLR$~Xb delta 19 bcmaEVoay~>rVSFwEEZNK#+zl5FFODLR)Pn< diff --git a/locale/fr/LC_MESSAGES/phpwiki.mo b/locale/fr/LC_MESSAGES/phpwiki.mo index df4020858381ec8207b9697eccefb5d7c5435494..6b485fe9dff0b9317e2b2c9bbbe7210cd4768955 100644 GIT binary patch delta 20 ccmX@`nC-x0wuUK;4_GX%3=FqEVZ5^e0At1pMgRZ+ delta 20 ccmX@`nC-x0wuUK;4_GX$OpLcaVZ5^e0Au9|O8@`> diff --git a/locale/it/LC_MESSAGES/phpwiki.mo b/locale/it/LC_MESSAGES/phpwiki.mo index a1955148462856dbdff27d686bb331db92dc5b50..fdff8cb96cfbc5d574779058542f4ff8dc1b881b 100644 GIT binary patch delta 19 acmX@q&UmPual?FV7E3Dw!_AAe, Carsten Klapp " ", Helmer Pardun \n" "Language-Team: \n" @@ -4941,6 +4941,26 @@ msgstr "No podía conectar con LDAP %s" msgid "Invalid username “%s” for LDAP Auth" msgstr "Username inválido '%s' para LDAP Auth" +#, php-format +msgid "PersonalPage login method:" +msgstr "Método de la conexión de PersonalPage:" + +#, php-format +msgid "You stored an empty password in your “%s” page." +msgstr "Usted almacenó una contraseña vacía en su página de “%s”." + +#, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "Sus permisos de acceso están solamente para un BogoUser." + +#, php-format +msgid "Please set a password in UserPreferences." +msgstr "Fije por favor una contraseña en UsuarioPreferencias." + +#, php-format +msgid "Given password ignored." +msgstr "Contraseña no hecho caso." + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -5010,26 +5030,6 @@ msgstr "La dirección “%s” del email no se ajusta a formato correctamente" msgid "E-mail address “%s” is properly formatted" msgstr "La dirección “%s” del email se ajusta a formato correctamente" -#, php-format -msgid "PersonalPage login method:" -msgstr "Método de la conexión de PersonalPage:" - -#, php-format -msgid "You stored an empty password in your “%s” page." -msgstr "Usted almacenó una contraseña vacía en su página de “%s”." - -#, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "Sus permisos de acceso están solamente para un BogoUser." - -#, php-format -msgid "Please set a password in UserPreferences." -msgstr "Fije por favor una contraseña en UsuarioPreferencias." - -#, php-format -msgid "Given password ignored." -msgstr "Contraseña no hecho caso." - #, php-format msgid "Couldn't connect to %s" msgstr "No podía conectar con %s" diff --git a/locale/po/fr.po b/locale/po/fr.po index 696c5e405..b60296aa9 100644 --- a/locale/po/fr.po +++ b/locale/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-26 18:43+0200\n" +"POT-Creation-Date: 2014-09-26 19:01+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen , Roland " "Trique , Stéphane Gourichon \n" "Language-Team: LANGUAGE \n" @@ -5042,6 +5042,26 @@ msgstr "" msgid "Invalid username “%s” for LDAP Auth" msgstr "" +#, php-format +msgid "PersonalPage login method:" +msgstr "" + +#, php-format +msgid "You stored an empty password in your “%s” page." +msgstr "" + +#, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "" + +#, php-format +msgid "Please set a password in UserPreferences." +msgstr "" + +#, php-format +msgid "Given password ignored." +msgstr "" + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -5097,26 +5117,6 @@ msgstr "" msgid "E-mail address “%s” is properly formatted" msgstr "" -#, php-format -msgid "PersonalPage login method:" -msgstr "" - -#, php-format -msgid "You stored an empty password in your “%s” page." -msgstr "" - -#, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "" - -#, php-format -msgid "Please set a password in UserPreferences." -msgstr "" - -#, php-format -msgid "Given password ignored." -msgstr "" - #, php-format msgid "Couldn't connect to %s" msgstr "" diff --git a/locale/po/nl.po b/locale/po/nl.po index db668e76f..8825ba195 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-26 18:43+0200\n" +"POT-Creation-Date: 2014-09-26 19:01+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -4891,6 +4891,26 @@ msgstr "" msgid "Invalid username “%s” for LDAP Auth" msgstr "" +#, php-format +msgid "PersonalPage login method:" +msgstr "" + +#, php-format +msgid "You stored an empty password in your “%s” page." +msgstr "" + +#, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "" + +#, php-format +msgid "Please set a password in UserPreferences." +msgstr "" + +#, php-format +msgid "Given password ignored." +msgstr "" + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -4946,26 +4966,6 @@ msgstr "" msgid "E-mail address “%s” is properly formatted" msgstr "" -#, php-format -msgid "PersonalPage login method:" -msgstr "" - -#, php-format -msgid "You stored an empty password in your “%s” page." -msgstr "" - -#, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "" - -#, php-format -msgid "Please set a password in UserPreferences." -msgstr "" - -#, php-format -msgid "Given password ignored." -msgstr "" - #, php-format msgid "Couldn't connect to %s" msgstr "Kan verbinding naar data base %s niet tot stand brengen, geef op." diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index 2b21c5fd0..f31790fbd 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-26 18:43+0200\n" +"POT-Creation-Date: 2014-09-26 19:01+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban \n" "Language-Team: LANGUAGE \n" @@ -4883,6 +4883,26 @@ msgstr "" msgid "Invalid username “%s” for LDAP Auth" msgstr "" +#, php-format +msgid "PersonalPage login method:" +msgstr "" + +#, php-format +msgid "You stored an empty password in your “%s” page." +msgstr "" + +#, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "" + +#, php-format +msgid "Please set a password in UserPreferences." +msgstr "" + +#, php-format +msgid "Given password ignored." +msgstr "" + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -4938,26 +4958,6 @@ msgstr "" msgid "E-mail address “%s” is properly formatted" msgstr "" -#, php-format -msgid "PersonalPage login method:" -msgstr "" - -#, php-format -msgid "You stored an empty password in your “%s” page." -msgstr "" - -#, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "" - -#, php-format -msgid "Please set a password in UserPreferences." -msgstr "" - -#, php-format -msgid "Given password ignored." -msgstr "" - #, php-format msgid "Couldn't connect to %s" msgstr "" diff --git a/locale/po/sv.po b/locale/po/sv.po index 35001ce07..5cada87d6 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-26 18:43+0200\n" +"POT-Creation-Date: 2014-09-26 19:01+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund \n" "Language-Team: \n" @@ -4884,6 +4884,26 @@ msgstr "" msgid "Invalid username “%s” for LDAP Auth" msgstr "" +#, php-format +msgid "PersonalPage login method:" +msgstr "" + +#, php-format +msgid "You stored an empty password in your “%s” page." +msgstr "" + +#, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "" + +#, php-format +msgid "Please set a password in UserPreferences." +msgstr "" + +#, php-format +msgid "Given password ignored." +msgstr "" + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -4939,26 +4959,6 @@ msgstr "" msgid "E-mail address “%s” is properly formatted" msgstr "" -#, php-format -msgid "PersonalPage login method:" -msgstr "" - -#, php-format -msgid "You stored an empty password in your “%s” page." -msgstr "" - -#, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "" - -#, php-format -msgid "Please set a password in UserPreferences." -msgstr "" - -#, php-format -msgid "Given password ignored." -msgstr "" - #, php-format msgid "Couldn't connect to %s" msgstr "" diff --git a/locale/po/zh.po b/locale/po/zh.po index 9854fcb45..c4a50a7e9 100644 --- a/locale/po/zh.po +++ b/locale/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-26 18:43+0200\n" +"POT-Creation-Date: 2014-09-26 19:01+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL \n" "Language-Team: DruryL \n" @@ -5130,6 +5130,26 @@ msgstr "無法為頁面 “%s” 變更權限為 “%s”" msgid "Invalid username “%s” for LDAP Auth" msgstr "" +#, php-format +msgid "PersonalPage login method:" +msgstr "" + +#, fuzzy, php-format +msgid "You stored an empty password in your “%s” page." +msgstr " 你在你的 “%s” 儲存了空白密碼." + +#, fuzzy, php-format +msgid "Your access permissions are only for a BogoUser." +msgstr "你的存取權限只能給 BogoUser." + +#, fuzzy, php-format +msgid "Please set a password in UserPreferences." +msgstr "請在 UserPreferences 中設定你的密碼." + +#, php-format +msgid "Given password ignored." +msgstr "" + msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" @@ -5194,26 +5214,6 @@ msgstr "" msgid "E-mail address “%s” is properly formatted" msgstr "" -#, php-format -msgid "PersonalPage login method:" -msgstr "" - -#, fuzzy, php-format -msgid "You stored an empty password in your “%s” page." -msgstr " 你在你的 “%s” 儲存了空白密碼." - -#, fuzzy, php-format -msgid "Your access permissions are only for a BogoUser." -msgstr "你的存取權限只能給 BogoUser." - -#, fuzzy, php-format -msgid "Please set a password in UserPreferences." -msgstr "請在 UserPreferences 中設定你的密碼." - -#, php-format -msgid "Given password ignored." -msgstr "" - #, fuzzy, php-format msgid "Couldn't connect to %s" msgstr "無法為頁面 “%s” 變更權限為 “%s”." diff --git a/locale/sv/LC_MESSAGES/phpwiki.mo b/locale/sv/LC_MESSAGES/phpwiki.mo index 42c4674e5998362286f89b7f4383c3391a8d2b7b..106eb29316ca9d7b13e3175dc7096edc884d1e4a 100644 GIT binary patch delta 17 Ycmdn*u-{=rohXZ?m4V^rCegiI06ggiD*ylh delta 17 Ycmdn*u-{=rohXZim5K4@CegiI06ho>FaQ7m diff --git a/locale/zh/LC_MESSAGES/phpwiki.mo b/locale/zh/LC_MESSAGES/phpwiki.mo index a33a61fbc7f72d68c3b25b02934a1ddfb6b94993..ab25f85fb64df466b77009c1dada3208814bdc52 100644 GIT binary patch delta 19 bcmaF)m+9qSrVYB)ES6RVhMNtmcQ^w8Ui1iC delta 19 bcmaF)m+9qSrVYB)EEZNK#+wbRcQ^w8UlRym diff --git a/pgsrc/Help%2FPagePermissions b/pgsrc/Help%2FPagePermissions index 270f54c1c..65ecbaa63 100644 --- a/pgsrc/Help%2FPagePermissions +++ b/pgsrc/Help%2FPagePermissions @@ -1,4 +1,4 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 +Date: Fri, 26 Sep 2014 19:00:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FPagePermissions; @@ -36,7 +36,7 @@ Consider the following perm: ----- -For Authentication see ~WikiUserNew.php, ~WikiGroup.php and main.php +For Authentication see ~WikiUser.php, ~WikiGroup.php and main.php I suspect ACL page permissions to degrade performance by 10% diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index 9a36a6a87..36fddf4e4 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -1,4 +1,4 @@ -Date: Fri, 26 Sep 2014 10:57:34 +0000 +Date: Fri, 26 Sep 2014 19:00:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -19,6 +19,7 @@ Content-Transfer-Encoding: binary * fix Bug#607 BackLinks do not work inside a [[Help:RichTablePlugin|RichTable]] * fix Bug#646 Wrong number of links in BackLinks * make work +* remove old WikiUser code (ENABLE_USER_NEW) == 1.5.0 2014-07-29 Marc-Etienne Vargenau == -- 2.45.0