wip #5279 @1

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 45c8c21abfaea7355cdbdf36951b0aa71ddbb749..063320c945f872133fea99f476d15b61242ee7ae 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,9 +10,4 @@
     <option name="languageLevel" value="ES6" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" />
-  <component name="SwUserDefinedSpecifications">
-    <option name="specTypeByUrl">
-      <map />
-    </option>
-  </component>
 </project>
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 828e726c175cc7f32839d3293563e660adc41d51..f45e4ffa40eac47e2068713de40bd30ff92654c3 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,9 +22,13 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wait #5265 @3">
+    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wait #5265">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/emailconfig/postfix-main.cf" beforeDir="false" afterPath="$PROJECT_DIR$/resources/emailconfig/postfix-main.cf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Models/CubedesignersEmails.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/CubedesignersEmails.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -304,20 +308,20 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "last_opened_file_path": "D:/Works/FluidbookToolbox/resources/emailconfig",
-    "nodejs_package_manager_path": "npm",
-    "ruby.rails.projectView.checked": "true",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookToolbox/resources/emailconfig&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookToolbox\resources\emailconfig" />
@@ -704,14 +708,9 @@
       <workItem from="1651753148416" duration="9398000" />
       <workItem from="1652080290830" duration="3185000" />
       <workItem from="1652177641382" duration="4133000" />
-      <workItem from="1652252396495" duration="6813000" />
-    </task>
-    <task id="LOCAL-00227" summary="wip #5045 @0.5">
-      <created>1643392589760</created>
-      <option name="number" value="00227" />
-      <option name="presentableId" value="LOCAL-00227" />
-      <option name="project" value="LOCAL" />
-      <updated>1643392589760</updated>
+      <workItem from="1652252396495" duration="7552000" />
+      <workItem from="1652268786509" duration="1257000" />
+      <workItem from="1652692762350" duration="3475000" />
     </task>
     <task id="LOCAL-00228" summary="wip #5045 @3">
       <created>1643626707430</created>
@@ -1049,7 +1048,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652262113616</updated>
     </task>
-    <option name="localTasksCounter" value="276" />
+    <task id="LOCAL-00276" summary="wait #5265">
+      <created>1652262608514</created>
+      <option name="number" value="00276" />
+      <option name="presentableId" value="LOCAL-00276" />
+      <option name="project" value="LOCAL" />
+      <updated>1652262608514</updated>
+    </task>
+    <option name="localTasksCounter" value="277" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1081,7 +1087,6 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="wip #5093 @0.25" />
     <MESSAGE value="wip #5093 @3" />
     <MESSAGE value="wip #5041 @0.25" />
     <MESSAGE value="wait #5109 @2.5" />
@@ -1106,7 +1111,8 @@
     <MESSAGE value="wip #5265 @0.5" />
     <MESSAGE value="wip #5228 @1.5" />
     <MESSAGE value="wait #5265 @3" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #5265 @3" />
+    <MESSAGE value="wait #5265" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #5265" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php
index b58c9d5294a578eef3a14aaf2f160c530d4fb0d2..63d3dfa0ee60a4715ce695e663165e12ff012148 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ELearningMedia/DownloadOperation.php
@@ -16,12 +16,13 @@ trait DownloadOperation
 
     protected function setupDownloadDefaults()
     {
+
         $this->crud->addButtonFromView('line', 'download', 'elearningmedia.download', 'end');
     }
 
     protected function download($id, $action)
     {
-        ElearningMediaDownload::dispatch(ELearningMedia::find($id), $action, backpack_user());
+        ElearningMediaDownload::dispatch(ELearningMedia::find($id), $action, backpack_user())->onQueue('download');;
         Alert::add('success', __('La compilation a été placée en file d\'attente. Vous recevrez un email lorsqu\'elle sera terminée.'))->flash();
         return redirect(backpack_url('elearning-media'));
     }

diff --git a/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php
index 93a232b1530046d93e0e8fba3537e1d70bfd6e32..23daf6202bc7fb623d41f381f2c516af0e88c5cf 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ELearningPackage/DownloadOperation.php
@@ -21,7 +21,7 @@ trait DownloadOperation
 
     protected function download($id, $action)
     {
-        ElearningPackageDownload::dispatch(ELearningPackage::find($id), $action, backpack_user());
+        ElearningPackageDownload::dispatch(ELearningPackage::find($id), $action, backpack_user())->onQueue('download');
         Alert::add('success', __('La compilation a été placée en file d\'attente. Vous recevrez un email lorsqu\'elle sera terminée.'))->flash();
         return redirect(backpack_url('elearning-package'));
     }

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
index 789e8b87e34c6d127b414b125753aca2df04dc7d..b4959e9ac13bc3b8d76a24939a27d1e9204243ef 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
@@ -21,7 +21,7 @@ trait DownloadOperation
 
     protected function download($id, $action)
     {
-        FluidbookCollectionDownload::dispatch(FluidbookCollection::find($id), $action, backpack_user());
+        FluidbookCollectionDownload::dispatch(FluidbookCollection::find($id), $action, backpack_user())->onQueue('download');;
         Alert::add('success', __('La compilation a été placée en file d\'attente. Vous recevrez un email lorsqu\'elle sera terminée.'))->flash();
         return redirect(backpack_url('fluidbook-collection'));
     }

diff --git a/app/Models/CubedesignersEmails.php b/app/Models/CubedesignersEmails.php
index 4af4f1eb14be1d2f5a9ad9451d8465d0da0223e3..6b0726bf9e26820b77c02495c77f58590087720f 100644 (file)
--- a/app/Models/CubedesignersEmails.php
+++ b/app/Models/CubedesignersEmails.php
@@ -55,12 +55,10 @@ class CubedesignersEmails extends CubistMagicAbstractModel
         }
 
         $accounts = [];
-        $_mailboxes = [];
         foreach ($mailboxes as $k => $m) {
             if (!isset($m['password'])) {
                 $m['password'] = '';
             }
-            $_mailboxes[] = $m['mailbox'];
 
             $email = $m['mailbox'] . '@' . $maindomain;
             $password = $m['password'] = trim($m['password']);
@@ -104,9 +102,6 @@ class CubedesignersEmails extends CubistMagicAbstractModel
                 $aliases[$from] = [];
             }
             $aliases[$from] = array_merge($aliases[$from], explode(',', str_replace('@' . $maindomain, '', $item['dest'])));
-            if (in_array($from, $_mailboxes)) {
-                $aliases[$from][] = $from . '@' . $maindomain;
-            }
         }
         ksort($aliases);
         $savedAliases = [];
@@ -118,13 +113,11 @@ class CubedesignersEmails extends CubistMagicAbstractModel
         $allAliases = [];
         foreach ($domains as $d) {
             $domain = $d['domaine'];
-            if ($domain !== 'cubedesigners.com') {
-                foreach ($accounts as $account => $password) {
-                    if (!isset($allAliases[$account . '@' . $domain])) {
-                        $allAliases[$account . '@' . $domain] = [];
-                    }
-                    $allAliases[$account . '@' . $domain][] = $account . '@' . $maindomain;
+            foreach ($accounts as $account => $password) {
+                if (!isset($allAliases[$account . '@' . $domain])) {
+                    $allAliases[$account . '@' . $domain] = [];
                 }
+                $allAliases[$account . '@' . $domain][] = $account . '@' . $maindomain;
             }
             foreach ($aliases as $from => $dest) {
                 if (!isset($allAliases[$from . '@' . $domain])) {
@@ -132,7 +125,7 @@ class CubedesignersEmails extends CubistMagicAbstractModel
                 }
                 $allAliases[$from . '@' . $domain] = array_merge($allAliases[$from . '@' . $domain], $dest);
             }
-//            $allAliases['@' . $domain] = ['postmaster+catchall@' . $maindomain];
+            $allAliases['@' . $domain] = ['spam@' . $maindomain];
         }
         $aliasesFile = [];
         foreach ($allAliases as $from => $dest) {