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

Čiščenje (nad.)

Browse Source
This commit is contained in:
May Doušak 2023-01-12 13:49:06 +01:00
parent 9a6272c316
commit 7589fe9251
9 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
admin/exportclases/class.pptIzvozAnalizaCharts.php
View File

@ -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
@ -71,7 +71,7 @@ class PptIzvozAnalizaCharts {
SurveyChart::Init($this->anketa);
// create new PPT document
$this->ppt = new PHPPowerPoint();
$this->ppt = new PhpPresentation();
// Poskrbimo za datoteko s podatki
$SDF = SurveyDataFile::get_instance();
@ -89,11 +89,11 @@ class PptIzvozAnalizaCharts {
SurveyUserSession::Init($this->anketa);
$this->sessionData = SurveyUserSession::getData('charts');
}
else{
else {
return false;
}
if ( SurveyInfo::getInstance()->SurveyInit($this->anketa) ){
if ( SurveyInfo::getInstance()->SurveyInit($this->anketa) ) {
SurveyUserSetting::getInstance()->Init($this->anketa, $global_user_id);
$this->skin = SurveyUserSetting :: getInstance()->getSettings('default_chart_profile_skin');
@ -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("&scaron;","&#353;","&#269;"),array("<EFBFBD>","<EFBFBD>","<EFBFBD>"),$text);
$text = str_replace(array("&scaron;","&#353;","&#269;"),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();

9
admin/exportclases/class.pptIzvozHeatmapImage.php
View File

@ -9,11 +9,10 @@
/** 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

8
composer.json
View File

@ -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",

2
frontend/drupal.php
View File

@ -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

BIN
frontend/drupal7.sql.zip
View File

Binary file not shown.

BIN
frontend/drupal9.sql.zip
View File

Binary file not shown.

2
frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php
View File

@ -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

4
frontend/payments/api_test.php
View File

@ -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);

2
utils/thumb.php
View File

@ -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);