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

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

@ -8,15 +8,15 @@
include_once('../exportclases/class.pdfIzvozAnalizaFrekvenca.php'); include_once('../exportclases/class.pdfIzvozAnalizaFrekvenca.php');
require_once('../exportclases/class.enka.pdf.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 **/ /** Include path **/
set_include_path('../exportclases/'); 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_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 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) function __construct ($anketa = null, $sprID = null, $loop = null)
{ {
global $site_path; global $site_path;
global $global_user_id; global $global_user_id;
// preverimo ali imamo stevilko ankete
if ( is_numeric($anketa) ){
$this->anketa = $anketa; // preverimo ali imamo stevilko ankete
$this->spremenljivka = $sprID; if ( is_numeric($anketa) ){
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();
$this->headFileName = $SDF->getHeaderFileName(); $this->anketa = $anketa;
$this->dataFileName = $SDF->getDataFileName(); $this->spremenljivka = $sprID;
$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) ){ SurveyAnalysis::Init($this->anketa);
SurveyUserSetting::getInstance()->Init($this->anketa, $global_user_id); SurveyAnalysis::$setUpJSAnaliza = false;
$this->skin = SurveyUserSetting :: getInstance()->getSettings('default_chart_profile_skin');
$this->numbering = SurveyDataSettingProfiles :: getSetting('chartNumbering');
$this->frontpage = SurveyDataSettingProfiles :: getSetting('chartFP');
}
else
return 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) function getFile($fileName)
@ -133,7 +133,7 @@ class PptIzvozAnalizaCharts {
function encodeText($text) function encodeText($text)
{ // popravimo sumnike ce je potrebno { // popravimo sumnike ce je potrebno
$text = html_entity_decode($text, ENT_NOQUOTES, 'UTF-8'); $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); return strip_tags($text);
} }
@ -151,7 +151,6 @@ class PptIzvozAnalizaCharts {
$this->ppt->removeSlideByIndex(0); $this->ppt->removeSlideByIndex(0);
// izpisemo prvo stran // izpisemo prvo stran
if($this->frontpage == 1){ if($this->frontpage == 1){
$this->createFrontPage(); $this->createFrontPage();

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

@ -9,12 +9,11 @@
/** Include path **/ /** Include path **/
set_include_path('../exportclases/'); set_include_path('../exportclases/');
/** PHPPowerPoint */ use PhpOffice\PhpPresentation\PhpPresentation;
include '../exportclases/PHPPowerPoint.php'; use PhpOffice\PhpPresentation\IOFactory;
use PhpOffice\PhpPresentation\Style\Color;
/** PHPPowerPoint_IOFactory */ use PhpOffice\PhpPresentation\Style\Alignment;
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_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 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" "role": "Developer"
}, },
{ {
"name": "Robert Šmalc", "name": "May Doušak",
"email": "robert@1ka.si",
"role": "Developer" "role": "Developer"
} },
], ],
"require": { "require": {
"php": "^5.5|^7.0", "php": "^5.5|^7.0",
@ -20,7 +19,8 @@
"minishlink/web-push": "^5.2", "minishlink/web-push": "^5.2",
"stripe/stripe-php": "^7.40", "stripe/stripe-php": "^7.40",
"geoip2/geoip2": "~2.0", "geoip2/geoip2": "~2.0",
"paypal/paypal-checkout-sdk": "^1.0" "paypal/paypal-checkout-sdk": "^1.0",
"phpoffice/phppresentation": "dev-master",
}, },
"require-dev": { "require-dev": {
"kint-php/kint": "^1.1", "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_RETURNTRANSFER, true);
//curl_setopt($ch, CURLOPT_HEADER ,1); //curl_setopt($ch, CURLOPT_HEADER ,1);
//curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,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 //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_RETURNTRANSFER, true);
//curl_setopt($ch, CURLOPT_HEADER ,1); //curl_setopt($ch, CURLOPT_HEADER ,1);
//curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,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 //curl_setopt($ch, CURLINFO_HEADER_OUT, true); //Vrne header, kar ni ok, ker drual direktno sprejmo echo
// Izvedemo klic // Izvedemo klic

4
frontend/payments/api_test.php
View File

@ -54,7 +54,7 @@ function executeGET(){
// GET params // GET params
$params = 'action='.$action; // Funkcija, ki jo želimo izvesti $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 // Pripravimo podatke za hashiranje
$request_method = 'GET'; $request_method = 'GET';
@ -156,7 +156,7 @@ function executePOST(){
curl_setopt($ch, CURLOPT_HEADER ,1); curl_setopt($ch, CURLOPT_HEADER ,1);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,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); 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_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_RETURNTRANSFER, TRUE);
curl_setopt ($curl, CURLOPT_HEADER, 0); 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_WRITEFUNCTION, 'timthumb::curlWrite');
@curl_setopt ($curl, CURLOPT_FOLLOWLOCATION, true); @curl_setopt ($curl, CURLOPT_FOLLOWLOCATION, true);
@curl_setopt ($curl, CURLOPT_MAXREDIRS, 10); @curl_setopt ($curl, CURLOPT_MAXREDIRS, 10);