Added group syncing.

index.php

@@ -7,7 +7,8 @@
 		$_GET['key'] = isset($opts['key'])?$opts['key']:(isset($opts['k'])?$opts['k']:false);
 		$_GET['server'] = isset($opts['server'])?$opts['server']:(isset($opts['s'])?$opts['s']:false);
 		if(!$_GET['user'] || !$_GET['key'] || !$_GET['server']){
-			die('# Please provide a user, api key and a server name.');
+			header('Location: site/');
+			die();
 		}
 	}
 	$user = get_current_user_obj('netadmin') or $user = get_current_user_obj('servermanager') or $user = get_current_user_obj('globaladmin') or die('# Invalid user/key pair.');

ircd.sql

@@ -442,6 +442,16 @@ INSERT INTO `user_role_types` (`id`, `name`, `description`, `flags`) VALUES
 (3, 'netadmin', 'Network Admin', 'on'),
 (4, 'globaladmin', 'Global Admin', 'nao');
 
+
+DROP TABLE IF EXISTS `smf_groups`;
+CREATE TABLE IF NOT EXISTS `smf_groups` (
+  `irc_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `id_group` smallint(5) NOT NULL,
+  PRIMARY KEY (`irc_name`),
+  UNIQUE KEY `irc_name` (`irc_name`,`id_group`),
+  KEY `id_group` (`id_group`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+
 -- --------------------------------------------------------
 
 --

lang/en/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet\n"
-"POT-Creation-Date: 2014-02-23 18:35-0700\n"
-"PO-Revision-Date: 2014-02-23 18:35-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: en\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr ""
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr ""
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgstr ""
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr ""
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr ""
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgstr ""
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr ""
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr ""
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr ""
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr ""
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr ""
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr ""
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr ""
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr ""
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr ""
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr ""
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr ""
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr ""
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr ""
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr ""
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgstr ""
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr ""
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr ""
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr ""
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr ""
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr ""
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr ""
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr ""
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr ""
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr ""
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr ""
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr ""
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr ""
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr ""
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr ""
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr ""
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr ""
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr ""
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr ""
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr ""
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr ""
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr ""
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr ""
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr ""
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr ""
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr ""
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr ""
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr ""
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr ""
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr ""
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr ""
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr ""
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgstr ""
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr ""
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr ""
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr ""
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr ""
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr ""
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr ""
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr ""
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr ""
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr ""
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr ""
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr ""
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr ""
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr ""
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr ""

lang/en_CA/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: en_CA\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr ""
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr ""
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgstr ""
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr ""
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr ""
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgstr ""
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr ""
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr ""
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr ""
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr ""
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr ""
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr ""
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr ""
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr ""
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr ""
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr ""
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr ""
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr ""
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr ""
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr ""
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgstr ""
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr ""
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr ""
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr ""
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr ""
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr ""
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr ""
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr ""
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr ""
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr ""
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr ""
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr ""
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr ""
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr ""
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr ""
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr ""
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr ""
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr ""
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr ""
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr ""
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr ""
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr ""
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr ""
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr ""
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr ""
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr ""
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr ""
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr ""
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr ""
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr ""
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr ""
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr ""
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgstr ""
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr ""
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr ""
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr ""
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr ""
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr ""
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr ""
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr ""
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr ""
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr ""
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr ""
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr ""
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr ""
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr ""
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr ""

lang/en_GB/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: en_GB\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr ""
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr ""
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgstr ""
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr ""
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr ""
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgstr ""
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr ""
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr ""
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr ""
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr ""
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr ""
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr ""
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr ""
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr ""
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr ""
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr ""
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr ""
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr ""
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr ""
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr ""
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgstr ""
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr ""
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr ""
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr ""
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr ""
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr ""
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr ""
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr ""
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr ""
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr ""
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr ""
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr ""
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr ""
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr ""
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr ""
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr ""
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr ""
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr ""
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr ""
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr ""
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr ""
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr ""
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr ""
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr ""
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr ""
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr ""
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr ""
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr ""
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr ""
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr ""
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr ""
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr ""
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgstr ""
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr ""
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr ""
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr ""
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr ""
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr ""
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr ""
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr ""
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr ""
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr ""
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr ""
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr ""
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr ""
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr ""
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr ""

lang/en_US/LC_MESSAGES/omninet.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 18:36-0700\n"
+"POT-Creation-Date: 2014-03-08 21:37-0700\n"
+"PO-Revision-Date: 2014-03-08 21:37-0700\n"
 "Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: en_US\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr ""
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr ""
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr ""
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr ""
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Omnimaga Profile"
 msgstr ""
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr ""
 
@@ -170,8 +170,8 @@ msgid "Invalid credentials"
 msgstr ""
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr ""
 
@@ -340,8 +340,7 @@ msgstr ""
 msgid "2-factor disabled."
 msgstr ""
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 
@@ -349,11 +348,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr ""
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr ""
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr ""
 
@@ -361,7 +366,7 @@ msgstr ""
 msgid "Must be logged in with type user to sync pass"
 msgstr ""
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr ""
 
@@ -369,60 +374,63 @@ msgstr ""
 msgid "Nickserv password synchronized with main account"
 msgstr ""
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
+#: ../../../site/api/index.php:376
+msgid "Unable to sync groups"
 msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
+
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr ""
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr ""
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr ""
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr ""
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr ""
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr ""
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr ""
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr ""
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr ""
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr ""
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr ""
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr ""
 
@@ -457,7 +465,7 @@ msgid "Reply"
 msgstr ""
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr ""
 
@@ -469,131 +477,135 @@ msgstr ""
 msgid "Access"
 msgstr ""
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr ""
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr ""
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr ""
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr ""
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr ""
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr ""
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr ""
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr ""
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr ""
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr ""
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr ""
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr ""
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr ""
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr ""
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr ""
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr ""
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr ""
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr ""
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr ""
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr ""
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr ""
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr ""
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr ""
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr ""
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr ""
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr ""
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr ""
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr ""
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr ""
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr ""
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr ""
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr ""
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr ""
 
@@ -613,64 +625,68 @@ msgstr ""
 msgid "Could not synchronize your password"
 msgstr ""
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+msgid "Could not synchronize your groups"
+msgstr ""
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr ""
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr ""
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr ""
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr ""
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr ""
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr ""
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr ""
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr ""
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr ""
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr ""
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr ""
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr ""
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr ""
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr ""
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr ""

lang/fr/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:45-0500\n"
-"Last-Translator: Julien Savard <juju2143@gmail.com>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr "vhost non défini."
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr "Utilisateur"
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgstr "Courriel"
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr "Opérateurs"
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr "avec la clé"
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr "Aucun courriel défini."
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr "Aucun profil défini."
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr "avec la valeur"
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr "Action invalide"
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgstr "Accès"
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr "Ajouter accès"
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr "Nouvelles"
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr "Canaux"
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr "À"
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr "Message"
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr "Nom du canal"
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr "Pays"
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr "Jeton"
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr "Lier le Persona"
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr "Changer de rôle"
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr "Mettre à jour"
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr "Changer"
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr "Type"
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr "Se connecter"
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr "Persona"
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr "La connexion a échoué"
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr "Ping du serveur"
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr "Changement de langue détecté"

lang/fr_CA/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:43-0500\n"
-"Last-Translator: Julien Savard <juju2143@gmail.com>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: fr_CA\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr "vhost non défini."
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr "Utilisateur"
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgstr "Courriel"
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr "Opérateurs"
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr "avec la clé"
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr "Aucun courriel défini."
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr "Aucun profil défini."
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr "avec la valeur"
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr "Action invalide"
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgstr "Accès"
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr "Ajouter accès"
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr "Nouvelles"
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr "Canaux"
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr "À"
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr "Message"
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr "Nom du canal"
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr "Pays"
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr "Jeton"
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr "Lier le Persona"
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr "Changer de rôle"
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr "Mettre à jour"
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr "Changer"
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr "Type"
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr "Se connecter"
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr "Persona"
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr "La connexion a échoué"
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr "Ping du serveur"
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr "Changement de langue détecté"

lang/fr_FR/LC_MESSAGES/omninet.po

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Omninet Control panel\n"
-"POT-Creation-Date: 2014-02-23 18:36-0700\n"
-"PO-Revision-Date: 2014-02-23 20:44-0500\n"
-"Last-Translator: Julien Savard <juju2143@gmail.com>\n"
+"POT-Creation-Date: 2014-03-08 21:38-0700\n"
+"PO-Revision-Date: 2014-03-08 21:38-0700\n"
+"Last-Translator: Nathaniel van Diepen <eeems@omnimaga.org>\n"
 "Language-Team: Omnimaga <admin@omnimaga.org>\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
@@ -120,15 +120,15 @@ msgid "RehashServ is already running."
 msgstr "RehashServ est déjà en cours d'exécution"
 
 #: ../../../lib/irc.php:142 ../../../lib/irc.php:159 ../../../lib/irc.php:176
-#: ../../../lib/irc.php:235 ../../../lib/irc.php:268 ../../../lib/irc.php:286
+#: ../../../lib/irc.php:235 ../../../lib/irc.php:271 ../../../lib/irc.php:289
 msgid "IRC Server refused the connection."
 msgstr "Le serveur IRC a refusé la connexion."
 
-#: ../../../lib/irc.php:163 ../../../lib/irc.php:272
+#: ../../../lib/irc.php:163 ../../../lib/irc.php:275
 msgid "Failed to authenticate with NickServ"
 msgstr "L'authentication avec NickServ a échoué"
 
-#: ../../../lib/irc.php:180 ../../../lib/irc.php:290
+#: ../../../lib/irc.php:180 ../../../lib/irc.php:293
 msgid "vhost not set."
 msgstr "vhost non défini."
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Rehashed. View console for output."
 msgstr "Mis à jour. Regardez la console pour la sortie."
 
-#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:284
+#: ../../../lib/irc.php:233 ../../../lib/irc.php:255 ../../../lib/irc.php:287
 msgid "RunServ is already running."
 msgstr "RunServ est déjà en cours d'exécution"
 
@@ -163,7 +163,7 @@ msgstr "Pseudonyme"
 msgid "Omnimaga Profile"
 msgstr "Profil Omnimaga"
 
-#: ../../../lib/opers.php:71 ../../../site/index.php:450
+#: ../../../lib/opers.php:71 ../../../site/index.php:446
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
@@ -172,8 +172,8 @@ msgid "Invalid credentials"
 msgstr "Informations de connexion invalides."
 
 #: ../../../lib/security.php:67 ../../../lib/security.php:81
-#: ../../../site/api/index.php:162 ../../../site/index.php:312
-#: ../../../site/index.php:463 ../../../site/index.php:517
+#: ../../../site/api/index.php:162 ../../../site/index.php:307
+#: ../../../site/index.php:459 ../../../site/index.php:513
 msgid "User"
 msgstr "Utilisateur"
 
@@ -241,7 +241,7 @@ msgstr "Vrai nom"
 msgid "Email"
 msgstr "Courriel"
 
-#: ../../../lib/servers.php:108 ../../../site/index.php:230
+#: ../../../lib/servers.php:108 ../../../site/index.php:225
 msgid "Opers"
 msgstr "Opérateurs"
 
@@ -342,8 +342,7 @@ msgstr "Impossible d'enlever le courriel"
 msgid "2-factor disabled."
 msgstr "Vérification en deux étapes désactivée."
 
-#: ../../../site/api/index.php:322 ../../../site/api/index.php:337
-#: ../../../site/api/index.php:348
+#: ../../../site/api/index.php:322 ../../../site/api/index.php:348
 msgid "Make sure that everything is filled in. Try reloading if it is."
 msgstr ""
 "Assurez-vous que tous les champs sont remplis. Essayez de recharger si c'est "
@@ -353,11 +352,17 @@ msgstr ""
 msgid "Could not update password with nickserv"
 msgstr "Impossible de mettre à jour le mot de passe avec NickServ"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:337 ../../../site/api/index.php:386
+#: ../../../site/api/index.php:391 ../../../site/api/index.php:404
+#: ../../../site/api/index.php:423
+msgid "Not logged in"
+msgstr "Déconnecté"
+
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "Not Logged in to use"
 msgstr "Déconnecté pour utiliser"
 
-#: ../../../site/api/index.php:338
+#: ../../../site/api/index.php:338 ../../../site/api/index.php:349
 msgid "with key"
 msgstr "avec la clé"
 
@@ -367,7 +372,7 @@ msgstr ""
 "Vous devez être connecté avec le type utilisateur pour synchroniser le mot "
 "de passe"
 
-#: ../../../site/api/index.php:342
+#: ../../../site/api/index.php:342 ../../../site/api/index.php:352
 msgid "Could not verify with nickserv"
 msgstr "Impossible de vérifier avec NickServ"
 
@@ -375,60 +380,64 @@ msgstr "Impossible de vérifier avec NickServ"
 msgid "Nickserv password synchronized with main account"
 msgstr "Le mot de passe NickServ a été synchronisé avec le compte principal"
 
-#: ../../../site/api/index.php:353 ../../../site/api/index.php:366
-#: ../../../site/api/index.php:385
-msgid "Not logged in"
-msgstr "Déconnecté"
+#: ../../../site/api/index.php:376
+#, fuzzy
+msgid "Unable to sync groups"
+msgstr "Impossible de mettre à jour l'utilisateur"
+
+#: ../../../site/api/index.php:383
+msgid "Groups synced with SMF"
+msgstr ""
 
-#: ../../../site/api/index.php:354 ../../../site/api/index.php:367
+#: ../../../site/api/index.php:392 ../../../site/api/index.php:405
 msgid "No user set."
 msgstr "Aucun utilisateur défini."
 
-#: ../../../site/api/index.php:355
+#: ../../../site/api/index.php:393
 msgid "No email set."
 msgstr "Aucun courriel défini."
 
-#: ../../../site/api/index.php:356
+#: ../../../site/api/index.php:394
 msgid "No real name set."
 msgstr "Aucun vrai nom défini."
 
-#: ../../../site/api/index.php:357 ../../../site/api/index.php:368
+#: ../../../site/api/index.php:395 ../../../site/api/index.php:406
 msgid "No nick set."
 msgstr "Aucun pseudonyme défini."
 
-#: ../../../site/api/index.php:358
+#: ../../../site/api/index.php:396
 msgid "User with id"
 msgstr "Utilisateur avec ID"
 
-#: ../../../site/api/index.php:358 ../../../site/api/index.php:370
+#: ../../../site/api/index.php:396 ../../../site/api/index.php:408
 msgid "does not exist. You should reload the page."
 msgstr "n'existe pas. Vous devriez recharger la page."
 
-#: ../../../site/api/index.php:362
+#: ../../../site/api/index.php:400
 msgid "Unable to update user"
 msgstr "Impossible de mettre à jour l'utilisateur"
 
-#: ../../../site/api/index.php:369
+#: ../../../site/api/index.php:407
 msgid "No profile set."
 msgstr "Aucun profil défini."
 
-#: ../../../site/api/index.php:370
+#: ../../../site/api/index.php:408
 msgid "Oper with id"
 msgstr "Opérateur avec ID"
 
-#: ../../../site/api/index.php:372 ../../../site/api/index.php:374
+#: ../../../site/api/index.php:410 ../../../site/api/index.php:412
 msgid "Unable to update oper"
 msgstr "Impossible de mettre à jour l'opérateur"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "Failed to update setting"
 msgstr "La mise à jour du réglage a échoué"
 
-#: ../../../site/api/index.php:380
+#: ../../../site/api/index.php:418
 msgid "with value"
 msgstr "avec la valeur"
 
-#: ../../../site/api/index.php:389
+#: ../../../site/api/index.php:427
 msgid "Invalid Action"
 msgstr "Action invalide"
 
@@ -463,7 +472,7 @@ msgid "Reply"
 msgstr "Répondre"
 
 #: ../../../site/index.php:116 ../../../site/index.php:117
-#: ../../../site/index.php:205 ../../../site/index.php:206
+#: ../../../site/index.php:200 ../../../site/index.php:201
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -475,131 +484,135 @@ msgstr "Nouveau canal"
 msgid "Access"
 msgstr "Accès"
 
-#: ../../../site/index.php:177 ../../../site/index.php:318
-msgid "Flags"
-msgstr "Indicateurs"
-
-#: ../../../site/index.php:182 ../../../site/index.php:308
+#: ../../../site/index.php:178 ../../../site/index.php:303
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../../../site/index.php:200 ../../../site/index.php:201
+#: ../../../site/index.php:195 ../../../site/index.php:196
 msgid "Add Access"
 msgstr "Ajouter accès"
 
-#: ../../../site/index.php:225
+#: ../../../site/index.php:220
 msgid "News"
 msgstr "Nouvelles"
 
-#: ../../../site/index.php:226
+#: ../../../site/index.php:221
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../../../site/index.php:227
+#: ../../../site/index.php:222
 msgid "Channels"
 msgstr "Canaux"
 
-#: ../../../site/index.php:229
+#: ../../../site/index.php:224
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../../../site/index.php:231
+#: ../../../site/index.php:226
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../../../site/index.php:233
+#: ../../../site/index.php:228
 msgid "Profile"
 msgstr "Profil"
 
-#: ../../../site/index.php:264
+#: ../../../site/index.php:259
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../../../site/index.php:268
+#: ../../../site/index.php:263
 msgid "To"
 msgstr "À"
 
-#: ../../../site/index.php:274
+#: ../../../site/index.php:269
 msgid "Message"
 msgstr "Message"
 
-#: ../../../site/index.php:289
+#: ../../../site/index.php:284
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../../../site/index.php:293
+#: ../../../site/index.php:288
 msgid "Channel Name"
 msgstr "Nom du canal"
 
-#: ../../../site/index.php:362
+#: ../../../site/index.php:313
+msgid "Flags"
+msgstr "Indicateurs"
+
+#: ../../../site/index.php:357
 msgid "Country"
 msgstr "Pays"
 
-#: ../../../site/index.php:370
+#: ../../../site/index.php:365
 msgid "Cell #"
 msgstr "Numéro de cellulaire"
 
-#: ../../../site/index.php:393
+#: ../../../site/index.php:388
 msgid "Token"
 msgstr "Jeton"
 
-#: ../../../site/index.php:408
+#: ../../../site/index.php:403
 msgid "Disable 2-factor"
 msgstr "Désactiver la vérification en deux étapes"
 
-#: ../../../site/index.php:414
+#: ../../../site/index.php:409
 msgid "Link Persona"
 msgstr "Lier le Persona"
 
-#: ../../../site/index.php:417
+#: ../../../site/index.php:412
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../../../site/index.php:425
+#: ../../../site/index.php:420
 msgid "Switch Role"
 msgstr "Changer de rôle"
 
-#: ../../../site/index.php:427
+#: ../../../site/index.php:422
 msgid "Rehash"
 msgstr "Mettre à jour"
 
-#: ../../../site/index.php:429 ../../../site/index.php:440
+#: ../../../site/index.php:424 ../../../site/index.php:436
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../../../site/index.php:431
+#: ../../../site/index.php:426
 msgid "Sync Password"
 msgstr "Synchroniser le mot de passe"
 
-#: ../../../site/index.php:433
+#: ../../../site/index.php:427
+msgid "Sync Groups"
+msgstr ""
+
+#: ../../../site/index.php:429
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: ../../../site/index.php:444 ../../../site/index.php:542
+#: ../../../site/index.php:440 ../../../site/index.php:538
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../../../site/index.php:474
+#: ../../../site/index.php:470
 msgid "Switch"
 msgstr "Changer"
 
-#: ../../../site/index.php:478 ../../../site/index.php:548
+#: ../../../site/index.php:474 ../../../site/index.php:544
 msgid "Type"
 msgstr "Type"
 
-#: ../../../site/index.php:496 ../../../site/index.php:528
+#: ../../../site/index.php:492 ../../../site/index.php:524
 msgid "Login"
 msgstr "Se connecter"
 
-#: ../../../site/index.php:500
+#: ../../../site/index.php:496
 msgid "2-Factor Verification"
 msgstr "Validation en deux étapes"
 
-#: ../../../site/index.php:532
+#: ../../../site/index.php:528
 msgid "Persona"
 msgstr "Persona"
 
-#: ../../../site/index.php:536
+#: ../../../site/index.php:532
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -619,64 +632,69 @@ msgstr "Impossible de mettre à jour les serveurs"
 msgid "Could not synchronize your password"
 msgstr "Impossible de synchroniser votre mot de passe"
 
-#: ../../../site/js/index.js:219
+#: ../../../site/js/index.js:226
+#, fuzzy
+msgid "Could not synchronize your groups"
+msgstr "Impossible de synchroniser votre mot de passe"
+
+#: ../../../site/js/index.js:239
 msgid "This is an admin only feature. Continue?"
 msgstr "Ceci est une fonction pour les administrateurs seulement. Continuer?"
 
-#: ../../../site/js/index.js:246
+#: ../../../site/js/index.js:266
 msgid "Login failure"
 msgstr "La connexion a échoué"
 
-#: ../../../site/js/index.js:271
+#: ../../../site/js/index.js:291
 msgid "Could not remove persona address"
 msgstr "Impossible d'enlever l'adresse Persona"
 
-#: ../../../site/js/index.js:391
+#: ../../../site/js/index.js:411
 msgid "Server Ping"
 msgstr "Ping du serveur"
 
-#: ../../../site/js/index.js:406 ../../../site/js/index.js:483
-#: ../../../site/js/index.js:591 ../../../site/js/index.js:618
+#: ../../../site/js/index.js:426 ../../../site/js/index.js:503
+#: ../../../site/js/index.js:611 ../../../site/js/index.js:638
 msgid "Could not ping server"
 msgstr "Impossible de pinger le serveur"
 
-#: ../../../site/js/index.js:414
+#: ../../../site/js/index.js:434
 msgid "Fetching Memos"
 msgstr "Récupérer les mémos"
 
-#: ../../../site/js/index.js:445 ../../../site/js/index.js:522
-#: ../../../site/js/index.js:561
+#: ../../../site/js/index.js:465 ../../../site/js/index.js:542
+#: ../../../site/js/index.js:581
 msgid "Could not contact server"
 msgstr "Impossible de contacter le serveur"
 
-#: ../../../site/js/index.js:464
+#: ../../../site/js/index.js:484
 msgid "Deleting memo"
 msgstr "Suppression du mémo"
 
-#: ../../../site/js/index.js:490
+#: ../../../site/js/index.js:510
 msgid "Fetching News"
 msgstr "Récupérer les nouvelles"
 
-#: ../../../site/js/index.js:512
+#: ../../../site/js/index.js:532
 msgid "New news item"
 msgstr "Nouvel item de nouvelle"
 
-#: ../../../site/js/index.js:532
+#: ../../../site/js/index.js:552
 msgid "Fetching Channels"
 msgstr "Récupérer les canaux"
 
-#: ../../../site/js/index.js:568
+#: ../../../site/js/index.js:588
 msgid "Are you sure you want to delete channel"
 msgstr "Êtes-vous sûr vous voulez supprimer le canal"
 
-#: ../../../site/js/index.js:569
+#: ../../../site/js/index.js:589
 msgid "Deleting channel"
 msgstr "Suppression du canal"
 
-#: ../../../site/js/index.js:599
+#: ../../../site/js/index.js:619
 msgid "Registering channel"
 msgstr "Enregistrement du canal"
 
-#: ../../../site/js/index.js:647
+#: ../../../site/js/index.js:667
 msgid "Language change detected"
 msgstr "Changement de langue détecté"

lib/irc.php

@@ -201,7 +201,7 @@
 		}
 		return '{"code":0,"message":"'.__('Rehashed. View console for output.').'","log":'.json_encode($msg).'}';
 	}
-	function irccommands($commands,$runas="RehashServ"){
+	function irccommands($commands,$runas="RehashServ",$nick='RunServ',$isreg=true){
 		global $msg;
 		global $irc;
 		global $ircret;
@@ -221,7 +221,7 @@
 			if(!ircputs("NICK RehashServ\r\n")){return $ircret;}
 			if(!ircputs("USER RehashServ omni.irc.omnimaga.org RehashServ :RehashServ\r\n")){return $ircret;}
 		}else{
-			if(!ircputs("NICK RunServ\r\n")){return $ircret;}
+			if(!ircputs("NICK {$nick}\r\n")){return $ircret;}
 			if(!ircputs("USER {$runas} omni.irc.omnimaga.org {$runas} :{$runas}\r\n")){return $ircret;}
 		}
 		while(!feof($irc)){
@@ -243,7 +243,7 @@
 		if($runas == 'RehashServ'){
 			if(!ircputs("OPER RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
 			if(!ircputs("IDENTIFY RehashServ ".get_conf('rehash-pass','string')."\r\n")){return $ircret;}
-		}else{
+		}else if($isreg){
 			if(!ircputs("IDENTIFY {$runas} ".$_SESSION['password']."\r\n")){return $ircret;}
 		}
 		while(!feof($irc)){
@@ -264,6 +264,9 @@
 							}
 						}
 					}
+					if(!$isreg){
+						break;
+					}
 				}elseif(strrpos($line,'ERROR :Closing Link:') !== false){
 					return ircclose(3,__("IRC Server refused the connection."),'array');
 				}elseif(strrpos($line,":You are now identified for") !== false){
@@ -294,6 +297,7 @@
 		}
 		foreach($commands as $k => $command){
 			if(!ircputs($command."\r\n")){return $ircret;}
+			time_nanosleep(0, 250000000);
 		}
 		try{
 			error_reporting(0);
@@ -306,6 +310,8 @@
 				$msg .= $line;
 			}
 		}
+		$msg .= 'QUIT :Done';
+		fputs($irc,'QUIT :Done');
 		fclose($irc);
 		return array(
 			'code'=>0,

site/api/index.php

@@ -334,7 +334,7 @@
 			die('{"code":0}');
 		break;
 		case 'sync-pass':
-			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Not logged in').'"}');
 			$u['api_key'] == $_COOKIE['key'] or die('{"code":3,"message":"'.__('Not Logged in to use').' '.$u['nick'].' '.__('with key').' '.$u['api_key'].' != '.$_COOKIE['key'].'."}');
 			$_COOKIE['type'] == 'user' or die('{"code":3,"message":"'.__('Must be logged in with type user to sync pass').'"}');
 			$res = atheme_login(get_conf('xmlrpc-server'),get_conf('xmlrpc-port'),get_conf('xmlrpc-path'),$u['nick'],$_SESSION['password']);
@@ -344,8 +344,46 @@
 			query("UPDATE users u SET u.password='%s' WHERE u.id=%d",array(mkpasswd($_SESSION['password']),$u['id']));
 			die('{"code":0,"message":"'.__('Nickserv password synchronized with main account').'"}');
 		break;
+		case 'sync-groups':
+			$u && isset($_SESSION['password'])or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u['api_key'] == $_COOKIE['key'] or die('{"code":3,"message":"'.__('Not Logged in to use').' '.$u['nick'].' '.__('with key').' '.$u['api_key'].' != '.$_COOKIE['key'].'."}');
+			$res = atheme_login(get_conf('xmlrpc-server'),get_conf('xmlrpc-port'),get_conf('xmlrpc-path'),$u['nick'],$_SESSION['password']);
+			if($res[0] === false){
+				die('{"code":2,"message":"'.__('Could not verify with nickserv').': '.$res[1].'"}');
+			}
+			require_once(get_conf('smf-path').'/SSI.php');
+			$res = $smcFunc['db_query']('',"SELECT id_group,additional_groups
+				FROM {db_prefix}members
+				WHERE id_member = {int:id_member}
+			",array(
+				'id_member'=>$user_info['id']
+			));
+			$log = '';
+			while($row = $smcFunc['db_fetch_assoc']($res)){
+				$groups = explode(',',$row['additional_groups']);
+				if(!is_null($row['id_group'])){
+					array_push($groups,$row['id_group']);
+				}
+				foreach($groups as $k => $group){
+					$res2 = query("SELECT irc_name FROM smf_groups WHERE id_group = %d",array($group));
+					if($res2 && $res2->num_rows > 0){
+						$res2 = $res2->fetch_assoc();
+						$ret3 = irccommands(array(
+							'grs fflags !'.$res2['irc_name'].' '.$_COOKIE['user'].' +cvi'
+						));
+						$log .= $ret3['log'];
+						if($ret3['code'] !== 0){
+							die('{"code":'.$ret3['code'].',"message":"'.__('Unable to sync groups').'","log":'.json_encode($log).'}');
+						}
+					}else{
+						$log .= "No group match for {$group}\n";
+					}
+				}
+			}
+			die('{"code":0,"message":"'.__('Groups synced with SMF').'","log":'.json_encode($log).'}');
+		break;
 		case 'role':
-			$u && isset($_GET['type']) or die('{"code":2,"message":"'.__('Make sure that everything is filled in. Try reloading if it is.').'"}');
+			$u && isset($_GET['type']) or die('{"code":2,"message":"'.__('Not logged in').'"}');
 			setcookie('type',$_GET['type'],null,'/');
 			die('{"code":0}');
 		break;

site/index.php

@@ -424,6 +424,7 @@
 				<li><a id="newpass-button"><?php echo __('Change Password'); ?></a></li>
 				<?php if(has_flag($user,'u')){ ?>
 					<li><a id="sync-pass"><?php echo __('Sync Password'); ?></a></li>
+					<li><a id="sync-groups"><?php echo __('Sync Groups'); ?></a></li>
 				<?php } ?>
 				<li><a id="logout"><?php echo __('Logout'); ?></a></li>
 			</ul>

site/js/index.js

@@ -211,6 +211,26 @@ $(function(){
 			btn.attr('disabled','disabled');
 			return false;
 		});
+		$('#sync-groups').click(function(){
+			var btn = $(this);
+			$.ajax(__HOSTNAME__+'site/api/?action=sync-groups',{
+				success: function(d){
+					if(d.log){
+						console.log(d.log);
+					}
+					alert(d.message);
+					btn.removeAttr('disabled');
+				},
+				error: function(xhr,msg,e){
+					console.error(e);
+					alert(_("Could not synchronize your groups")+": "+msg);
+					btn.removeAttr('disabled');
+				},
+				dataType: 'json'
+			});
+			btn.attr('disabled','disabled');
+			return false;
+		});
 		$('#persona-register').hover(function(){
 			$(this).addClass('ui-state-hover');
 		},function(){