[evolvis-commits] r18367: unbreak user creation

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Apr 23 12:39:33 CEST 2012


Author: mirabilos
Date: 2012-04-23 12:39:33 +0200 (Mon, 23 Apr 2012)
New Revision: 18367

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
Log:
unbreak user creation

apparently, an unused $2 in db_query_params() is not liked

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2012-04-23 10:39:26 UTC (rev 18366)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2012-04-23 10:39:33 UTC (rev 18367)
@@ -343,9 +343,8 @@
 		// if we got this far, it must be good
 		$confirm_hash = substr(md5($password1 . util_randbytes() . microtime()),0,16);
 		db_begin();
-		$result = db_query_params ('INSERT INTO users (user_name,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,jabber_address,jabber_only,unix_box,address,address2,phone,fax,title,ccode,theme_id) VALUES ($1,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24)',
+		$result = db_query_params ('INSERT INTO users (user_name,unix_pw,realname,firstname,lastname,email,add_date,status,confirm_hash,mail_siteupdates,mail_va,language,timezone,jabber_address,jabber_only,unix_box,address,address2,phone,fax,title,ccode,theme_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23)',
 					   array ($unix_name,
-						  'X',
 						  account_genunixpw($password1),
 						  htmlspecialchars($firstname.' '.$lastname),
 						  htmlspecialchars($firstname),

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-23 10:39:26 UTC (rev 18366)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-04-23 10:39:33 UTC (rev 18367)
@@ -1,8 +1,9 @@
-fusionforge (1:5.1.1+evolvis55) xunstable; urgency=low
+fusionforge (1:5.1.1+evolvis55) unstable; urgency=low
 
   * Fix passwords being set wrongly after mailing list creation
+  * Unbreak user creation
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 23 Apr 2012 12:25:45 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 23 Apr 2012 12:37:35 +0200
 
 fusionforge (1:5.1.1+evolvis54) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-04-23 10:39:26 UTC (rev 18366)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-04-23 10:39:33 UTC (rev 18367)
@@ -1,9 +1,9 @@
 # German translations for Evolvis.
 msgid ""
 msgstr ""
-"Project-Id-Version: EvolvisForge 5.1+evolvis54\n"
+"Project-Id-Version: EvolvisForge 5.1+evolvis55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 14:44+0200\n"
+"POT-Creation-Date: 2012-04-23 12:35+0200\n"
 "PO-Revision-Date: 2012-04-18 14:45+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -2575,7 +2575,7 @@
 msgid "Invalid Unix Name."
 msgstr "Ungültiger Unix-Name."
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
+#: common/include/User.class.php:283 common/include/User.class.php:528
 msgid "Invalid Jabber Address"
 msgstr "Ungültige Jabber-Adresse"
 
@@ -2592,12 +2592,12 @@
 "Ein Benutzer mit dieser Email-Adresse existiert bereits - benutzen Sie die "
 "Personen-Suche,um Ihren Anmeldenamen wiederzufinden."
 
-#: common/include/User.class.php:372
+#: common/include/User.class.php:371
 #, fuzzy
 msgid "Insert Failed: "
 msgstr "Eingabe fehlgeschlagen"
 
-#: common/include/User.class.php:413
+#: common/include/User.class.php:412
 #, php-format
 msgid ""
 "Thank you for registering on the %3$s web site. You have\n"
@@ -2638,45 +2638,45 @@
 "\n"
 "-- Die %3$s Leitung\n"
 
-#: common/include/User.class.php:435
+#: common/include/User.class.php:434
 #, php-format
 msgid "%1$s Account Registration"
 msgstr "%1$s Account-Registrierung"
 
-#: common/include/User.class.php:582
+#: common/include/User.class.php:581
 #, fuzzy
 msgid "ERROR - Could Not Update User Object:"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/User.class.php:657
+#: common/include/User.class.php:656
 #, fuzzy
 msgid "ERROR: Invalid status value"
 msgstr "Ungültige Bewertungsgröße"
 
-#: common/include/User.class.php:671
+#: common/include/User.class.php:670
 #, fuzzy
 msgid "ERROR - Could Not Update User Status:"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/User.class.php:850 common/include/User.class.php:903
+#: common/include/User.class.php:849 common/include/User.class.php:902
 msgid "User with this email already exists."
 msgstr "Ein Benutzer mit dieser Email-Adresse existiert bereits."
 
-#: common/include/User.class.php:1003
+#: common/include/User.class.php:1002
 msgid "ERROR: Invalid Shell"
 msgstr "Fehler: Ungültige Shell"
 
-#: common/include/User.class.php:1012
+#: common/include/User.class.php:1011
 #, fuzzy
 msgid "ERROR - Could Not Update User Unix Shell:"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/User.class.php:1169
+#: common/include/User.class.php:1168
 #, fuzzy
 msgid "ERROR - Could Not Update User SSH Keys"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/User.class.php:1312
+#: common/include/User.class.php:1311
 #, fuzzy
 msgid "ERROR - Could Not Change User Password:"
 msgstr "Fehler: Datenbank: Konnte den Gruppenstatus: %s nicht verändern"

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-04-23 10:39:26 UTC (rev 18366)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-04-23 10:39:33 UTC (rev 18367)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 14:44+0200\n"
+"POT-Creation-Date: 2012-04-23 12:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -2289,7 +2289,7 @@
 msgid "Invalid Unix Name."
 msgstr ""
 
-#: common/include/User.class.php:283 common/include/User.class.php:529
+#: common/include/User.class.php:283 common/include/User.class.php:528
 msgid "Invalid Jabber Address"
 msgstr ""
 
@@ -2304,11 +2304,11 @@
 "login."
 msgstr ""
 
-#: common/include/User.class.php:372
+#: common/include/User.class.php:371
 msgid "Insert Failed: "
 msgstr ""
 
-#: common/include/User.class.php:413
+#: common/include/User.class.php:412
 #, php-format
 msgid ""
 "Thank you for registering on the %3$s web site. You have\n"
@@ -2331,40 +2331,40 @@
 "-- the %3$s staff\n"
 msgstr ""
 
-#: common/include/User.class.php:435
+#: common/include/User.class.php:434
 #, php-format
 msgid "%1$s Account Registration"
 msgstr ""
 
-#: common/include/User.class.php:582
+#: common/include/User.class.php:581
 msgid "ERROR - Could Not Update User Object:"
 msgstr ""
 
-#: common/include/User.class.php:657
+#: common/include/User.class.php:656
 msgid "ERROR: Invalid status value"
 msgstr ""
 
-#: common/include/User.class.php:671
+#: common/include/User.class.php:670
 msgid "ERROR - Could Not Update User Status:"
 msgstr ""
 
-#: common/include/User.class.php:850 common/include/User.class.php:903
+#: common/include/User.class.php:849 common/include/User.class.php:902
 msgid "User with this email already exists."
 msgstr ""
 
-#: common/include/User.class.php:1003
+#: common/include/User.class.php:1002
 msgid "ERROR: Invalid Shell"
 msgstr ""
 
-#: common/include/User.class.php:1012
+#: common/include/User.class.php:1011
 msgid "ERROR - Could Not Update User Unix Shell:"
 msgstr ""
 
-#: common/include/User.class.php:1169
+#: common/include/User.class.php:1168
 msgid "ERROR - Could Not Update User SSH Keys"
 msgstr ""
 
-#: common/include/User.class.php:1312
+#: common/include/User.class.php:1311
 msgid "ERROR - Could Not Change User Password:"
 msgstr ""
 



More information about the evolvis-commits mailing list