wip #922 @4

diff --git a/inc/extranet/Controlleur/class.extranet.page.chiffres.php b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
index 3b5a8d27b1ac6bdd95432a3ad55e3d2656a69dfc..e912b83340f6cc59cea98de147860766f2140698 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.page.chiffres.php
+++ b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
@@ -603,6 +603,7 @@ class extranetPageChiffres {
                $precision = 1 / $pas;\r
                $data = array();\r
                $max = 0;\r
+               $total = 0;\r
                while ($r->fetch()) {\r
                        $n = min(300, cubeMath::round($r->nb_pages, $precision, 'ceil'));\r
                        if (!isset($data[$n])) {\r
@@ -610,14 +611,16 @@ class extranetPageChiffres {
                        }\r
                        $data[$n]++;\r
                        $max = max($max, $n);\r
+                       $total++;\r
                }\r
-               fb($max);\r
+\r
                for ($i = 0; $i <= $max; $i += $pas) {\r
                        if (!isset($data[$i])) {\r
                                $data[$i] = 0;\r
                        }\r
                }\r
 \r
+\r
                ksort($data);\r
 \r
                $res = commonPage::bh();\r
@@ -630,13 +633,16 @@ class extranetPageChiffres {
                $res .= '<th>' . __("Quantité") . '</th>';\r
                $res .= '</tr>';\r
 \r
-\r
                foreach ($data as $pages => $qty) {\r
                        $res .= '<tr><td></td>';\r
                        $res .= '<td>' . $pages . '</td>';\r
                        $res .= '<td>' . $qty . '</td>';\r
                        $res .= '</tr>';\r
                }\r
+               $res .= '<tr><td></td>';\r
+               $res .= '<td><b>' . __('Total') . '</b></td>';\r
+               $res .= '<td><b>' . $total . '</b></td>';\r
+               $res .= '</tr>';\r
 \r
 \r
                $res .= '</table>';\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 4d589e003e582730d7384a36e2935063b8b8a8ab..f0444726bab2f22a20e4e5398a5d6325ef3a9083 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1222,6 +1222,24 @@ class wsDAOBook extends commonDAO {
                $ignoreLinks = array();
                foreach ($links as $id => $link) {
                        $links[$id]['id'] = $id;
+
+                       if (isset($link['image']) && $link['image']) {
+                               $workingFile = $workingDir . '/' . $link['image'];
+                               $assetId = 'link_datas_i_' . md5($link['image']);
+
+                               if (isset($imagesassets[$assetId])) {
+                                       continue;
+                               }
+                               if (file_exists($workingFile)) {
+                                       if ($link['page'] <= 1) {
+                                               $flexLight->addBitmap($workingFile, $assetId);
+                                       } else {
+                                               $flex->addBitmap($workingFile, $assetId);
+                                       }
+                               }
+                               $imagesassets[$assetId] = true;
+                       }
+
                        if ($link['type'] == 15) {
                                if (isset($imagesassets[$id])) {
                                        continue;

diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index b7643243ad0a5d72f803818ccb917342dcac8a48..aba683de2a30441334f0d1667e703b16ad968948 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -91,7 +91,7 @@
   <!-- Executed before build -->\r
   <preBuildCommand />\r
   <!-- Executed after build -->\r
-  <postBuildCommand alwaysRun="False">"$(ToolsDir)\PuTTY\pscp.exe" "$(OutputDir)\$(OutputName)" extranet@extranet.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>\r
+  <postBuildCommand alwaysRun="False">"H:\Applications\PortableApps\PuTTYPortable\App\PuTTY\pscp.exe" -agent -batch "$(OutputDir)\$(OutputName)" extranet@extranet.cubedesigners.com:/home/extranet/www/swf</postBuildCommand>\r
   <!-- Other project options -->\r
   <options>\r
     <option showHiddenPaths="False" />\r