may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-03 14:10:15 +02:00
commit 162dee365c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/modules/Evalvacija/class.GC.php
View File

@ -186,15 +186,16 @@ class GC{
'4_1' => 'predmeti' '4_1' => 'predmeti'
); );
$reports_id = '02032022'; $reports_id = '02082022';
$report_type = '1_1'; $report_type = '1_1';
$fak_id = '3000001'; $fak_id = '3000001';
$zip_name = ''; $zip_name = '';
// Nastavimo pot do pdf-jev // Nastavimo pot do pdf-jev
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'; //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'; //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/'; //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/povzetki/';
echo '<span class="bold">Parametri:</span>'; echo '<span class="bold">Parametri:</span>';
echo '<ul><li>ID: <span class="bold">'.$reports_id.'</span></li>'; echo '<ul><li>ID: <span class="bold">'.$reports_id.'</span></li>';

4
editors/ckeditor_4_4/uploader/EnkaUploader.php
View File

@ -116,8 +116,8 @@ if (!isset ($_POST['posted']) && (isset ($_GET['image']) && $_GET['image'] == 1)
$UF_obj->NewName = $_FILES['eitorSlika']['name']; $UF_obj->NewName = $_FILES['eitorSlika']['name'];
//Širina in višina slike nastavimo //Širina in višina slike nastavimo
$UF_obj->NewWidth = 600; $UF_obj->NewWidth = 1920;
$UF_obj->NewHeight = 600; $UF_obj->NewHeight = 1920;
$ime = $UF_obj->NameCase = 'lower'; $ime = $UF_obj->NameCase = 'lower';
$UF_obj->OverWrite = false; $UF_obj->OverWrite = false;