V9.9.6 Stable merge

Modules/feed/feed_controller.php

@@ -38,12 +38,12 @@ function feed_controller()
             $ui_version_2 = $user->get_preferences($session['userid'], 'deviceView');
 
             if (isset($ui_version_2) && $ui_version_2) {
-                $result = view("Modules/feed/Views/feedlist_view_v2.php",array());
+                return view("Modules/feed/Views/feedlist_view_v2.php",array());
             } else {
-                $result = view("Modules/feed/Views/feedlist_view.php",array());
+                return view("Modules/feed/Views/feedlist_view.php",array());
             }
         }
-        else if ($route->action == "api" && $session['write']) $result = view("Modules/feed/Views/feedapi_view.php",array());
+        else if ($route->action == "api" && $session['write']) return view("Modules/feed/Views/feedapi_view.php",array());
     }
 
     else if ($route->format == 'json')
@@ -52,22 +52,22 @@ function feed_controller()
         if ($route->action == "list")
         {
             if ($session['read']) {
-                if (!isset($_GET['userid']) || (isset($_GET['userid']) && $_GET['userid'] == $session['userid'])) $result = $feed->get_user_feeds($session['userid']);
-                else if (isset($_GET['userid']) && $_GET['userid'] != $session['userid']) $result = $feed->get_user_public_feeds(get('userid'));
+                if (!isset($_GET['userid']) || (isset($_GET['userid']) && $_GET['userid'] == $session['userid'])) return $feed->get_user_feeds($session['userid']);
+                else if (isset($_GET['userid']) && $_GET['userid'] != $session['userid']) return $feed->get_user_public_feeds(get('userid'));
             }
-            else if (isset($_GET['userid'])) $result = $feed->get_user_public_feeds(get('userid'));
+            else if (isset($_GET['userid'])) return $feed->get_user_public_feeds(get('userid'));
 
         } elseif ($route->action == "listwithmeta" && $session['read']) {
-            $result = $feed->get_user_feeds_with_meta($session['userid']);
+            return $feed->get_user_feeds_with_meta($session['userid']);
         } elseif ($route->action == "getid" && $session['read']) { 
             $route->format = "text";
-            $result = $feed->get_id($session['userid'],get("name"));
+            return $feed->get_id($session['userid'],get("name"));
         } elseif ($route->action == "create" && $session['write']) {
-            $result = $feed->create($session['userid'],get('tag'),get('name'),get('datatype'),get('engine'),json_decode(get('options')),get('unit'));
+            return $feed->create($session['userid'],get('tag'),get('name'),get('datatype'),get('engine'),json_decode(get('options')),get('unit'));
         } elseif ($route->action == "updatesize" && $session['write']) {
-            $result = $feed->update_user_feeds_size($session['userid']);
+            return $feed->update_user_feeds_size($session['userid']);
         } elseif ($route->action == "buffersize" && $session['write']) {
-            $result = $feed->get_buffer_size();
+            return $feed->get_buffer_size();
         // To "fetch" multiple feed values in a single request
         // http://emoncms.org/feed/fetch.json?ids=123,567,890
         } elseif ($route->action == "fetch") {
@@ -81,10 +81,87 @@ function feed_controller()
                    } else { $result[$i] = false; }
                 } else { $result[$i] = false; } // false means feed not found
             }
+            return $result;
         } else if ($route->action == "csvexport" && $session['write'] && isset($_GET['ids'])) {
             // Export multiple feeds on the same csv
             // http://emoncms.org/feed/csvexport.json?ids=1,3,4,5,6,7,8,157,156,169&start=1450137600&end=1450224000&interval=10&timeformat=1
-            $result = $feed->csv_export_multi(get('ids'),get('start'),get('end'),get('interval'),get('timeformat'),get('name'));
+            return $feed->csv_export_multi(get('ids'),get('start'),get('end'),get('interval'),get('timeformat'),get('name'));
+
+        // ----------------------------------------------------------------------------
+        // Multi feed actions
+        // ----------------------------------------------------------------------------
+        } else if (in_array($route->action,array("data","average"))) {
+            // get data for a list of existing feeds
+            $result = array('success'=>false, 'message'=>'bad parameters');
+            // return $_REQUEST;
+            $singular = false;
+            $feedids = array();
+            if (isset($_GET['id'])) {
+                $feedids = explode(",", get('id'));
+                $singular = true;
+            }
+            else if (isset($_GET['ids'])) $feedids = explode(",", get('ids'));
+
+            if (!empty($feedids)) {
+                $missing = array();
+                foreach($feedids as $key => $feedid) {
+                    if ($feed->exist($feedid)) { // if the feed exists
+                        $f = $feed->get($feedid);
+                        // if public or belongs to user
+                        if ($f['public'] || ($session['userid']>0 && $f['userid']==$session['userid'] && $session['read']))
+                        {
+
+                            $results[$key] = array('feedid'=>$feedid);
+
+                            // feed/data ----------------------------------------------
+                            if ($route->action=="data") {
+                                $skipmissing = 1;
+                                $limitinterval = 1;
+                                if (isset($_GET['skipmissing']) && $_GET['skipmissing']==0) $skipmissing = 0;
+                                if (isset($_GET['limitinterval']) && $_GET['limitinterval']==0) $limitinterval = 0;
+
+
+                                if (isset($_GET['interval'])) {
+                                    $results[$key]['data'] = $feed->get_data($feedid,get('start'),get('end'),get('interval'),$skipmissing,$limitinterval);
+                                } else if (isset($_GET['mode'])) {
+                                    if (isset($_GET['split'])) {
+                                        $results[$key]['data'] = $feed->get_data_DMY_time_of_day($feedid,get('start'),get('end'),get('mode'),get('split'));
+                                    } else {
+                                        $results[$key]['data'] = $feed->get_data_DMY($feedid,get('start'),get('end'),get('mode'));
+                                    }
+                                }
+                            // feed/average --------------------------------------------   
+                            } else if ($route->action == 'average') {
+                                if (isset($_GET['interval'])) {
+                                    $results[$key]['data'] = $feed->get_average($feedid,get('start'),get('end'),get('interval'));
+                                } else if (isset($_GET['mode'])) {
+                                    $results[$key]['data'] = $feed->get_average_DMY($feedid,get('start'),get('end'),get('mode'));
+                                }
+                            }
+                        }
+                    } else {
+                        $missing = $feedid;
+                    }
+                }
+                if (!empty($missing)) {
+                    // return error if any feed ids not found
+                    return array('success'=>false, 'message'=> count($missing) .' feeds do not exist');
+                } else {
+
+                    if ($singular && count($results)==1) {
+                        return $results[0]['data'];
+                    } else {
+                        return $results;
+                    } 
+                    // @todo: return array for each feed's data 
+                    // and a single array for each interval timestamp
+                }
+            } else {
+                // no ids passed
+                return array('success'=>false, 'message'=>'no ids given');
+            }
+            return $result;
+            // ----------------------------------------------------------------------------
         } else {
             $feedid = (int) get('id');
             // Actions that operate on a single existing feed that all use the feedid to select:
@@ -95,45 +172,22 @@ function feed_controller()
                 // if public or belongs to user
                 if ($f['public'] || ($session['userid']>0 && $f['userid']==$session['userid'] && $session['read']))
                 {
-                    if ($route->action == "timevalue") $result = $feed->get_timevalue($feedid);
-                    else if ($route->action == 'data') {
-                        $skipmissing = 1;
-                        $limitinterval = 1;
-                        if (isset($_GET['skipmissing']) && $_GET['skipmissing']==0) $skipmissing = 0;
-                        if (isset($_GET['limitinterval']) && $_GET['limitinterval']==0) $limitinterval = 0;
-
-                        if (isset($_GET['interval'])) {
-                            $result = $feed->get_data($feedid,get('start'),get('end'),get('interval'),$skipmissing,$limitinterval);
-                        } else if (isset($_GET['mode'])) {
-                            if (isset($_GET['split'])) {
-                                $result = $feed->get_data_DMY_time_of_day($feedid,get('start'),get('end'),get('mode'),get('split'));
-                            } else {
-                                $result = $feed->get_data_DMY($feedid,get('start'),get('end'),get('mode'));
-                            }
-                        }
-                    }
-                    else if ($route->action == 'average') {
-                        if (isset($_GET['interval'])) {
-                            $result = $feed->get_average($feedid,get('start'),get('end'),get('interval'));
-                        } else if (isset($_GET['mode'])) {
-                            $result = $feed->get_average_DMY($feedid,get('start'),get('end'),get('mode'));
-                        }
-                    }
-                    else if ($route->action == "value") $result = $feed->get_value($feedid); // null is a valid response
-                    else if ($route->action == "get") $result = $feed->get_field($feedid,get('field')); // '/[^\w\s-]/'
-                    else if ($route->action == "aget") $result = $feed->get($feedid);
-                    else if ($route->action == "getmeta") $result = $feed->get_meta($feedid);
-                    else if ($route->action == "setstartdate") $result = $feed->set_start_date($feedid,get('startdate'));
-
-                    else if ($route->action == 'histogram') $result = $feed->histogram_get_power_vs_kwh($feedid,get('start'),get('end'));
-                    else if ($route->action == 'kwhatpower') $result = $feed->histogram_get_kwhd_atpower($feedid,get('min'),get('max'));
-                    else if ($route->action == 'kwhatpowers') $result = $feed->histogram_get_kwhd_atpowers($feedid,get('points'));
-                    else if ($route->action == "csvexport") $result = $feed->csv_export($feedid,get('start'),get('end'),get('interval'),get('timeformat'));
+                    if ($route->action == "timevalue") return $feed->get_timevalue($feedid);
+                    else if ($route->action == "value") return $feed->get_value($feedid); // null is a valid response
+                    else if ($route->action == "get") return $feed->get_field($feedid,get('field')); // '/[^\w\s-]/'
+                    else if ($route->action == "aget") return $feed->get($feedid);
+                    else if ($route->action == "getmeta") return $feed->get_meta($feedid);
+                    else if ($route->action == "setstartdate") return $feed->set_start_date($feedid,get('startdate'));
+
+                    else if ($route->action == 'histogram') return $feed->histogram_get_power_vs_kwh($feedid,get('start'),get('end'));
+                    else if ($route->action == 'kwhatpower') return $feed->histogram_get_kwhd_atpower($feedid,get('min'),get('max'));
+                    else if ($route->action == 'kwhatpowers') return $feed->histogram_get_kwhd_atpowers($feedid,get('points'));
+                    else if ($route->action == "csvexport") return $feed->csv_export($feedid,get('start'),get('end'),get('interval'),get('timeformat'));
                     else if ($route->action == "export") {
-                        if ($f['engine']==Engine::MYSQL || $f['engine']==Engine::MYSQLMEMORY) $result = $feed->mysqltimeseries_export($feedid,get('start'));
-                        elseif ($f['engine']==Engine::PHPTIMESERIES) $result = $feed->phptimeseries_export($feedid,get('start'));
-                        elseif ($f['engine']==Engine::PHPFIWA) $result = $feed->phpfiwa_export($feedid,get('start'),get('layer'));
-                        elseif ($f['engine']==Engine::PHPFINA) $result = $feed->phpfina_export($feedid,get('start'));
+                        if ($f['engine']==Engine::MYSQL || $f['engine']==Engine::MYSQLMEMORY) return $feed->mysqltimeseries_export($feedid,get('start'));
+                        elseif ($f['engine']==Engine::PHPTIMESERIES) return $feed->phptimeseries_export($feedid,get('start'));
+                        elseif ($f['engine']==Engine::PHPFIWA) return $feed->phpfiwa_export($feedid,get('start'),get('layer'));
+                        elseif ($f['engine']==Engine::PHPFINA) return $feed->phpfina_export($feedid,get('start'));
                     }
                 }
 
@@ -155,64 +209,64 @@ function feed_controller()
                             // exists_tag_name returns false if not found
                             $unique = $feed->exists_tag_name($session['userid'], $new_tag, $new_name) === false;
                             // update if tag:name unique else return error;
-                            $result = $unique ? $feed->set_feed_fields($feedid, get('fields')) : array('success'=>false, 'message'=>'fields tag:name must be unique');
+                            return $unique ? $feed->set_feed_fields($feedid, get('fields')) : array('success'=>false, 'message'=>'fields tag:name must be unique');
                         }else{
                             // update if no tag/name change
-                            $result = $feed->set_feed_fields($feedid, get('fields'));
+                            return $feed->set_feed_fields($feedid, get('fields'));
                         }
 
                     // Insert datapoint
                     } else if ($route->action == "insert") { 
-                        $result = $feed->insert_data($feedid,time(),get("time"),get("value"));
+                        return $feed->insert_data($feedid,time(),get("time"),get("value"));
 
                     // Update datapoint
                     } else if ($route->action == "update") {
                         if (isset($_GET['updatetime'])) $updatetime = get("updatetime"); else $updatetime = time();
-                        $result = $feed->update_data($feedid,$updatetime,get("time"),get('value'));
+                        return $feed->update_data($feedid,$updatetime,get("time"),get('value'));
 
                     // Delete feed
                     } else if ($route->action == "delete") {
-                        $result = $feed->delete($feedid);
+                        return $feed->delete($feedid);
 
                     // Clear feed
                     } else if ($route->action == "clear") {
-                        $result = $feed->clear($feedid);
+                        return $feed->clear($feedid);
 
                     // Trim feed
                     } else if ($route->action == "trim") {
                         if (!filter_var(get('start_time'), FILTER_VALIDATE_INT)) return false;
                         $start_time = filter_var(get('start_time'), FILTER_SANITIZE_NUMBER_INT);
-                        $result = $feed->trim($feedid, $start_time);
+                        return $feed->trim($feedid, $start_time);
 
                     // Process
                     } else if ($route->action == "process") {
-                        if ($f['engine']!=Engine::VIRTUALFEED) { $result = array('success'=>false, 'message'=>'Feed is not Virtual'); }
-                        else if ($route->subaction == "get") $result = $feed->get_processlist($feedid);
-                        else if ($route->subaction == "set") $result = $feed->set_processlist($session['userid'], $feedid, post('processlist'),$process->get_process_list());
-                        else if ($route->subaction == "reset") $result = $feed->reset_processlist($feedid);
+                        if ($f['engine']!=Engine::VIRTUALFEED) { return array('success'=>false, 'message'=>'Feed is not Virtual'); }
+                        else if ($route->subaction == "get") return $feed->get_processlist($feedid);
+                        else if ($route->subaction == "set") return $feed->set_processlist($session['userid'], $feedid, post('processlist'),$process->get_process_list());
+                        else if ($route->subaction == "reset") return $feed->reset_processlist($feedid);
 
                     // Fast bulk uploader
                     } else if ($route->action == "upload") {
                         // Start time and interval
                         if (isset($_GET['start']) && isset($_GET['interval']) && isset($_GET['npoints'])) {
-                            $result = $feed->upload_fixed_interval($feedid,get("start"),get("interval"),get("npoints"));
+                            return $feed->upload_fixed_interval($feedid,get("start"),get("interval"),get("npoints"));
                         } else if (isset($_GET['npoints'])) {
-                            $result = $feed->upload_variable_interval($feedid,get("npoints"));
+                            return $feed->upload_variable_interval($feedid,get("npoints"));
                         }
                     }
 
                     if ($f['engine']==Engine::MYSQL || $f['engine']==Engine::MYSQLMEMORY) {
-                        if ($route->action == "deletedatapoint") $result = $feed->mysqltimeseries_delete_data_point($feedid,get('feedtime'));
-                        else if ($route->action == "deletedatarange") $result = $feed->mysqltimeseries_delete_data_range($feedid,get('start'),get('end'));
+                        if ($route->action == "deletedatapoint") return $feed->mysqltimeseries_delete_data_point($feedid,get('feedtime'));
+                        else if ($route->action == "deletedatarange") return $feed->mysqltimeseries_delete_data_range($feedid,get('start'),get('end'));
                     }
                 }
             }
             else
             {
-                $result = array('success'=>false, 'message'=>'Feed does not exist');
+                return array('success'=>false, 'message'=>'Feed does not exist');
             }
         }
     }
 
-    return array('content'=>$result);
+    return array('content'=>'<br>Action not found');
 }