]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce29ed1)
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 26 May 2011 14:41:09 +0000 (14:41 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 26 May 2011 14:41:09 +0000 (14:41 +0000)
fluidbook/tools/fwstk.jar patch | blob | history
inc/ws/Controlleur/class.ws.url.php patch | blob | history
inc/ws/DAO/class.ws.dao.lang.php patch | blob | history

diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar
index d8d10f35bf7102d20c8f553c2663b29d106fd91d..52b0113efebb00ca2b1a30cbfde3ae0ce4b4640a 100644 (file)
Binary files a/fluidbook/tools/fwstk.jar and b/fluidbook/tools/fwstk.jar differ
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 083c5e6d298c626302e86a6214a58f8064ced73d..2293b7f583d91e6faf28bc1fb19368e2b95ed7ca 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -322,8 +322,6 @@ class wsUrl {
                        http::redirect(SITE_PATH . 'editor/' . $book->book_id);\r
                }\r
 \r
-               cubePage::swfaddress();\r
-\r
                $res = '<html><head><style type="text/css">';\r
                $res .= '#composerSwf{width:100%;height:100%;margin:0 auto;}\r
 body{margin:0;padding:0;height:100%;overflow:hidden;background:#d2d3c7;}\r
@@ -510,8 +508,7 @@ html{height:100%}' . "\n";
                        'book_id' => $args[0]);\r
 \r
                $mtime = filemtime(ROOT . '/swf/composer.swf');\r
-               $res = cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, true);\r
-               return $res;\r
+               return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false);\r
        }\r
 \r
        public static function stats($args) {\r
diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index c1406c594a0274e2d2a5d0708231b0e7846246b1..f63ca2302c94bc7d27e720f7f49e2a72d0466f8a 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -30,7 +30,7 @@ class wsDAOLang extends commonDAO {
 \r
        public function selectAll()\r
        {\r
-               $r = $this->con->select('SELECT * FROM langues WHERE CHAR_LENGTH(lang_id)=2');\r
+               $r = $this->con->select('SELECT * FROM langues');\r
                return $this->factory($r);\r
        }\r
 \r
Unnamed repository; edit this file 'description' to name the repository.