Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9981] trunk
|
From: <var...@us...> - 2016-12-05 12:46:42
|
Revision: 9981
http://sourceforge.net/p/phpwiki/code/9981
Author: vargenau
Date: 2016-12-05 12:46:40 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
Wiki upgrade: do not ask for login/password
Modified Paths:
--------------
trunk/lib/upgrade.php
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/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/lib/upgrade.php 2016-12-05 12:46:40 UTC (rev 9981)
@@ -412,13 +412,6 @@
_("database")),
" - ", DATABASE_TYPE, "</h2>\n";
$dbadmin = $this->request->getArg('dbadmin');
- if ($this->isSQL) {
- $this->_db_init();
- if (isset($dbadmin['cancel'])) {
- echo _("Cancel"), " <br />\n";
- return;
- }
- }
echo _("db version: we want "), $this->current_db_version, "\n<br />";
echo _("db version: we have "), $this->db_version, "\n<br />";
if ($this->db_version >= $this->current_db_version) {
@@ -719,113 +712,6 @@
}
/**
- * Filter SQL missing permissions errors.
- *
- * A wrong DBADMIN user will not be able to connect
- * @see _is_false_error, ErrorManager
- */
- public function _dbpermission_filter($err)
- {
- if ($err->isWarning()) {
- global $ErrorManager;
- $this->error_caught = 1;
- $ErrorManager->_postponed_errors[] = $err;
- return true;
- }
- return false;
- }
-
- private function _try_dbadmin_user($user, $passwd)
- {
- global $DBParams;
- $AdminParams = $DBParams;
- if (DATABASE_TYPE == 'SQL')
- $dsn = DB::parseDSN($AdminParams['dsn']);
- else {
- $dsn = parseDSN($AdminParams['dsn']);
- }
- $AdminParams['dsn'] = sprintf("%s://%s:%s@%s/%s",
- $dsn['phptype'],
- $user,
- $passwd,
- $dsn['hostspec'],
- $dsn['database']);
- $AdminParams['_tryroot_from_upgrade'] = 1;
- // add error handler to warn about missing permissions for DBADMIN_USER
- global $ErrorManager;
- $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_dbpermission_filter'));
- $this->error_caught = 0;
- $this->dbi = WikiDB::open($AdminParams);
- if (!$this->error_caught)
- return true;
- // FAILED: redo our connection with the wikiuser
- $this->dbi = WikiDB::open($DBParams);
- $ErrorManager->flushPostponedErrors();
- $ErrorManager->popErrorHandler();
- return false;
- }
-
- private function _db_init()
- {
- if (!$this->isSQL)
- return;
-
- /* SQLite never needs admin params */
- $backend_type = $this->dbi->_backend->backendType();
- if (substr($backend_type, 0, 6) == "sqlite") {
- return;
- }
- $dbadmin_user = 'root';
- if ($dbadmin = $this->request->getArg('dbadmin')) {
- $dbadmin_user = $dbadmin['user'];
- if (isset($dbadmin['cancel'])) {
- return;
- } elseif (!empty($dbadmin_user)) {
- if ($this->_try_dbadmin_user($dbadmin['user'], $dbadmin['passwd']))
- return;
- }
- } elseif (DBADMIN_USER) {
- if ($this->_try_dbadmin_user(DBADMIN_USER, DBADMIN_PASSWD)) {
- return;
- }
- }
- // Check if the privileges are enough. Need CREATE and ALTER perms.
- // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql.
- $form = HTML::form(array("method" => "post",
- "action" => $this->request->getPostURL(),
- "accept-charset" => 'UTF-8'),
- HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."),
- HTML::br(),
- _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
- HiddenInputs(array('action' => 'upgrade',
- 'overwrite' => $this->request->getArg('overwrite'))),
- HTML::table(array("cellspacing" => 4),
- HTML::tr(HTML::td(array('align' => 'right'),
- _("DB admin user:")),
- HTML::td(HTML::input(array('name' => "dbadmin[user]",
- 'size' => 12,
- 'maxlength' => 256,
- 'value' => $dbadmin_user)))),
- HTML::tr(HTML::td(array('align' => 'right'),
- _("DB admin password:")),
- HTML::td(HTML::input(array('name' => "dbadmin[passwd]",
- 'type' => 'password',
- 'size' => 12,
- 'maxlength' => 256)))),
- HTML::tr(HTML::td(array('align' => 'center', 'colspan' => 2),
- Button("submit:", _("Submit"), 'wikiaction'),
- HTML::raw(' '),
- Button("submit:dbadmin[cancel]", _("Cancel"),
- 'button')))));
- $form->printXML();
- echo "</div><!-- content -->\n";
- echo AsXML(Template("bottom"));
- echo "</body></html>\n";
- $this->request->finish();
- exit();
- }
-
- /**
* if page.cached_html does not exists:
* put _cached_html from pagedata into a new separate blob,
* not into the huge serialized string.
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 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/de.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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."
@@ -4743,22 +4743,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr "DB Admin Benutzername:"
-
-msgid "DB admin password:"
-msgstr "DB Admin passwort:"
-
msgid "Check for extra page.cached_html column"
msgstr ""
@@ -6039,6 +6023,12 @@
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+#~ msgid "DB admin user:"
+#~ msgstr "DB Admin Benutzername:"
+
+#~ msgid "DB admin password:"
+#~ msgstr "DB Admin passwort:"
+
#~ msgid "Help/TextFormattingRules"
#~ msgstr "Hilfe/TextFormatierungsRegeln"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/es.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -4620,22 +4620,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr "DB admin username:"
-
-msgid "DB admin password:"
-msgstr "DB admin contraseña:"
-
msgid "Check for extra page.cached_html column"
msgstr ""
@@ -5867,6 +5851,12 @@
msgid "Edit this page"
msgstr "Corrija esta página"
+#~ msgid "DB admin user:"
+#~ msgstr "DB admin username:"
+
+#~ msgid "DB admin password:"
+#~ msgstr "DB admin contraseña:"
+
#~ msgid "Help/TextFormattingRules"
#~ msgstr "Ayuda/ReglasDeFormatoDeTexto"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/fr.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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."
@@ -4700,26 +4700,6 @@
msgid "db version: upgrade to "
msgstr "Version de la base de données : mise à niveau vers "
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-"La mise à niveau nécessite les droits CREATE et ALTER de la base de données "
-"phpwiki "
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-"Et pour Windows au moins le droit de SELECT FROM mysql, et éventuellement "
-"UPDATE mysql "
-
-msgid "DB admin user:"
-msgstr "Identifiant de l'administrateur de la base de données :"
-
-msgid "DB admin password:"
-msgstr "Mot de passe de l'administrateur de la base de données :"
-
msgid "Check for extra page.cached_html column"
msgstr "Recherche une colonne supplémentaire page.cached_html"
@@ -5973,6 +5953,26 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid ""
+#~ "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
+#~ "database."
+#~ msgstr ""
+#~ "La mise à niveau nécessite les droits CREATE et ALTER de la base de "
+#~ "données phpwiki "
+
+#~ msgid ""
+#~ "And on Windows at least the privilege to SELECT FROM mysql, and possibly "
+#~ "UPDATE mysql"
+#~ msgstr ""
+#~ "Et pour Windows au moins le droit de SELECT FROM mysql, et éventuellement "
+#~ "UPDATE mysql "
+
+#~ msgid "DB admin user:"
+#~ msgstr "Identifiant de l'administrateur de la base de données :"
+
+#~ msgid "DB admin password:"
+#~ msgstr "Mot de passe de l'administrateur de la base de données :"
+
#~ msgid "Invalid path: No access"
#~ msgstr "Chemin non valable : accès refusé"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/it.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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"
@@ -4584,22 +4584,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-msgid "DB admin password:"
-msgstr ""
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/ja.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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"
@@ -4723,22 +4723,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-msgid "DB admin password:"
-msgstr ""
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/nl.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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"
@@ -4574,22 +4574,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-msgid "DB admin password:"
-msgstr ""
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/phpwiki.pot 2016-12-05 12:46:40 UTC (rev 9981)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+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"
@@ -4566,22 +4566,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-msgid "DB admin password:"
-msgstr ""
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/sv.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -4567,22 +4567,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-msgid "DB admin password:"
-msgstr ""
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2016-12-02 09:36:22 UTC (rev 9980)
+++ trunk/locale/po/zh.po 2016-12-05 12:46:40 UTC (rev 9981)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 10:34+0100\n"
+"POT-Creation-Date: 2016-12-05 13:42+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -4804,23 +4804,6 @@
msgid "db version: upgrade to "
msgstr ""
-msgid ""
-"Upgrade requires database privileges to CREATE and ALTER the phpwiki "
-"database."
-msgstr ""
-
-msgid ""
-"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
-"UPDATE mysql"
-msgstr ""
-
-msgid "DB admin user:"
-msgstr ""
-
-#, fuzzy
-msgid "DB admin password:"
-msgstr "改變密碼:"
-
msgid "Check for extra page.cached_html column"
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
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.
|
