diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index 58f0aef75..870c3d2cc 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -337,7 +337,6 @@ class WebApplication $this->rest->addAPIClass($namespace); } } - // adding aliases for Restler if (array_key_exists('alias', $config)) { foreach ($config['alias'] as $alias => $aliasData) { diff --git a/gulliver/bin/tasks/pakeGulliver.php b/gulliver/bin/tasks/pakeGulliver.php index 4160cc929..747897e4b 100755 --- a/gulliver/bin/tasks/pakeGulliver.php +++ b/gulliver/bin/tasks/pakeGulliver.php @@ -920,6 +920,8 @@ function run_create_poedit_file($task, $args) { G::LoadSystem('xmlform'); G::LoadSystem('xmlformExtension'); G::LoadSystem('form'); + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); $langIdOut = $langId; //the output language, later we'll include the country too. $exceptionFields = array ( @@ -993,18 +995,25 @@ function run_create_poedit_file($task, $args) { } else { + $xmlfile = $filter->xssFilterHard($xmlfile); + $exceptionFields = $filter->xssFilterHard($exceptionFields); if( is_object($node) && ! in_array($node->type, $exceptionFields) ) { if( isset($node->value) && strpos($node->value, 'G::LoadTranslation') !== false ) { $exceptIndex ++; //print ($node->value); } else { + $node->name = $filter->xssFilterHard($node->name); + $node->type = $filter->xssFilterHard($node->type); printf("Error: xmlform %s has no english definition for %s [%s]\n", pakeColor::colorize($xmlfile, 'ERROR'), pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($node->type, 'INFO')); $xmlError ++; } } else { $exceptIndex ++; - if( $verboseFlag ) + if( $verboseFlag ){ + $node->name = $filter->xssFilterHard($node->name); + $node->type = $filter->xssFilterHard($node->type); printf("%s %s in %s\n", $node->type, pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($xmlfile, 'INFO')); + } } } } diff --git a/gulliver/js/codemirror/addon/hint/php-hint.js b/gulliver/js/codemirror/addon/hint/php-hint.js index 2b2f7338f..320dfe2a8 100644 --- a/gulliver/js/codemirror/addon/hint/php-hint.js +++ b/gulliver/js/codemirror/addon/hint/php-hint.js @@ -264,4 +264,4 @@ } return found; } -})(); \ No newline at end of file +})(); diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css index a50d4fc57..5ced51ca7 100644 --- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css @@ -4,7 +4,7 @@ .clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block} /* General */ -.clearlooks2 {position:absolute; direction:ltr} +.clearlooks2 {position:fixed !important; direction:ltr; top:20px !important;height:552px !important;} .clearlooks2 .mceWrapper {position:static} .mceEventBlocker {position:fixed; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%} .clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50)} diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php index 88e883b82..4ea183dc0 100644 --- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php +++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php @@ -1,12 +1,49 @@ + Upload an Output Document + xssFilterHard($_GET["q"]); + $Action = $_GET["q"]; + } else { + $Action = "none"; + } + //$Action = isset($_GET["q"]) ? $_GET["q"] : "none"; if($Action =="none"){ displayUploadForm(); }else if($Action=="upload"){ @@ -21,22 +58,41 @@ // displays the upload form function displayUploadForm() { - echo '
' - .'File Name:
' - .'
' - .'' - .' ' - .'
'; + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + if(isset($_SERVER["QUERY_STRING"])) { + $_SERVER["QUERY_STRING"] = $filter->xssFilterHard($_SERVER["QUERY_STRING"],'url'); + } + + $html = " +
+
+ File:  +  (*.html, *.htm) +

+ +
+
+ +
+ Uploading... \"\" +
+ "; + + echo $html; } // uploads the file to the destination path, and returns a link with link path substituted for destination path function uploadContentFile() { + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + $_FILES["upload_file"] = $filter->xssFilterHard($_FILES["upload_file"]); + $StatusMessage = ""; $ActualFileName = ""; - $FileObject = $_FILES["upload_file"]; // find data on the file $DestPath = sys_get_temp_dir(); $aux=''; - $chain = preg_replace("/\r\n+|\r+|\n+|\t+/i", ' ', file_get_contents(htmlentities($FileObject['tmp_name']))); + $chain = preg_replace("/\r\n+|\r+|\n+|\t+/i", " ", file_get_contents($_FILES["upload_file"]["tmp_name"])); $chain=preg_replace('#(.*?)#is', ' ', $chain); $chain=strip_tags($chain, '