(no commit message)

diff --git a/.htaccess b/.htaccess
index a950c2c9657e21519197bd990f075cc397da6b39..cce222941d352509dd6d40bbe016ef632eb96c70 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -28,7 +28,7 @@ AddCharset UTF-8 log
        RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
        RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L]\r
        RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L]\r
-       RewriteRule ^([-_a-zA-Z0-9/]+)$ index.php/$1 [L]\r
+       RewriteRule ^([-,_a-zA-Z0-9/]+)$ index.php/$1 [L]\r
 \r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L]\r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/index.swf [L]\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index b6d4eca48da23c1c998ce0515909f2bb7391069f..cf0bcea6d8df077d6ad29fa286fdbc48ea016e95 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -355,6 +355,7 @@ class commonCore extends cubeCore {
                $db->document_links_versions->index('idx_document_links_version_update', 'BTREE', 'update');\r
                // Table Books\r
                $db->books->book_id('integer', 0, false);\r
+               $db->books->cid('varchar', 6, false);\r
                $db->books->nom('varchar', 256, false);\r
                $db->books->lang('varchar', 20, false);\r
                $db->books->theme('integer', 0, false);\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 844cc6b51809bce40eae27c991f2ea0d156e1e0e..6207dd2ddd5933ef879f2fc8627657471a69339e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -325,6 +325,12 @@ class wsServices extends cubeFlashGateway {
                return array('url' => $destURL, 'file' => $destFile);\r
        }\r
 \r
+       public function e() {\r
+               $this->args['id'] = $this->callArgs[0];\r
+               $this->args['range'] = $this->callArgs[1];\r
+               return $this->exportpdf();\r
+       }\r
+\r
        public function exportpdf($print = false) {\r
                global $core;\r
                $dest = $this->getPDFComplex($this->args['id'], $this->args['range']);\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 808365a5718fed5f8f28ebe17e7b718c7f17d4e3..e413ae3b3e5f5c9344d339551276f07523d97bee 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -11,13 +11,13 @@ class wsHTML5Compiler {
                }
 
                if ($version == 'stable') {
-                       return new wsHTML5Compiler($book_id, $version, $phonegap, $dir, $standalone);
+                       return new wsHTML5Compiler($book_id, 'stable', $phonegap, $dir, $standalone);
                } else {
-                       return new wsHTML5CompilerDev($book_id, $version, $phonegap, $dir, $standalone);
+                       return new wsHTML5CompilerDev($book_id, 'dev', $phonegap, $dir, $standalone);
                }
        }
 
-       protected static $resolutions = array(150);
+       protected static $resolutions = array(150,36);
        protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');
        public $jsFiles = array(
                'js/libs/fix/ios-orientation.js',
@@ -60,6 +60,7 @@ class wsHTML5Compiler {
        public $testJsFiles = array(
                'js/libs/cube/fb.js',
                'js/libs/modernizr/modernizr.js',
+               'js/libs/modernizr/tests.js',
                'js/libs/jquery/jquery.js',
                'js/libs/jquery/jquery.transform.js',
                'js/libs/jquery/jquery.mousewheel.js',
@@ -69,6 +70,7 @@ class wsHTML5Compiler {
        public $widgetJsFiles = array(
                'js/libs/cube/fb.js',
                'js/libs/modernizr/modernizr.js',
+               'js/libs/modernizr/tests.js',
                'js/libs/jquery/jquery.js',
                'js/libs/jquery/jquery.transit.js',
                'js/widget.js'
@@ -670,6 +672,7 @@ class wsHTML5Compiler {
                $config = $this->writeConfig();
                $finals = array('fluidbook' => $this->jsFiles, 'widget' => $this->widgetJsFiles);
 
+
                foreach ($finals as $jsfinal => $files) {
                        $mintime = 0;
                        $minimized = $this->assets . '/js/' . $jsfinal . '-min.js';
@@ -684,6 +687,12 @@ class wsHTML5Compiler {
                                }
                        }
 
+                       if (!$reminimize) {
+                               if (filemtime(__FILE__) > $mintime) {
+                                       $reminimize = true;
+                               }
+                       }
+
                        if ($reminimize) {
                                $js = '';
                                foreach ($files as $file) {
@@ -696,9 +705,7 @@ class wsHTML5Compiler {
                                $uglify = new cubeCommandLine('uglifyjs');
                                $uglify->setPath(CONVERTER_PATH);
                                $uglify->setArg('o', $minimized);
-                               $uglify->setArg('mangle-toplevel');
                                $uglify->setArg('no-copyright');
-                               $uglify->setArg('unsafe');
                                $uglify->setArg(null, $tmp);
                                $uglify->execute();
                        }

diff --git a/inc/ws/prepend.php b/inc/ws/prepend.php
index c34e389b4963baff458130c1ce7f456fbaf52e91..19d8a0c0dc8d797b733c15a81fc5f319d93cc791 100644 (file)
--- a/inc/ws/prepend.php
+++ b/inc/ws/prepend.php
@@ -2,6 +2,7 @@
 
 $core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in'));
 $core->url->register('services', 'services', '^services(.*)$', array('wsServices', 'in'));
+$core->url->register('s', 's', '^s/(.*)$', array('wsServices', 'in'));
 $core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('wsMaintenance', 'in'));
 $core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));
 $core->url->register('restoreLinks', 'restoreLinks', '^restoreLinks/(.*)$', array('wsUrl', 'restoreLinks'));