From beccead3889bd42459f8933ad55cdd6a17dc5a6d Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sun, 26 Mar 2023 14:58:10 +0200
Subject: [PATCH] php-func fix

---
 bin/v-php-func                   |  1 +
 func/bash-to-php-interpreter.php | 21 +++++++++++++++++----
 func/main.php                    |  1 +
 func/string.php                  | 25 +++++++++++++++----------
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/bin/v-php-func b/bin/v-php-func
index dd75df43..f6192c33 100644
--- a/bin/v-php-func
+++ b/bin/v-php-func
@@ -9,3 +9,4 @@
 #----------------------------------------------------------#
 
 php /usr/local/vesta/func/bash-to-php-interpreter.php "$@"
+exit $?
diff --git a/func/bash-to-php-interpreter.php b/func/bash-to-php-interpreter.php
index f47e7f9c..6c1c2fa0 100644
--- a/func/bash-to-php-interpreter.php
+++ b/func/bash-to-php-interpreter.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!isset($argv)) exit;
+if (!isset($argv)) exit 5;
 
 include ("/usr/local/vesta/func/main.php");
 include ("/usr/local/vesta/func/string.php");
@@ -8,8 +8,11 @@ include ("/usr/local/vesta/func/string.php");
 $counter=count($argv);
 if ($counter<2) myvesta_throw_error(2, 'Function is missing');
 
-$func="myvesta_".$argv[1];
-if (!function_exists($func)) myvesta_throw_error(2, 'Function does not exists');
+$func=$argv[1];
+if (!function_exists($func)) {
+	$func="myvesta_".$argv[1];	
+	if (!function_exists($func)) myvesta_throw_error(2, 'Function does not exists');
+}
 
 $params=array();
 
@@ -17,5 +20,15 @@ for ($i=2; $i<$counter; $i++) {
 	$argv[$i]=myvesta_fix_backslashes($argv[$i]);
 	$params[]=$argv[$i];
 }
-// echo $func."\n"; print_r($params);
+
 $r=call_user_func_array($func, $params);
+if (is_bool($r)) {
+	if ($r) {
+		exit(0);
+	} else {
+		exit(MYVESTA_ERROR_GENERAL);
+	}
+} else {
+	echo $r;
+	exit(0);
+}
diff --git a/func/main.php b/func/main.php
index 5b127691..d09a6bd8 100644
--- a/func/main.php
+++ b/func/main.php
@@ -8,6 +8,7 @@ define('MYVESTA_ERROR_PERMISSION_DENIED', 1);
 define('MYVESTA_ERROR_MISSING_ARGUMENTS', 2);
 define('MYVESTA_ERROR_FILE_DOES_NOT_EXISTS', 3);
 define('MYVESTA_ERROR_STRING_NOT_FOUND', 4);
+define('MYVESTA_ERROR_GENERAL', 5);
 
 function myvesta_throw_error($code, $message) {
     global $myvesta_exit_on_error;
diff --git a/func/string.php b/func/string.php
index e6e9f7ba..0fa284cf 100644
--- a/func/string.php
+++ b/func/string.php
@@ -11,7 +11,8 @@ function myvesta_replace_in_file($file, $find, $replace) {
 
     $buf=str_replace($find, $replace, $buf);
     $r=file_put_contents($file, $buf);
-    return $r;
+	if ($r===false) return false;
+    return true;
 }
 
 function myvesta_get_between_in_file($file, $left_substring, $right_substring, $start=0, $return_left_substring=0, $return_right_substring=0, $left_substring_necessary=1, $right_substring_necessary=1) {
@@ -25,7 +26,8 @@ function myvesta_replace_in_file_once_between_including_borders($file, $left, $r
     $text=file_get_contents($file);
 	$buf=myvesta_str_replace_once_between_including_borders($text, $left, $right, $replace_with);
     $r=file_put_contents($file, $buf);
-    return $r;
+	if ($r===false) return false;
+    return true;
 }
 
 function myvesta_strip_once_in_file_between_including_borders($file, $left, $right) {
@@ -33,7 +35,8 @@ function myvesta_strip_once_in_file_between_including_borders($file, $left, $rig
     $text=file_get_contents($file);
 	$buf=myvesta_str_strip_once_between_including_borders($text, $left, $right);
     $r=file_put_contents($file, $buf);
-    return $r;
+	if ($r===false) return false;
+    return true;
 }
 
 function myvesta_replace_in_file_between_including_borders($file, $left, $right, $replace_with) {
@@ -41,7 +44,8 @@ function myvesta_replace_in_file_between_including_borders($file, $left, $right,
     $text=file_get_contents($file);
 	$buf=myvesta_str_replace_between_including_borders($text, $left, $right, $replace_with);
     $r=file_put_contents($file, $buf);
-    return $r;
+	if ($r===false) return false;
+    return true;
 }
 
 function myvesta_strip_in_file_between_including_borders($file, $left, $right) {
@@ -49,7 +53,8 @@ function myvesta_strip_in_file_between_including_borders($file, $left, $right) {
     $text=file_get_contents($file);
 	$buf=myvesta_str_strip_between_including_borders($text, $left, $right);
     $r=file_put_contents($file, $buf);
-    return $r;
+	if ($r===false) return false;
+    return true;
 }
 
 // --- string functions ---
@@ -71,7 +76,7 @@ function myvesta_str_get_between (&$text, $left_substring, $right_substring, $st
     {
         if ($from_null==0) $pos1=$pos1+strlen($left_substring);
     }
-    $pos2=strpos($text, $right_substring, $pos1+1);
+    $pos2=strpos($text, $right_substring, $pos1+strlen($left_substring));
     if ($pos2===FALSE)
     {
         if ($right_substring_necessary==1) return "";
@@ -92,7 +97,7 @@ function myvesta_str_get_between (&$text, $left_substring, $right_substring, $st
 function myvesta_str_replace_once_between_including_borders(&$text, $left, $right, $replace_with) {
     $pos1=strpos($text, $left);
     if ($pos1===false) return $text;
-    $pos2=strpos($text, $right, $left+strlen($left));
+    $pos2=strpos($text, $right, $pos1+strlen($left));
     if ($pos2===false) return $text;
     return substr($text, 0, $pos1).$replace_with.substr($text, $pos2+strlen($right));
 }
@@ -100,7 +105,7 @@ function myvesta_str_replace_once_between_including_borders(&$text, $left, $righ
 function myvesta_str_strip_once_between_including_borders(&$text, $left, $right) {
     $pos1=strpos($text, $left);
     if ($pos1===false) return $text;
-    $pos2=strpos($text, $right, $left+strlen($left));
+    $pos2=strpos($text, $right, $pos1+strlen($left));
     if ($pos2===false) return $text;
     return substr($text, 0, $pos1).substr($text, $pos2+strlen($right));
 }
@@ -112,7 +117,7 @@ function myvesta_str_replace_between_including_borders($text, $left, $right, $re
     while (true) {
         $pos1=strpos($text, $left);
         if ($pos1===false) break;
-        $pos2=strpos($text, $right, $left+$left_len);
+        $pos2=strpos($text, $right, $pos1+$left_len);
         if ($pos2===false) break;
         $text=substr($text, 0, $pos1).$replace_with.substr($text, $pos2+$right_len);
     }
@@ -125,7 +130,7 @@ function myvesta_str_strip_between_including_borders($text, $left, $right) {
     while (true) {
         $pos1=strpos($text, $left);
         if ($pos1===false) break;
-        $pos2=strpos($text, $right, $left+$left_len);
+        $pos2=strpos($text, $right, $pos1+$left_len);
         if ($pos2===false) break;
         $text=substr($text, 0, $pos1).substr($text, $pos2+$right_len);
     }