Pārlūkot izejas kodu

added logic in cli mode to chdir to the correct directory first

the webserver would normally do this for us, but we need to do it
Matthew Vale 9 gadi atpakaļ
vecāks
revīzija
f0b1b61918

+ 1 - 0
core/databases/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/default_settings/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/domain_settings/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/install/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/menu/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/upgrade/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/user_settings/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
core/users/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
resources/captcha/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
resources/classes/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
resources/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
themes/accessible/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
themes/enhanced/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {

+ 1 - 0
themes/minimized/root.php

@@ -36,6 +36,7 @@
 	// make sure the document_root is set
 	// make sure the document_root is set
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
 	if(PHP_SAPI == 'cli'){
 	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
 		if (file_exists('/.project.ROOT')) {
 		if (file_exists('/.project.ROOT')) {