wip #4211

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 019355015807dde55fa097c4e26eff4b105ab904..240c42f1e180fec631988b000f650299f7e51acc 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,6 +25,7 @@
     <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #4211">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Jobs/LegacyBookSettingsGenerate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/LegacyBookSettingsGenerate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/emailconfig/spamassassin-rules.cf" beforeDir="false" afterPath="$PROJECT_DIR$/resources/emailconfig/spamassassin-rules.cf" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -709,14 +710,7 @@
       <workItem from="1652692762350" duration="3636000" />
       <workItem from="1652718109996" duration="3224000" />
       <workItem from="1652768161632" duration="8698000" />
-      <workItem from="1652782240791" duration="10605000" />
-    </task>
-    <task id="LOCAL-00233" summary="wait #5045 @0.5">
-      <created>1644398473526</created>
-      <option name="number" value="00233" />
-      <option name="presentableId" value="LOCAL-00233" />
-      <option name="project" value="LOCAL" />
-      <updated>1644398473526</updated>
+      <workItem from="1652782240791" duration="12767000" />
     </task>
     <task id="LOCAL-00234" summary="wip #5041 @1.5">
       <created>1644412790547</created>
@@ -1054,7 +1048,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652812648980</updated>
     </task>
-    <option name="localTasksCounter" value="282" />
+    <task id="LOCAL-00282" summary="wip #4211">
+      <created>1652812942801</created>
+      <option name="number" value="00282" />
+      <option name="presentableId" value="LOCAL-00282" />
+      <option name="project" value="LOCAL" />
+      <updated>1652812942801</updated>
+    </task>
+    <option name="localTasksCounter" value="283" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/app/Jobs/LegacyBookSettingsGenerate.php b/app/Jobs/LegacyBookSettingsGenerate.php
index 311350dd7aba3d2d3d858a9957107b64d3b5aca8..62c27d9e3e1746b346435103938351ec0cf03ac6 100644 (file)
--- a/app/Jobs/LegacyBookSettingsGenerate.php
+++ b/app/Jobs/LegacyBookSettingsGenerate.php
@@ -6,8 +6,6 @@ use App\Models\Traits\PublicationSettings;
 use Cubist\Backpack\Magic\BunchOfFields;
 use Cubist\Backpack\Magic\Fields\FormSection;
 use Cubist\Backpack\Magic\Fields\FormSeparator;
-use Cubist\Backpack\Magic\Fields\SelectFromArray;
-use Cubist\Util\Files\Files;
 use Cubist\Util\PHP;
 
 class LegacyBookSettingsGenerate extends Base
@@ -47,7 +45,7 @@ class LegacyBookSettingsGenerate extends Base
                 if (isset($f['datasFunc'])) {
                     $f['datas'] = '%!%' . $f['datasFunc'] . '!%!';
                 } else {
-                    $f['datas'] = $field->getAttribute('options');
+                    $f['datas'] = array_flip($field->getAttribute('options'));
                 }
             }
             $fields[$field->getName()] = $f;

diff --git a/resources/emailconfig/spamassassin-rules.cf b/resources/emailconfig/spamassassin-rules.cf
index ca65156842c16eed06fcd258f8c98802e5ee2241..a966f035b8907c3a18bc98eec415655038179a8f 100644 (file)
--- a/resources/emailconfig/spamassassin-rules.cf
+++ b/resources/emailconfig/spamassassin-rules.cf
@@ -16,7 +16,7 @@ score BAYES_60          3.1
 score BAYES_80          4.1
 score BAYES_95          5.1
 score BAYES_99          5.5
-score BAYES_999         5.6
+score BAYES_999         7.5
 
 # TXRep