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

Lep url - popravek buga, ce imamo v urlju dash

Browse Source
This commit is contained in:
pero1203 2022-03-23 10:47:08 +01:00
parent 8a04a479de
commit 1d458c7469
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/SurveyAdminAjax.php
View File

@ -5424,7 +5424,7 @@ class SurveyAdminAjax {
// Dodamo nice url za anketo
$f = @fopen($site_path.'.htaccess', 'a');
if ($f !== false) {
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
// Dodamo nice url v bazo
$s = sisplet_query("INSERT INTO srv_nice_links (id,ank_id,link) VALUES ('','$this->anketa','$nice_url')");
@ -5450,7 +5450,7 @@ class SurveyAdminAjax {
$link_skupina = $link.'&'.$skupina_string.'='.$rowS['id'];
// Skupini dodamo nice url zapis v htaccess
fwrite($f, "\nRewriteRule ^".$nice_url_skupina.'\b(.*) '.$link_skupina."&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^".$nice_url_skupina.'\b(?!-)(.*) '.$link_skupina."&foo=\$1&%{QUERY_STRING}");
// Skupini zapisemo nice url se v bazo
$sqlSI = sisplet_query("INSERT INTO srv_nice_links_skupine
@ -5490,7 +5490,7 @@ class SurveyAdminAjax {
$output = array();
while (!feof($f)) {
$r = fgets($f);
if (strpos($r, "^".$nice_url.'\b(.*) ') !== false && strpos($r, "?anketa=".$anketa."") !== false) {
if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$anketa."") !== false) {
// kao pobrisemo vrstico
} else {
$output[] = $r;
@ -5528,7 +5528,7 @@ class SurveyAdminAjax {
$sqlS = sisplet_query("SELECT * FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$nice_url_id'");
while($rowS = mysqli_fetch_array($sqlS)){
if (strpos($r, "^".$rowS['link'].'\b(.*) ') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$rowS['vre_id']."") !== false) {
if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$rowS['vre_id']."") !== false) {
// pobrisemo vrstico in vnos v bazi
$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'");
$delete = true;

4
admin/survey/api/class.ApiSurvey.php
View File

@ -3531,7 +3531,7 @@ class ApiSurvey {
if ($add) {
$f = @fopen($site_path . '.htaccess', 'a');
if ($f !== false) {
fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}");
fclose($f);
$sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");
@ -3638,7 +3638,7 @@ class ApiSurvey {
if ($add) {
$f = @fopen($site_path . '.htaccess', 'a');
if ($f !== false) {
fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}");
fclose($f);
$sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");

4
admin/survey/classes/class.Common.php
View File

@ -1112,7 +1112,7 @@ class Common {
while (!feof($f)) {
$r = fgets($f);
if (strpos($r, "^".$nice_url.'\b(.*) ') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$ank_id."") !== false) {
// kao pobrisemo vrstico
} else {
$output[] = $r;
@ -1152,7 +1152,7 @@ class Common {
while($rowS = mysqli_fetch_array($sqlS)){
if (strpos($r, "^".$rowS['link'].'\b(.*) ') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) {
// pobrisemo vrstico in vnos v bazi
$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$ank_id' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'");

4
admin/survey/classes/class.SurveySkupine.php
View File

@ -309,7 +309,7 @@ class SurveySkupine {
if ($add) {
$f = @fopen($site_path.'.htaccess', 'a');
if ($f !== false) {
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
fclose($f);
$sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$this->anketa','$row[id]','$vre_id','$nice_url')");
@ -384,7 +384,7 @@ class SurveySkupine {
$output = array();
while (!feof($f)) {
$r = fgets($f);
if (strpos($r, "^".$nice_url.'\b(.*) ') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$vre_id."") !== false) {
if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$anketa."&".$skupina_string."=".$vre_id."") !== false) {
// kao pobrisemo vrstico in vnos v bazi
$sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$anketa' AND nice_link_id='$row[id]' AND vre_id='$vre_id'");
}

2
admin/survey/modules/mod_EVOLI/class.EvoliForm.php
View File

@ -830,7 +830,7 @@ class EvoliForm {
if ($add) {
$f = @fopen($site_path.'.htaccess', 'a');
if ($f !== false) {
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*) '.$link."&foo=\$1&%{QUERY_STRING}");
fclose($f);
$sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')");