Reversed previous commit

Zignature · Zignature · commit b500d9466d5b · 2021-11-20T22:53:17.000+01:00
diff --git a/system/user/addons/json/README.md b/system/user/addons/json/README.md
@@ -1,5 +1,7 @@
 # JSON #
 
+Output ExpressionEngine data in JSON format.
+
 ## Requirements
 
 - ExpressionEngine 4.x, 5.x or 6.x
@@ -12,10 +14,9 @@
 I don't own Assets, Matrix and Playa modules, so if you use Assets, Matrix or Playa fields I recommend to verify whether changes to the code are required and to test this plugin on a local or development server before using it on a production/live server.
 Since this plugin only outputs data I don't expect any damage but I will not accept any liability for any problems risen from using this plugin.
 
-***Do not select duplicate custom fields in channels***
+***No duplicate custom fields in channels!***
 
-Since EE4 it is possible to use custom fields outside of field groups as well as inside field groups. This plugin will not work when a new custom field is assigned as a standalone custom field as well as a grouped custom field within the same channel. You need to choose to use either a grouped custom field or a standalone custom field. This is because newly created custom fields get their own table in the database.
-Since legacy custom fields do not have their own table they will work fine either way.
+Since EE4 it is possible to use custom fields outside of field groups as well as inside field groups. This plugin will not work when a custom field is assigned as a standalone custom field as well as a grouped custom field within the same channel. You need to choose to use either a grouped custom field or a standalone custom field.
 
 ***Fluid fieldtype***
 
@@ -456,20 +457,15 @@ function yourCallbackFunction(data) {
 
 ## Changelog
 
-### v2.5.1
-
-- Bugfix: Removed all remnants of fluid field data, since the Fluid fieldtype is not (yet) supported the remnant data is unusable at this point. Working on support for Fluid fieldtype
-- Bugfix: Updated the `members` function to fit EE6.x
-- **Note:** not tested with Assets, Matrix, Playa and Channel Files fieldtypes/modules
-
 ### v2.5.0
 
-- ExpressionEngine 4+ compatibility
+- ExpressionEngine 4.x, 5.x or 6.x required
 - Several changes to the code due to database changes
 - Added support for File Grid fieldtype
-- Added support for legacy custom fields and data (EE2 and EE3 custom fields and data) for compatibility with upgraded versions of EE4+
-- Added `/system/user/addons/json/icon.png` for the EE6 control panel
-- **Note:** not tested with Assets, Matrix, Playa and Channel Files fieldtypes/modules
+- Added support for legacy custom fields and data (EE2 and EE3 custom fields and data)
+- Added `/system/user/addons/json/icon.png` for the control panel
+- Fluid fieldtype not supported
+- **Note:** not tested with Assets, Matrix and Playa
 
 ### v1.1.9
 
@@ -479,8 +475,53 @@ function yourCallbackFunction(data) {
 - Added `/system/user/addons/json/README.md` for the add-on manual in the control panel (as of EE3)
 - **Note:** not tested with Assets, Matrix and Playa
 
-## Attribution
+### v1.1.8
+
+- Added `json_plugin_entries_end` and `json_plugin_members_end` hooks
+- Improved Wygwam support
+- Fixed intermittent disappearing `ee()->TMPL` object
+
+### v1.1.7
+
+- Added `offset` support for members
+
+### v1.1.6
+
+- Add Channel Files support.
+
+### v1.1.5
+
+- Add `root_node` and `item_root_node` parameters.
+
+### v1.1.4
+
+- Add manipulations to Assets fields
+
+### v1.1.3
+
+- Fix bug where show_categories parameter did not work
+
+### v1.1.2
+
+- Fix bug where `fields` parameter was not being honored
+- Fix bug causing fatal MySQL error when using the `fixed_order` parameter
+
+### v1.1.1
+
+- Fix WSOD on Plugins page
+- Fix PHP errors when an Assests field has no selection(s)
+
+### v1.1.0
+
+- Added support for the following fieldtypes: Assets, Grid, Playa, Relationships
+- Change IDs (entry_id, author_id, etc.) and Dates to integers
+- Added `show_categories` and `show_category_group` parameters to `{exp:json:entries}`
+- Added `{exp:json:search}`
+- Added JSONP support
+- Added `date_format` parameter
+- Added `content_type` parameter
 
-This plugin is a fork of the excellent [JSON plugin](https://github.com/rsanchez/json) by [Rob Sanchez](https://github.com/rsanchez).
+## Upgrading from 1.0.x
 
-Since I'm a jack of all trades and master of none, I could have never done this without the jumpstart Rob Sanchez's plugin gave me.
+- IDs (entry_id, author_id, etc.) and Dates are returned as integers
+- The following fieldtypes have different output: Playa, Assets. Please see docs above for an example of their output.
diff --git a/system/user/addons/json/addon.setup.php b/system/user/addons/json/addon.setup.php
@@ -1,23 +1,20 @@
 <?php
 /*
  *
- * Original author: Rob Sanchez
- * Original author URL: https://github.com/rsanchez
- * Original docs URL: https://github.com/rsanchez/json
- *
- * Requires ExpressionEngine 4.x, 5.x or 6.x.
+ * Requires ExpressionEngine 6.
  * Older versions of ExpressionEngine are not supported.
  *
- * EE4-EE6 compatibility created by Zignature.
+ * EE6 compatibility created by Zignature.
+ * https://github.com/zignature/json
  *
  */
 return array(
-	'author'			=> 'Zignature',
-	'author_url'		=> 'https://github.com/zignature',
+	'author'			=> 'Rob Sanchez',
+	'author_url'		=> 'https://github.com/rsanchez',
 	'description'		=> 'Output ExpressionEngine channel entries in JSON format.',
-	'docs_url'			=> 'https://github.com/zignature/json',
+	'docs_url'			=> 'https://github.com/rsanchez/json',
 	'name'				=> 'JSON',
 	'settings_exist'	=> FALSE,
-	'version'			=> '2.5.1',
-	'namespace'			=> 'zignature/json'
+	'version'			=> '2.5.0',
+	'namespace'			=> 'rsanchez/json'
 );
diff --git a/system/user/addons/json/pi.json.php b/system/user/addons/json/pi.json.php
@@ -30,13 +30,13 @@ public function entries($entry_ids = null)
   {
     $this->initialize('entries');
 
-    // exit if ajax request is required and not found
+    //exit if ajax request is required and not found
     if ($this->check_xhr_required())
     {
       return '';
     }
 
-    // instantiate channel module object
+    //instantiate channel module object
     if (empty($this->channel))
     {
       require_once PATH_MOD.'channel/mod.channel.php';
@@ -55,7 +55,7 @@ public function entries($entry_ids = null)
     }
     else
     {
-      // run through the channel module process to grab the entries
+      //run through the channel module process to grab the entries
       $this->channel->uri = ($this->channel->query_string != '') ? $this->channel->query_string : 'index.php';
 
       if ($this->channel->enable['custom_fields'] === TRUE)
@@ -107,7 +107,6 @@ public function entries($entry_ids = null)
           ->join('channels_channel_field_groups', 'channel_field_groups_fields.group_id = channels_channel_field_groups.group_id')
           ->join('channels', 'channels_channel_field_groups.channel_id = channels.channel_id')
           ->where('channels.site_id', ee()->config->item('site_id'))
-          ->where('channel_fields.field_type !=', 'fluid_field')
           ->where_in('channels.channel_name', explode('|', ee()->TMPL->fetch_param('channel')))
           ->get()
           ->result_array();
@@ -117,7 +116,6 @@ public function entries($entry_ids = null)
           ->join('channels_channel_fields', 'channel_fields.field_id = channels_channel_fields.field_id')
           ->join('channels', 'channels_channel_fields.channel_id = channels.channel_id')
           ->where('channels.site_id', ee()->config->item('site_id'))
-          ->where('channel_fields.field_type !=', 'fluid_field')
           ->where_in('channels.channel_name', explode('|', ee()->TMPL->fetch_param('channel')))
           ->get()
           ->result_array();
@@ -160,20 +158,19 @@ public function entries($entry_ids = null)
       {
         if (empty($this->fields) || in_array($field['field_name'], $this->fields))
         {
-
-          if ( ee()->db->table_exists('channel_data_field_'.$field['field_id']) )
+          if ( ee()->db->table_exists('channel_data_field_'.$field['field_id']) AND ee()->db->field_exists('field_id_'.$field['field_id'], 'channel_data_field_'.$field['field_id']) )
           {
             $select[] = 'cdf_'.$field['field_id'].'.'.ee()->db->protect_identifiers('field_id_'.$field['field_id']).' AS '.ee()->db->protect_identifiers($field['field_name']);
           }
-          // We got legacy channel data, let's get it
+          // Legacy data?
           else
           {
-            $select[] = 'lcd.'.ee()->db->protect_identifiers('field_id_'.$field['field_id']).' AS '.ee()->db->protect_identifiers($field['field_name']);
+            $select[] = 'cd.'.ee()->db->protect_identifiers('field_id_'.$field['field_id']).' AS '.ee()->db->protect_identifiers($field['field_name']);
           }
         }
       }
 
-      // we need entry_id, always grab it
+      //we need entry_id, always grab it
       if ( ! in_array('t.entry_id', $select))
       {
         $select[] = 't.entry_id';
@@ -188,19 +185,11 @@ public function entries($entry_ids = null)
         {
           ee()->db->join('channel_data_field_'.$field['field_id'].' cdf_'.$field['field_id'], 't.entry_id = cdf_'.$field['field_id'].'.entry_id');
         }
-        // We got legacy channel data, let's join it
-        else
-        {
-          // Make sure the legacy channel data has not already been joined
-          if ( ! isset($is_legacy_data_joined) ) {
-            // join legacy channel data
-            ee()->db->join('channel_data lcd', 't.entry_id = lcd.entry_id');
-            // Set flag because we want this join only once!
-            $is_legacy_data_joined = TRUE;
-          }
-        }
       }
 
+      // legacy data
+      ee()->db->join('channel_data cd', 't.entry_id = cd.entry_id');
+
       ee()->db->where_in('t.entry_id', $this->entries_entry_ids);
 
 
@@ -260,7 +249,7 @@ public function entries($entry_ids = null)
           unset($entry['yearweek']);
         }
 
-        // format dates as javascript unix time (in microseconds!)
+        //format dates as javascript unix time (in microseconds!)
         if (isset($entry['entry_date']))
         {
           $entry['entry_date'] = $this->date_format($entry['entry_date']);
@@ -278,14 +267,10 @@ public function entries($entry_ids = null)
 
         foreach ($this->entries_custom_fields as &$field)
         {
-          // check for file grid fieldtype, if found "convert" it to grid fieldtype
-          $field_type = $field['field_type'];
-          if ( $field_type == "file_grid" ) $field_type = "grid";
-
-          // call our custom callback for this fieldtype if it exists
-          if (is_callable(array($this, 'entries_'.$field_type)))
+          //call our custom callback for this fieldtype if it exists
+          if (is_callable(array($this, 'entries_'.$field['field_type'])))
           {
-            $entry[$field['field_name']] = call_user_func(array($this, 'entries_'.$field_type), $entry['entry_id'], $field, $entry[$field['field_name']], $entry);
+            $entry[$field['field_name']] = call_user_func(array($this, 'entries_'.$field['field_type']), $entry['entry_id'], $field, $entry[$field['field_name']], $entry);
           }
         }
 
@@ -345,7 +330,6 @@ public function entries($entry_ids = null)
     return $this->respond($this->entries, array(ee()->typography, 'parse_file_paths'));
   }
 
-
   protected function entries_matrix($entry_id, $field, $field_data)
   {
     if (is_null($this->entries_matrix_rows))
@@ -413,11 +397,74 @@ protected function entries_grid($entry_id, $field, $field_data)
   {
     if ( ! isset($this->entries_grid_rows[$field['field_id']]))
     {
-      $query = ee()->db->where('fluid_field_data_id', '0')
-                       ->where_in('entry_id', $this->entries_entry_ids)
+      $query = ee()->db->where_in('entry_id', $this->entries_entry_ids)
                        ->order_by('row_order')
                        ->get('channel_grid_field_'.$field['field_id']);
 
+      foreach ($query->result_array() as $row)
+      {
+        if ( ! isset($this->entries_grid_rows[$field['field_id']][$row['entry_id']]))
+        {
+          $this->entries_grid_rows[$field['field_id']][$row['entry_id']] = array();
+        }
+
+        $this->entries_grid_rows[$field['field_id']][$row['entry_id']][] = $row;
+      }
+
+      $query->free_result();
+    }
+
+    if (is_null($this->entries_grid_cols))
+    {
+      $query = ee()->db->order_by('col_order', 'ASC')
+                       ->get('grid_columns');
+
+      foreach ($query->result_array() as $row)
+      {
+        if ( ! isset($this->entries_grid_cols[$row['field_id']]))
+        {
+          $this->entries_grid_cols[$row['field_id']] = array();
+        }
+
+        $this->entries_grid_cols[$row['field_id']][$row['col_id']] = $row;
+      }
+
+      $query->free_result();
+    }
+
+    $data = array();
+
+    if (isset($this->entries_grid_rows[$field['field_id']][$entry_id]) && isset($this->entries_grid_cols[$field['field_id']]))
+    {
+      foreach ($this->entries_grid_rows[$field['field_id']][$entry_id] as $grid_row)
+      {
+        $row = array('row_id' => (int) $grid_row['row_id']);
+
+        foreach ($this->entries_grid_cols[$field['field_id']] as $col_id => $col)
+        {
+          // $row[$col['col_name']] = $grid_row['col_id_'.$col_id];
+          $val = $grid_row['col_id_' . $col_id];
+          if ($col['col_type'] == 'relationship')
+          {
+            $val = $this->entries_grid_relationship($col_id, $row['row_id'], $entry_id);
+          }
+          $row[$col['col_name']] = $val;
+        }
+
+        $data[] = $row;
+      }
+    }
+
+    return $data;
+  }
+
+  protected function entries_file_grid($entry_id, $field, $field_data)
+  {
+    if ( ! isset($this->entries_grid_rows[$field['field_id']]))
+    {
+      $query = ee()->db->where_in('entry_id', $this->entries_entry_ids)
+                       ->order_by('row_order')
+                       ->get('channel_grid_field_'.$field['field_id']);
 
       foreach ($query->result_array() as $row)
       {
@@ -779,7 +826,8 @@ protected function entries_custom_field($entry_id, $field, $field_data, $entry,
     return $field_data;
   }
 
-  protected function entries_wygwam($entry_id, $field, $field_data, $entry) {
+  protected function entries_wygwam($entry_id, $field, $field_data, $entry)
+  {
     return $this->entries_custom_field($entry_id, $field, $field_data, $entry);
   }
 
@@ -821,7 +869,7 @@ protected function entries_assets($entry_id, $field, $field_data, $entry)
     {
       $source_type = $row['source_type'];
       $filedir_id = $row['filedir_id'];
-      // excise any other fields from this row
+      //excise any other fields from this row
       $row = array_intersect_key($row, array_flip($fields));
       $row['file_id'] = (int) $row['file_id'];
       $row['date'] = $this->date_format($row['date']);
@@ -996,6 +1044,7 @@ public function members()
       'm.timezone',
     );
 
+    // for backwards compatibility
     if (version_compare(APP_VER, '6.0.0', '>='))
     {
       $default_fields[1] = "m.role_id";
@@ -1056,8 +1105,7 @@ public function members()
 
     if (ee()->TMPL->fetch_param('group_id'))
     {
-      $m_group_id = version_compare(APP_VER, '6.0.0', '>=') ? 'm.role_id' : 'm.group_id';
-      ee()->db->where_in($m_group_id, explode('|', ee()->TMPL->fetch_param('group_id')));
+      ee()->db->where_in('m.group_id', explode('|', ee()->TMPL->fetch_param('group_id')));
     }
 
     if (ee()->TMPL->fetch_param('limit'))
@@ -1105,7 +1153,7 @@ protected function initialize($which = NULL)
     switch($which)
     {
       case 'entries':
-        // initialize caches
+        //initialize caches
         $this->entries = array();
         $this->entries_entry_ids = array();
         $this->entries_custom_fields = array();
@@ -1179,8 +1227,7 @@ protected function respond(array $response, $callback = NULL)
     }
 
     $response = function_exists('json_encode')
-      // ? json_encode($response,JSON_PRETTY_PRINT)
-      ? json_encode($response)
+      ? json_encode($response,JSON_PRETTY_PRINT) // json_encode($response,JSON_PRETTY_PRINT) for development
       : ee()->javascript->generate_json($response, TRUE);
 
     if ( ! is_null($callback))
