Changeset 1430794

Timestamp:

06/05/2016 10:39:29 AM (10 years ago)

Author:

nikdo

Message:

Pass webcam directory as argument

Location:

react-webcam/tags/1.2.0

Files:

• . (copied) (copied from react-webcam/tags/1.1.0)
• react-webcam.php (modified) (4 diffs)
• readme.txt (copied) (copied from react-webcam/tags/1.1.0/readme.txt)

react-webcam/tags/1.2.0/react-webcam.php

@@ -23 +23 @@
     wp_enqueue_script('ReactWebcam_ActualImage', plugins_url('js/ActualImage.js', __FILE__), array('react'));
 
-    $upload_dir = wp_upload_dir();
+    $upload_path = wp_upload_dir();
 
     $ajax_url = admin_url('admin-ajax.php');
-    $webcam_url = $upload_dir['baseurl'] . '/' . WEBCAM_DIR . '/';
-    $initial_image_url = $webcam_url . '/' . get_last_filename();
+    $webcam_url = $upload_path['baseurl'] . '/' . WEBCAM_DIR . '/';
+    $initial_image_url = $webcam_url . '/' . get_last_filename(WEBCAM_DIR);
 
     return '
@@ -47 +47 @@
 
 // Returns filename of the last webcam image.
-function get_last_filename() {
+function get_last_filename($webcam_dir) {
 
-    $filenames = get_filenames();
+    $filenames = get_filenames($webcam_dir);
 
     $last_filename = end($filenames);
@@ -59 +59 @@
 
 // Returns list of all webcam image filenames.
-function get_filenames() {
+function get_filenames($webcam_dir) {
 
-    $upload_dir = wp_upload_dir();
-    $webcam_dir = $upload_dir['basedir'] . '/' . WEBCAM_DIR . '/';
+    $upload_path = wp_upload_dir();
+    $webcam_path = $upload_path['basedir'] . '/' . $webcam_dir . '/';
 
     $filenames = array();
-    foreach (glob($webcam_dir . '*') as $path) {
+    foreach (glob($webcam_path . '*') as $path) {
         array_push($filenames, basename($path));
     }
@@ -75 +75 @@
 // AJAX call handler to return last webcam image filename.
 function last_image() {
-    echo get_last_filename();
+    echo get_last_filename(WEBCAM_DIR);
     wp_die();
 }