wip #4937 @3

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index cb7d64b9c7c5018c4e935e0dbffa950819469aeb..262b9d2898d7d2696c0fa2512499e3dcca652a6d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -461,7 +461,6 @@ class wsUrl
 
     public static function getSelectVersions($versions)
     {
-        fb($versions);
         $res = array('-----' => '');
         $e = explode(',', $versions);
 
@@ -561,7 +560,9 @@ class wsUrl
         $versions['win_exe_html'] = array('title' => __('Version offline') . ' - ' . __('ZIP Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
         $versions['mac_exe_html'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png'));
         $versions['win_cd_html'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png'));
+        //$versions['chromeos'] = array('title' => __('Version offline') . ' - ' . __('ChromeOS'), 'icon' => cubeMedia::silk('cd.png'));
         $versions['win_html'] = array('title' => __('Version offline') . ' - ' . __('HTML') . ' (' . __('Non adaptée à l\'installation sur un serveur web') . ')', 'icon' => cubeMedia::silk('cd.png'));
+
         if ($droits->admin) {
             $versions['phonegap'] = array('title' => __('Version offline') . ' - ' . __('Application mobile'), 'icon' => cubeMedia::image(IMG . '/phonegap.png'));
             $versions['precompiled'] = array('title' => __('Version precompilée'), 'icon' => cubeMedia::image(IMG . '/phonegap.png'));

diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php
index 85c702090f64e836168bffc40f76fcd69785d272..ece243151406659293e08616057ed6992f5283ef 100644 (file)
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -17,6 +17,8 @@ $__autoload['wsPackagerWinCDHTML'] = dirname(__FILE__) . '/class.ws.packager.win
 $__autoload['wsPackagerMacEXEHTML'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.html.php';\r
 $__autoload['wsPackagerPrecompiled'] = dirname(__FILE__) . '/class.ws.packager.precompiled.php';\r
 \r
+$__autoload['wsPackagerChromeOS'] = dirname(__FILE__) . '/class.ws.packager.chromeos.php';\r
+\r
 \r
 $__autoload['wsPackagerWinHTML'] = dirname(__FILE__) . '/class.ws.packager.win.html.php';\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.chromeos.php b/inc/ws/Util/packager/class.ws.packager.chromeos.php
new file mode 100644 (file)
index 0000000..2c3b16d
--- /dev/null
+++ b/inc/ws/Util/packager/class.ws.packager.chromeos.php
@@ -0,0 +1,46 @@
+<?php\r
+\r
+class wsPackagerChromeOS extends wsPackagerHTML\r
+{\r
+    public function __construct($book_id, $vdir = null, $whole = true)\r
+    {\r
+        parent::__construct($book_id, $vdir, $whole);\r
+        $this->version = 'chromeos';\r
+        $this->cleanOnDestruct = false;\r
+    }\r
+\r
+    protected function preparePackage()\r
+    {\r
+        $res = parent::preparePackage();\r
+        $manifest = ['name' => $this->book->parametres->offlineTitle == '' ? $this->book->parametres->title : $this->book->parametres->offlineTitle,\r
+            'version' => '1.0.' . time(),\r
+            'manifest_version' => 3,\r
+            //'default_locale' => $this->book->lang,\r
+            //'icons' => [],\r
+            'permissions' => [\r
+                'webview',\r
+            ]\r
+        ];\r
+//        $sizes=[128,64,32,16];\r
+//        $pngFile = WS_THEMES . '/' . $this->theme->theme_id . '/' . $this->theme->parametres->favicon;\r
+//        foreach ($sizes as $size) {\r
+//\r
+//        }\r
+\r
+        file_put_contents($this->vdir . '/m/manifest.json', json_encode($manifest));\r
+        return $res;\r
+    }\r
+\r
+//    public function makePackage($zip)\r
+//    {\r
+//        $this->preparePackage();\r
+//\r
+//        $chrome = new CubeIT_CommandLine('crx3');\r
+//        $chrome->setArg('o', WS_PACKAGER . '/download/' . $this->getBaseFile() . '.crx');\r
+//        $chrome->setArg(null, $this->vdir.'/m/');\r
+//        $chrome->execute();\r
+//        $chrome->debug();\r
+//\r
+//        return $this->getURLBase('crx');\r
+//    }\r
+}
\ No newline at end of file

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
index 7ce274c8de3adece80217eb28223591b1f5223a8..1b868d2c90ad326790c8a29b84ce8efa4d8ed2e0 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
@@ -3,7 +3,7 @@
 class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML\r
 {\r
     protected $nwplatform = 'osx64';\r
-    //protected $nwversion = '0.49.2';\r
+    protected $nwversion = '0.49.2';\r
     protected $node_platform = 'mac';\r
     protected $exenameMaxlength = 28;\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 140e4f7e6a49c5fc125508029745aa9a1206986a..fba50a74bd654f1ec2858e6ff00c3c0d8a104448 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -46,6 +46,8 @@ class wsPackager
             $packager = new wsPackagerWinCDHTML($book_id);
         } else if ($version === 'precompiled') {
             $packager = new wsPackagerPrecompiled($book_id);
+        } else if ($version === 'chromeos') {
+            $packager = new wsPackagerChromeOS($book_id);
         }
         $packager->cleanOnDestruct = $packager->cleanOnDestruct && $cleanOnDestruct;