From 92cb24cb896477641e0b7bead60620a2956702b6 Mon Sep 17 00:00:00 2001
From: lenovo <lenovo@lenovo.com>
Date: Sat, 29 Oct 2022 20:57:06 +0200
Subject: [PATCH] fixed pbm var env name in env docker

---
 srcs/plugins/google_map/google_map                | 1 -
 srcs/plugins/map_prof/map_prof                    | 1 -
 srcs/plugins/map_prof/map_prof.php                | 4 ++--
 srcs/requirements/wordpress/Dockerfile            | 7 ++++---
 srcs/requirements/wordpress/conf/wp_entrypoint.sh | 5 ++---
 5 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 120000 srcs/plugins/google_map/google_map
 delete mode 120000 srcs/plugins/map_prof/map_prof

diff --git a/srcs/plugins/google_map/google_map b/srcs/plugins/google_map/google_map
deleted file mode 120000
index 3704f62..0000000
--- a/srcs/plugins/google_map/google_map
+++ /dev/null
@@ -1 +0,0 @@
-/home/www-data//google_map
\ No newline at end of file
diff --git a/srcs/plugins/map_prof/map_prof b/srcs/plugins/map_prof/map_prof
deleted file mode 120000
index 5fcaf6e..0000000
--- a/srcs/plugins/map_prof/map_prof
+++ /dev/null
@@ -1 +0,0 @@
-/home/www-data//map_prof
\ No newline at end of file
diff --git a/srcs/plugins/map_prof/map_prof.php b/srcs/plugins/map_prof/map_prof.php
index 03c6fe7..80979d4 100644
--- a/srcs/plugins/map_prof/map_prof.php
+++ b/srcs/plugins/map_prof/map_prof.php
@@ -14,7 +14,7 @@ function my_init_script() {
 	wp_enqueue_style('my_style', $style_path);
 }
 
-// if bock theme : https://wordpress.org/support/topic/twenty-twenty-two-cpt-template-error-theme-without-header-is-deprecated/
+// if block theme : https://wordpress.org/support/topic/twenty-twenty-two-cpt-template-error-theme-without-header-is-deprecated/
 function add_map_api(){
 	?>
 		<script type="text/javascript" src="https://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
@@ -106,7 +106,7 @@ function print_content($content){
 					});
 				}
 				</script>';
-	$content .= '<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCvdGV2ssD4ov4a9CuIlQhoJyz5gWWiSvE&callback=initMap"></script>';
+	$content .= '<script async defer src="https://maps.googleapis.com/maps/api/js?sensor=false&key=AIzaSyCvdGV2ssD4ov4a9CuIlQhoJyz5gWWiSvE&callback=initMap"></script>';
 
 	return $content;
 };
diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile
index b7c7bc4..2af3acd 100644
--- a/srcs/requirements/wordpress/Dockerfile
+++ b/srcs/requirements/wordpress/Dockerfile
@@ -19,12 +19,13 @@ COPY ./conf/www.conf /etc/php7/php-fpm.d/
 RUN mkdir /run/php/
 
 ARG WP_VOLUME_DIR
+ARG WP_VOLUME_PLUGINS
 ARG MAX_UPLOAD_SIZE
 ARG EXECUTION_TIME
 
-# create and empty volume dir
-RUN mkdir -p ${WP_VOLUME_DIR} && \
-	rm -rf ${WP_VOLUME_DIR}/*
+# create and empty volumes dir
+RUN mkdir -p ${WP_VOLUME_DIR}   ${WP_VOLUME_PLUGINS} && \
+	rm -rf   ${WP_VOLUME_DIR}/* ${WP_VOLUME_PLUGINS}/*
 
 # replace max file size upload and execution time
 RUN sed -i "s/\(upload_max_filesize = \).*\(M\)/\1${MAX_UPLOAD_SIZE}\2/g" /etc/php7/php.ini && \
diff --git a/srcs/requirements/wordpress/conf/wp_entrypoint.sh b/srcs/requirements/wordpress/conf/wp_entrypoint.sh
index fd2e9aa..88275b0 100644
--- a/srcs/requirements/wordpress/conf/wp_entrypoint.sh
+++ b/srcs/requirements/wordpress/conf/wp_entrypoint.sh
@@ -68,11 +68,10 @@ chown -R www-data:www-data /var/www/*
 chmod 755 -R /var/www/*
 
 # symlinks for folders found in host plugins/
-plugins=$(ls ${WP_VOLUME_PLUGIN})
+plugins=$(ls ${WP_VOLUME_PLUGINS})
 for dir in $plugins; do
-    ln -s ${WP_VOLUME_PLUGIN}/$dir ${WP_VOLUME_DIR}/wp-content/plugins/$dir
+	ln -s ${WP_VOLUME_PLUGINS}/$dir ${WP_VOLUME_DIR}/wp-content/plugins/$dir
 done
 
-
 exec "${PHP_VERSION}" -FR