diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 33 | ||||
| -rw-r--r-- | include/text.php | 100 |
2 files changed, 96 insertions, 37 deletions
diff --git a/include/items.php b/include/items.php index 989edf683..316ab4b23 100644 --- a/include/items.php +++ b/include/items.php @@ -1539,6 +1539,39 @@ function item_sign(&$item) { $item['item_verified'] = 1; } +/** + * @brief packs json data for storage. + * if it is a string, check if it is already json encoded. + * Otherwise, json encode it + * If it is an array, sanitise it and then json_encode it. + * + * @param array $arr + * @param string | intval $k + * + * @return string | null + */ + +function item_json_encapsulate($arr, $k) { + $retval = null; + + if (isset($arr[$k])) { + if (is_string($arr[$k])) { + // determine if it is json encoded already + $test = json_decode($arr[$k]); + // assume it is json encoded already + $retval = $arr[$k]; + if ($test === NULL) { + $retval = json_encode($arr[$k], JSON_UNESCAPED_SLASHES); + } + } + else { + activity_sanitise($arr[$k]); + $retval = json_encode($arr[$k], JSON_UNESCAPED_SLASHES); + } + } + + return $retval; +} /** * @brief Stores an item type record. diff --git a/include/text.php b/include/text.php index d84b36378..aadca80e1 100644 --- a/include/text.php +++ b/include/text.php @@ -3301,61 +3301,87 @@ function json_url_replace($old,$new,&$s) { return $replaced; } +function item_url_replace($channel, &$item, $old, $new, $oldnick = '') { -function item_url_replace($channel,&$item,$old,$new,$oldnick = '') { - - if($item['attach']) { - json_url_replace($old,$new,$item['attach']); - if($oldnick && ($oldnick !== $channel['channel_address'])) - json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['attach']); - } - if($item['object']) { - json_url_replace($old,$new,$item['object']); - if($oldnick && ($oldnick !== $channel['channel_address'])) - json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['object']); + if (!empty($item['attach'])) { + $converted = false; + if (is_array($item['attach'])) { + $item['attach'] = item_json_encapsulate($item,'attach'); + $converted = true; + } + json_url_replace($old, $new, $item['attach']); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + json_url_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['attach']); + } + if ($converted) { + $item['attach'] = json_decode($item['attach'],true); + } } - if($item['target']) { - json_url_replace($old,$new,$item['target']); - if($oldnick && ($oldnick !== $channel['channel_address'])) - json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']); + + if (!empty($item['obj'])) { + $converted = false; + if (is_array($item['obj'])) { + $item['obj'] = item_json_encapsulate($item,'obj'); + $converted = true; + } + json_url_replace($old, $new, $item['obj']); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + json_url_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['obj']); + } + if ($converted) { + $item['obj'] = json_decode($item['obj'],true); + } } - $root_replaced = null; - $nick_replaced = null; + if (!empty($item['target'])) { + $converted = false; + if (is_array($item['target'])) { + $item['target'] = item_json_encapsulate($item,'target'); + $converted = true; + } + json_url_replace($old, $new, $item['target']); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + json_url_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['target']); + } + if ($converted) { + $item['target'] = json_decode($item['target'],true); + } + } // FIXME: ignore anything in a share tag + $item['body'] = str_replace($old, $new, $item['body']); - $item['body'] = str_replace($old, $new, $item['body'], $root_replaced); - - if($oldnick && ($oldnick !== $channel['channel_address'])) { - $item['body'] = str_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['body'], $nick_replaced); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + $item['body'] = str_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['body']); } - if ($root_replaced || $nick_replaced) { - $item['sig'] = Libzot::sign($item['body'], $channel['channel_prvkey']); - $item['item_verified'] = 1; - } + $item['sig'] = Libzot::sign($item['body'], $channel['channel_prvkey']); + $item['item_verified'] = 1; - $item['plink'] = str_replace($old,$new,$item['plink']); - if($oldnick && ($oldnick !== $channel['channel_address'])) - $item['plink'] = str_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['plink']); + if (isset($item['plink'])) { + $item['plink'] = str_replace($old, $new, $item['plink']); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + $item['plink'] = str_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['plink']); + } + } - $item['llink'] = str_replace($old,$new,$item['llink']); - if($oldnick && ($oldnick !== $channel['channel_address'])) - $item['llink'] = str_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['llink']); + if (isset($item['llink'])) { + $item['llink'] = str_replace($old, $new, $item['llink']); + if ($oldnick && ($oldnick !== $channel['channel_address'])) { + $item['llink'] = str_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['llink']); + } + } - if($item['term']) { - for($x = 0; $x < count($item['term']); $x ++) { - $item['term'][$x]['url'] = str_replace($old,$new,$item['term'][$x]['url']); + if (isset($item['term']) && is_array($item['term'])) { + for ($x = 0; $x < count($item['term']); $x++) { + $item['term'][$x]['url'] = str_replace($old, $new, $item['term'][$x]['url']); if ($oldnick && ($oldnick !== $channel['channel_address'])) { - $item['term'][$x]['url'] = str_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['term'][$x]['url']); + $item['term'][$x]['url'] = str_replace('/' . $oldnick . '/', '/' . $channel['channel_address'] . '/', $item['term'][$x]['url']); } } } - } - /** * @brief Used to wrap ACL elements in angle brackets for storage. * |