From c268263e9cf9960150ef84c9ceb45cdb4f508611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Fri, 19 Mar 2021 12:49:52 +0100
Subject: [PATCH 1/3] Add ability to update 'user' field of SASL XOAUTH2
 authentication

---
 front/authorization.form.php       | 22 ++++++++++++--
 inc/authorization.class.php        | 47 ++++++++++++++++++++++++++++--
 inc/mailcollectorfeature.class.php | 31 ++++++++++++++++++++
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/front/authorization.form.php b/front/authorization.form.php
index 2d05e82..75796e9 100644
--- a/front/authorization.form.php
+++ b/front/authorization.form.php
@@ -27,12 +27,30 @@
 include ('../../../inc/includes.php');
 
 $authorization = new PluginOauthimapAuthorization();
+$application   = new PluginOauthimapApplication();
 
 if (isset($_POST['id']) && isset($_POST['delete'])) {
    $authorization->check($_POST['id'], DELETE);
    $authorization->delete($_POST);
 
    Html::back();
-}
+} else if (isset($_POST['id']) && isset($_POST['update'])) {
+   $authorization->check($_POST['id'], UPDATE);
+   if ($authorization->update($_POST)
+      && $application->getFromDB($authorization->fields[$application->getForeignKeyField()])) {
+      Html::redirect($application->getLinkURL());
+   }
 
-Html::displayErrorAndDie('lost');
+   Html::back();
+} else if (isset($_GET['id'])) {
+   $application = new PluginOauthimapApplication();
+   $application->displayHeader();
+   $authorization->display(
+      [
+         'id' => $_GET['id'],
+      ]
+   );
+   Html::footer();
+} else {
+   Html::displayErrorAndDie('lost');
+}
diff --git a/inc/authorization.class.php b/inc/authorization.class.php
index 313ce21..b70a075 100644
--- a/inc/authorization.class.php
+++ b/inc/authorization.class.php
@@ -34,6 +34,9 @@
 
 class PluginOauthimapAuthorization extends CommonDBChild {
 
+   // From CommonGlpi
+   protected $displaylist  = false;
+
    // From CommonDBTM
    public $dohistory       = true;
 
@@ -100,7 +103,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
          echo '<tr><th>' . __('No authorizations.', 'oauthimap') . '</th></tr>';
       } else {
          echo '<tr>';
-         echo '<th>' . __('Email') . '</th>';
+         echo '<th>' . __('Email', 'oauthimap') . '</th>';
          echo '<th></th>';
          echo '</tr>';
 
@@ -110,7 +113,11 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
             echo '<td>' . $row['email'] . '</td>';
 
             echo '<td>';
-            echo '<form method="POST" action="' . Plugin::getWebDir('oauthimap') . '/front/authorization.form.php">';
+            echo '<a class="vsubmit" href="' . self::getFormURLWithID($row['id']) . '">';
+            echo __('Update', 'oauthimap');
+            echo '</a>';
+            echo ' ';
+            echo '<form method="POST" action="' . self::getFormURL() . '" style="display:inline-block;">';
             echo Html::hidden('_glpi_csrf_token', ['value' => Session::getNewCSRFToken()]);
             echo Html::hidden('id', ['value' => $row['id']]);
             echo '<button type="submit" class="vsubmit" name="delete" value="1">';
@@ -129,6 +136,38 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
       return true;
    }
 
+   public function showForm($id, $options = []) {
+
+      $options['colspan'] = 1;
+
+      $this->initForm($id, $options);
+      $this->showFormHeader($options);
+
+      echo '<tr class="tab_bg_1">';
+      echo '<td>';
+      echo __('Email', 'oauthimap');
+      echo ' ';
+      echo Html::showToolTip(
+         __('This email address corresponds to the "user" field of the SASL XOAUTH2 authentication query.'),
+         ['display' => false]
+      );
+      echo '</td>';
+      echo '<td>';
+      echo Html::input(
+         'email',
+         [
+            'value' => $this->fields['email'],
+            'style' => 'width:90%'
+         ]
+      );
+      echo '</td>';
+      echo '</tr>';
+
+      $this->showFormButtons($options + ['candel' => false]);
+
+      return true;
+   }
+
    function prepareInputForAdd($input) {
       if (!($input = $this->prepareInput($input))) {
          return false;
@@ -292,6 +331,10 @@ public function getOwnerDetails(): ?OwnerDetails {
       return $this->owner_details;
    }
 
+   function post_updateItem($history = 1) {
+      MailCollectorFeature::postUpdateAuthorization($this);
+      parent::post_updateItem($history);
+   }
 
    function post_purgeItem() {
       MailCollectorFeature::postPurgeAuthorization($this);
diff --git a/inc/mailcollectorfeature.class.php b/inc/mailcollectorfeature.class.php
index 9949fea..9e2353a 100644
--- a/inc/mailcollectorfeature.class.php
+++ b/inc/mailcollectorfeature.class.php
@@ -336,6 +336,37 @@ public static function postPurgeAuthorization(PluginOauthimapAuthorization $auth
       );
    }
 
+   /**
+    * Update mail collectors linked to the authorization.
+    *
+    * @param PluginOauthimapAuthorization $authorization
+    *
+    * @return void
+    */
+   public static function postUpdateAuthorization(PluginOauthimapAuthorization $authorization): void {
+      if (in_array('email', $authorization->updates) && array_key_exists('email', $authorization->oldvalues)) {
+         $collectors = self::getAssociatedMailCollectors(
+            self::getMailProtocolTypeIdentifier($authorization->fields[PluginOauthimapApplication::getForeignKeyField()]),
+            $authorization->oldvalues['email']
+         );
+         foreach ($collectors as $row) {
+            $mailcollector = new MailCollector();
+            $mailcollector->update(
+               [
+                  'id'    => $row['id'],
+                  'login' => $authorization->fields['email'],
+               ]
+            );
+            Session::addMessageAfterRedirect(
+               sprintf(
+                  __('Mail receiver "%s" has been updated.', 'oauthimap'),
+                  $mailcollector->getName()
+               )
+            );
+         }
+      }
+   }
+
    /**
     * Deactivate mail collectors using given protocol type and given login.
     *

From 95bdfd297fd6ba888a97dfa8ef1268b6403bbaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Thu, 1 Apr 2021 09:16:09 +0200
Subject: [PATCH 2/3] Update locales

---
 locales/en_GB.mo      | Bin 2396 -> 2506 bytes
 locales/en_GB.po      |  41 +++++++++++++++++++++++++----------------
 locales/fr_FR.mo      | Bin 2542 -> 2662 bytes
 locales/fr_FR.po      |  41 +++++++++++++++++++++++++----------------
 locales/oauthimap.pot |  35 ++++++++++++++++++++++-------------
 locales/pt_BR.mo      | Bin 2494 -> 2590 bytes
 locales/pt_BR.po      |  40 +++++++++++++++++++++++++---------------
 7 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/locales/en_GB.mo b/locales/en_GB.mo
index 1639e2f745828dfeb9031951908ac6bc8264c154..94580cfd8015491452abace2eae53c937f8514bc 100644
GIT binary patch
delta 759
zcmajdKQBX37{~F`KUbA1+WKF5rEQQ<L?W0ihzJS0q!AJXA;HoP3<is<Q!U;B>0psa
zL=0B3h>!?_5HEnm_g8jL^4!nKy|?F_-?@DV-GnobA#cu5F*-^|T*h=@z|Dm^!8o2`
z0PoO`&sc#USdCv;hXIc<Nlah~j-ri|XyF=G;U<<FlQDaL4|3SfgFGhi3cdJ-5&Xn@
z^l&qTQ7pr5OyLmf_X`-r1029()Q0cT#uscwi`~Ro-?TB%PRFndr*NB7$QEBP=9`B~
z9`pT9)QL*ok4ip_N<M>0Tt>}zh&JYtsmwVl`6ZIv-0D8-n<oa^`70(cSo)j150!iX
zm3$nPd=8a-3zd8a+p&O3{(wsUj!K^3Vq*%Gd;;URiqqO@j)9UNA;F8KWJ<*xrk3XO
znlRl!*U(C&YNoZQN}E*0oL+Z$L|bp9byh8O6RqMq7E2Mdx=OKFyjYc7^-t6p>AV8Y
xzWds{G`q0qWPIaJ))Vz?tfULqzIm55y^@|?cRKw&&Y-pH>MdMYXRiNV{Q+G3Nx}dC

delta 705
zcmZwF&nv@m9LMqZ=DXh*o8PRyT4HL8r1%pQ2g}uA%E3j#N-lQr2UyERIdO5|GIDZ2
zDDC1V$<2?$YIh}`ukGqx?;hX2zdrBR=lgw(zs7dnV$Qx%33`BbJZ34ZqH51;mc$}9
z;{}HB23xR#?f8P-Sj8c9n#}w-iY|_07_-=hix@H6u~iOyoY=+@ETDrY*nwx*gSQyN
zSJaDYn89z<b15Eb#Vk%?4mIcjx_FF(c!x>+#5C($gw?l6JB_+<&e%%&jC#R4DrpUs
z^aqtR8fYXPMo!rry10NEFpo-FK$2P!74#4_@DVz!Zxs%d^a+*p1C{g_^`cm?ku-sN
za2Ay`k4n0W8uSWXd_X1rLInzQF^w4{XT3C77d^>6)=Bf(>WgXs4Wmg_`X{uQN~yIo
zR+{(5XW|_6(%KtUUjyTN)JvmlUsT#Rji`#!`rB0fbfk3Zy$@}zt*kF^xVg>JbzrVM
V5nS?=vc9rstnBw+dj7wf`2#CYL?!?L

diff --git a/locales/en_GB.po b/locales/en_GB.po
index e66b817..3671207 100644
--- a/locales/en_GB.po
+++ b/locales/en_GB.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Cédric Anne, 2020
+# Cédric Anne, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-14 13:17+0000\n"
+"POT-Creation-Date: 2021-04-01 07:07+0000\n"
 "PO-Revision-Date: 2020-10-15 13:49+0000\n"
-"Last-Translator: Cédric Anne, 2020\n"
+"Last-Translator: Cédric Anne, 2021\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/teclib/teams/28042/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,50 +38,59 @@ msgstr "Unable to get authorization code"
 msgid "Unable to save authorization code"
 msgstr "Unable to save authorization code"
 
-#: inc/authorization.class.php:51
+#: inc/authorization.class.php:54
 msgid "Oauth authorization"
 msgid_plural "Oauth authorizations"
 msgstr[0] "Oauth authorization"
 msgstr[1] "Oauth authorizations"
 
-#: inc/authorization.class.php:92
+#: inc/authorization.class.php:95
 msgid "Create an authorization"
 msgstr "Create an authorization"
 
-#: inc/authorization.class.php:100
+#: inc/authorization.class.php:103
 msgid "No authorizations."
 msgstr "No authorizations."
 
-#: inc/authorization.class.php:104
-msgid "Expires at"
-msgstr "Expires at"
+#: inc/authorization.class.php:106 inc/authorization.class.php:148
+msgid "Email"
+msgstr "Email"
 
-#: inc/authorization.class.php:135
+#: inc/authorization.class.php:117
+msgid "Update"
+msgstr "Update"
+
+#: inc/authorization.class.php:125
 msgid "Delete"
 msgstr "Delete"
 
-#: inc/mailcollectorfeature.class.php:360
+#: inc/mailcollectorfeature.class.php:362
+#, php-format
+msgid "Mail receiver \"%s\" has been updated."
+msgstr "Mail receiver \"%s\" has been updated."
+
+#: inc/mailcollectorfeature.class.php:391
 #, php-format
 msgid "Mail receiver \"%s\" has been deactivated."
 msgstr "Mail receiver \"%s\" has been deactivated."
 
-#: inc/mailcollectorfeature.class.php:423
+#: inc/mailcollectorfeature.class.php:454
 msgid "No associated receivers."
 msgstr "No associated receivers."
 
-#: inc/mailcollectorfeature.class.php:426
+#: inc/mailcollectorfeature.class.php:457
 msgid "Name"
 msgstr "Name"
 
-#: inc/mailcollectorfeature.class.php:427
+#: inc/mailcollectorfeature.class.php:458
 msgid "Connection string"
 msgstr "Connection string"
 
-#: inc/mailcollectorfeature.class.php:428
+#: inc/mailcollectorfeature.class.php:459
 msgid "Login"
 msgstr "Login"
 
-#: inc/mailcollectorfeature.class.php:429
+#: inc/mailcollectorfeature.class.php:460
 msgid "Is active ?"
 msgstr "Is active ?"
 
diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
index 2911d240b90923f804e6c8f933f6cf9950ececac..9573b10c956c1c40939a80a5a8b5514982341fd9 100644
GIT binary patch
delta 774
zcmXxiJxE(o7{>8)b8{18;zv!?s;ORyU&W6ar&1_g+JcIMMJHVZ14fj_m_RpmbP&Od
zlS{=-5S7rOLvd*7(7j8g4z>u22#)Qd|L3YNob$`Q=bm%k_nchC&k{=~HNj0ow9t~Y
zgk{WAj0Nb315Du|#_%Ub@DwZX5+C7ztjCybOgpw=2#3(cQFJhm)%XFU#w?lD`+-gD
zVqgo~@EZp4920njkJ0934JNT1pJ5-qK+Vr$C2rtz+(sq*3tjw+t>}<Viv3L|Ka}Y(
z_ToFtaSF@W!}B$Rs<b(5Oau0yp5LMp8$(r|#Wb#<HY{N~enGAO2lf30Qn|U2>~ErF
zcN^8;`x+_META?lVk54j7T85qeuS$02X^2;)K$3b{t^dJSDM3aT*H3+jGA|W<2tGa
zR?~zoq;Nm9kg8%$Q%B=^O`N8LYH1vfA5ZADhC<h)Xz|j4_@Gi%+Wy&L6HTGg6e>aI
zqR@qsjUQF?N?T{7e@e_-3w#gGPi5!4NqfXwwv%=-H(lDXXDnwtH$7GGBF-l(T{?1p
tTcJ0-{)c<v3GX=UM(4AO?$?j*?E7NA6e`=bDn~MfLO%2G&fAZ?x&=g`Qf&YL

delta 713
zcmXZa%PT}-7{~GV%#4{~+{gV=<38gS3x%STjfG+sHnKP}iz&HI$Oiuboor-jfg&}@
zo+za(mD>&}vA5y-J3RHyXU@!d&vSXtYtd(T?YYpmZHQ`C70YKC6T=TwY<i5T!!69l
zQ_RG3%)uKhz<Vsk4{Si6*BC!GV+1=f3*(rN6BsgP&CKv6gCABgitFgZ11!R0EW-;d
z#7ESFzOWs?QTt+S%EdT#qm3$b2P3$LHF$}2_=audHzBgm(QOa5^2Z@%tFt>S$Cv->
zA5=j(fxk{`v6JgwRHA8A=S!%G?4sKM(y6)l_ZF4s0lnlm!Qfw_Y^>nA5w&pu)#(_j
zQyUv`6P4f$`|uidbOEYp!Fue#5!Aj7)O{yNpKj;~N?2X&HN`BB%^j~st>iiqg&wT2
zDs;Yj2aGf72@i$&qWNf63YD(lJls&}jLZ#{OLjN%_|)5`sAPqlBhOXl%3N|Gu^6#a
w&a!tn{qCK#oOnjs>PY+jPgcR8ok~Qeni9IpP9<k&ocF+ZdOo;sInk{CU*4KV!vFvP

diff --git a/locales/fr_FR.po b/locales/fr_FR.po
index 61f8341..c0353b3 100644
--- a/locales/fr_FR.po
+++ b/locales/fr_FR.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Cédric Anne, 2020
+# Cédric Anne, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-14 13:17+0000\n"
+"POT-Creation-Date: 2021-04-01 07:07+0000\n"
 "PO-Revision-Date: 2020-10-15 13:49+0000\n"
-"Last-Translator: Cédric Anne, 2020\n"
+"Last-Translator: Cédric Anne, 2021\n"
 "Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,50 +38,59 @@ msgstr "Impossible d'obtenir le code d'autorisation"
 msgid "Unable to save authorization code"
 msgstr "Impossible de sauvegarder le code d'autorisation"
 
-#: inc/authorization.class.php:51
+#: inc/authorization.class.php:54
 msgid "Oauth authorization"
 msgid_plural "Oauth authorizations"
 msgstr[0] "Autorisation Oauth"
 msgstr[1] "Autorisations Oauth"
 
-#: inc/authorization.class.php:92
+#: inc/authorization.class.php:95
 msgid "Create an authorization"
 msgstr "Créer une autorisation"
 
-#: inc/authorization.class.php:100
+#: inc/authorization.class.php:103
 msgid "No authorizations."
 msgstr "Aucune autorisation."
 
-#: inc/authorization.class.php:104
-msgid "Expires at"
-msgstr "Date d'expiration"
+#: inc/authorization.class.php:106 inc/authorization.class.php:148
+msgid "Email"
+msgstr "E-mail"
 
-#: inc/authorization.class.php:135
+#: inc/authorization.class.php:117
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: inc/authorization.class.php:125
 msgid "Delete"
 msgstr "Supprimer"
 
-#: inc/mailcollectorfeature.class.php:360
+#: inc/mailcollectorfeature.class.php:362
+#, php-format
+msgid "Mail receiver \"%s\" has been updated."
+msgstr "Le collecteur mail \"%s\" a été mis à jour."
+
+#: inc/mailcollectorfeature.class.php:391
 #, php-format
 msgid "Mail receiver \"%s\" has been deactivated."
 msgstr "Le collecteur mail \"%s\" a été désactivé."
 
-#: inc/mailcollectorfeature.class.php:423
+#: inc/mailcollectorfeature.class.php:454
 msgid "No associated receivers."
 msgstr "Aucun collecteur associé."
 
-#: inc/mailcollectorfeature.class.php:426
+#: inc/mailcollectorfeature.class.php:457
 msgid "Name"
 msgstr "Nom"
 
-#: inc/mailcollectorfeature.class.php:427
+#: inc/mailcollectorfeature.class.php:458
 msgid "Connection string"
 msgstr "Chaîne de connexion"
 
-#: inc/mailcollectorfeature.class.php:428
+#: inc/mailcollectorfeature.class.php:459
 msgid "Login"
 msgstr "Identifiant"
 
-#: inc/mailcollectorfeature.class.php:429
+#: inc/mailcollectorfeature.class.php:460
 msgid "Is active ?"
 msgstr "Est actif ?"
 
diff --git a/locales/oauthimap.pot b/locales/oauthimap.pot
index a356813..4c2f049 100644
--- a/locales/oauthimap.pot
+++ b/locales/oauthimap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-14 13:17+0000\n"
+"POT-Creation-Date: 2021-04-01 07:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,50 +35,59 @@ msgstr ""
 msgid "Unable to save authorization code"
 msgstr ""
 
-#: inc/authorization.class.php:51
+#: inc/authorization.class.php:54
 msgid "Oauth authorization"
 msgid_plural "Oauth authorizations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: inc/authorization.class.php:92
+#: inc/authorization.class.php:95
 msgid "Create an authorization"
 msgstr ""
 
-#: inc/authorization.class.php:100
+#: inc/authorization.class.php:103
 msgid "No authorizations."
 msgstr ""
 
-#: inc/authorization.class.php:104
-msgid "Expires at"
+#: inc/authorization.class.php:106 inc/authorization.class.php:148
+msgid "Email"
 msgstr ""
 
-#: inc/authorization.class.php:135
+#: inc/authorization.class.php:117
+msgid "Update"
+msgstr ""
+
+#: inc/authorization.class.php:125
 msgid "Delete"
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:360
+#: inc/mailcollectorfeature.class.php:362
+#, php-format
+msgid "Mail receiver \"%s\" has been updated."
+msgstr ""
+
+#: inc/mailcollectorfeature.class.php:391
 #, php-format
 msgid "Mail receiver \"%s\" has been deactivated."
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:423
+#: inc/mailcollectorfeature.class.php:454
 msgid "No associated receivers."
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:426
+#: inc/mailcollectorfeature.class.php:457
 msgid "Name"
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:427
+#: inc/mailcollectorfeature.class.php:458
 msgid "Connection string"
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:428
+#: inc/mailcollectorfeature.class.php:459
 msgid "Login"
 msgstr ""
 
-#: inc/mailcollectorfeature.class.php:429
+#: inc/mailcollectorfeature.class.php:460
 msgid "Is active ?"
 msgstr ""
 
diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
index c3c26aa705285c97ce2e0df93567b6097d46e681..302ed78b2de5a4aa30cac717a06110de04914c4c 100644
GIT binary patch
delta 781
zcmXZaKS&#K6u|M{<#JwQQ%#eoO-)TC5w%opBADV9x@bx%O4F$hhY<`|D<MMZV%An%
zJOTwJP@2Ker6s$IBDm-j6o(GM!Gd(Ei(UGCmpt<OeR6+)@4esc2P(mhUw(I45fMh1
z5!93#MX!sA_<=F}iC%1=2b*{gukk+KVjp^SrG_w$9hku=&Y^(?^x+4*tJH@2)V@&0
z5iaat91qcrzcGk^@B!+a^kW!1aRSG28s+&scHuTY!>=d_Utkn3aS#o%iLt&K=8t6h
z0>^M3i*%vn+@RDA7rQwhGFugoq9l-No55a=7jPJh$WQGuNhhl)?>|9#u7T3YD>PVN
z-S9_l{MUBqPOI`)_>l9j+rGyD$DdIuub@<3!x213sa&Jn6#7uMXa?o|Z}2gea0<U;
zmZ6$V3A{!McS815_LFxy)v>+K;vwu|&>SZoG0UP7vON+JJK+k<%BD&BlEMI^pCQ3M
zIw2)UUnHb2l8J=$TE0ZS4(Chp+FPz8_d6@UV!zd2+9f@#udn6m-}Gh8$gbtAqU|xN
z{^tj^Tp_<0O|PylJ&7itCKL5D<5)AsoCo*JIs4QcFs<UcwUYl>|7(8HJn7bfRj@Zb
Glm7ulgj9V1

delta 745
zcmXZaKS*0q6vy$C<QbEut$$*zR)tqY)Sy8_Yb%Jj2(=)^l)80zh9HVjG1`iY;_RS2
zx;R)Uf{3(Ba1n7(DhNWCPDQ$wN}$lK4$|*0ddSV^y_ei~&bjw))f~l_e^xsmjA&vs
zGMs=}I~Gx~9yDvl4ZMr{7{z0}hv!&@Kky+Iu?3xwSr`-OVmIEwG*;qUjF~OlG#6z&
zSi&}3K?irS2ESk(o?tazpkDL`lX!)i*UqH-n8xSmp$gqZ7q{^-e#K_|g`MQL7}?k8
zwioroDP>pSC91<KRN_eajSX1KeG*%75cyb+FRk1HD)C3uyj|4F9ikdNL;dd?I^?&1
zTs*?-Tk9icaqgd>I(>oa^fk8ODyq{xe1-?8LjR&(tn3L$U=O~*Zd^n9EQPi}O+00e
zJz%hHrE0a*T6R^c(3wy&h4xpSm_HJX52?g@hEglkf`a`hg-X{6Q0Rn^y%btooi;@S
zBj$e&o<<jEC+4zw*PHj>hlUHkLt_CyUG^#QGV4vdquIG}?_|fzyM2@Ibe-|?1LHYw
mVk()L$@O=*sjgI4AsjvnMD!ZZ&F1{?<s*ex5kKG;qpAOK<x>Ly

diff --git a/locales/pt_BR.po b/locales/pt_BR.po
index 520c5c1..4260de9 100644
--- a/locales/pt_BR.po
+++ b/locales/pt_BR.po
@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Jean Vergaças <jvergacas@gmail.com>, 2020
+# Cédric Anne, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-14 13:17+0000\n"
+"POT-Creation-Date: 2021-04-01 07:07+0000\n"
 "PO-Revision-Date: 2020-10-15 13:49+0000\n"
-"Last-Translator: Jean Vergaças <jvergacas@gmail.com>, 2020\n"
+"Last-Translator: Cédric Anne, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,50 +39,59 @@ msgstr "Incapaz de obter código de autorização"
 msgid "Unable to save authorization code"
 msgstr "Incapaz de salvar código de autorização"
 
-#: inc/authorization.class.php:51
+#: inc/authorization.class.php:54
 msgid "Oauth authorization"
 msgid_plural "Oauth authorizations"
 msgstr[0] "Autorização Oauth"
 msgstr[1] "Autorizações Oauth"
 
-#: inc/authorization.class.php:92
+#: inc/authorization.class.php:95
 msgid "Create an authorization"
 msgstr "Crie uma autorização"
 
-#: inc/authorization.class.php:100
+#: inc/authorization.class.php:103
 msgid "No authorizations."
 msgstr "Sem autorizações."
 
-#: inc/authorization.class.php:104
-msgid "Expires at"
-msgstr "Expira em"
+#: inc/authorization.class.php:106 inc/authorization.class.php:148
+msgid "Email"
+msgstr "E-mail"
 
-#: inc/authorization.class.php:135
+#: inc/authorization.class.php:117
+msgid "Update"
+msgstr "Atualizar"
+
+#: inc/authorization.class.php:125
 msgid "Delete"
 msgstr "Excluir"
 
-#: inc/mailcollectorfeature.class.php:360
+#: inc/mailcollectorfeature.class.php:362
+#, php-format
+msgid "Mail receiver \"%s\" has been updated."
+msgstr "O receptor de e-mail \"%s\" foi atualizado."
+
+#: inc/mailcollectorfeature.class.php:391
 #, php-format
 msgid "Mail receiver \"%s\" has been deactivated."
 msgstr "O receptor de e-mail \"%s\" foi desativado."
 
-#: inc/mailcollectorfeature.class.php:423
+#: inc/mailcollectorfeature.class.php:454
 msgid "No associated receivers."
 msgstr "Sem receptores associados."
 
-#: inc/mailcollectorfeature.class.php:426
+#: inc/mailcollectorfeature.class.php:457
 msgid "Name"
 msgstr "Nome"
 
-#: inc/mailcollectorfeature.class.php:427
+#: inc/mailcollectorfeature.class.php:458
 msgid "Connection string"
 msgstr "String de conexão"
 
-#: inc/mailcollectorfeature.class.php:428
+#: inc/mailcollectorfeature.class.php:459
 msgid "Login"
 msgstr "Login"
 
-#: inc/mailcollectorfeature.class.php:429
+#: inc/mailcollectorfeature.class.php:460
 msgid "Is active ?"
 msgstr "Está ativo?"
 

From 5c382a7cd79cfcebd042489c708a957f79362f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Thu, 1 Apr 2021 09:17:34 +0200
Subject: [PATCH 3/3] Add 1.1.0 version definition

---
 oauthimap.xml | 5 +++++
 setup.php     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/oauthimap.xml b/oauthimap.xml
index 24ab515..63f06d7 100644
--- a/oauthimap.xml
+++ b/oauthimap.xml
@@ -27,6 +27,11 @@ It permits emails fetching from G Suite and Azure AD mailboxes.
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+          <num>1.1.0</num>
+          <compatibility>~9.5.0</compatibility>
+          <download_url>https://github.com/pluginsGLPI/oauthimap/releases/download/1.1.0/glpi-oauthimap-1.1.0.tar.bz2</download_url>
+      </version>
       <version>
           <num>1.0.4</num>
           <compatibility>~9.5.0</compatibility>
diff --git a/setup.php b/setup.php
index f4a6e0f..00b96c4 100644
--- a/setup.php
+++ b/setup.php
@@ -24,7 +24,7 @@
  --------------------------------------------------------------------------
  */
 
-define('PLUGIN_OAUTHIMAP_VERSION', '1.0.4');
+define('PLUGIN_OAUTHIMAP_VERSION', '1.1.0');
 
 // Minimal GLPI version, inclusive
 define('PLUGIN_OAUTHIMAP_MIN_GLPI', '9.5');