done #3939 @0.75

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 4518d23734b581a27996a30e62376a5826825883..c28bba1d4051750536e9aa6589b321f150c586d3 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -278,16 +278,6 @@ class commonCore extends cubeCore
         $db->dashboard->index('index_dashboard_sort', 'BTREE', 'sort');\r
         $db->dashboard->index('index_dashboard_site', 'BTREE', 'site');\r
         // .\r
-        // Table Signatures\r
-        $db->signatures->signature_id('integer', 0, false);\r
-        $db->signatures->nom('varchar', 256, false);\r
-        $db->signatures->fbcredit('varchar', 64, false);\r
-        $db->signatures->fblink('varchar', 64, false);\r
-        $db->signatures->partnercredit('varchar', 64, false);\r
-        $db->signatures->partnerlink('varchar', 64, false);\r
-        $db->signatures->active('integer', 0, false, '1');\r
-        // Clés\r
-        $db->signatures->primary('pk_signatures', 'signature_id');\r
         // Table jeux d'icones\r
         $db->icones->icone_id('integer', 0, false);\r
         $db->icones->nom('varchar', 256, false);\r
@@ -704,7 +694,7 @@ LEFT JOIN e2_u a ON ri.administrateur_id=a.utilisateur_id');
             . 'WHERE p.client_id=e.utilisateur_id '\r
             . 'GROUP BY e.type, p.annee_fin');\r
 \r
-\r
+        $this->views->createView('signatures', 'SELECT * FROM fluidbook_toolbox.signature');\r
         //cubeDb::mysqlConvert($this->con, 'UTF8', 'utf8_general_ci', 'MYISAM');\r
         touch($cache);\r
     }\r

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 157dbc2339ceeed0cf9e3eacb082193cca40ee13..23c66f4c6c5e386655f04d9ffc43802cbb097dea 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -1186,7 +1186,8 @@ class commonTools
         $options = ['10doigts' => '10 doigts',
             'ascocelda' => 'Asco & Celda',
             'wesco' => 'Wesco',
-            'mopec' => 'Mopec'];
+            'mopec' => 'Mopec',
+            'intex'=>'Intex'];
 
         $options = array_flip($options);
         ksort($options);

diff --git a/inc/ws/DAO/class.ws.dao.signature.php b/inc/ws/DAO/class.ws.dao.signature.php
index 868f91c2b35d039daa94474a1e15b6041886bacb..b9acb6389f6fda5d2f021826bc440bcd6f8e4cce 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.signature.php
+++ b/inc/ws/DAO/class.ws.dao.signature.php
@@ -1,29 +1,26 @@
 <?php\r
-class wsDAOSignature extends commonDAO {\r
-       protected function singleton($r)\r
-       {\r
-               $signature = new wsSignature();\r
-               $signature->signature_id = $r->signature_id;\r
-               $signature->nom = $r->nom;\r
-               $signature->main = $r->fbcredit;\r
-               $signature->mainLink = $r->fblink;\r
-               $signature->partner = $r->partnercredit;\r
-               $signature->partnerLink = $r->partnerlink;\r
-               $signature->active = $r->active;\r
-               return $signature;\r
-       }\r
 \r
-       public function selectById($signature_id)\r
-       {\r
-               $r = $this->con->select('SELECT * FROM signatures WHERE signature_id=\'' . $this->con->escape($signature_id) . '\'');\r
-               return $this->singleton($r);\r
-       }\r
+class wsDAOSignature extends commonDAO\r
+{\r
+    protected function singleton($r)\r
+    {\r
+        $signature = new wsSignature();\r
+        $signature->signature_id = $r->id;\r
+        $signature->nom = $r->name;\r
+        $signature->credits = $r->credits;\r
+        $signature->active = $r->active;\r
+        return $signature;\r
+    }\r
 \r
-       public function selectAll()\r
-       {\r
-               $r = $this->con->select('SELECT * FROM signatures ORDER BY signature_id');\r
-               return $this->factory($r);\r
-       }\r
-}\r
+    public function selectById($signature_id)\r
+    {\r
+        $r = $this->con->select('SELECT * FROM signatures WHERE id=\'' . $this->con->escape($signature_id) . '\'');\r
+        return $this->singleton($r);\r
+    }\r
 \r
-?>
\ No newline at end of file
+    public function selectAll()\r
+    {\r
+        $r = $this->con->select('SELECT * FROM signatures ORDER BY id');\r
+        return $this->factory($r);\r
+    }\r
+}
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.signature.php b/inc/ws/Metier/class.ws.signature.php
index e54195c552a0c3e88eead2cb428bbfb657f17045..26235f62771fa95708bb6f5fff30e8851620fbd9 100644 (file)
--- a/inc/ws/Metier/class.ws.signature.php
+++ b/inc/ws/Metier/class.ws.signature.php
@@ -2,11 +2,6 @@
 class wsSignature extends cubeMetier {\r
        protected $signature_id;\r
        protected $nom;\r
-       protected $main;\r
-       protected $mainLink;\r
-       protected $partner;\r
-       protected $partnerLink;\r
+       protected $credits;\r
        protected $active;\r
-}\r
-\r
-?>
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 2f393ed9582ba400acb105b7e057c7edc91a3cde..3d632e3141516ec0b750add402948ea7428b7f49 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -914,11 +914,7 @@ class wsHTML5Compiler
                 $this->_signature = $daoSignature->selectById($this->book->parametres->signature);
             }
 
-            $credits = '';
-            if ($this->_signature->partner != '') {
-                $credits = '<a href="' . $this->_signature->partnerLink . '" target="_blank">' . $this->_signature->partner . '</a> ';
-            }
-            $credits .= '<a href="' . $this->_signature->mainLink . '" target="_blank">' . $this->_signature->main . '</a>';
+            $credits = $this->_signature->credits;
 
             $hiddenContents = implode("\n", $this->hiddenContents);
 
@@ -1121,7 +1117,7 @@ class wsHTML5Compiler
             $html = file_get_contents($this->assets . '/_seo.html');
             $a = $seoArticle;
             unset($a['image']);
-            $a['imageurl'] = 'https://workshop.fluidbook.com/services/facebook_thumbnail?cid=' . $this->book->cid . '&j=' .TIME;
+            $a['imageurl'] = 'https://workshop.fluidbook.com/services/facebook_thumbnail?cid=' . $this->book->cid . '&j=' . TIME;
             if ($seoArticle['image']) {
                 $a['imageurl'] .= '&image=' . $seoArticle['image'];
             }

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 933f1270e7cdf3fe06af9d333851fb09c2aa422c..791e510e5de12e986032c7e121cd6c1e8061a06a 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1796,7 +1796,7 @@ class wescoLink extends normalLink
 
     public function getURL()
     {
-        return self::_getURL($this->to);
+        return static::_getURL($this->to);
     }
 
     protected static function _getURLOfType($type, $ref)
@@ -2018,7 +2018,6 @@ class customLink extends wescoLink
 
     public static function _getURL($to)
     {
-        global $core;
         $e = explode(':', $to, 2);
         if (!count($e) == 1) {
             return 'https://workshop.fluidbook.com/services/wsref?ref=' . urlencode($to);