diff --git a/package-lock.json b/package-lock.json index 3c52f450d..26e74dbb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4293,9 +4293,9 @@ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, "jsprim": { diff --git a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php index 6f2ad158e..fa82fb78a 100644 --- a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php +++ b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php @@ -423,6 +423,9 @@ class REST_Items_Controller extends REST_Controller { foreach($tax_query as $tax) { + if ( !isset($tax['taxonomy']) || !isset($tax['terms']) ) + continue; + $taxonomy = $tax['taxonomy']; $taxonomy_id = $this->taxonomies_repository->get_id_by_db_identifier($taxonomy); $terms_id = is_array($tax['terms']) ? $tax['terms']: [$tax['terms']]; diff --git a/src/classes/class-tainacan-elastic-press.php b/src/classes/class-tainacan-elastic-press.php index b68d2f7b6..f5e6b3d9e 100644 --- a/src/classes/class-tainacan-elastic-press.php +++ b/src/classes/class-tainacan-elastic-press.php @@ -274,6 +274,8 @@ class Elastic_Press { if( isset($args['tax_query']) ) { foreach( $args['tax_query'] as $taxquery ) { + if ( !isset($tax['taxonomy']) || !isset($tax['terms']) ) + continue; if( $taxquery['taxonomy'] === $taxonomy_slug ) { $include = is_array($taxquery['terms']) ? $taxquery['terms'] : [$taxquery['terms']]; } @@ -288,6 +290,8 @@ class Elastic_Press { if( isset($args['meta_query']) ) { foreach( $args['meta_query'] as $metaquery ) { + if ( !isset($meta['key']) || !isset($meta['value']) ) + continue; if( isset($metaquery['key']) && $metaquery['key'] == $metadatum_id ){ $include = is_array($metaquery['value']) ? $metaquery['value'] : [$metaquery['value']]; } diff --git a/src/classes/importer/class-tainacan-csv.php b/src/classes/importer/class-tainacan-csv.php index 349d0acb0..5f0537967 100644 --- a/src/classes/importer/class-tainacan-csv.php +++ b/src/classes/importer/class-tainacan-csv.php @@ -545,7 +545,7 @@ class CSV extends Importer { $id = $TainacanMedia->insert_attachment_from_file($server_path_files . $correct_value, $item_inserted->get_id()); if(!$id) { - $this->add_error_log('Error in Document file imported from server ' . $correct_value); + $this->add_error_log('Error in Document file imported from server ' . $server_path_files . $correct_value); return false; } @@ -604,7 +604,7 @@ class CSV extends Importer { $id = $TainacanMedia->insert_attachment_from_file($server_path_files . $attachment, $item_inserted->get_id()); if(!$id) { - $this->add_log('Error in Attachment file imported from server ' . $attachment); + $this->add_log('Error in Attachment file imported from server ' . $server_path_files . $attachment); continue; } diff --git a/src/classes/importer/class-tainacan-flickr-importer.php b/src/classes/importer/class-tainacan-flickr-importer.php index 920c212ff..6b5f164a0 100644 --- a/src/classes/importer/class-tainacan-flickr-importer.php +++ b/src/classes/importer/class-tainacan-flickr-importer.php @@ -5,542 +5,542 @@ use Tainacan\Entities; class Flickr_Importer extends Importer { - protected $endPoint = 'https://api.flickr.com/services/rest/?'; - protected $method = 'method=flickr.'; - protected $apiKey = '&api_key='; - protected $perPage = '&per_page=1'; - protected $format = '&format=json&nojsoncallback=1'; - protected $apiKeyValue = '59dcf7e8e317103416c529b476f44fab'; - - protected $steps = [ - [ - 'name' => 'Identify URL', - 'progress_label' => 'Identify URL', - 'callback' => 'identify_url' - ], - [ - 'name' => 'Import Items', - 'progress_label' => 'Import Items', - 'callback' => 'process_collections', - 'total' => 2 - ], - ]; - - /** - * constructor - */ - public function __construct($attributes = array()) { - parent::__construct($attributes); - - $this->col_repo = \Tainacan\Repositories\Collections::get_instance(); - $this->items_repo = \Tainacan\Repositories\Items::get_instance(); - $this->metadata_repo = \Tainacan\Repositories\Metadata::get_instance(); - $this->item_metadata_repo = \Tainacan\Repositories\Item_Metadata::get_instance(); - $this->tax_repo = \Tainacan\Repositories\Taxonomies::get_instance(); - $this->term_repo = \Tainacan\Repositories\Terms::get_instance(); - - $this->remove_import_method('file'); - $this->add_import_method('url'); - - } - - /** - * @inheritdoc - */ - public function get_source_metadata() { - $details = $this->identify_url(true); - $this->apiKeyValue = $this->get_option('api_id'); - - - if( $details && $this->apiKeyValue ){ - - return [ - 'title', - 'ownername', - 'tags', - 'description', - 'owner', - 'date_upload', - 'url', - 'id', - 'type', - 'views', - 'image_thumbnail', - 'image_medium', - 'image_large', - ]; - } else { - return []; - } - } - - /** - * Method implemented by the child importer class to proccess each item - * @return array - */ - public function process_item( $index, $collection_definition ){ - $items_json = $this->get_list_items(); - - $type = $this->get_transient('url_type'); - - switch ($type) { - - case 'album': - return $this->process_item_album_request( $items_json, $index, $collection_definition ); - - case 'user': - return $this->process_item_user_request( $items_json, $index, $collection_definition ); - - case 'singlephoto': - return $this->process_item_single_request( $items_json, $index, $collection_definition ); - - default: - return []; - } - } - - /** - * method responsible for identify the type of url - * - * @param bool $showDetails - * @return array|bool - */ - public function identify_url( $showDetails = false ){ - $url = $this->get_url(); - $details = []; - $matches = []; - - $preg_entities = [ - 'album' => 'albums\/(([^\/])+)', - 'singlephoto' => '(([^\/])+?)\/in\/', - 'user' => 'photos\/(([^\/])+)', //match YouTube user from url - ]; - - - foreach ( $preg_entities as $key => $preg_entity ) { - //var_dump(preg_match( $preg_entity, $url, $matches )); - if ( preg_match( '/' . $preg_entity . '/', $url, $matches ) ) { - if ( isset( $matches[1] ) ) { - $details = [ - 'type' => $key, - 'id' => $matches[1], - ]; - break; - } - } - } - - if( !$details ) { - $this->add_error_log('None url from flickr has found'); - $this->abort(); - return false; - } else { - $this->add_transient( 'url_type', $details['type'] ); - $this->add_transient( 'flickr_id', $details['id'] ); - return ( !$showDetails ) ? false : $details; - } - - } - - /** - * @inheritdoc - */ - public function get_source_number_of_items() { - $type = $this->get_transient('url_type'); - - switch ($type) { - case 'singlephoto': - return 1; - break; - - default: - $json = $this->get_list_items(); - - if( isset( $json->photos ) && isset( $json->photos->total ) ){ - return $json->photos->total; - } else if( isset( $json->photoset ) && isset( $json->photoset->total ) ){ - return $json->photoset->total; - } - break; - } - - return 0; - } - - /** - * return the list of items for the different types of url - * - * @return array|mixed - */ - private function get_list_items() { - $type = $this->get_transient('url_type'); - $id = $this->get_transient('flickr_id'); - $pageToken = $this->get_transient('pageToken'); - - switch ($type) { - - case 'album': - $api_url = $this->endPoint . - $this->method . 'photosets.getPhotos' . - $this->apiKey . $this->apiKeyValue . '&photoset_id=' . $id . - '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o' . - $this->perPage . '&page=' . $pageToken . $this->format; - - $this->add_log('url ' . $api_url); - - $response = wp_remote_get( $api_url ); - $body = wp_remote_retrieve_body( $response ); - $json = json_decode($body); - if( $json && isset($json->photoset) ){ - return $json; - } - break; - - case 'user': - $api_url = $this->endPoint . - $this->method . 'photos.search' . - $this->apiKey . $this->apiKeyValue . '&user_id=' . $id . - '&sort=date-posted-asc&content_type=1&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o' . - $this->perPage . '&page=' . $pageToken . $this->format; - - $this->add_log('url ' . $api_url); - - $response = wp_remote_get( $api_url ); - $body = wp_remote_retrieve_body( $response ); - $json = json_decode($body); - - if( $json && isset($json->photos) ){ - return $json; - - } - break; - - case 'singlephoto': - $api_url = $this->endPoint . - $this->method . 'photos.getInfo' . - $this->apiKey . $this->apiKeyValue . '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o&photo_id=' - . $id . $this->format; - - $this->add_log('url ' . $api_url); - - $response = wp_remote_get( $api_url ); - $body = wp_remote_retrieve_body( $response ); - $json = json_decode($body); - if( $json && isset($json->photo) ){ - return $json; - - } - break; - - default: - return []; - break; - } - - return []; - } - - /** - * get raw user request and return data from specific index - * - * @param $items_json - * @param $index - * @param $collection_definition - * @return array - * @throws \Exception - */ - private function process_item_user_request( $items_json, $index, $collection_definition ){ - $processedItem = []; - - if ( $items_json && $items_json->photos ) { - $item = $items_json->photos->photo[0]; - - $id = $this->get_transient('insertedId'); - - if ($id && $id === $item->id ) { - return false; - } - - $items_json_from_item = $this->get_item_data( $item->id ); - $processedItem = $this->process_item_single_request( $items_json_from_item, $index, $collection_definition ); - - $token = $index + 2; - $this->add_log('nextToken ' . $token); - if ( $token ) { - $this->add_transient( 'pageToken', $token ); - } - - $this->add_transient( 'insertedId', $item->id ); - } - - return $processedItem; - } - - /** - * get raw album request and return data from specific index - * - * @param $items_json - * @param $index - * @param $collection_definition - * @return array - * @throws \Exception - */ - private function process_item_album_request( $items_json, $index, $collection_definition ){ - $processedItem = []; - - if ( $items_json && $items_json->photoset ) { - $item = $items_json->photoset->photo[0]; - - $id = $this->get_transient('insertedId'); - - if ($id && $id === $item->id ) { - return false; - } - - $items_json_from_item = $this->get_item_data( $item->id ); - $processedItem = $this->process_item_single_request( $items_json_from_item, $index, $collection_definition ); - - $token = $index + 2; - $this->add_log('nextToken ' . $token); - if ( $token ) { - $this->add_transient( 'pageToken', $token ); - } - - $this->add_transient( 'insertedId', $item->id ); - } - - return $processedItem; - } - - /** - * get raw item request and return data from specific index - * - * @param $items_json - * @param $index - * @param $collection_definition - * @return array - * @throws \Exception - */ - private function process_item_single_request( $items_json, $index, $collection_definition ){ - $processedItem = []; - - if ( $items_json && $items_json->photo ) { - $item = $items_json->photo; - - $id = $this->get_transient('insertedId'); - - if ($id && $id === $item->id ) { - return false; - } - - $url_image = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_b.jpg'; - $this->add_transient('image_url', $url_image); - - foreach ($collection_definition['mapping'] as $metadatum_id => $raw_metadatum) { - $value = ''; - - switch ($raw_metadatum) { - case 'title': - $value = $item->title->_content; - break; - - case 'ownername': - $value = $item->owner->username; - break; - - case 'tags': - $tags = []; - - if ( isset( $item->tags ) && isset( $item->tags->tag ) && is_array( $item->tags->tag ) ) { - foreach ( $item->tags->tag as $tag ) { - if (isset($tag->raw)) { + protected $endPoint = 'https://api.flickr.com/services/rest/?'; + protected $method = 'method=flickr.'; + protected $apiKey = '&api_key='; + protected $perPage = '&per_page=1'; + protected $format = '&format=json&nojsoncallback=1'; + protected $apiKeyValue = '59dcf7e8e317103416c529b476f44fab'; + + protected $steps = [ + [ + 'name' => 'Identify URL', + 'progress_label' => 'Identify URL', + 'callback' => 'identify_url' + ], + [ + 'name' => 'Import Items', + 'progress_label' => 'Import Items', + 'callback' => 'process_collections', + 'total' => 2 + ], + ]; + + /** + * constructor + */ + public function __construct($attributes = array()) { + parent::__construct($attributes); + + $this->col_repo = \Tainacan\Repositories\Collections::get_instance(); + $this->items_repo = \Tainacan\Repositories\Items::get_instance(); + $this->metadata_repo = \Tainacan\Repositories\Metadata::get_instance(); + $this->item_metadata_repo = \Tainacan\Repositories\Item_Metadata::get_instance(); + $this->tax_repo = \Tainacan\Repositories\Taxonomies::get_instance(); + $this->term_repo = \Tainacan\Repositories\Terms::get_instance(); + + $this->remove_import_method('file'); + $this->add_import_method('url'); + + } + + /** + * @inheritdoc + */ + public function get_source_metadata() { + $details = $this->identify_url(true); + $this->apiKeyValue = $this->get_option('api_id'); + + + if( $details && $this->apiKeyValue ){ + + return [ + 'title', + 'ownername', + 'tags', + 'description', + 'owner', + 'date_upload', + 'url', + 'id', + 'type', + 'views', + 'image_thumbnail', + 'image_medium', + 'image_large', + ]; + } else { + return []; + } + } + + /** + * Method implemented by the child importer class to proccess each item + * @return array + */ + public function process_item( $index, $collection_definition ){ + $items_json = $this->get_list_items(); + + $type = $this->get_transient('url_type'); + + switch ($type) { + + case 'album': + return $this->process_item_album_request( $items_json, $index, $collection_definition ); + + case 'user': + return $this->process_item_user_request( $items_json, $index, $collection_definition ); + + case 'singlephoto': + return $this->process_item_single_request( $items_json, $index, $collection_definition ); + + default: + return []; + } + } + + /** + * method responsible for identify the type of url + * + * @param bool $showDetails + * @return array|bool + */ + public function identify_url( $showDetails = false ){ + $url = $this->get_url(); + $details = []; + $matches = []; + + $preg_entities = [ + 'album' => 'albums\/(([^\/])+)', + 'singlephoto' => '(([^\/])+?)\/in\/', + 'user' => 'photos\/(([^\/])+)', //match YouTube user from url + ]; + + + foreach ( $preg_entities as $key => $preg_entity ) { + //var_dump(preg_match( $preg_entity, $url, $matches )); + if ( preg_match( '/' . $preg_entity . '/', $url, $matches ) ) { + if ( isset( $matches[1] ) ) { + $details = [ + 'type' => $key, + 'id' => $matches[1], + ]; + break; + } + } + } + + if( !$details ) { + $this->add_error_log('None url from flickr has found'); + $this->abort(); + return false; + } else { + $this->add_transient( 'url_type', $details['type'] ); + $this->add_transient( 'flickr_id', $details['id'] ); + return ( !$showDetails ) ? false : $details; + } + + } + + /** + * @inheritdoc + */ + public function get_source_number_of_items() { + $type = $this->get_transient('url_type'); + + switch ($type) { + case 'singlephoto': + return 1; + break; + + default: + $json = $this->get_list_items(); + + if( isset( $json->photos ) && isset( $json->photos->total ) ){ + return $json->photos->total; + } else if( isset( $json->photoset ) && isset( $json->photoset->total ) ){ + return $json->photoset->total; + } + break; + } + + return 0; + } + + /** + * return the list of items for the different types of url + * + * @return array|mixed + */ + private function get_list_items() { + $type = $this->get_transient('url_type'); + $id = $this->get_transient('flickr_id'); + $pageToken = $this->get_transient('pageToken'); + + switch ($type) { + + case 'album': + $api_url = $this->endPoint . + $this->method . 'photosets.getPhotos' . + $this->apiKey . $this->apiKeyValue . '&photoset_id=' . $id . + '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o' . + $this->perPage . '&page=' . $pageToken . $this->format; + + $this->add_log('url ' . $api_url); + + $response = wp_remote_get( $api_url ); + $body = wp_remote_retrieve_body( $response ); + $json = json_decode($body); + if( $json && isset($json->photoset) ){ + return $json; + } + break; + + case 'user': + $api_url = $this->endPoint . + $this->method . 'photos.search' . + $this->apiKey . $this->apiKeyValue . '&user_id=' . $id . + '&sort=date-posted-asc&content_type=1&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o' . + $this->perPage . '&page=' . $pageToken . $this->format; + + $this->add_log('url ' . $api_url); + + $response = wp_remote_get( $api_url ); + $body = wp_remote_retrieve_body( $response ); + $json = json_decode($body); + + if( $json && isset($json->photos) ){ + return $json; + + } + break; + + case 'singlephoto': + $api_url = $this->endPoint . + $this->method . 'photos.getInfo' . + $this->apiKey . $this->apiKeyValue . '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o&photo_id=' + . $id . $this->format; + + $this->add_log('url ' . $api_url); + + $response = wp_remote_get( $api_url ); + $body = wp_remote_retrieve_body( $response ); + $json = json_decode($body); + if( $json && isset($json->photo) ){ + return $json; + + } + break; + + default: + return []; + break; + } + + return []; + } + + /** + * get raw user request and return data from specific index + * + * @param $items_json + * @param $index + * @param $collection_definition + * @return array + * @throws \Exception + */ + private function process_item_user_request( $items_json, $index, $collection_definition ){ + $processedItem = []; + + if ( $items_json && $items_json->photos ) { + $item = $items_json->photos->photo[0]; + + $id = $this->get_transient('insertedId'); + + if ($id && $id === $item->id ) { + return false; + } + + $items_json_from_item = $this->get_item_data( $item->id ); + $processedItem = $this->process_item_single_request( $items_json_from_item, $index, $collection_definition ); + + $token = $index + 2; + $this->add_log('nextToken ' . $token); + if ( $token ) { + $this->add_transient( 'pageToken', $token ); + } + + $this->add_transient( 'insertedId', $item->id ); + } + + return $processedItem; + } + + /** + * get raw album request and return data from specific index + * + * @param $items_json + * @param $index + * @param $collection_definition + * @return array + * @throws \Exception + */ + private function process_item_album_request( $items_json, $index, $collection_definition ){ + $processedItem = []; + + if ( $items_json && $items_json->photoset ) { + $item = $items_json->photoset->photo[0]; + + $id = $this->get_transient('insertedId'); + + if ($id && $id === $item->id ) { + return false; + } + + $items_json_from_item = $this->get_item_data( $item->id ); + $processedItem = $this->process_item_single_request( $items_json_from_item, $index, $collection_definition ); + + $token = $index + 2; + $this->add_log('nextToken ' . $token); + if ( $token ) { + $this->add_transient( 'pageToken', $token ); + } + + $this->add_transient( 'insertedId', $item->id ); + } + + return $processedItem; + } + + /** + * get raw item request and return data from specific index + * + * @param $items_json + * @param $index + * @param $collection_definition + * @return array + * @throws \Exception + */ + private function process_item_single_request( $items_json, $index, $collection_definition ){ + $processedItem = []; + + if ( $items_json && $items_json->photo ) { + $item = $items_json->photo; + + $id = $this->get_transient('insertedId'); + + if ($id && $id === $item->id ) { + return false; + } + + $url_image = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_b.jpg'; + $this->add_transient('image_url', $url_image); + + foreach ($collection_definition['mapping'] as $metadatum_id => $raw_metadatum) { + $value = ''; + + switch ($raw_metadatum) { + case 'title': + $value = $item->title->_content; + break; + + case 'ownername': + $value = $item->owner->username; + break; + + case 'tags': + $tags = []; + + if ( isset( $item->tags ) && isset( $item->tags->tag ) && is_array( $item->tags->tag ) ) { + foreach ( $item->tags->tag as $tag ) { + if (isset($tag->raw)) { $tags[] = $tag->raw; } - } - } + } + } - $value = ( $tags ) ? $tags : []; - break; + $value = ( $tags ) ? $tags : []; + break; - case 'id': - $value = $item->id; - break; + case 'id': + $value = $item->id; + break; - case 'description': - $value = $item->description->_content; - break; + case 'description': + $value = $item->description->_content; + break; - case 'owner': - $value = $item->owner->nsid; - break; + case 'owner': + $value = $item->owner->nsid; + break; - case 'url': + case 'url': - if ( isset( $item->urls->url ) && !empty( $item->urls->url ) ) { - $url = $item->urls->url[0]; - $value = $url->_content; - } else { - $value = $url_image; - } + if ( isset( $item->urls->url ) && !empty( $item->urls->url ) ) { + $url = $item->urls->url[0]; + $value = $url->_content; + } else { + $value = $url_image; + } - break; + break; - case 'date_upload': - $value = date('Y-m-d', $item->dateuploaded ); - break; + case 'date_upload': + $value = date('Y-m-d', $item->dateuploaded ); + break; - case 'image_thumbnail': - $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_t.jpg'; - break; + case 'image_thumbnail': + $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_t.jpg'; + break; - case 'image_medium': - $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '.jpg'; - break; + case 'image_medium': + $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '.jpg'; + break; - case 'image_large': - $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_c.jpg'; - break; + case 'image_large': + $value = 'https://farm' . $item->farm . '.staticflickr.com/' . $item->server . '/' . $item->id . '_' . $item->secret . '_c.jpg'; + break; - case 'views': - $value = $item->views; - break; + case 'views': + $value = $item->views; + break; - case 'type': - $value = $this->get_image_mime_type( $url_image ); - break; - } + case 'type': + $value = $this->get_image_mime_type( $url_image ); + break; + } - $metadatum = new \Tainacan\Entities\Metadatum($metadatum_id); - $processedItem[$raw_metadatum] = ( $metadatum->is_multiple() && !is_array($value) ) ? [$value] : $value; - } + $metadatum = new \Tainacan\Entities\Metadatum($metadatum_id); + $processedItem[$raw_metadatum] = ( $metadatum->is_multiple() && !is_array($value) ) ? [$value] : $value; + } - $this->add_transient( 'insertedId', $item->id ); - } + $this->add_transient( 'insertedId', $item->id ); + } - return $processedItem; - } + return $processedItem; + } - /** - * method responsible to get data from a unique photo - * - * @param $id - * @return mixed - */ - private function get_item_data( $id ){ - $api_url = $this->endPoint . - $this->method . 'photos.getInfo' . - $this->apiKey . $this->apiKeyValue . '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o&photo_id=' - . $id . $this->format; + /** + * method responsible to get data from a unique photo + * + * @param $id + * @return mixed + */ + private function get_item_data( $id ){ + $api_url = $this->endPoint . + $this->method . 'photos.getInfo' . + $this->apiKey . $this->apiKeyValue . '&extras=license,date_upload,date_taken,owner_name,icon_server,original_format,last_update,geo,tags,machine_tags,o_dims,views,media,path_alias,url_o&photo_id=' + . $id . $this->format; - $this->add_log('url ' . $api_url); - $response = wp_remote_get( $api_url ); - $body = wp_remote_retrieve_body( $response ); - $json = json_decode($body); - if( $json && isset($json->photo) ){ - return $json; + $this->add_log('url ' . $api_url); + $response = wp_remote_get( $api_url ); + $body = wp_remote_retrieve_body( $response ); + $json = json_decode($body); + if( $json && isset($json->photo) ){ + return $json; - } - } + } + } - /** - * @inheritdoc - */ - public function after_inserted_item( $inserted_item, $collection_index ) { - $image_url = $this->get_transient('image_url'); + /** + * @inheritdoc + */ + public function after_inserted_item( $inserted_item, $collection_index ) { + $image_url = $this->get_transient('image_url'); - if( isset( $image_url ) && $image_url ){ - $TainacanMedia = \Tainacan\Media::get_instance(); - $id = $TainacanMedia->insert_attachment_from_url( $image_url, $inserted_item->get_id() ); - $inserted_item->set__thumbnail_id( $id ); + if( isset( $image_url ) && $image_url ){ + $TainacanMedia = \Tainacan\Media::get_instance(); + $id = $TainacanMedia->insert_attachment_from_url( $image_url, $inserted_item->get_id() ); + $inserted_item->set__thumbnail_id( $id ); - $inserted_item->set_document( $id ); - $inserted_item->set_document_type( 'attachment' ); - } + $inserted_item->set_document( $id ); + $inserted_item->set_document_type( 'attachment' ); + } - if( $inserted_item->validate() ) - $this->items_repo->update($inserted_item); - } + if( $inserted_item->validate() ) + $this->items_repo->update($inserted_item); + } - /** - * @param $collection_id int the collection id - * @param $mapping array the headers-metadata mapping - */ - public function save_mapping( $collection_id, $mapping ){ - update_post_meta( $collection_id, 'metadata_mapping', $mapping ); - } + /** + * @param $collection_id int the collection id + * @param $mapping array the headers-metadata mapping + */ + public function save_mapping( $collection_id, $mapping ){ + update_post_meta( $collection_id, 'metadata_mapping', $mapping ); + } - /** - * @param $collection_id - * - * @return array/bool false if has no mapping or associated array with metadata id and header - */ - public function get_mapping( $collection_id ){ - $mapping = get_post_meta( $collection_id, 'metadata_mapping', true ); - return ( $mapping ) ? $mapping : false; - } + /** + * @param $collection_id + * + * @return array/bool false if has no mapping or associated array with metadata id and header + */ + public function get_mapping( $collection_id ){ + $mapping = get_post_meta( $collection_id, 'metadata_mapping', true ); + return ( $mapping ) ? $mapping : false; + } - /** - * @inheritdoc - * - * allow save mapping - */ - public function add_collection(array $collection) { - if (isset($collection['id'])) { + /** + * @inheritdoc + * + * allow save mapping + */ + public function add_collection(array $collection) { + if (isset($collection['id'])) { - if( isset($collection['mapping']) && is_array($collection['mapping']) ){ + if( isset($collection['mapping']) && is_array($collection['mapping']) ){ - foreach( $collection['mapping'] as $metadatum_id => $header ){ + foreach( $collection['mapping'] as $metadatum_id => $header ){ - if( !is_numeric($metadatum_id) ) { - $create_string = $header; + if( !is_numeric($metadatum_id) ) { + $create_string = $header; if ($header == 'tags') { $create_string = 'Tags|taxonomy|multiple'; } $metadatum = $this->create_new_metadata( $create_string, $collection['id']); - if( is_object($metadatum) ){ - unset($collection['mapping'][$metadatum_id]); - $collection['mapping'][$metadatum->get_id()] = $header; - } + if( is_object($metadatum) ){ + unset($collection['mapping'][$metadatum_id]); + $collection['mapping'][$metadatum->get_id()] = $header; + } - } - } + } + } - $this->save_mapping( $collection['id'], $collection['mapping'] ); - } + $this->save_mapping( $collection['id'], $collection['mapping'] ); + } - $this->remove_collection($collection['id']); - $this->collections[] = $collection; - } - } + $this->remove_collection($collection['id']); + $this->collections[] = $collection; + } + } - /** - * @param $image_path - * @return bool|mixed - */ - private function get_image_mime_type($image_path) { - $mimes = array( - IMAGETYPE_GIF => "image/gif", - IMAGETYPE_JPEG => "image/jpg", - IMAGETYPE_PNG => "image/png", - IMAGETYPE_SWF => "image/swf", - IMAGETYPE_PSD => "image/psd", - IMAGETYPE_BMP => "image/bmp", - IMAGETYPE_TIFF_II => "image/tiff", - IMAGETYPE_TIFF_MM => "image/tiff", - IMAGETYPE_JPC => "image/jpc", - IMAGETYPE_JP2 => "image/jp2", - IMAGETYPE_JPX => "image/jpx", - IMAGETYPE_JB2 => "image/jb2", - IMAGETYPE_SWC => "image/swc", - IMAGETYPE_IFF => "image/iff", - IMAGETYPE_WBMP => "image/wbmp", - IMAGETYPE_XBM => "image/xbm", - IMAGETYPE_ICO => "image/ico"); + /** + * @param $image_path + * @return bool|mixed + */ + private function get_image_mime_type($image_path) { + $mimes = array( + IMAGETYPE_GIF => "image/gif", + IMAGETYPE_JPEG => "image/jpg", + IMAGETYPE_PNG => "image/png", + IMAGETYPE_SWF => "image/swf", + IMAGETYPE_PSD => "image/psd", + IMAGETYPE_BMP => "image/bmp", + IMAGETYPE_TIFF_II => "image/tiff", + IMAGETYPE_TIFF_MM => "image/tiff", + IMAGETYPE_JPC => "image/jpc", + IMAGETYPE_JP2 => "image/jp2", + IMAGETYPE_JPX => "image/jpx", + IMAGETYPE_JB2 => "image/jb2", + IMAGETYPE_SWC => "image/swc", + IMAGETYPE_IFF => "image/iff", + IMAGETYPE_WBMP => "image/wbmp", + IMAGETYPE_XBM => "image/xbm", + IMAGETYPE_ICO => "image/ico"); if (function_exists('exif_imagetype')) { if ( $image_type = exif_imagetype($image_path) @@ -549,58 +549,58 @@ class Flickr_Importer extends Importer { } } - return false; - - } + return false; + + } - public function options_form(){ - ob_start(); - ?> -
-
-
- -

- ', __('https://www.flickr.com/services/api/misc.api_keys.html', 'tainacan') ), - '' - ); ?> -

-
-

- -

-
- -
-
-
-
-
- - -

- -

- - - https://www.flickr.com/photos/username -
- - - https://www.flickr.com/photos/username/albums/123456 -
- - - https://www.flickr.com/photos/username/123456 - -

-
-
-
- - +
+
+
+ +

+ ', __('https://www.flickr.com/services/api/misc.api_keys.html', 'tainacan') ), + '' + ); ?> +

+
+

+ +

+
+ +
+
+
+
+
+ + +

+ +

+ - + https://www.flickr.com/photos/username +
+ - + https://www.flickr.com/photos/username/albums/123456 +
+ - + https://www.flickr.com/photos/username/123456 + +

+
+
+
+ + + +

+ {{ $i18n.get('info_item_submission_draft_status') }} +

+ diff --git a/src/views/admin/components/lists/metadata-types-list.vue b/src/views/admin/components/lists/metadata-types-list.vue index f582d72b6..b595122ef 100644 --- a/src/views/admin/components/lists/metadata-types-list.vue +++ b/src/views/admin/components/lists/metadata-types-list.vue @@ -14,7 +14,7 @@ drag-class="sortable-drag">
+ +   + + + @@ -159,6 +173,7 @@ taxonomy: '', loading: false, allow_new_terms: 'yes', + hide_hierarchy_path: 'no', link_filtered_by_collections: [], visible_options_list: false, input_type: 'tainacan-taxonomy-radio', @@ -230,6 +245,7 @@ this.taxonomy_id = this.value.taxonomy_id; this.allow_new_terms = ( this.value.allow_new_terms ) ? this.value.allow_new_terms : 'no'; + this.hide_hierarchy_path = ( this.value.hide_hierarchy_path ) ? this.value.hide_hierarchy_path : 'no'; if (this.metadatum && this.metadatum.multiple === 'no') { let types = Object.keys( this.single_types ); @@ -296,6 +312,7 @@ allow_new_terms: this.allow_new_terms, visible_options_list: this.visible_options_list, link_filtered_by_collections: this.link_filtered_by_collections, + hide_hierarchy_path: this.hide_hierarchy_path, taxonomy: this.taxonomy }) }, diff --git a/src/views/admin/components/metadata-types/taxonomy/class-tainacan-taxonomy.php b/src/views/admin/components/metadata-types/taxonomy/class-tainacan-taxonomy.php index 02c8c677c..4fab7a1da 100644 --- a/src/views/admin/components/metadata-types/taxonomy/class-tainacan-taxonomy.php +++ b/src/views/admin/components/metadata-types/taxonomy/class-tainacan-taxonomy.php @@ -23,6 +23,7 @@ class Taxonomy extends Metadata_Type { 'allow_new_terms' => 'no', 'link_filtered_by_collections' => [], 'input_type' => 'tainacan-taxonomy-radio', + 'hide_hierarchy_path' => 'no' ]); $this->set_form_component('tainacan-form-taxonomy'); @@ -101,6 +102,10 @@ class Taxonomy extends Metadata_Type { 'link_filtered_by_collections' => [ 'title' => __( 'Link filtered by collections', 'tainacan' ), 'description' => __( 'Links to term items list filtered by certain collections instead of repository level term items page.', 'tainacan' ), + ], + 'hide_hierarchy_path' => [ + 'title' => __( 'Hide hierarchy path', 'tainacan' ), + 'description' => __( 'Display only the current child term when showing values that belong to a term hierarchy.', 'tainacan' ), ] ]; } @@ -191,6 +196,15 @@ class Taxonomy extends Metadata_Type { $readable_option_value = __( 'None', 'tainacan' ); break; + case 'hide_hierarchy_path': + if ($option_value == 'yes') + $readable_option_value = __('Yes', 'tainacan'); + else if ($option_value == 'no') + $readable_option_value = __('No', 'tainacan'); + else + $readable_option_value = $option_value; + break; + default: $readable_option_value = $option_value; } @@ -334,7 +348,7 @@ class Taxonomy extends Metadata_Type { public function get_value_as_html(Item_Metadata_Entity $item_metadata) { $value = $item_metadata->get_value(); $return = ''; - + if ( $item_metadata->is_multiple() ) { $count = 1; $total = sizeof($value); @@ -369,6 +383,10 @@ class Taxonomy extends Metadata_Type { } private function get_term_hierarchy_html( \Tainacan\Entities\Term $term ) { + + if ( $this->get_option('hide_hierarchy_path') == 'yes' ) + return $this->term_to_html($term); + $terms = []; $terms[] = $this->term_to_html($term); diff --git a/src/views/admin/components/other/item-metadatum-errors-tooltip.vue b/src/views/admin/components/other/item-metadatum-errors-tooltip.vue index 70902d94e..e3dba9bf2 100644 --- a/src/views/admin/components/other/item-metadatum-errors-tooltip.vue +++ b/src/views/admin/components/other/item-metadatum-errors-tooltip.vue @@ -14,7 +14,7 @@