clean url for svg and paint

skala
Juan Carlos Raña 14 years ago
parent d098b42440
commit c0a3ed20f9
  1. 6
      main/document/create_draw.php
  2. 7
      main/document/create_paint.php
  3. 9
      main/document/edit_draw.php
  4. 4
      main/document/edit_paint.php

@ -150,6 +150,8 @@ if (api_browser_support('svg')){
$langsvgedit = api_get_language_isocode();
$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
$svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit ;
?>
<script type="text/javascript">
if (window.innerHeight){
@ -158,11 +160,11 @@ if (api_browser_support('svg')){
height_iframe = 550;
}
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit; ?>" width="100%" height="' + height_iframe + '"></iframe>');
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="' + height_iframe + '"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
</script>
<?php
echo '<noscript>';
echo '<iframe style=\'height: 550px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?lang='.$langsvgedit.'\'></iframe>';
echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0" src="'.$svg_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
echo '</noscript>';
} else {
Display::display_error_message(get_lang('BrowserDontSupportsSVG'));

@ -162,6 +162,9 @@ else {
$credentials="false";
}
$pixlr_url = 'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials;
?>
<script type="text/javascript">
@ -172,11 +175,11 @@ if (window.innerHeight){
height_iframe = 600;
}
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo 'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials; ?>" width="100%" height="' + height_iframe + '"></iframe>');
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $pixlr_url; ?>" width="100%" height="' + height_iframe + '"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
</script>
<?php
echo '<noscript>';
echo '<iframe style=\'height: 600px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\'http://pixlr.com/editor/?title='.$title.'&amp;image='.$image.'&amp;loc='.$loc.'&amp;referrer='.$referrer.'&amp;target='.$target.'&amp;exit='.$exit_path.'&amp;locktarget='.$locktarget.'&amp;locktitle='.$locktitle.'&amp;credentials='.$credentials.'\'></iframe>';
echo '<iframe style="height: 600px; width: 100%;" scrolling="no" frameborder="0" src="'.$pixlr_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
echo '</noscript>';

@ -134,7 +134,10 @@ if (api_browser_support('svg')) {
$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
$langsvgedit = api_get_language_isocode();
$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'svg-edit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
$svg_url= api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&amp;lang='.$langsvgedit;
?>
<script type="text/javascript">
if (window.innerHeight){
@ -143,11 +146,11 @@ if (api_browser_support('svg')) {
height_iframe = 550;
}
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&amp;lang='.$langsvgedit; ?>" width="100%" height="' + height_iframe + '"></iframe>');
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="' + height_iframe + '"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
</script>
<?php
echo '<noscript>';
echo '<iframe style=\'height: 550px; width: 100%;\' scrolling=\'no\' frameborder=\'0\' src=\''.api_get_path(WEB_LIBRARY_PATH).'svg-edit/svg-editor.php?url=../../../../courses/'.$courseDir.$dir.$file.'&amp;lang='.$langsvgedit.'\'></iframe>';
echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
echo '</noscript>';
} else {
Display::display_error_message(get_lang('BrowserDontSupportsSVG'));

@ -225,13 +225,13 @@ if (window.innerHeight){
height_iframe = 600;
}
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $pixlr_url; ?>" width="100%" height="' + height_iframe + '"></iframe>');
document.write ('<iframe frameborder="0" scrolling="no" src="<?php echo $pixlr_url; ?>" width="100%" height="' + height_iframe + '"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
</script>
<?php
echo '<noscript>';
echo '<iframe style="height: 600px; width: 100%;" scrolling="no" frameborder="0" src="'.$pixlr_url.'"></iframe>';
echo '<iframe style="height: 600px; width: 100%;" scrolling="no" frameborder="0" src="'.$pixlr_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
echo '</noscript>';
Display::display_footer();

Loading…
Cancel
Save