diff --git a/admin/exportclases/class.pptIzvozAnalizaCharts.php b/admin/exportclases/class.pptIzvozAnalizaCharts.php index 80b3884f9..33d03c1c6 100644 --- a/admin/exportclases/class.pptIzvozAnalizaCharts.php +++ b/admin/exportclases/class.pptIzvozAnalizaCharts.php @@ -8,15 +8,15 @@ include_once('../exportclases/class.pdfIzvozAnalizaFrekvenca.php'); require_once('../exportclases/class.enka.pdf.php'); + use PhpOffice\PhpPresentation\PhpPresentation; + use PhpOffice\PhpPresentation\IOFactory; + use PhpOffice\PhpPresentation\Style\Color; + use PhpOffice\PhpPresentation\Style\Alignment; + + /** Include path **/ set_include_path('../exportclases/'); - /** PHPPowerPoint */ - include '../exportclases/PHPPowerPoint.php'; - - /** PHPPowerPoint_IOFactory */ - include '../exportclases/PHPPowerPoint/IOFactory.php'; - define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge @@ -56,54 +56,54 @@ class PptIzvozAnalizaCharts { */ function __construct ($anketa = null, $sprID = null, $loop = null) { - global $site_path; - global $global_user_id; - - // preverimo ali imamo stevilko ankete - if ( is_numeric($anketa) ){ + global $site_path; + global $global_user_id; - $this->anketa = $anketa; - $this->spremenljivka = $sprID; - - SurveyAnalysis::Init($this->anketa); - SurveyAnalysis::$setUpJSAnaliza = false; - - SurveyChart::Init($this->anketa); - - // create new PPT document - $this->ppt = new PHPPowerPoint(); - - // Poskrbimo za datoteko s podatki - $SDF = SurveyDataFile::get_instance(); - $SDF->init($this->anketa); - $SDF->prepareFiles(); + // preverimo ali imamo stevilko ankete + if ( is_numeric($anketa) ){ - $this->headFileName = $SDF->getHeaderFileName(); - $this->dataFileName = $SDF->getDataFileName(); - $this->dataFileStatus = $SDF->getStatus(); - - SurveyZankaProfiles :: Init($this->anketa, $global_user_id); - $this->current_loop = ($loop != null) ? $loop : $this->current_loop; - - // preberemo nastavitve iz baze (prej v sessionu) - SurveyUserSession::Init($this->anketa); - $this->sessionData = SurveyUserSession::getData('charts'); - } - else{ - return false; - } + $this->anketa = $anketa; + $this->spremenljivka = $sprID; - if ( SurveyInfo::getInstance()->SurveyInit($this->anketa) ){ - SurveyUserSetting::getInstance()->Init($this->anketa, $global_user_id); - - $this->skin = SurveyUserSetting :: getInstance()->getSettings('default_chart_profile_skin'); - $this->numbering = SurveyDataSettingProfiles :: getSetting('chartNumbering'); - $this->frontpage = SurveyDataSettingProfiles :: getSetting('chartFP'); - } - else - return false; + SurveyAnalysis::Init($this->anketa); + SurveyAnalysis::$setUpJSAnaliza = false; - return true; + SurveyChart::Init($this->anketa); + + // create new PPT document + $this->ppt = new PhpPresentation(); + + // Poskrbimo za datoteko s podatki + $SDF = SurveyDataFile::get_instance(); + $SDF->init($this->anketa); + $SDF->prepareFiles(); + + $this->headFileName = $SDF->getHeaderFileName(); + $this->dataFileName = $SDF->getDataFileName(); + $this->dataFileStatus = $SDF->getStatus(); + + SurveyZankaProfiles :: Init($this->anketa, $global_user_id); + $this->current_loop = ($loop != null) ? $loop : $this->current_loop; + + // preberemo nastavitve iz baze (prej v sessionu) + SurveyUserSession::Init($this->anketa); + $this->sessionData = SurveyUserSession::getData('charts'); + } + else { + return false; + } + + if ( SurveyInfo::getInstance()->SurveyInit($this->anketa) ) { + SurveyUserSetting::getInstance()->Init($this->anketa, $global_user_id); + + $this->skin = SurveyUserSetting :: getInstance()->getSettings('default_chart_profile_skin'); + $this->numbering = SurveyDataSettingProfiles :: getSetting('chartNumbering'); + $this->frontpage = SurveyDataSettingProfiles :: getSetting('chartFP'); + } + else + return false; + + return true; } function getFile($fileName) @@ -133,7 +133,7 @@ class PptIzvozAnalizaCharts { function encodeText($text) { // popravimo sumnike ce je potrebno $text = html_entity_decode($text, ENT_NOQUOTES, 'UTF-8'); - $text = str_replace(array("š","š","č"),array("�","�","�"),$text); + $text = str_replace(array("š","š","č"),array("š","ž","č"),$text); return strip_tags($text); } @@ -151,7 +151,6 @@ class PptIzvozAnalizaCharts { $this->ppt->removeSlideByIndex(0); - // izpisemo prvo stran if($this->frontpage == 1){ $this->createFrontPage(); diff --git a/admin/exportclases/class.pptIzvozHeatmapImage.php b/admin/exportclases/class.pptIzvozHeatmapImage.php index c9450a1c9..39a8e0d4b 100644 --- a/admin/exportclases/class.pptIzvozHeatmapImage.php +++ b/admin/exportclases/class.pptIzvozHeatmapImage.php @@ -9,12 +9,11 @@ /** Include path **/ set_include_path('../exportclases/'); - /** PHPPowerPoint */ - include '../exportclases/PHPPowerPoint.php'; - - /** PHPPowerPoint_IOFactory */ - include '../exportclases/PHPPowerPoint/IOFactory.php'; - + use PhpOffice\PhpPresentation\PhpPresentation; + use PhpOffice\PhpPresentation\IOFactory; + use PhpOffice\PhpPresentation\Style\Color; + use PhpOffice\PhpPresentation\Style\Alignment; + define("ALLOW_HIDE_ZERRO_REGULAR", false); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za navadne odgovore define("ALLOW_HIDE_ZERRO_MISSING", true); // omogočimo delovanje prikazovanja/skrivanja ničelnih vnosti za missinge diff --git a/composer.json b/composer.json index 9a4529108..421b0a0ee 100644 --- a/composer.json +++ b/composer.json @@ -8,10 +8,9 @@ "role": "Developer" }, { - "name": "Robert Šmalc", - "email": "robert@1ka.si", + "name": "May Doušak", "role": "Developer" - } + }, ], "require": { "php": "^5.5|^7.0", @@ -20,7 +19,8 @@ "minishlink/web-push": "^5.2", "stripe/stripe-php": "^7.40", "geoip2/geoip2": "~2.0", - "paypal/paypal-checkout-sdk": "^1.0" + "paypal/paypal-checkout-sdk": "^1.0", + "phpoffice/phppresentation": "dev-master", }, "require-dev": { "kint-php/kint": "^1.1", diff --git a/frontend/drupal.php b/frontend/drupal.php index 43c5d26c2..8f280dc15 100644 --- a/frontend/drupal.php +++ b/frontend/drupal.php @@ -83,7 +83,7 @@ if(empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUE curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); //curl_setopt($ch, CURLOPT_HEADER ,1); //curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,1); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE); //curl_setopt($ch, CURLINFO_HEADER_OUT, true); //Vrne header, kar ni ok, ker drual direktno sprejmo echo diff --git a/frontend/drupal7.sql.zip b/frontend/drupal7.sql.zip deleted file mode 100644 index 33686d507..000000000 Binary files a/frontend/drupal7.sql.zip and /dev/null differ diff --git a/frontend/drupal9.sql.zip b/frontend/drupal9.sql.zip deleted file mode 100644 index 92aad5bb1..000000000 Binary files a/frontend/drupal9.sql.zip and /dev/null differ diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php index 3c15d6d5e..50a8cc8be 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php @@ -131,7 +131,7 @@ class NarociloController extends ControllerBase curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); //curl_setopt($ch, CURLOPT_HEADER ,1); //curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,1); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE); //curl_setopt($ch, CURLINFO_HEADER_OUT, true); //Vrne header, kar ni ok, ker drual direktno sprejmo echo // Izvedemo klic diff --git a/frontend/payments/api_test.php b/frontend/payments/api_test.php index 1cf828237..4310e502c 100644 --- a/frontend/payments/api_test.php +++ b/frontend/payments/api_test.php @@ -54,7 +54,7 @@ function executeGET(){ // GET params $params = 'action='.$action; // Funkcija, ki jo želimo izvesti - $params .= '&email=peter.hrvatin@gmail.com&package_id=2&trajanje=12'; +// $params .= '&email=peter.hrvatin@gmail.com&package_id=2&trajanje=12'; // Pripravimo podatke za hashiranje $request_method = 'GET'; @@ -156,7 +156,7 @@ function executePOST(){ curl_setopt($ch, CURLOPT_HEADER ,1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,1); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE); curl_setopt($ch, CURLINFO_HEADER_OUT, true); diff --git a/utils/thumb.php b/utils/thumb.php index 28911b99a..e192486b0 100644 --- a/utils/thumb.php +++ b/utils/thumb.php @@ -1172,7 +1172,7 @@ class timthumb { curl_setopt ($curl, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.122 Safari/534.30"); curl_setopt ($curl, CURLOPT_RETURNTRANSFER, TRUE); curl_setopt ($curl, CURLOPT_HEADER, 0); - curl_setopt ($curl, CURLOPT_SSL_VERIFYPEER, FALSE); + curl_setopt ($curl, CURLOPT_SSL_VERIFYPEER, TRUE); curl_setopt ($curl, CURLOPT_WRITEFUNCTION, 'timthumb::curlWrite'); @curl_setopt ($curl, CURLOPT_FOLLOWLOCATION, true); @curl_setopt ($curl, CURLOPT_MAXREDIRS, 10);