Allow Motifs to be configured.

paragonie · Aug 27, 2016 · e6bb9fe · e6bb9fe
1 parent efffb34
commit e6bb9fe
Show file tree

Hide file tree

Showing 16 changed files with 201 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@
 /src/config/keyring/*.skey
 /src/config/keyring/*.keypair
 /src/config/universal.json
+/src/config/motifs/*.json
 /src/tmp/cache/*.json
 /src/tmp/installing.json
 /src/tmp/last_update_check.txt

diff --git a/src/Engine/Gadgets.php b/src/Engine/Gadgets.php
@@ -56,7 +56,7 @@ public static function loadCargo(string $name, string $source)
         if (!\array_key_exists($name, $cargo)) {
             $cargo[$name] = [];
         }
-        
+
         \array_unshift($cargo[$name], $source);
         $cargo[$name] = \array_values($cargo[$name]);
 
@@ -79,8 +79,8 @@ public static function unloadNextCargo(string $name)
         $iterate = $state->cargoIterator;
 
         if (isset($iterate[$name])) {
-            $cargo = self::unloadCargo($name, $iterate[$name]);
             ++$iterate[$name];
+            $cargo = self::unloadCargo($name, $iterate[$name]);
             $state->cargoIterator = $iterate;
             return $cargo;
         }

diff --git a/src/Engine/Lens.php b/src/Engine/Lens.php
@@ -275,6 +275,56 @@ public function listFilters(): array
         return \array_keys($filters);
     }
 
+    /**
+     * Load the cargo for these motifs
+     *
+     * @param string $name
+     * @return self
+     */
+    public function loadMotifCargo(string $name): self
+    {
+        $state = State::instance();
+        if (
+            isset($state->motifs[$name])
+            &&
+            isset($state->motifs[$name]['config']['cargo'])
+        ) {
+            foreach ($state->motifs[$name]['config']['cargo'] as $key => $subPath) {
+                Gadgets::loadCargo(
+                    $key,
+                    'motif/' . $name . '/cargo/' . $subPath
+                );
+            }
+        }
+        return $this;
+    }
+
+
+    /**
+     * Load the config for this motif
+     *
+     * @param string $name
+     * @return self
+     */
+    public function loadMotifConfig(string $name): self
+    {
+        $state = State::instance();
+        if (isset($state->motifs[$name])) {
+            try {
+                if (\file_exists(ROOT . '/config/motifs/' . $name . '.json')) {
+                    $state->motif_config = \Airship\loadJSON(
+                        ROOT . '/config/motifs/' . $name . '.json'
+                    );
+                } else {
+                    $state->motif_config = [];
+                }
+            } catch (\Throwable $ex) {
+                $state->motif_config = [];
+            }
+        }
+        return $this;
+    }
+
     /**
      * Set the active motif
      *
@@ -308,7 +358,7 @@ public function resetBaseTemplate(): self
      * Override the base template
      *
      * @param string $name
-     * @return Lens
+     * @return self
      */
     public function setBaseTemplate(string $name): self
     {
@@ -320,9 +370,10 @@ public function setBaseTemplate(string $name): self
         ) {
             $state->base_template = 'motif/' .
                 $name .
-                '/lens/' .
+                '/' .
                 $state->motifs[$name]['config']['base_template'] .
                 '.twig';
+            \var_dump($state->base_template);
         }
         return $this;
     }

diff --git a/src/Motifs/paragonie/airship-classic/config.twig b/src/Motifs/paragonie/airship-classic/config.twig
@@ -0,0 +1,16 @@
+<div class="multiline_checkbox_container">
+    <div class="multiline_checkbox">
+        <input
+            id="motif-config-bridge-gradient"
+            type="checkbox"
+            name="motif_config[bridge][gradient]"
+            value="1"
+            {% if motif_config['bridge']['gradient'] %}
+                checked="checked"
+            {% endif %}
+        />
+        <label for="motif-config-bridge-gradient">
+            {{ __("Metallic look?") }}
+        </label>
+    </div>
+</div>
diff --git a/src/Motifs/paragonie/airship-classic/config_filter.php b/src/Motifs/paragonie/airship-classic/config_filter.php
@@ -0,0 +1,17 @@
+<?php
+declare(strict_types=1);
+
+use Airship\Engine\Security\Filter\{
+    BoolFilter,
+    GeneralFilterContainer
+};
+
+/**
+ * @return $motifInputFilter
+ */
+$motifInputFilter = (new GeneralFilterContainer())
+    ->addFilter(
+        'bridge.gradient',
+        (new BoolFilter())->setDefault(true)
+    )
+;
diff --git a/src/Motifs/paragonie/airship-classic/lens/base-classic.twig b/src/Motifs/paragonie/airship-classic/lens/base-classic.twig
diff --git a/src/Motifs/paragonie/airship-classic/lens/cargo/base_head.twig b/src/Motifs/paragonie/airship-classic/lens/cargo/base_head.twig
@@ -0,0 +1,73 @@
+{% include next_cargo("base_head") %}
+
+<style type="text/css" nonce={{ csp_nonce('style-src') }}>
+{% if MOTIF['bridge']['gradient'] %}
+.bridge-body-site-wrapper {
+    background-image: -webkit-linear-gradient(
+            top,
+            rgba(0, 0, 0, 0) 0%,
+            rgba(0, 0, 0, 0.5) 100%
+    ), -webkit-linear-gradient(
+            top,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 3rem
+    ), -webkit-linear-gradient(
+            left,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 200px
+    );
+    background-image: -moz-linear-gradient(
+            top,
+            rgba(0, 0, 0, 0) 0%,
+            rgba(0, 0, 0, 0.5) 100%
+    ), -moz-linear-gradient(
+            top,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 3rem
+    ), -moz-linear-gradient(
+            left,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 200px
+    );
+    background-image: -ms-linear-gradient(
+            top,
+            rgba(0, 0, 0, 0) 0%,
+            rgba(0, 0, 0, 0.5) 100%
+    ), -ms-linear-gradient(
+            top,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 3rem
+    ), -ms-linear-gradient(
+            left,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 200px
+    );
+    background-image: -o-linear-gradient(
+            top,
+            rgba(0, 0, 0, 0) 0%,
+            rgba(0, 0, 0, 0.5) 100%
+    ), -o-linear-gradient(
+            top,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 3rem
+    ), -o-linear-gradient(
+            left,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 200px
+    );
+    background-image: linear-gradient(
+            top,
+            rgba(0, 0, 0, 0) 0%,
+            rgba(0, 0, 0, 0.5) 100%
+    ), linear-gradient(
+            top,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 3rem
+    ), linear-gradient(
+            left,
+            rgba(255, 255, 255, 0.1) 0px,
+            rgba(255, 255, 255, 0) 200px
+    );
+}
+{% endif %}
+</style>
diff --git a/src/Motifs/paragonie/airship-classic/motif.json b/src/Motifs/paragonie/airship-classic/motif.json
@@ -3,6 +3,9 @@
   "name": "airship-classic",
   "display_name": "Airship Classic v1.3.0",
   "base_template": null,
+  "cargo": {
+    "base_head": "base_head.twig"
+  },
   "css": [
     "style.css"
   ],

diff --git a/src/Motifs/paragonie/airship-classic/public/style.css b/src/Motifs/paragonie/airship-classic/public/style.css
@@ -16,71 +16,6 @@ body {
 }
 .bridge-body-site-wrapper {
     background-color: #242424;
-    background-image: -webkit-linear-gradient(
-            top,
-            rgba(0, 0, 0, 0) 0%,
-            rgba(0, 0, 0, 0.5) 100%
-    ), -webkit-linear-gradient(
-            top,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 3rem
-    ), -webkit-linear-gradient(
-            left,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 200px
-    );
-    background-image: -moz-linear-gradient(
-            top,
-            rgba(0, 0, 0, 0) 0%,
-            rgba(0, 0, 0, 0.5) 100%
-    ), -moz-linear-gradient(
-            top,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 3rem
-    ), -moz-linear-gradient(
-            left,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 200px
-    );
-    background-image: -ms-linear-gradient(
-            top,
-            rgba(0, 0, 0, 0) 0%,
-            rgba(0, 0, 0, 0.5) 100%
-    ), -ms-linear-gradient(
-            top,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 3rem
-    ), -ms-linear-gradient(
-            left,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 200px
-    );
-    background-image: -o-linear-gradient(
-            top,
-            rgba(0, 0, 0, 0) 0%,
-            rgba(0, 0, 0, 0.5) 100%
-    ), -o-linear-gradient(
-            top,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 3rem
-    ), -o-linear-gradient(
-            left,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 200px
-    );
-    background-image: linear-gradient(
-            top,
-            rgba(0, 0, 0, 0) 0%,
-            rgba(0, 0, 0, 0.5) 100%
-    ), linear-gradient(
-            top,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 3rem
-    ), linear-gradient(
-            left,
-            rgba(255, 255, 255, 0.1) 0px,
-            rgba(255, 255, 255, 0) 200px
-    );
 }
 #hull-header-icon {
     height: 64px;

diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -162,12 +162,12 @@ function($matches) {
 /**
  * Load up all of the keys used by the application:
  */
-require_once ROOT.'/keys.php';
+require_once ROOT . '/keys.php';
 
 /**
  * Set up the logger
  */
-require_once ROOT."/config/logger.php";
+require_once ROOT . '/config/logger.php';
 
 /**
  * Automatic security updates

diff --git a/src/config/gadgets.php b/src/config/gadgets.php
@@ -52,7 +52,7 @@
     );
 } else {
     $cabinsGadgets = [];
-    \file_get_contents(
+    \file_put_contents(
         ROOT . '/Cabin/' . $active['name'] . '/config/gadgets.json',
         '[]'
     );

diff --git a/src/config/lens.php b/src/config/lens.php
@@ -7,7 +7,7 @@
  * GLOBAL LENS MODIFICATIONS GO HERE
  * 
  * We can add filters, functions, etc. to the current lens if we want
- * 
+ *
  * @global Lens $lens
  */
 
@@ -110,6 +110,7 @@
 $lens->func('global_config');
 $lens->func('is_admin');
 $lens->func('logout_token');
+$lens->func('next_cargo');
 $lens->func('userid');
 $lens->func('user_authors');
 $lens->func('user_author_ids');

diff --git a/src/config/motifs/.gitkeep b/src/config/motifs/.gitkeep
diff --git a/src/lens_functions.php b/src/lens_functions.php
@@ -593,7 +593,6 @@ function logout_token(): string
     return $_SESSION['logout_token'];
 }
 
-
 /**
  * Get information about the motifs
  *
@@ -605,6 +604,15 @@ function motifs()
     return $state->motifs;
 }
 
+/**
+ * @param array ...$args
+ * @return array
+ */
+function next_cargo(...$args)
+{
+    return Gadgets::unloadNextCargo(...$args);
+}
+
 /**
  * @param string $string
  * @param bool $return
@@ -901,10 +909,13 @@ function user_motif(int $userId = null, string $cabin = \CABIN_NAME): array
     if (isset($userPrefs['motif'][$cabin])) {
         $split = \explode('/', $userPrefs['motif'][$cabin]);
         foreach ($state->motifs as $k => $motif) {
+            if (empty($motif['config'])) {
+                continue;
+            }
             if (
-                $motif['config']['supplier'] === $split[0]
+                $motif['supplier'] === $split[0]
                     &&
-                $motif['config']['name'] === $split[1]
+                $motif['name'] === $split[1]
             ) {
                 // We've found a match:
                 $userCache[$userId] = $k;