Kolab Groupware OBS

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/bin/inspect.php Changed

@@ -51,18 +51,27 @@
     rcube::raise_error("Email address not specified (--email).", false, true);
 }
 $email = $opts'email';
-if (empty($opts'adminpassword')) {
-    rcube::raise_error("Admin password not specified (--adminpassword).", false, true);
+
+$proxyAuth = false;
+if ($password = $opts'adminpassword') {
+    $proxyAuth = true;
+    $user = "cyrus-admin";
+} else {
+    $password = $opts'password';
+}
+
+if (empty($password)) {
+    rcube::raise_error("Password not specified (--adminpassword/--password).", false, true);
 }
-$password = $opts'adminpassword';
 
 $rcube = rcube::get_instance();
 $default_port = $rcube->config->get('default_port', 143);
 $default_host = $rcube->config->get('default_host');
-$user = "cyrus-admin";
 $imap = new \rcube_imap_generic();
-$options'auth_cid' = $user;
-$options'auth_pw' = $password;
+if ($proxyAuth) {
+    $options'auth_cid' = $user;
+    $options'auth_pw' = $password;
+}
 $options'auth_type' = 'PLAIN';
 $options'port' = $default_port;
 $options'socket_options' = 
@@ -96,7 +105,7 @@
 if ($data = $db->fetch_assoc($select)) {
     $userid = $data'user_id';
 } else {
-    rcube::raise_error("User not found: $email.", false, true);
+    rcube::raise_error("User not found in roundcube database (only available after first login): $email.", false, true);
 }
 
 print("Found the user with id: $userid\n");

kolab-syncroton.dsc Changed

Changes of Revision 57