diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php index f6a5bae6d..93ae04e63 100644 --- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php +++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php @@ -863,13 +863,12 @@ class LatexSurveyElement{ $textPotem = substr($text, $posImg); //tekst po img, z vkljuceno hmlt kodo z img $posImgEnd = strpos($textPotem, '/>'); //pozicija, kjer se konca html koda za img $textPotem = substr($textPotem, $posImgEnd+strlen('/>')); //tekst od konca html kode za img dalje - - //$text = $textPrej.' '.PIC_SIZE_ANS."{".$this->path2UploadedImages."".$this->getImageName($text, 0, 'path2UploadedImages."".$this->getImageName($text, 0, 'path2UploadedImages."".$this->getImageName($text, 0, 'path2UploadedImages."".$this->getImageName($text, 0, '"); + //echo "velikost: ".filesize($imageNameTest)."
"; if(filesize($imageNameTest) > 0){ $text = $textPrej.' '.PIC_SIZE_ANS."{".$imageName."}".' '.$textPotem; }else{ @@ -1128,7 +1127,7 @@ class LatexSurveyElement{ #funkcija, ki skrbi za pridobitev imena slike, ki jo je potrebno izrisati ###################################### function getImageName($text='', $sprId=null, $findme='', $vre_id=0){ - global $site_path; + global $site_path, $site_url; $imageName = ''; if($text == 'hotspot' && $findme == 'hotspot_image='){ @@ -1144,9 +1143,11 @@ class LatexSurveyElement{ $imageName = substr($text,$pos); //pokazi le del text od besedila $findme dalje (vkljucno z besedilom) //echo "imageName prej: ".$imageName."
"; - $findme = $site_path.'uploadi/editor/'; + //$findme = $site_path.'uploadi/editor/'; + //$findme = $site_url.'uploadi/editor/'; //$findme = 'uploadi/editor/'; - + $findme = 'editor/'; + //echo "findme: ".$findme."
"; $pos = strpos($imageName, $findme); //najdi pozicijo teksta v $findme //echo "najdi tole: ".$findme."
"; //echo "najdi tukaj: ".$imageName."
"; @@ -1159,6 +1160,7 @@ class LatexSurveyElement{ //echo "ali je slika na strežniku: ".$slikaNaStrezniku."
"; if($slikaNaStrezniku==1){ //ce je slika na strezniku $imageName = substr($imageName,$pos+7); //pokazi le del params od besedila 'editor/' dalje, brez besedila 'editor/' + //echo "imagename : ".$imageName."
"; $pos = $this->getEndPosition($imageName); //najdi pozicijo konca URL slike $imageExtension = substr($imageName, $pos-3, 3); //pridobi koncnico slike (za gif je potrebno sliko pretvoriti v png, saj latex ne podpira gif) /* echo "exr1: ".$imageExtension."
";