diff --git a/plugins/fipf_wp_plugin/fipf_wp_hooks.php b/plugins/fipf_wp_plugin/fipf_wp_hooks.php index e23f699..d21675a 100644 --- a/plugins/fipf_wp_plugin/fipf_wp_hooks.php +++ b/plugins/fipf_wp_plugin/fipf_wp_hooks.php @@ -26,18 +26,6 @@ include_once(dirname(__FILE__) . '/utils/create_html.php'); function main_shortcode() { -# # send styles files by name, without extension .css -# add_css_to_front( array( -# "mystyle", -# )); -# -# # send scripts files by name, without extension .js -# add_scripts_to_front( array( -# "myscript", -# "myscript2", -# "myscript3", -# )); - add_files_to_front( array( "mystyle.css", "myscript.js", @@ -45,17 +33,14 @@ function main_shortcode() { "myscript3.js", )); - $myvar_1 = "I am one"; $myvar_2 = "I am two"; - # maybe a future version of php will allow to - # get the name of a variable : - # https://wiki.php.net/rfc/nameof - # but for now i have to declare both the variable and its name - # (more : https://stackoverflow.com/q/255312/9497573) - add_var_to_front( array( - "myvar_1" => $myvar_1, - "myvar_2" => $myvar_2, + # compact creates an array containing the variables and their value + # as key => value + # from an array of variables names as strings + add_var_to_front( compact( + "myvar_1", + "myvar_2", )); return create_html( array( diff --git a/plugins/fipf_wp_plugin/utils/add_to_front.php b/plugins/fipf_wp_plugin/utils/add_to_front.php index 4189b99..9f9c34b 100644 --- a/plugins/fipf_wp_plugin/utils/add_to_front.php +++ b/plugins/fipf_wp_plugin/utils/add_to_front.php @@ -31,7 +31,14 @@ function add_files_to_front($files_arr) { } } +# this function expect an array of key => value +# with the key being name of the variable, like this : +# 'my_var' => 'value', +# simpler way to do it is to use compact when calling the function : +# add_var_to_front(compact("var1", "var2", "var3")); function add_var_to_front($var_array) { + extract($var_array); + foreach ($var_array as $key => $var) { $js_var = 'const ' . $key . ' = '; diff --git a/plugins/fipf_wp_plugin/utils/create_html.php b/plugins/fipf_wp_plugin/utils/create_html.php index dec3fe0..652ac6d 100644 --- a/plugins/fipf_wp_plugin/utils/create_html.php +++ b/plugins/fipf_wp_plugin/utils/create_html.php @@ -1,10 +1,5 @@