From dfc8b403b327e8bacc14b40c0c52fff2ac9843ad Mon Sep 17 00:00:00 2001 From: pero1203 Date: Mon, 21 Sep 2020 14:01:46 +0200 Subject: [PATCH 1/7] Dodana omejitev klikov/minuto pri izpolnjevanju dolocene ankete (zaenkrat 100) --- function.php | 69 +++++++++++++++++++++++++++++++++++++++++++------ sql/update2.sql | 11 ++++++++ 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/function.php b/function.php index 76ab97b40..970edaca8 100644 --- a/function.php +++ b/function.php @@ -248,13 +248,6 @@ if ($admin_type > -1) { } -// Sledenje spremembam (tracker) -// deluje tudi v adminu... -/*if ($global_user_id != 0) { - sisplet_query("INSERT INTO user_tracker (uid, timestamp, what) VALUES ('$global_user_id', '" . time() . "', '" . $_SERVER["REQUEST_URI"] . "')"); -}*/ - - // Preverimo ce je spremenljivka countable (zaradi ogromno warningov v kodi, kjer se counta prazno spremenljivko) if (!function_exists('is_countable')) { function is_countable($var) { @@ -263,12 +256,21 @@ if (!function_exists('is_countable')) { } +// Preverimo klike na minuto pri izpolnjevanju anekte da se ne zapolni sql +if(!checkClicksPerMinute()){ + + http_response_code(425); + echo '

Service Unavailable.

'; + + die(); +} + + // Preverimo tip hierarhije $hierarhija_type = preveriTipHierarhije(); - /******* SPLOSNE FUNKCIJE *******/ // Skrajsa string, in ga odreze lepo za besedo in ne kar vmes :) @@ -1143,4 +1145,55 @@ function root_dir($file = null) return __DIR__ .'/'. $file; } + +// Pri izpolnjevanju ankete preverimo stevilo klikov na minuto - ce jih je prevec, respondenta zavrnemo, drugace se lahko sql zafila in streznik ni vec odziven +function checkClicksPerMinute(){ + + // Stevilo klikov/minuto na anketo (izpolnjevanje), ki jih se pustimo preden zablokiramo dostop + $click_minute_limit = 100; + + // Preverimo ce gre za izpolnjevanje ankete + if($_SERVER["SCRIPT_NAME"] != '/main/survey/index.php') + return true; + + // Preverimo ce gre za prvi prihod na doloceno stran ankete in ne na prvo stran + if(isset($_GET['grupa'])) + return true; + + // Preverimo ce je id ankete ustrezno nastavljen + if(!isset($_GET['anketa']) || $_GET['anketa'] <= 0) + return true; + + + $click_time = time(); + + $sql = sisplet_query("SELECT click_count, click_time FROM srv_clicks WHERE ank_id='".$_GET['anketa']."'"); + if (mysqli_num_rows($sql) > 0) { + + list($click_count, $first_click_time) = mysqli_fetch_array($sql); + + // Ce nismo znotraj minute vse resetiramo in pustimo naprej + if($click_time - $first_click_time > 60){ + $sqlI = sisplet_query("UPDATE srv_clicks SET click_count='1', click_time='".$click_time."' WHERE ank_id='".$_GET['anketa']."'"); + return true; + } + + // Click count je ok - pustimo naprej + if($click_count < $click_minute_limit){ + $sqlI = sisplet_query("UPDATE srv_clicks SET click_count=click_count+1 WHERE ank_id='".$_GET['anketa']."'"); + return true; + } + // Click count je previsok - ZAVRNEMO + else{ + return false; + } + } + else{ + $sqlI = sisplet_query("INSERT INTO srv_clicks (ank_id, click_count, click_time) VALUES ('".$_GET['anketa']."', '1', '".$click_time."')"); + } + + + return true; +} + ?> \ No newline at end of file diff --git a/sql/update2.sql b/sql/update2.sql index dfd01e28e..f15acf1db 100644 --- a/sql/update2.sql +++ b/sql/update2.sql @@ -9294,3 +9294,14 @@ UPDATE misc SET value='20.09.16' WHERE what="version"; INSERT INTO srv_help (help, what) VALUES ('Upload omejitev', 'srv_upload_limit'); UPDATE misc SET value='20.09.18' WHERE what="version"; + +## Tabela dostopov do izpolnjevanja - preverjanje stevila klikov na minuto +CREATE TABLE srv_clicks ( + ank_id INT(11) NOT NULL, + click_count SMALLINT NOT NULL DEFAULT 0, + click_time INT(11) NOT NULL, + PRIMARY KEY (ank_id), + CONSTRAINT fk_srv_clicks_ank_id FOREIGN KEY (ank_id) REFERENCES srv_anketa (id) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +UPDATE misc SET value='20.09.21' WHERE what="version"; From fdc950f1e1df3bcef7110865b4414c7ea8c56701 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 22 Sep 2020 09:30:32 +0200 Subject: [PATCH 2/7] Racuni in predracuni se posiljajo preko drugega smtp racuna (invoice@1ka.si) --- admin/survey/classes/objects/obj.MailAdapter.php | 12 +++++++++++- frontend/payments/classes/class.UserNarocila.php | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php index c970ba0b7..1eec08100 100644 --- a/admin/survey/classes/objects/obj.MailAdapter.php +++ b/admin/survey/classes/objects/obj.MailAdapter.php @@ -22,6 +22,7 @@ class MailAdapter{ * "alert" - email obvescanje (aktivacija ankete, zakljucena anketa, arhiv ankete...) * "admin" - email povezan z administracijo (alerti za admine) * "account" - email povezan z upravljanjem racuna (dodan dostop do anket...) + * "payments" - email povezan s placili paketov (posiljanje racunov, predracunov...) */ private $type = ''; @@ -138,7 +139,7 @@ class MailAdapter{ $this->settings['1ka']['SMTPReplyTo'] = $email_server_settings['secondary_mail']['SMTPReplyTo']; $this->settings['1ka']['SMTPUsername'] = $email_server_settings['secondary_mail']['SMTPUsername']; $this->settings['1ka']['SMTPPassword'] = $email_server_settings['secondary_mail']['SMTPPassword']; - } + } } // Nimamo se nicesar v bazi - nastavimo default nastavitve else{ @@ -223,6 +224,15 @@ class MailAdapter{ if(isset($email_server_settings['SMTPSecure'])) $this->settings['smtp']['SMTPSecure'] = $email_server_settings['SMTPSecure']; + + // ce posiljamo v povezavi s placili (racuni, predracuni...) - posiljamo preko tretjega maila (invoice@1ka.si) + if($this->type == 'payments' && isset($email_server_settings['payments_mail'])){ + $this->settings['smtp']['SMTPFrom'] = $email_server_settings['payments_mail']['SMTPFrom']; + $this->settings['smtp']['SMTPFromNice'] = $email_server_settings['payments_mail']['SMTPFromNice']; + $this->settings['smtp']['SMTPReplyTo'] = $email_server_settings['payments_mail']['SMTPReplyTo']; + $this->settings['smtp']['SMTPUsername'] = $email_server_settings['payments_mail']['SMTPUsername']; + $this->settings['smtp']['SMTPPassword'] = $email_server_settings['payments_mail']['SMTPPassword']; + } } diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index 1b939bae9..c6311aac6 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -751,7 +751,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($narocilo_data['email']); @@ -974,7 +974,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($rowNarocilo['email']); $resultX = $MA->sendMail($content, $subject); } @@ -1008,7 +1008,7 @@ class UserNarocila{ $content .= $signature; try{ - $MA = new MailAdapter(); + $MA = new MailAdapter($anketa=null, $type='payments'); $MA->addRecipients($rowNarocilo['email']); From 891146077ef5d9619febb3e6d49571878d17c838 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 22 Sep 2020 09:39:26 +0200 Subject: [PATCH 3/7] invoice@1ka.si se uporablja samo na www.1ka.si (na testu ta smtp ne deluje) --- admin/survey/classes/objects/obj.MailAdapter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php index 1eec08100..9811d19fc 100644 --- a/admin/survey/classes/objects/obj.MailAdapter.php +++ b/admin/survey/classes/objects/obj.MailAdapter.php @@ -203,6 +203,7 @@ class MailAdapter{ // Pripravimo nastavitve splosnega posiljanja v aplikaciji glede na nastavitve v settings_optional.php private function prepareGeneralSettings(){ global $email_server_settings; + global $mysql_database_name; $this->mailMode = 'smtp'; $this->settings['SMTPMailMode'] = 2; @@ -226,7 +227,7 @@ class MailAdapter{ $this->settings['smtp']['SMTPSecure'] = $email_server_settings['SMTPSecure']; // ce posiljamo v povezavi s placili (racuni, predracuni...) - posiljamo preko tretjega maila (invoice@1ka.si) - if($this->type == 'payments' && isset($email_server_settings['payments_mail'])){ + if($this->type == 'payments' && isset($email_server_settings['payments_mail']) && $mysql_database_name == 'real1kasi'){ $this->settings['smtp']['SMTPFrom'] = $email_server_settings['payments_mail']['SMTPFrom']; $this->settings['smtp']['SMTPFromNice'] = $email_server_settings['payments_mail']['SMTPFromNice']; $this->settings['smtp']['SMTPReplyTo'] = $email_server_settings['payments_mail']['SMTPReplyTo']; From b2980fcd51a68cc9ac3387bccef810fe4783302b Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 23 Sep 2020 10:25:59 +0200 Subject: [PATCH 4/7] Mobile datatables za narocila in placila, nastavljen meta viewport v admin vmesniku, da mobile ne scale-a --- admin/survey/index.php | 3 ++ admin/survey/minify/groupsConfig.php | 1 + .../datatables/dataTables.responsive.min.js | 48 +++++++++++++++++++ admin/survey/script/narocila.js | 2 + .../payments/classes/class.UserNarocila.php | 2 +- .../payments/classes/class.UserPlacila.php | 2 +- 6 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 admin/survey/script/datatables/dataTables.responsive.min.js diff --git a/admin/survey/index.php b/admin/survey/index.php index edbe22d2f..ef63d341f 100644 --- a/admin/survey/index.php +++ b/admin/survey/index.php @@ -89,6 +89,9 @@ echo ''; echo ''; + // Responsive + echo ''; + // ZAMENJAMO UREJEVALNIK ZA CKEDITOR echo ''; diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php index bad42521e..1b15c942b 100644 --- a/admin/survey/minify/groupsConfig.php +++ b/admin/survey/minify/groupsConfig.php @@ -209,6 +209,7 @@ return [ dirname(__FILE__).'/../script/datatables/buttons.print.min.js', dirname(__FILE__).'/../script/datatables/buttons.colVis.min.js', dirname(__FILE__).'/../script/datatables/dataTables.select.min.js', + dirname(__FILE__).'/../script/datatables/dataTables.responsive.min.js', dirname(__FILE__).'/../script/uporabniki_custom.js', dirname(__FILE__).'/../script/dostop.js', dirname(__FILE__).'/../script/narocila.js', diff --git a/admin/survey/script/datatables/dataTables.responsive.min.js b/admin/survey/script/datatables/dataTables.responsive.min.js new file mode 100644 index 000000000..0851a9843 --- /dev/null +++ b/admin/survey/script/datatables/dataTables.responsive.min.js @@ -0,0 +1,48 @@ +/*! + Copyright 2014-2020 SpryMedia Ltd. + + This source file is free software, available under the following license: + MIT license - http://datatables.net/license/mit + + This source file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details. + + For details please refer to: http://www.datatables.net + Responsive 2.2.6 + 2014-2020 SpryMedia Ltd - datatables.net/license +*/ +var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(b,k,m){b instanceof String&&(b=String(b));for(var n=b.length,p=0;ptd, >th", +g).each(function(e){e=c.column.index("toData",e);!1===a.s.current[e]&&b(this).css("display","none")})});c.on("destroy.dtr",function(){c.off(".dtr");b(c.table().body()).off(".dtr");b(k).off("resize.dtr orientationchange.dtr");c.cells(".dtr-control").nodes().to$().removeClass("dtr-control");b.each(a.s.current,function(g,l){!1===l&&a._setColumnVis(g,!0)})});this.c.breakpoints.sort(function(g,l){return g.widthl.width?-1:0});this._classLogic();this._resizeAuto();d=this.c.details;!1!== +d.type&&(a._detailsInit(),c.on("column-visibility.dtr",function(){a._timer&&clearTimeout(a._timer);a._timer=setTimeout(function(){a._timer=null;a._classLogic();a._resizeAuto();a._resize(!0);a._redrawChildren()},100)}),c.on("draw.dtr",function(){a._redrawChildren()}),b(c.table().node()).addClass("dtr-"+d.type));c.on("column-reorder.dtr",function(g,l,h){a._classLogic();a._resizeAuto();a._resize(!0)});c.on("column-sizing.dtr",function(){a._resizeAuto();a._resize()});c.on("preXhr.dtr",function(){var g= +[];c.rows().every(function(){this.child.isShown()&&g.push(this.id(!0))});c.one("draw.dtr",function(){a._resizeAuto();a._resize();c.rows(g).every(function(){a._detailsDisplay(this,!1)})})});c.on("draw.dtr",function(){a._controlClass()}).on("init.dtr",function(g,l,h){"dt"===g.namespace&&(a._resizeAuto(),a._resize(),b.inArray(!1,a.s.current)&&c.columns.adjust())});this._resize()},_columnsVisiblity:function(a){var c=this.s.dt,d=this.s.columns,f,g=d.map(function(t,v){return{columnIdx:v,priority:t.priority}}).sort(function(t, +v){return t.priority!==v.priority?t.priority-v.priority:t.columnIdx-v.columnIdx}),l=b.map(d,function(t,v){return!1===c.column(v).visible()?"not-visible":t.auto&&null===t.minWidth?!1:!0===t.auto?"-":-1!==b.inArray(a,t.includeIn)}),h=0;var e=0;for(f=l.length;eh-d[q].minWidth?(r=!0,l[q]=!1):l[q]=!0,h-=d[q].minWidth)}g=!1;e=0;for(f=d.length;e=q&&g(h,c[e].name);else if("not-"===r)for(e= +0,r=c.length;ef?c.columns().eq(0).length+f:f;if(c.cell(this).index().column!==l)return}l=c.row(b(this).closest("tr"));"click"===g.type?a._detailsDisplay(l,!1):"mousedown"===g.type?b(this).css("outline","none"):"mouseup"===g.type&&b(this).trigger("blur").css("outline","")}})}, +_detailsObj:function(a){var c=this,d=this.s.dt;return b.map(this.s.columns,function(f,g){if(!f.never&&!f.control)return f=d.settings()[0].aoColumns[g],{className:f.sClass,columnIndex:g,data:d.cell(a,g).render(c.c.orthogonal),hidden:d.column(g).visible()&&!c.s.current[g],rowIndex:a,title:null!==f.sTitle?f.sTitle:b(d.column(g).header()).text()}})},_find:function(a){for(var c=this.c.breakpoints,d=0,f=c.length;d").append(h).appendTo(g)}b("").append(l).appendTo(f);"inline"===this.c.details.type&&b(d).addClass("dtr-inline collapsed");b(d).find("[name]").removeAttr("name");b(d).css("position","relative");d=b("
").css({width:1,height:1,overflow:"hidden",clear:"both"}).append(d);d.insertBefore(a.table().node());l.each(function(e){e=a.column.index("fromVisible",e);c[e].minWidth=this.offsetWidth||0});d.remove()}},_responsiveOnlyHidden:function(){var a=this.s.dt;return b.map(this.s.current, +function(c,d){return!1===a.column(d).visible()?!0:c})},_setColumnVis:function(a,c){var d=this.s.dt;c=c?"":"none";b(d.column(a).header()).css("display",c);b(d.column(a).footer()).css("display",c);d.column(a).nodes().to$().css("display",c);b.isEmptyObject(A)||d.cells(null,a).indexes().each(function(f){y(d,f.row,f.column)})},_tabIndexes:function(){var a=this.s.dt,c=a.cells({page:"current"}).nodes().to$(),d=a.settings()[0],f=this.c.details.target;c.filter("[data-dtr-keyboard]").removeData("[data-dtr-keyboard]"); +"number"===typeof f?a.cells(null,f,{page:"current"}).nodes().to$().attr("tabIndex",d.iTabIndex).data("dtr-keyboard",1):("td:first-child, th:first-child"===f&&(f=">td:first-child, >th:first-child"),b(f,a.rows({page:"current"}).nodes()).attr("tabIndex",d.iTabIndex).data("dtr-keyboard",1))}});u.breakpoints=[{name:"desktop",width:Infinity},{name:"tablet-l",width:1024},{name:"tablet-p",width:768},{name:"mobile-l",width:480},{name:"mobile-p",width:320}];u.display={childRow:function(a,c,d){if(c){if(b(a.node()).hasClass("parent"))return a.child(d(), +"child").show(),!0}else{if(a.child.isShown())return a.child(!1),b(a.node()).removeClass("parent"),!1;a.child(d(),"child").show();b(a.node()).addClass("parent");return!0}},childRowImmediate:function(a,c,d){if(!c&&a.child.isShown()||!a.responsive.hasHidden())return a.child(!1),b(a.node()).removeClass("parent"),!1;a.child(d(),"child").show();b(a.node()).addClass("parent");return!0},modal:function(a){return function(c,d,f){if(d)b("div.dtr-modal-content").empty().append(f());else{var g=function(){l.remove(); +b(m).off("keypress.dtr")},l=b('
').append(b('
').append(b('
').append(f())).append(b('
×
').click(function(){g()}))).append(b('
').click(function(){g()})).appendTo("body");b(m).on("keyup.dtr",function(h){27===h.keyCode&&(h.stopPropagation(),g())})}a&&a.header&&b("div.dtr-modal-content").prepend("

"+a.header(c)+"

")}}};var A={};u.renderer= +{listHiddenNodes:function(){return function(a,c,d){var f=b('
    '),g=!1;b.each(d,function(l,h){h.hidden&&(b("
  • '+h.title+"
    • ").append(b('').append(p(a,h.rowIndex,h.columnIndex))).appendTo(f),g=!0)});return g?f:!1}},listHidden:function(){return function(a, +c,d){return(a=b.map(d,function(f){var g=f.className?'class="'+f.className+'"':"";return f.hidden?"
  • '+f.title+' '+f.data+"
    • ":""}).join(""))?b('
      ').append(a):!1}},tableAll:function(a){a=b.extend({tableClass:""},a);return function(c,d,f){c=b.map(f,function(g){return"'+g.title+": "+g.data+""}).join("");return b('').append(c)}}};u.defaults={breakpoints:u.breakpoints,auto:!0,details:{display:u.display.childRow,renderer:u.renderer.listHidden(),target:0,type:"inline"},orthogonal:"display"};var C=b.fn.dataTable.Api;C.register("responsive()",function(){return this});C.register("responsive.index()", +function(a){a=b(a);return{column:a.data("dtr-index"),row:a.parent().data("dtr-index")}});C.register("responsive.rebuild()",function(){return this.iterator("table",function(a){a._responsive&&a._responsive._classLogic()})});C.register("responsive.recalc()",function(){return this.iterator("table",function(a){a._responsive&&(a._responsive._resizeAuto(),a._responsive._resize())})});C.register("responsive.hasHidden()",function(){var a=this.context[0];return a._responsive?-1!==b.inArray(!1,a._responsive._responsiveOnlyHidden()): +!1});C.registerPlural("columns().responsiveHidden()","column().responsiveHidden()",function(){return this.iterator("column",function(a,c){return a._responsive?a._responsive._responsiveOnlyHidden()[c]:!1},1)});u.version="2.2.6";b.fn.dataTable.Responsive=u;b.fn.DataTable.Responsive=u;b(m).on("preInit.dt.dtr",function(a,c,d){"dt"===a.namespace&&(b(c.nTable).hasClass("responsive")||b(c.nTable).hasClass("dt-responsive")||c.oInit.responsive||z.defaults.responsive)&&(a=c.oInit.responsive,!1!==a&&new u(c, +b.isPlainObject(a)?a:{}))});return u}); diff --git a/admin/survey/script/narocila.js b/admin/survey/script/narocila.js index 96296c5f3..67ef3e31e 100644 --- a/admin/survey/script/narocila.js +++ b/admin/survey/script/narocila.js @@ -60,6 +60,7 @@ function prepareNarocilaTableAdmin(){ lengthChange: true, deferRender: true, dom: 'Blfrtip', + responsive: true, language: { "url": siteUrl+"admin/survey/script/datatables/Slovenian.json" }, @@ -116,6 +117,7 @@ function preparePlacilaTableAdmin(){ lengthChange: true, deferRender: true, dom: 'Blfrtip', + responsive: true, language: { "url": siteUrl+"admin/survey/script/datatables/Slovenian.json" }, diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index c6311aac6..02fadbbcc 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -313,7 +313,7 @@ class UserNarocila{ // Admini vidijo vsa narocila $data = $this->getNarocila(); - echo '
      '; + echo '
      '; // Glava tabele echo ' '; diff --git a/frontend/payments/classes/class.UserPlacila.php b/frontend/payments/classes/class.UserPlacila.php index 873e4b2a0..87318c9ee 100644 --- a/frontend/payments/classes/class.UserPlacila.php +++ b/frontend/payments/classes/class.UserPlacila.php @@ -124,7 +124,7 @@ class UserPlacila{ // Admini vidijo vsa placila $data = $this->getPlacila(); - echo '
      '; + echo '
      '; // Glava tabele echo ' '; From 7bc8b8d09d466b22f32a7c52a940385026842047 Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Wed, 23 Sep 2020 17:02:19 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Latex=20za=20izvoze:=20IZVOZ-54:=20Tabela?= =?UTF-8?q?=20ve=C4=8D=20odgovorov=20-izvoz=20ne=20deluje?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/export/latexclasses/class.LatexDocument.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/survey/export/latexclasses/class.LatexDocument.php b/admin/survey/export/latexclasses/class.LatexDocument.php index 0f95d40ad..091536e16 100644 --- a/admin/survey/export/latexclasses/class.LatexDocument.php +++ b/admin/survey/export/latexclasses/class.LatexDocument.php @@ -435,7 +435,12 @@ class LatexDocument{ $samoLatex = microtime(true); } - /********************* END TEST ******************************/ + /********************* END TEST ******************************/ + + /*UREDITEV ODSTRANJEVANJA PRAZNIH VRSTIC IN CHARACTER-JEV IZ TEX DATOTEKE******************/ + $ukazOdstrani = "sed -i '/^[[:space:]]*$/d' ".$filenameTex; + exec($ukazOdstrani); + /*UREDITEV ODSTRANJEVANJA PRAZNIH VRSTIC IN CHARACTER-JEV IZ TEX DATOTEKE - END ******************/ if($export_format == 'pdf'){ # generating pdf output From 9df72d62a4747259f0f793f33c065423bf8e8fb2 Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Wed, 23 Sep 2020 20:45:21 +0200 Subject: [PATCH 6/7] Latex za izvoze: IZVOZ-55: Izvoz sumarnik - ne dela --- admin/survey/export/latexclasses/class.LatexAnalysisElement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php index 72ef9cc2a..f6519f153 100644 --- a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php +++ b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php @@ -10,7 +10,7 @@ //include('../../function.php'); include('../../vendor/autoload.php'); -define("MAX_STRING_LENGTH", 12, true); +define("MAX_STRING_LENGTH", 15, true); class LatexAnalysisElement{ From 5f1116f19fe7c62bb7027c6f654842624642d9dd Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Wed, 23 Sep 2020 20:51:21 +0200 Subject: [PATCH 7/7] Latex za izvoze: IZVOZ-55: Izvoz sumarnik - ne dela --- admin/survey/export/latexclasses/class.LatexAnalysisElement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php index f6519f153..de7150027 100644 --- a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php +++ b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php @@ -10,7 +10,7 @@ //include('../../function.php'); include('../../vendor/autoload.php'); -define("MAX_STRING_LENGTH", 15, true); +define("MAX_STRING_LENGTH", 20, true); class LatexAnalysisElement{