(no commit message)

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index b34dc5db2424d6065e477cfd8340f763b5330cd9..2d31961f3d7c072872ef66ebe3c886e7e4005c9e 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -243,6 +243,39 @@ class commonTools {
                cubeHTTP::downloadFile($tmpfile, 'favicon.zip');
        }
 
+       public static function uglify() {
+               $js = '';
+               if (isset($_POST['js'])) {
+                       $js = $_POST['js'];
+               } else if (isset($_GET['js'])) {
+                       $js = $_GET['js'];
+               }
+
+               if ($js == '') {
+                       ob_end_clean();
+                       exit;
+               }
+               $tmp = cubeFiles::tempnam();
+               $res = cubeFiles::tempnam();
+               file_put_contents($tmp, $js);
+               $uglify = new cubeCommandLine('uglifyjs');
+               $uglify->setPath(CONVERTER_PATH);
+               $uglify->setArg('o', $res);
+               $uglify->setArg('mangle-toplevel');
+               $uglify->setArg('no-copyright');
+               $uglify->setArg(null, $tmp);
+               $uglify->execute();
+               ob_end_clean();
+
+               header('Content-type: text/javascript');
+               if (file_exists($res)) {
+                       echo file_get_contents($res);
+                       unlink($res);
+               }
+               unlink($tmp);
+               exit;
+       }
+
 }
 
 ?>

diff --git a/inc/config.inc.php b/inc/config.inc.php
index f953cc4533dbb85338d4a6312c850371be57083c..72f2f212bc3404f6afafaa44150d693e59edb352 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -10,7 +10,7 @@ define('SITE_PATH', WEBROOT . '/');
 define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
 define('FTPROOT', '/home/extranet/ftp/');\r
 define('WINDOWS', false);\r
-define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF:/usr/local/scour');\r
+define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF:/usr/local/scour:/home/extranet/node_modules/uglify-js/bin');\r
 define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');\r
 define('MXMLC_PATH_3', '/usr/local/flex_sdk_3.6/bin/mxmlc');\r
 define('AS3_SOURCES', '/home/ws/sources/as3');\r