2.92 new architecture + quickcss class

author: vincent-peugnet <v.peugnet@free.fr> 2018-10-18 01:08:46 +0200
committer: vincent-peugnet <v.peugnet@free.fr> 2018-10-18 01:08:46 +0200
commit: 7b2e48276b2a3ceff83c906d38077f8d0479c3df (patch)
tree: 0fc26bb1cbae5a30583292fbfb2b752fb623a94d /public
parent: 65796d4a2349e71ca05f5f298d6f94ff792d88b2 (diff)
download: wcms-7b2e48276b2a3ceff83c906d38077f8d0479c3df.tar.gz
wcms-7b2e48276b2a3ceff83c906d38077f8d0479c3df.zip
14 files changed, 257 insertions, 648 deletions
diff --git a/public/index.php b/public/index.php
deleted file mode 100644
index ab7ff55..0000000
--- a/public/index.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<h1>Vincent Peugnet</h1>
-<a href="/w/"><h2>W</h2></a>
-
-<h2>@</h2>
-<a href="mailto:v.peugnet@free.fr">v.peugnet@free.fr</a>
-
-<h1>📐</h1>
-
-
-</html>
-\ No newline at end of file
diff --git a/public/test.php b/public/test.php
index 6e5e835..aee0004 100644
--- a/public/test.php
+++ b/public/test.php
@@ -1,119 +1,186 @@
 <?php
-$text = 'gfgdfgdfgdsggggggggggggg
-dfgdsfgdh
-dh
-
-gh
-g
-hg
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-
-fhfgfgdfgdfgdsggggggggggggg
-dfgdsfgdh
-dh
-
-gh
-g
-hg
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-
-fhf<h3 id="titre2laguerre">tiTre2:laguerre</h3>  dqs fdddddddfdfdsfs fdsfdksdfjnsdjkhsf lkfljkfhjldshsf fsdf
-fdgfgdfgdfgdsggggggggggggg
-dfgdsfgdh
-dh
-
-gh
-g
-hg
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-<p>
-fhfgfgdfgdfgdsggggggggggggg
-dfgdsfgdh</p>
-dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>
-
-gh<p>
-g
-hg</p>
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-gh
-g
-hg
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-<p>
-fhfgfgdfgdfgdsggggggggggggg
-dfgdsfgdh</p>
-dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>
-
-gh<p>
-g
-hg</p>
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-gh
-<h1 id="yolo">YOLO</h1>
-<h2 id="ptout">PROUT</h2>
-<h2 id="lol">LOLDELAMORT</h2>
-hg
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-
-<p>
-fhfgfgdfgdfgdsggggggggggggg
-dfgdsfgdh</p>
-dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>dh</br>
-
-gh<p>
-g
-hg</p>
-fhhhhhhhhhhhhhhhhhhgfghfghfgh
-
-fhf
-g
-hffffgggggggggggggggggggggggggggggggggggggdsf <h3>titre 3- les hommes </h3> la fin';
-
-
-function sumparser($text)
-{
-    preg_match_all('#<h([1-6]) id="(\w+)">(.+)</h[1-6]>#iU', $text, $out);
-
-    var_dump($out);
-
-    $sum = [];
-    foreach ($out[2] as $key => $value) {
-        $sum[$value][$out[1][$key]] = $out[3][$key];
+
+
+require('../w/class/class.w.quickcss.php');
+
+$quick = new Quickcss;
+
+
+
+var_dump($quick);
+
+
+
+
+$color = ['color', 'background-color', 'border-color'];
+$size = ['width', 'height', 'margin', 'padding', 'border-width'];
+$font = ['font-size'];
+$unique = ['background-image', 'opacity', 'border-style', 'text-align'];
+$params = array_merge($color, $size, $font, $unique);
+
+
+
+
+
+
+// $presets = ['body' => ['font-size' => 'px']];
+// $quickcss = ['section' => ['color' => '#a74545', 'font-size' => '32px'], 'p' => ['background-color' => '#458da7', 'width' => '7px']];
+
+$presets = [];
+$quickcss = [];
+
+if (isset($_POST['quickcss'])) {
+    $quickcss = $_POST['quickcss'];
+}
+
+if (isset($_POST['presets'])) {
+    $presets = $_POST['presets'];
+}
+
+
+if (isset($_POST['active'])) {
+    $active = $_POST['active'];
+    echo '<h3>active</h3>';
+    var_dump($active);
+    $intersect = array_intersect_key($quickcss, $active);
+
+    foreach ($intersect as $element => $css) {
+        $intersect[$element] = array_intersect_key($quickcss[$element], $active[$element]);
     }
+    
+    echo '<h3>intersect</h3>';
+    var_dump($intersect);
+
+    $quickcss = $intersect;
+
+
+}
+
+
+if (!empty($_POST['new']['element']) && !empty($_POST['new']['param']) && in_array($_POST['new']['param'], $params)) {
+    $new = array($_POST['new']['element'] => array($_POST['new']['param'] => ''));
+    var_dump($new);
+
+    $quickcss = array_merge_recursive($quickcss, $new);
+}
+
+
+
+
+echo '<h3>quickcss</h3>';
+
+var_dump($quickcss);
+
+echo '<h3>presets</h3>';
 
-    var_dump($sum);
-
-    $sumstring = '';
-    $last = 0;
-    foreach ($sum as $title => $list) {
-        foreach ($list as $h => $link) {
-            if($h > $last) {
-                for ($i = 1; $i <= ($h - $last); $i++) {
-                    $sumstring .= '<ul>';
-                }            
-                $sumstring .= '<li><a href="#'.$title.'">'.$link.'</a></li>' ;
-            } elseif ($h < $last) {
-                for ($i = 1; $i <= ($last - $h); $i++) {
-                    $sumstring .= '</ul>';
-                }
-                $sumstring .= '<li><a href="#'.$title.'">'.$link.'</a></li>' ;            
-            } elseif ($h = $last) {
-                $sumstring .= '<li><a href="#'.$title.'">'.$link.'</a></li>' ;
-            }
-            $last = $h;
+var_dump($presets);
+
+foreach ($presets as $element => $preset) {
+    foreach ($preset as $param => $unit) {
+        if (array_key_exists($element, $quickcss) && array_key_exists($param, $quickcss[$element])) {
+            $quickcss[$element][$param] .= $unit;
         }
     }
-    for ($i = 1; $i <= ($last); $i++) {
-        $sumstring .= '</ul>';
+}
+
+
+$jsonquickcss = json_encode($quickcss);
+
+var_dump($jsonquickcss);
+
+$string = '';
+foreach ($quickcss as $key => $css) {
+    $string .= PHP_EOL . $key . ' {';
+    foreach ($css as $param => $value) {
+ 
+            $string .= PHP_EOL . '    ' . $param . ': ' . $value . ';';
+
+    }
+    $string .= PHP_EOL . '}' . PHP_EOL;
+}
+
+var_dump($string);
+
+
+
+
+echo '<form action="test.php" method="post">';
+
+foreach ($quickcss as $element => $css) {
+    echo '<h3>' . $element . '</h3>';
+    foreach ($css as $param => $value) {
+
+        echo '<input type="checkbox" name="active[' . $element . '][' . $param . ']" checked>';
+
+        if (in_array($param, $color)) {
+            echo '<label for="quickcss[' . $element . '][' . $param . ']">' . $param . '</label>';
+            echo '<input type="color" name="quickcss[' . $element . '][' . $param . ']" value="' . $quickcss[$element][$param] . '" id="quickcss[' . $element . '][' . $param . ']">';
+        }
+
+        if (in_array($param, $size)) {
+            echo '<label for="quickcss[' . $element . '][' . $param . ']">' . $param . '</label>';
+            echo '<input type="number" name="quickcss[' . $element . '][' . $param . ']" value="' . intval($quickcss[$element][$param]) . '" id="quickcss[' . $element . '][' . $param . ']">';
+
+            $unit = preg_replace('/\d/', '', $quickcss[$element][$param]);
+            ?>
+            <select name="presets[<?= $element ?>][<?= $param ?>]" >
+                <option value="px" <?= $unit == 'px' ? 'selected' : '' ?>>px</option>
+                <option value="%" <?= $unit == '%' ? 'selected' : '' ?>>%</option>
+            </select>
+            <?php
+
+        }
+
+        if (in_array($param, $font)) {
+            echo '<label for="quickcss[' . $element . '][' . $param . ']">' . $param . '</label>';
+            echo '<input type="number" name="quickcss[' . $element . '][' . $param . ']" value="' . intval($quickcss[$element][$param]) . '" id="quickcss[' . $element . '][' . $param . ']">';
+
+            $unit = preg_replace('/\d/', '', $quickcss[$element][$param]);
+            ?>
+            <select name="presets[<?= $element ?>][<?= $param ?>]" >
+                <option value="px" <?= $unit == 'px' ? 'selected' : '' ?>>px</option>
+                <option value="em" <?= $unit == 'em' ? 'selected' : '' ?>>em</option>
+            </select>
+            <?php
+
+        }
     }
-    return $sumstring;
 }
 
+echo '<h1>Add element</h1>';
+
+echo '<input type="text" name="new[element]">';
+echo '<select name="new[param]">';
+foreach ($params as $param) {
+    echo '<option value="' . $param . '">' . $param . '</option>';
+}
+echo '</select>';
+
+echo '</br><input type="submit" value="submit">';
+
+echo '</form>';
+
+?>
+
+
+
+
+<style>
+
+<?= $string ?>
+
+
 
+</style>
 
+<section>
+    <h4>Yolo babyzesssssss</h4>
 
+    <p>
+    Note that the values of array need to be valid keys, i.e. they need to be either integer or string. A warning will be emitted if a value has the wrong type, and the key/value pair in question will not be included in the result.
 
-echo $sumstring;
+If a value has several occurrences, the latest key will be used as its value, and all others will be lost.
+    </p>
 
 
-echo $text.'</br>';
-\ No newline at end of file
+</section>
+\ No newline at end of file
diff --git a/public/test2.php b/public/test2.php
new file mode 100644
index 0000000..a0cbafa
--- /dev/null
+++ b/public/test2.php
@@ -0,0 +1,84 @@
+<?php
+session_start();
+
+
+
+
+?>
+
+
+<html>
+
+<div class="prot">
+
+<?php
+
+require('../w/class/class.w.quickcss.php');
+
+$quick = new Quickcss($_POST);
+
+//$quick->setjson($_SESSION['css']);
+
+$quick->calc();
+
+$quick->form('test2.php');
+
+$_SESSION['css'] = $quick->tojson();
+
+
+?>
+
+</div>
+
+
+
+
+
+<style>
+
+form {
+    position: fixed;
+    right: 0;
+    top: 0;
+    width: 250px;
+    height: 100%;
+    overflow: scroll;
+    background-color: #d8d8d8;
+    border: 1px solid black;
+
+}
+
+.quickinput {
+    width: 100%;
+    background-color: #755454;
+    display: inline-flex;
+}
+
+input, select{
+    width: -webkit-fill-available;
+}
+
+
+<?= $quick->tocss() ?>
+
+</style>
+
+<body>
+<span class="u">BODY</span>
+    <section>
+    <span class="u">SECTION</span>
+    <h1><span class="u">H1</span>Bonjour tout le monde</h1>
+
+    <p><span class="u">P</span>Des bails de oufs qui toueeeett</p>
+
+    <article>
+    <span class="u">ARTICLE</span>
+        <h2><span class="u">H2</span>YOLO</h2>
+        <p><span class="u">P</span> Des bails noirs très noir....</p>
+    </article>
+    
+    
+    </section>
+</body>
+
+</html>
diff --git a/public/w/article.php b/public/w/article.php
deleted file mode 100644
index 307caa4..0000000
--- a/public/w/article.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-if ($app->exist($_GET['id'])) {
-
-    $art = $app->get($_GET['id']);
-
-    if (isset($_GET['edit']) and $_GET['edit'] == 1 and $app->session() >= $app::EDITOR) {
-        echo '<section class=edit>';
-        $aff->edit($art, $app, $app->getlister(['id', 'titre']), $config->fontsize(), $app->getlistermedia($app::MEDIA_DIR, 'image'));
-        //$aff->copy($art, $app->getlister(['id', 'titre']));
-        $aff->aside($app);
-        echo '</section>';
-    } else {
-        echo '<section class="lecture">';
-
-
-        $art->autotaglistupdate($app->taglist($app->getlister(['id', 'titre', 'intro', 'tag']), $art->autotaglist()));
-
-
-        $aff->lecture($art, $app);
-        echo '</section>';
-
-    }
-} else {
-    echo '<span class="alert">This article does not exist yet</span>';
-
-    if ($app->session() >= $app::EDITOR) {
-        echo '<form action="?id=' . $_GET['id'] . '&edit=1" method="post"><input type="hidden" name="action" value="new"><input type="submit" value="Create"></form>';
-    }
-
-}
-
-?>
-\ No newline at end of file
diff --git a/public/w/home.php b/public/w/home.php
deleted file mode 100644
index 3094d03..0000000
--- a/public/w/home.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-
-$aff->header();
-
-echo '<section class="home">';
-
-
-if ($app->session() >= $app::EDITOR) {
-
-    $app->bddinit($config);
-
-    $opt = new Opt(Art::classvarlist());
-    $opt->setcol(['id', 'tag', 'lien', 'contenu', 'intro', 'titre', 'datemodif', 'datecreation', 'secure']);
-    $table = $app->getlisteropt($opt);
-    $app->listcalclien($table);
-    $opt->settaglist($table);
-    $opt->submit();
-    
-    
-    
-
-   
-
-   
-
- 
-
-
-    $opt->setcol(['id', 'tag', 'lien', 'contenu', 'intro', 'titre', 'datemodif', 'datecreation', 'secure', 'liento']);
-
-
-    $aff->option($app, $opt);
-
-    $filtertagfilter = $app->filtertagfilter($table, $opt->tagfilter(), $opt->tagcompare());
-    $filtersecure = $app->filtersecure($table, $opt->secure());
-
-    $filter = array_intersect($filtertagfilter, $filtersecure);
-    $table2 = [];
-    $table2invert = [];
-    foreach ($table as $art) {
-            if (in_array($art->id(), $filter)) {
-                $table2[] = $art;
-            } else {
-                $table2invert[] = $art;
-            }
-
-        
-    }
-
-    if(!empty($opt->invert())) {
-        $table2 = $table2invert;
-    }
-
-    $app->artlistsort($table2, $opt->sortby(), $opt->order());
-
-
-    echo '<div id="flex">';
-    
-    
-    $aff->home2table($app, $table2, $app->getlister());   
-
-
-
-
-    echo '<div id="map">';
-    $aff->mapheader();    
-    if(isset($_GET['map'])) {
-        $aff->mermaid($app->map($table2));
-    }
-    echo '</div>';
-
-
-
-
-
-    echo '</div>';
-
-}
-
-
-
-echo '</section>';
-
-?>
-\ No newline at end of file
diff --git a/public/w/index.php b/public/w/index.php
index a5b3e03..bc5047e 100644
--- a/public/w/index.php
+++ b/public/w/index.php
@@ -1,362 +1,5 @@
 <?php
 
-// _____________________________________________________ R E Q U I R E ________________________________________________________________
-
-session_start();
-
-
-
-require('../../vendor/autoload.php');
-require('../../fn/fn.w.php');
-
-spl_autoload_register('my_autoloader');
-
-
-
-
-// ________________________________________________________ I N S T A L _________________________________________________
-
-$app = new App();
-$aff = new Aff();
-
-
-$config = $app->readconfig();
-if (!$config) {
-    $message = 'config_file_error';
-    echo $message;
-    if (isset($_POST['config']) && $_POST['config'] == 'create') {
-        $config = $app->createconfig($_POST);
-        $app->savejson($config->tojson());
-        header('Location: ./');
-
-    } else {
-        $aff->configform();
-    }
-    exit;
-}
-
-
-// _________________________________________________________ S E S ___________________________________________________________
-
-
-if (!isset($_SESSION['level'])) {
-    $session = 0;
-} else {
-    $session = $_SESSION['level'];
-}
-
-$app->setsession($session);
-
-
-
-
-// _______________________________________________________ A C T I O N __________________________________________________________________
-
-
-if (isset($_POST['action'])) {
-    switch ($_POST['action']) {
-
-        case 'login':
-            $_SESSION['level'] = $app->login($_POST['pass'], $config);
-            if (isset($_GET['id'])) {
-                header('Location: ?id=' . $_GET['id']);
-            } else {
-                header('Location: ./');
-            }
-            break;
-
-        case 'logout':
-            $_SESSION['level'] = $app->logout();
-            if (isset($_GET['id'])) {
-                header('Location: ?id=' . $_GET['id']);
-            } else {
-                header('Location: ./');
-            }
-            break;
-
-        case 'addmedia':
-            $message = $app->addmedia($_FILES, 2 ** 24, $_POST['id']);
-            header('Location: ./?aff=media&message=' . $message);
-            break;
-
-        case 'addcss':
-            $message = $app->addcss($_FILES, 2 ** 24, $_POST['id']);
-            header('Location: ./?aff=admin&message=' . $message);
-            break;
-
-        case 'editcss':
-            file_put_contents($app::CSS_READ_DIR . $config->cssread(), $_POST['editcss']);
-            header('Location: ./?aff=admin');
-            break;
-
-        case 'editconfig':
-            $config->hydrate($_POST);
-            $app->savejson($config->tojson());
-            header('Location: ./?aff=admin');
-            break;
-
-
-    }
-}
-
-
-
-// _____________________________________________________ D A T A B A S E __________________________________________________________________
-
-if (isset($_POST['action'])) {
-    $app->bddinit($config);
-
-    switch ($_POST['action']) {
-
-        case 'new':
-            if (isset($_GET['id'])) {
-                $art = new Art($_GET);
-                $art->reset();
-                $app->add($art);
-                header('Location: ?id=' . $_GET['id'] . '&edit=1');
-            }
-            break;
-
-        case 'update':
-            if ($app->exist($_GET['id'])) {
-                $art = new Art($_POST);
-                $art->updatelien();
-                $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist()));
-                $app->update($art);
-                if($config->fontsize() != $_POST['fontsize']) {
-                    $config->setfontsize($_POST['fontsize']);
-                    $app->savejson($config->tojson());
-                }
-                header('Location: ?id=' . $art->id() . '&edit=1&message='.$art->id().'_saved');
-            }
-            break;
-
-        case 'display':
-            if ($app->exist($_GET['id'])) {
-                $art = new Art($_POST);
-                $art->updatelien();
-                $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist()));
-                $app->update($art);
-                if($config->fontsize() != $_POST['fontsize']) {
-                    $config->setfontsize($_POST['fontsize']);
-                    $app->savejson($config->tojson());
-                }
-                header('Location: ?id=' . $art->id().'&message='.$art->id().'_saved');
-            }
-            break;
-
-        case 'home':
-            if ($app->exist($_GET['id'])) {
-                $art = new Art($_POST);
-                $art->updatelien();
-                $art->autotaglistcalc($app->taglist($app->getlister(['id', 'titre', 'tag']), $art->autotaglist()));
-                $app->update($art);
-                if($config->fontsize() != $_POST['fontsize']) {
-                    $config->setfontsize($_POST['fontsize']);
-                    $app->savejson($config->tojson());
-                }
-                header('Location: ./?message='.$art->id().'_saved');
-            }
-            break;
-
-        case 'copy':
-            if ($app->exist($_GET['id'])) {
-                $copy = $app->get($_POST['copy']);
-                $art = $app->get($_POST['id']);
-                if (!empty($_POST['css'])) {
-                    $art->setcss($copy->css());
-                }
-                if (!empty($_POST['color'])) {
-                    $art->setcouleurtext($copy->couleurtext());
-                    $art->setcouleurbkg($copy->couleurbkg());
-                    $art->setcouleurlien($copy->couleurlien());
-                    $art->setcouleurlienblank($copy->couleurlienblank());
-                }
-                if (!empty($_POST['html'])) {
-                    $art->sethtml($copy->md());
-                }
-                if (!empty($_POST['template'])) {
-                    $art->settemplate($copy->template());
-                }
-                $app->update($art);
-                header('Location: ?id=' . $art->id() . '&edit=1');
-            }
-            break;
-
-        case 'delete':
-            if ($app->exist($_GET['id'])) {
-                $art = new Art($_POST);
-                $app->delete($art);
-                header('Location: ?id=' . $art->id());
-            }
-            break;
-
-        case 'massedit':
-            if (isset($_POST['id'])) {
-                foreach ($_POST['id'] as $id) {
-                    if ($app->exist($id)) {
-                        $art = $app->get($id);
-
-                        switch ($_POST['massaction']) {
-                            case 'do':
-                                switch ($_POST['massedit']) {
-                                    case 'delete':
-                                        $app->delete($art);
-                                        break;
-
-                                    case 'erasetag':
-                                        $art->settag('');
-                                        $app->update($art);
-                                        break;
-
-                                    case 'erasetemplate':
-                                        $art->settemplate('');
-                                        $app->update($art);
-                                        break;
-
-                                    case 'not published':
-                                        $art->setsecure(2);
-                                        $app->update($art);
-                                        break;
-
-                                    case 'private':
-                                        $art->setsecure(1);
-                                        $app->update($art);
-                                        break;
-
-                                    case 'public':
-                                        $art->setsecure(0);
-                                        $app->update($art);
-                                        break;
-                                }
-                                break;
-
-                            case 'set template':
-                                if (isset($_POST['masstemplate'])) {
-                                    $art->settemplate($_POST['masstemplate']);
-                                    $app->update($art);
-                                }
-                                break;
-
-                            case 'add tag':
-                                if (isset($_POST['targettag'])) {
-                                    $art = $app->get($id);
-                                    $tagstring = strip_tags(trim(strtolower($_POST['targettag'])));
-                                    $taglist = str_replace(' ', '', $tagstring);
-                                    $taglist = explode(",", $taglist);
-                                    foreach ($taglist as $tag) {
-                                        if (!in_array($tag, $art->tag('array'))) {
-                                            $newtaglist = $art->tag('array');
-                                            array_push($newtaglist, $tag);
-                                            $art->settag($newtaglist);
-                                        }
-                                    }
-                                    $app->update($art);
-                                }
-                                break;
-
-                        }
-
-                       
-
-
-                    }
-                    header('Location: ./');
-                }
-                break;
-            }
-    }
-}
-
-
-
-
-
-if (isset($_POST['actiondb'])) {
-    $app->setbdd($config);
-
-    switch ($_POST['actiondb']) {
-
-        case 'addtable':
-            if (isset($_POST['tablename'])) {
-                $message = $app->addtable($config->dbname(), $_POST['tablename']);
-                header('Location: ./?aff=admin&message=' . $message);
-            }
-            break;
-
-        case 'duplicatetable':
-            $message = $app->tableduplicate($config->dbname(), $_POST['arttable'], $_POST['tablename']);
-            header('Location: ./?aff=admin&message=' . $message);            
-            break;
-
-    }
-}
-
-
-
-
-// _______________________________________________________ H E A D _____________________________________________________________
-
-if (isset($_GET['id'])) {
-    $app->bddinit($config);
-    if ($app->exist($_GET['id'])) {
-        $art = $app->get($_GET['id']);
-        if (!isset($_GET['edit'])) {
-            $_GET['edit'] = 0;
-        }
-        $aff->arthead($art, $app::CSS_READ_DIR, $config->cssread(), $_GET['edit']);
-    } else {
-        // $aff->head($_GET['id'], '', 'white');
-        $aff->noarthead($_GET['id'], $app::CSS_READ_DIR, $config->cssread());
-
-    }
-} elseif (isset($_GET['aff'])) {
-    $aff->head($_GET['aff'], $_GET['aff'], $config->color4());
-} else {
-    $aff->head('home', 'home', $config->color4());
-}
-
-
-
-
-
-
-
-// _____________________________________________________ A L E R T _______________________________________________________________ 
-
-if (isset($_GET['message'])) {
-    echo '<span class="alert">' . $_GET['message'] . '</span>';
-}
-
-
-
-
-
-
-
-
-// ______________________________________________________ B O D Y _______________________________________________________________ 
-
-
-$aff->nav($app);
-
-if (array_key_exists('id', $_GET)) {
-    $app->bddinit($config);
-    include('article.php');
-} elseif (array_key_exists('tag', $_GET)) {
-    $app->bddinit($config);
-    echo '<h4>' . $_GET['tag'] . '</h4>';
-    $aff->tag($app->getlister(['id', 'titre', 'intro', 'tag']), $_GET['tag'], $app);
-} elseif (array_key_exists('lien', $_GET)) {
-    $app->bddinit($config);
-    echo '<h4><a href="?id=' . $_GET['lien'] . '">' . $_GET['lien'] . '</a></h4>';
-    $aff->lien($app->getlister(['id', 'titre', 'intro', 'lien']), $_GET['lien'], $app);
-} elseif (array_key_exists('aff', $_GET)) {
-    include('menu.php');
-} else {
-    include('home.php');
-}
-
-
+require('../../w/w.router.php');
 
 ?>
 \ No newline at end of file
diff --git a/public/w/menu.php b/public/w/menu.php
deleted file mode 100644
index 8e89ed1..0000000
--- a/public/w/menu.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-
-if ($app->session() >= $app::EDITOR) {
-
-    if ($_GET['aff'] == 'admin' && $app->session() >= $app::ADMIN) {
-        echo '<section>';
-        echo '<h1>Admin</h1>';
-
-        $aff->admincss($config, $app);
-        $aff->adminpassword($config);
-        $aff->admindb($config);
-        if ($app->setbdd($config)) {
-            $status = "OK";
-        } else {
-            $status = "Not Connected";
-        }
-        $aff->admintable($config, $status, $app->tablelist($config->dbname()));
-        $aff->admindisplay($config->color4());
-
-        echo '</section>';
-    } elseif ($_GET['aff'] == 'media') {
-        echo '<h1>Media</h1>';
-        echo '<section>';
-        echo '<article>';
-
-        $aff->addmedia($app);
-        $aff->medialist($app->getlistermedia($app::MEDIA_DIR), $app::MEDIA_DIR);
-
-        echo '</article>';
-        echo '</section>';
-
-    } elseif ($_GET['aff'] == 'record') {
-        echo '<h1>Record</h1>';
-        echo '<section>';
-
-        $aff->recordlist($app);
-
-        echo '</section>';
-
-    } elseif ($_GET['aff'] == 'info') {
-
-
-
-    } else {
-        
-    echo '<h1>Private</h1><p>You dont have the permission to access this page.</p>';
-
-    }
-
-
-} else {
-    echo '<h1>Private</h1><p>You should be connected to access this page.</p>';
-}
-
-?>
-\ No newline at end of file
diff --git a/public/w/css/styleadmin.css b/public/w/rsc/css/styleadmin.css
index a3fcc5c..a3fcc5c 100644
--- a/public/w/css/styleadmin.css
+++ b/public/w/rsc/css/styleadmin.css
diff --git a/public/w/css/stylebase.css b/public/w/rsc/css/stylebase.css
index 017b075..017b075 100644
--- a/public/w/css/stylebase.css
+++ b/public/w/rsc/css/stylebase.css
diff --git a/public/w/css/styleedit.css b/public/w/rsc/css/styleedit.css
index fe6745f..fe6745f 100644
--- a/public/w/css/styleedit.css
+++ b/public/w/rsc/css/styleedit.css
diff --git a/public/w/css/stylehome.css b/public/w/rsc/css/stylehome.css
index 98822f0..98822f0 100644
--- a/public/w/css/stylehome.css
+++ b/public/w/rsc/css/stylehome.css
diff --git a/public/w/css/styleinfo.css b/public/w/rsc/css/styleinfo.css
index a3fcc5c..a3fcc5c 100644
--- a/public/w/css/styleinfo.css
+++ b/public/w/rsc/css/styleinfo.css
diff --git a/public/w/css/stylemedia.css b/public/w/rsc/css/stylemedia.css
index d721a9b..d721a9b 100644
--- a/public/w/css/stylemedia.css
+++ b/public/w/rsc/css/stylemedia.css
diff --git a/public/w/css/stylerecord.css b/public/w/rsc/css/stylerecord.css
index 409bcd4..409bcd4 100644
--- a/public/w/css/stylerecord.css
+++ b/public/w/rsc/css/stylerecord.css
author	vincent-peugnet <v.peugnet@free.fr>	2018-10-18 01:08:46 +0200
committer	vincent-peugnet <v.peugnet@free.fr>	2018-10-18 01:08:46 +0200
commit	7b2e48276b2a3ceff83c906d38077f8d0479c3df (patch)
tree	0fc26bb1cbae5a30583292fbfb2b752fb623a94d /public
parent	65796d4a2349e71ca05f5f298d6f94ff792d88b2 (diff)
download	wcms-7b2e48276b2a3ceff83c906d38077f8d0479c3df.tar.gz wcms-7b2e48276b2a3ceff83c906d38077f8d0479c3df.zip