Kolab Groupware OBS

phabricator.spec Changed

@@ -58,19 +58,20 @@
 
 # feature/stable/0001-create-accounts-inbound-email
 Patch0010:          0010-Create-user-account-on-inbound-email.patch
+Patch0011:          0011-Create-the-user-account-only-if-there-is-not-a-defau.patch
 
 # feature/stable/0002-no-requiring-top-replies
-Patch0011:          0011-Do-not-require-top-replies-only.patch
+Patch0012:          0012-Do-not-require-top-replies-only.patch
 
 # feature/stable/0003-no-display-name-matching
-Patch0012:          0012-No-matching-commits-to-users-on-displayname.patch
+Patch0013:          0013-No-matching-commits-to-users-on-displayname.patch
 
 # feature/stable/0004-pht-title
-Patch0013:          0013-Allow-the-title-to-be-overriden.patch
-Patch0014:          0014-Translate-Phabricator-in-welcome-emails.patch
+Patch0014:          0014-Allow-the-title-to-be-overriden.patch
+Patch0015:          0015-Translate-Phabricator-in-welcome-emails.patch
 
 # feature/stable/0005-revert-obsolete-buildApplicationPage-removal
-Patch0015:          0015-Revert-Removed-unused-buildApplicationPage-method-fr.patch
+Patch0016:          0016-Revert-Removed-unused-buildApplicationPage-method-fr.patch
 
 # Unvendorized system dependencies
 Requires:           cowsay
@@ -145,11 +146,12 @@
 
 # features (arguably)
 %patch0010 -p1 -b .user-accounts
-%patch0011 -p1 -b .top-replies
-%patch0012 -p1 -b .display-name
-%patch0013 -p1 -b .pht-title
-%patch0014 -p1 -b .welcome-email
-%patch0015 -p1 -b .buildApplicationPage
+%patch0011 -p1 -b .default-user
+%patch0012 -p1 -b .top-replies
+%patch0013 -p1 -b .display-name
+%patch0014 -p1 -b .pht-title
+%patch0015 -p1 -b .welcome-email
+%patch0016 -p1 -b .buildApplicationPage
 
 grep -rlE '/usr/local/bin|bin/env' . | xargs sed -i -e ' 1 {
 	s,/usr/local/bin/php,/usr/bin/php,

0001-Unbundle-figlet.patch Changed

0002-Unbundle-cowsay.patch Changed

0003-Unbundle-wordlist.patch Changed

0004-Unbundle-Amazon-SES.patch Changed

0005-Unbundle-pear-figlet.patch Changed

0006-Unbundle-phpmailer.patch Changed

0007-Unbundle-stripe.patch Changed

0008-Unbundle-wepay.patch Changed

0009-Unbundle-twilio.patch Changed

0010-Create-user-account-on-inbound-email.patch Changed

0011-Create-the-user-account-only-if-there-is-not-a-defau.patch Added

@@ -0,0 +1,73 @@
+From a5641853097c3741609135cac39fc51b80f2f9fb Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Tue, 4 Oct 2016 14:58:30 +0200
+Subject: [PATCH 11/16] Create the user account only if there is not a default
+ user account associated with the inbound email address
+
+---
+ .../metamta/receiver/PhabricatorMailReceiver.php   | 42 +++++++++++-----------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
+index 6fa0dba..0ec9a6c 100644
+--- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php
++++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
+@@ -138,6 +138,27 @@ abstract class PhabricatorMailReceiver extends Phobject {
+       }
+     }
+ 
++    if ($this->getApplicationEmail()) {
++      $application_email = $this->getApplicationEmail();
++      $default_user_phid = $application_email->getConfigValue(
++        PhabricatorMetaMTAApplicationEmail::CONFIG_DEFAULT_AUTHOR);
++
++      if ($default_user_phid) {
++        $user = id(new PhabricatorUser())->loadOneWhere(
++          'phid = %s',
++          $default_user_phid);
++        if ($user) {
++          return $user;
++        }
++      }
++
++      $reasons[] = pht(
++        "Phabricator is misconfigured, the application email ".
++        "'%s' is set to user '%s' but that user does not exist.",
++        $application_email->getAddress(),
++        $default_user_phid);
++    }
++
+     // If we don't know who this user is, load or create an external user
+     // account for them if we're configured for it.
+     $email_key = 'phabricator.allow-email-users';
+@@ -185,27 +206,6 @@ abstract class PhabricatorMailReceiver extends Phobject {
+         $raw_from);
+     }
+ 
+-    if ($this->getApplicationEmail()) {
+-      $application_email = $this->getApplicationEmail();
+-      $default_user_phid = $application_email->getConfigValue(
+-        PhabricatorMetaMTAApplicationEmail::CONFIG_DEFAULT_AUTHOR);
+-
+-      if ($default_user_phid) {
+-        $user = id(new PhabricatorUser())->loadOneWhere(
+-          'phid = %s',
+-          $default_user_phid);
+-        if ($user) {
+-          return $user;
+-        }
+-      }
+-
+-      $reasons[] = pht(
+-        "Phabricator is misconfigured, the application email ".
+-        "'%s' is set to user '%s' but that user does not exist.",
+-        $application_email->getAddress(),
+-        $default_user_phid);
+-    }
+-
+     $reasons = implode("\n\n", $reasons);
+ 
+     throw new PhabricatorMetaMTAReceivedMailProcessingException(
+-- 
+2.7.4
+

0011-Do-not-require-top-replies-only.patch Deleted

@@ -1,25 +0,0 @@
-From d21180ac5c75c4b2a90258c6472a5f04c388055d Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Wed, 10 Aug 2016 18:19:22 +0200
-Subject: [PATCH 11/15] Do not require top-replies only.
-
-Phabricator's MetaMTA mail parser currently strips anything beyond a very selected set of magical markers. This doesn't work for inline comments nor bottom replies.
----
- src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
-index be0401f..55ef52c 100644
---- a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
-+++ b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
-@@ -81,6 +81,7 @@ final class PhabricatorMetaMTAEmailBodyParser extends Phobject {
-   }
- 
-   private function stripQuotedText($body) {
-+    return rtrim($body);
- 
-     // Look for "On <date>, <user> wrote:". This may be split across multiple
-     // lines. We need to be careful not to remove all of a message like this:
--- 
-2.7.4
-

0012-Do-not-require-top-replies-only.patch Added

@@ -0,0 +1,25 @@
+From b1aef7656d4876be311e16d1fe5bf6f782231cc5 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Wed, 10 Aug 2016 18:19:22 +0200
+Subject: [PATCH 12/16] Do not require top-replies only.
+
+Phabricator's MetaMTA mail parser currently strips anything beyond a very selected set of magical markers. This doesn't work for inline comments nor bottom replies.
+---
+ src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
+index be0401f..55ef52c 100644
+--- a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
++++ b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
+@@ -81,6 +81,7 @@ final class PhabricatorMetaMTAEmailBodyParser extends Phobject {
+   }
+ 
+   private function stripQuotedText($body) {
++    return rtrim($body);
+ 
+     // Look for "On <date>, <user> wrote:". This may be split across multiple
+     // lines. We need to be careful not to remove all of a message like this:
+-- 
+2.7.4
+

0012-No-matching-commits-to-users-on-displayname.patch Deleted

@@ -1,53 +0,0 @@
-From 4565b2a45c60a6e419f4ace8dbd3116632b6c7a6 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Wed, 10 Aug 2016 18:27:51 +0200
-Subject: [PATCH 12/15] No matching commits to users on displayname
-
-Phabricator erroneously assumes that it operates in a vacuum, while in the real world, multiple people may carry a display name of Jack.
-
-Do not too eagerly match one thing with a completely different thing on the premises that one thing sorta looks similar to another thing.
----
- .../diffusion/query/DiffusionResolveUserQuery.php     | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/src/applications/diffusion/query/DiffusionResolveUserQuery.php b/src/applications/diffusion/query/DiffusionResolveUserQuery.php
-index a22408c..fa67145 100644
---- a/src/applications/diffusion/query/DiffusionResolveUserQuery.php
-+++ b/src/applications/diffusion/query/DiffusionResolveUserQuery.php
-@@ -44,13 +44,7 @@ final class DiffusionResolveUserQuery extends Phobject {
-       return $phid;
-     }
- 
--    $phid = $this->findUserByRealName($user_name);
--    if ($phid) {
--      return $phid;
--    }
--
-     // No hits yet, try to parse it as an email address.
--
-     $email = new PhutilEmailAddress($user_name);
- 
-     $phid = $this->findUserByEmailAddress($email->getAddress());
-@@ -58,19 +52,6 @@ final class DiffusionResolveUserQuery extends Phobject {
-       return $phid;
-     }
- 
--    $display_name = $email->getDisplayName();
--    if ($display_name) {
--      $phid = $this->findUserByUserName($display_name);
--      if ($phid) {
--        return $phid;
--      }
--
--      $phid = $this->findUserByRealName($display_name);
--      if ($phid) {
--        return $phid;
--      }
--    }
--
-     return null;
-   }
- 
--- 
-2.7.4
-

0013-Allow-the-title-to-be-overriden.patch Deleted

@@ -1,25 +0,0 @@
-From ff017a4ecdde8c2ec173dccfd61dbb972f72c1df Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Tue, 23 Aug 2016 11:58:19 +0200
-Subject: [PATCH 13/15] Allow the title to be overriden
-
----
- src/applications/home/controller/PhabricatorHomeMainController.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
-index 405959f..aebbfd9 100644
---- a/src/applications/home/controller/PhabricatorHomeMainController.php
-+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
-@@ -45,7 +45,7 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController {
-     }
- 
-     return $this->newPage()
--      ->setTitle('Phabricator')
-+      ->setTitle(pht('Phabricator'))
-       ->addClass('phabricator-home')
-       ->appendChild($content);
- 
--- 
-2.7.4
-

0013-No-matching-commits-to-users-on-displayname.patch Added

@@ -0,0 +1,53 @@
+From 3cb4d831aca166cba7a885fbfe78a83ba1126fde Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Wed, 10 Aug 2016 18:27:51 +0200
+Subject: [PATCH 13/16] No matching commits to users on displayname
+
+Phabricator erroneously assumes that it operates in a vacuum, while in the real world, multiple people may carry a display name of Jack.
+
+Do not too eagerly match one thing with a completely different thing on the premises that one thing sorta looks similar to another thing.
+---
+ .../diffusion/query/DiffusionResolveUserQuery.php     | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/src/applications/diffusion/query/DiffusionResolveUserQuery.php b/src/applications/diffusion/query/DiffusionResolveUserQuery.php
+index a22408c..fa67145 100644
+--- a/src/applications/diffusion/query/DiffusionResolveUserQuery.php
++++ b/src/applications/diffusion/query/DiffusionResolveUserQuery.php
+@@ -44,13 +44,7 @@ final class DiffusionResolveUserQuery extends Phobject {
+       return $phid;
+     }
+ 
+-    $phid = $this->findUserByRealName($user_name);
+-    if ($phid) {
+-      return $phid;
+-    }
+-
+     // No hits yet, try to parse it as an email address.
+-
+     $email = new PhutilEmailAddress($user_name);
+ 
+     $phid = $this->findUserByEmailAddress($email->getAddress());
+@@ -58,19 +52,6 @@ final class DiffusionResolveUserQuery extends Phobject {
+       return $phid;
+     }
+ 
+-    $display_name = $email->getDisplayName();
+-    if ($display_name) {
+-      $phid = $this->findUserByUserName($display_name);
+-      if ($phid) {
+-        return $phid;
+-      }
+-
+-      $phid = $this->findUserByRealName($display_name);
+-      if ($phid) {
+-        return $phid;
+-      }
+-    }
+-
+     return null;
+   }
+ 
+-- 
+2.7.4
+

0014-Allow-the-title-to-be-overriden.patch Added

@@ -0,0 +1,25 @@
+From 05a0dedce4586baa161de7eb98afe0f54b459b1a Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Tue, 23 Aug 2016 11:58:19 +0200
+Subject: [PATCH 14/16] Allow the title to be overriden
+
+---
+ src/applications/home/controller/PhabricatorHomeMainController.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
+index 405959f..aebbfd9 100644
+--- a/src/applications/home/controller/PhabricatorHomeMainController.php
++++ b/src/applications/home/controller/PhabricatorHomeMainController.php
+@@ -45,7 +45,7 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController {
+     }
+ 
+     return $this->newPage()
+-      ->setTitle('Phabricator')
++      ->setTitle(pht('Phabricator'))
+       ->addClass('phabricator-home')
+       ->appendChild($content);
+ 
+-- 
+2.7.4
+

0014-Translate-Phabricator-in-welcome-emails.patch Deleted

@@ -1,38 +0,0 @@
-From d597a7cfe819c6add7827f511fcb743b844c0e6a Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Thu, 8 Sep 2016 13:53:45 +0200
-Subject: [PATCH 14/15] Translate Phabricator in welcome emails
-
----
- src/applications/people/storage/PhabricatorUser.php | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
-index acbf477..7d1761e 100644
---- a/src/applications/people/storage/PhabricatorUser.php
-+++ b/src/applications/people/storage/PhabricatorUser.php
-@@ -690,17 +690,19 @@ final class PhabricatorUser
-       PhabricatorAuthSessionEngine::ONETIME_WELCOME);
- 
-     $body = pht(
--      "Welcome to Phabricator!\n\n".
-+      "Welcome to %s!\n\n".
-       "%s (%s) has created an account for you.\n\n".
-       "  Username: %s\n\n".
--      "To login to Phabricator, follow this link and set a password:\n\n".
-+      "To login to %s, follow this link and set a password:\n\n".
-       "  %s\n\n".
-       "After you have set a password, you can login in the future by ".
-       "going here:\n\n".
-       "  %s\n",
-+      pht('Phabricator'),
-       $admin_username,
-       $admin_realname,
-       $user_username,
-+      pht('Phabricator'),
-       $uri,
-       $base_uri);
- 
--- 
-2.7.4
-

0015-Revert-Removed-unused-buildApplicationPage-method-fr.patch Deleted

@@ -1,63 +0,0 @@
-From e72436ac5f020b6c22644d0abc9bdf62a75d9518 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Thu, 8 Sep 2016 16:57:03 +0200
-Subject: [PATCH 15/15] Revert "Removed unused buildApplicationPage method from
- PhabricatorController"
-
-This reverts commit 2201c65eb73fb99b8625bea45c273d262f2c289f.
----
- .../base/controller/PhabricatorController.php      | 40 ++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
-index f2b267b..0cb8182 100644
---- a/src/applications/base/controller/PhabricatorController.php
-+++ b/src/applications/base/controller/PhabricatorController.php
-@@ -575,4 +575,44 @@ abstract class PhabricatorController extends AphrontController {
-     return $page->produceAphrontResponse();
-   }
- 
-+
-+  /**
-+   * DEPRECATED. Use @{method:newPage}.
-+   */
-+  public function buildApplicationPage($view, array $options) {
-+    $page = $this->newPage();
-+
-+    $title = PhabricatorEnv::getEnvConfig('phabricator.serious-business') ?
-+      'Phabricator' :
-+      pht('Bacon Ice Cream for Breakfast');
-+
-+    $page->setTitle(idx($options, 'title', $title));
-+
-+    if (idx($options, 'class')) {
-+      $page->addClass($options['class']);
-+    }
-+
-+    if (!($view instanceof AphrontSideNavFilterView)) {
-+      $nav = new AphrontSideNavFilterView();
-+      $nav->appendChild($view);
-+      $view = $nav;
-+    }
-+
-+    $page->appendChild($view);
-+
-+    $object_phids = idx($options, 'pageObjects', array());
-+    if ($object_phids) {
-+      $page->setPageObjectPHIDs($object_phids);
-+    }
-+
-+    if (!idx($options, 'device', true)) {
-+      $page->setDeviceReady(false);
-+    }
-+
-+    $page->setShowFooter(idx($options, 'showFooter', true));
-+    $page->setShowChrome(idx($options, 'chrome', true));
-+
-+    return $page->produceAphrontResponse();
-+  }
-+
- }
--- 
-2.7.4
-

0015-Translate-Phabricator-in-welcome-emails.patch Added

@@ -0,0 +1,38 @@
+From 9ed50b98bc33cf7123103206a3374128d94f1afd Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Thu, 8 Sep 2016 13:53:45 +0200
+Subject: [PATCH 15/16] Translate Phabricator in welcome emails
+
+---
+ src/applications/people/storage/PhabricatorUser.php | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
+index acbf477..7d1761e 100644
+--- a/src/applications/people/storage/PhabricatorUser.php
++++ b/src/applications/people/storage/PhabricatorUser.php
+@@ -690,17 +690,19 @@ final class PhabricatorUser
+       PhabricatorAuthSessionEngine::ONETIME_WELCOME);
+ 
+     $body = pht(
+-      "Welcome to Phabricator!\n\n".
++      "Welcome to %s!\n\n".
+       "%s (%s) has created an account for you.\n\n".
+       "  Username: %s\n\n".
+-      "To login to Phabricator, follow this link and set a password:\n\n".
++      "To login to %s, follow this link and set a password:\n\n".
+       "  %s\n\n".
+       "After you have set a password, you can login in the future by ".
+       "going here:\n\n".
+       "  %s\n",
++      pht('Phabricator'),
+       $admin_username,
+       $admin_realname,
+       $user_username,
++      pht('Phabricator'),
+       $uri,
+       $base_uri);
+ 
+-- 
+2.7.4
+

0016-Revert-Removed-unused-buildApplicationPage-method-fr.patch Added

@@ -0,0 +1,63 @@
+From d836210ed3ca314405062883ed15cfaea5003149 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Thu, 8 Sep 2016 16:57:03 +0200
+Subject: [PATCH 16/16] Revert "Removed unused buildApplicationPage method from
+ PhabricatorController"
+
+This reverts commit 2201c65eb73fb99b8625bea45c273d262f2c289f.
+---
+ .../base/controller/PhabricatorController.php      | 40 ++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
+index f2b267b..0cb8182 100644
+--- a/src/applications/base/controller/PhabricatorController.php
++++ b/src/applications/base/controller/PhabricatorController.php
+@@ -575,4 +575,44 @@ abstract class PhabricatorController extends AphrontController {
+     return $page->produceAphrontResponse();
+   }
+ 
++
++  /**
++   * DEPRECATED. Use @{method:newPage}.
++   */
++  public function buildApplicationPage($view, array $options) {
++    $page = $this->newPage();
++
++    $title = PhabricatorEnv::getEnvConfig('phabricator.serious-business') ?
++      'Phabricator' :
++      pht('Bacon Ice Cream for Breakfast');
++
++    $page->setTitle(idx($options, 'title', $title));
++
++    if (idx($options, 'class')) {
++      $page->addClass($options['class']);
++    }
++
++    if (!($view instanceof AphrontSideNavFilterView)) {
++      $nav = new AphrontSideNavFilterView();
++      $nav->appendChild($view);
++      $view = $nav;
++    }
++
++    $page->appendChild($view);
++
++    $object_phids = idx($options, 'pageObjects', array());
++    if ($object_phids) {
++      $page->setPageObjectPHIDs($object_phids);
++    }
++
++    if (!idx($options, 'device', true)) {
++      $page->setDeviceReady(false);
++    }
++
++    $page->setShowFooter(idx($options, 'showFooter', true));
++    $page->setShowChrome(idx($options, 'chrome', true));
++
++    return $page->produceAphrontResponse();
++  }
++
+ }
+-- 
+2.7.4
+

Changes of Revision 35