diff --git a/editors/ckeditor_4_4/config.js b/editors/ckeditor_4_4/config.js index fe40437af..8d37bd435 100644 --- a/editors/ckeditor_4_4/config.js +++ b/editors/ckeditor_4_4/config.js @@ -6,6 +6,9 @@ //spremenljivka za ID elementa od txtUrl var urlsrc = ''; +// Url strani za embedd uploaderja +var site_url = $('#srv_site_url').val(); + // Jezik za image uploader var lang = 'sl'; @@ -160,7 +163,7 @@ CKEDITOR.on('dialogDefinition', function (ev) { type: 'html', id: 'uploadSlikeEnka', label: 'Naloži sliko', - html: '
' + html: '
' }, 'txtAlt' ); @@ -179,7 +182,7 @@ CKEDITOR.on('dialogDefinition', function (ev) { type: 'html', id: 'uploadDatotekeEnka', label: 'Naloži datoteko', - html: '
' + html: '
' } ); } diff --git a/editors/ckeditor_4_4/uploader/EnkaUploader.php b/editors/ckeditor_4_4/uploader/EnkaUploader.php index 685096081..da7caebd6 100644 --- a/editors/ckeditor_4_4/uploader/EnkaUploader.php +++ b/editors/ckeditor_4_4/uploader/EnkaUploader.php @@ -7,7 +7,7 @@
+ action="editors/ckeditor_4_4/uploader/EnkaUploader.php" style="height: 15px;"> @@ -41,7 +41,7 @@ if (!isset ($_POST['posted']) && (isset ($_GET['image']) && $_GET['image'] == 1) ?> + action="editors/ckeditor_4_4/uploader/EnkaUploader.php" style="height: 15px;"> @@ -64,7 +64,7 @@ if (!isset ($_POST['posted']) && (isset ($_GET['image']) && $_GET['image'] == 1) $final = $nakljucno .$ime; if (move_uploaded_file($_FILES['editorDatoteka']['tmp_name'], $site_path .'uploadi/editor/doc/' .$final)) { ?> - uploadi/editor/doc/'; window.location.href='/editors/ckeditor_4_4/uploader/EnkaUploader.php'; "> + uploadi/editor/doc/'; window.location.href='editors/ckeditor_4_4/uploader/EnkaUploader.php'; "> - + File = $_FILES['eitorSlika']; - $UF_obj->SavePath = $_SERVER['DOCUMENT_ROOT'] . '/uploadi/editor'; + $UF_obj->SavePath = $site_path . '/uploadi/editor'; $UF_obj->NewName = $_FILES['eitorSlika']['name']; //Širina in višina slike nastavimo @@ -113,7 +113,7 @@ if (!isset ($_POST['posted']) && (isset ($_GET['image']) && $_GET['image'] == 1) $Error = $UF_obj->UploadFile(); if (empty($Error)) { ?> - +