- added capacity in plugin tool to take urls

- test front end integration ok
This commit is contained in:
asus
2024-02-23 10:52:02 +01:00
parent fea195638b
commit 7cfa2e6351
6 changed files with 144 additions and 94 deletions

View File

@@ -51,26 +51,26 @@ class PLGNTLS_class
}
public function add_to_front($files_arr = null, $vars = null) {
if (!is_null($files_arr))
public function add_to_front($scripts_arr = null, $vars = null) {
if (!is_null($scripts_arr))
{
// add ajax file at beginning of files list
array_unshift($files_arr, "utils/plugin_ajax.js");
array_unshift($scripts_arr, "utils/plugin_ajax.js");
$nonce = array("ajax_nonce" => wp_create_nonce('wp-pageviews-nonce'));
$url = array("ajax_url" => admin_url('admin-ajax.php'));
$vars = array_merge($vars, $nonce);
$vars = array_merge($vars, $url);
}
$files = array();
foreach($files_arr as $key => $file_name) {
$files[] = $this->init_file($key, $file_name);
$scripts = array();
foreach($scripts_arr as $key => $script_name) {
$scripts[] = $this->init_script($key, $script_name);
}
if (!is_null($files_arr))
$this->add_files_to_front($files);
if (!is_null($scripts_arr))
$this->add_scripts_to_front($scripts);
if (!is_null($vars))
$this->add_vars_to_front($vars);
return $this->create_html($files, $vars);
return $this->create_html($scripts, $vars);
}
@@ -169,49 +169,49 @@ class PLGNTLS_class
* - to add ajax script and variables
* - default to true
*/
private function add_files_to_front($files_arr) {
//wp_enqueue_script(<give_it_a_name>, /url/to/file, [depends on], version, defer? );
//wp_enqueue_style( <give_it_a_name>, /url/to/file, [depends on], version, media );
private function add_scripts_to_front($scripts_arr) {
//wp_enqueue_script(<give_it_a_name>, /url/to/script, [depends on], version, defer? );
//wp_enqueue_style( <give_it_a_name>, /url/to/script, [depends on], version, media );
$previous_css_basename = '';
$previous_js_basename = '';
foreach ($files_arr as $file) {
if ($file->ext === "js") {
foreach ($scripts_arr as $script) {
if (in_array($script->ext, array("js", "url"))) {
if (is_null($this->_first_script))
$this->_first_script = $file->handle;
$depends_on = $this->check_dependencies($file, $previous_js_basename);
$this->_first_script = $script->handle;
$depends_on = $this->check_dependencies($script, $previous_js_basename);
if ($depends_on !== null)
wp_enqueue_script( $file->handle, $file->url, $depends_on, $file->version, true);
$previous_js_basename = $file->handle;
wp_enqueue_script( $script->handle, $script->url, $depends_on, $script->version, true);
$previous_js_basename = $script->handle;
}
else if ($file->ext === "css") {
$depends_on = $this->check_dependencies($file, $previous_css_basename);
else if ($script->ext === "css") {
$depends_on = $this->check_dependencies($script, $previous_css_basename);
if ($depends_on !== null)
wp_enqueue_style( $file->handle, $file->url, $depends_on, $file->version, '');
$previous_css_basename = $file->handle;
wp_enqueue_style( $script->handle, $script->url, $depends_on, $script->version, '');
$previous_css_basename = $script->handle;
}
}
}
private function check_dependencies(&$file, $previous_basename)
private function check_dependencies(&$script, $previous_basename)
{
if ($file->ext === "js")
if (in_array($script->ext, array("js", "url")))
{
global $wp_scripts;
$already_enqueued = array_search($file->handle, $wp_scripts->queue);
$already_enqueued = array_search($script->handle, $wp_scripts->queue);
if ($already_enqueued !== false)
return null;
}
else if ($file->ext === "css")
else if ($script->ext === "css")
{
global $wp_styles;
$already_enqueued = array_search($file->handle, $wp_styles->queue);
$already_enqueued = array_search($script->handle, $wp_styles->queue);
if ($already_enqueued !== false)
return null;
}
$depends_on = array();
if (isset($file->depends) && $file->depends !== '')
$depends_on[] = $file->depends;
if (isset($script->depends) && $script->depends !== '')
$depends_on[] = $script->depends;
if (isset($previous_basename) && $previous_basename !== '')
$depends_on[] = $previous_basename;
@@ -233,25 +233,40 @@ class PLGNTLS_class
* - version : used to avoid browser caching
* - depends : string if depends on a handle, or ''
*/
private function init_file($key, $file_name) {
$file = (object)[];
private function init_script($key, $script_name) {
$script = (object)[];
$file->ext = pathinfo($file_name, PATHINFO_EXTENSION);
if (! in_array($file->ext, array("js", "css", "html")))
if(filter_var($script_name, FILTER_VALIDATE_URL))
$script->ext = "url";
else
$script->ext = pathinfo($script_name, PATHINFO_EXTENSION);
if (! in_array($script->ext, array("js", "css", "html", "url")))
return null;
$file->basename = pathinfo($file_name, PATHINFO_BASENAME);
$file->handle = "PLGNTLS_" . str_replace(".", "_", $file->basename);
if ($script->ext === "url")
$script->basename = parse_url($script_name, PHP_URL_HOST);
else
$script->basename = pathinfo($script_name, PATHINFO_BASENAME);
$script->handle = "PLGNTLS_" . str_replace(".", "_", $script->basename);
console_log("script->handle:");
console_log($script->handle);
$file->url = $this->get_url().$file_name;
$file->path = $this->get_path().$file_name;
$file->version = date("ymd-Gis", filemtime($file->path));
if ($script->ext === "url") {
$script->url = $script_name;
$script->path = null;
$script->version = null;
}
else {
$script->url = $this->get_url().$script_name;
$script->path = $this->get_path().$script_name;
$script->version = date("ymd-Gis", filemtime($script->path));
}
$file->depends = '';
$script->depends = '';
if (is_string($key))
$file->depends = $key;
$script->depends = $key;
return $file;
return $script;
}