#1113

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 016e79577e2bf0ad0f101a58997ccdc36ae8e49a..a943a7d459de860290452805f67e0228df6d3eff 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -587,7 +587,7 @@ class commonTools {
                        $conv->setDest($round);
                        $conv->setRadius($_POST['round']);
                        $conv->execute();
-                       $conv->debug();
+                       //$conv->debug();
                }
 
                $png2icns = new cubeCommandLine('png2icns');

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index e28618f6aa817b8b851078da6b83d01ee042ff92..7f75731dd81f7525198994349c01c8b63c6e501b 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -441,7 +441,7 @@ class wsExporter {
                $cl = new CubeIT_CommandLine_Rsync($src, $dest, $erase);
                $cl->setProg('/usr/bin/rsync');
                $cl->execute();
-               $cl->debug();
+               //$cl->debug();
                if (!is_null($chown)) {
                        `chown -R $chown $dest`;
                }

diff --git a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
index 3cabf6fe4e64e73e7b236fba03fed7d051376e8f..fc83274e04cefd210ae45a4e5f1ceed841c0e250 100644 (file)
--- a/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
+++ b/inc/ws/Util/html5/app/class.ws.html5.app.compiler.php
@@ -40,6 +40,7 @@ class wsHTML5AppCompiler {
 
        public function createVersion() {
                $os = array('ios', 'android');
+               set_time_limit(0);
                $time = time();
 
                $dir = WS_COLLECTIONS . '/versions/' . $this->collectionId . '/' . $time . '/';

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 5a0473bd4ae403ba6c16d0a80877b8f10c1ff5ff..eb3d7e1399835f4b87f8f6394e033791ca91e237 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -97,6 +97,7 @@ class wsHTML5Compiler {
                'js/libs/jquery/jquery.transit.js',
                'js/widget.js'
        );
+       public $specialCSS = array();
        public $phonegapStandardPlugins = array('ios' => array('ExternalFileUtil'),
                                                'android' => array('webintent'));
        public $pluginCSS = array();
@@ -474,7 +475,7 @@ class wsHTML5Compiler {
                for ($i = 0; $i < $numCSS; $i++) {
                        $sheets[] = 'data/style/style_' . $i . '.css';
                }
-               $sheets = array_merge($sheets, $this->pluginCSS);
+               $sheets = array_merge($sheets, $this->pluginCSS, $this->specialCSS);
 
                $style = array();
                foreach ($sheets as $sheet) {
@@ -706,7 +707,9 @@ class wsHTML5Compiler {
                global $core;
 
                if ($this->book->parametres->customLinkClass == 'WescoSalesLink') {
+                       $this->specialJsFiles[] = 'js/libs/interact.js';
                        $this->specialJsFiles[] = 'js/libs/fluidbook/special/wescosales.js';
+                       $this->specialCSS[] = 'style/special/wescosales.css';
                }
 
                $this->config->links = array();
@@ -861,7 +864,7 @@ class wsHTML5Compiler {
                                $uglify->setArg('no-copyright');
                                $uglify->setArg(null, $tmp);
                                $uglify->execute();
-                               $uglify->debug();
+                               //$uglify->debug();
                        }
 
                        $js = file_get_contents($minimized);
@@ -1005,7 +1008,7 @@ class wsHTML5Compiler {
                $this->config->iconsDimensions = array();
                $makepng = !$this->supportSVG();
                foreach ($icons as $icon => $color) {
-                       wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', 4, $w, $h, $makepng);
+                       wsTools::colorizeAndRasterizeIcon($this->theme->parametres->iconSet, $icon, $color, $this->vdir . '/data/images/', $w, $h);
                        $this->config->iconsDimensions[$icon] = array($w, $h);
                }
                return $res;

diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php
index 81f752b047ad87ff3b5925b28b101c6eb8164d72..f56e9589eb6b1c289231182c76bdcd9a6669530a 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.phonegap.php
+++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php
@@ -101,9 +101,9 @@ class wsPackagerPhonegap extends wsPackager {
                                $url = $baseUrl . $view['url'];
                                $out = $dir . '/' . $k . '.jpeg';
 
-                               $cl = new cubeCommandLine('xvfb-run');
+                               $cl = new CubeIT_CommandLine('xvfb-run');
                                $cl->setArg('server-args', '-screen 0, ' . $screenWidth . 'x' . $screenHeight . 'x24');
-                               $cl->setArg(null, 'CutyCapt');
+                               $cl->setArg(null, '/usr/bin/cutycapt');
                                $cl->setArg('min-width', $screenWidth);
                                $cl->setArg('min-height', $screenHeight);
                                $cl->setArg('zoom-factor', $z);

diff --git a/index.php b/index.php
index 423adcd4844dd60f2d3c13a500d0e826cfd98c30..a5a9578f60de92c3cf8e974c88859d28a6b80db0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,7 +2,6 @@
 
 require_once 'inc/ZendFramework/ChromeLogger/ChromePhp.php';
 ChromePhp::getInstance()->setEnabled();
-ChromePhp::log('!!');
 
 require_once(dirname(__FILE__) . '/inc/prepend.php');