para acompanhar acesse o link: [%link%]
+para acompanhar acesse o link: %link%
' . $this->mail_footer["topo"] . '
' ), 'new_ticket_replied' => array( @@ -93,7 +93,7 @@ function __construct() { 'default-subject' => '[%site_nome%] Nova resposta #%ticket_id%', 'default-email' => 'para acompanhar acesse o link: [%link%]
+para acompanhar acesse o link: %link%
' . $this->mail_footer["topo"] . '
' ), 'new_ticket_replied_not_logged' => array( @@ -217,8 +217,6 @@ function filter_retrieve_password_request_email_body($message, $key, $user_login 'link' => network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login )) ); - $message = $this->get_message('retrieve_password_message', $args); - return $this->get_message('retrieve_password_message', $args); } @@ -331,7 +329,7 @@ function comment_post($comment){ } /* - * Envia um email ao seguidor do post por ter recebido um novo comentario. + * Envia um email ao seguidor do post por ter recebido um novo comentário. */ function comment_post_follow($comment){ $follow = new RHSFollowPost(); diff --git a/public/wp-content/themes/rhs/inc/notification/channels-hooks.php b/public/wp-content/themes/rhs/inc/notification/channels-hooks.php index 9f40c598..645700b1 100644 --- a/public/wp-content/themes/rhs/inc/notification/channels-hooks.php +++ b/public/wp-content/themes/rhs/inc/notification/channels-hooks.php @@ -22,6 +22,8 @@ function __construct() { add_action('rhs_add_user_follow_post', array(&$this, 'rhs_add_user_follow_post')); add_action('rhs_delete_user_follow_post', array(&$this, 'rhs_delete_user_follow_post')); + + add_action('rhs_add_recommend_post', array(&$this, 'rhs_add_recommend_post')); } @@ -90,6 +92,14 @@ function rhs_delete_user_follow_post($args) { global $RHSNotifications; $RHSNotifications->delete_user_from_channel(RHSNotifications::CHANNEL_COMMENTS, $args['post_id'], $args['user_id']); } + + /** + * Quando um post é indicado + */ + function rhs_add_recommend_post($args) { + global $RHSNotifications; + $RHSNotifications->add_user_to_channel(RHSNotifications::CHANNEL_COMMENTS, $args['post_id'], $args['user_id']); + } } diff --git a/public/wp-content/themes/rhs/inc/notification/registered-notifications.php b/public/wp-content/themes/rhs/inc/notification/registered-notifications.php index fb7bcb60..9125a0ea 100644 --- a/public/wp-content/themes/rhs/inc/notification/registered-notifications.php +++ b/public/wp-content/themes/rhs/inc/notification/registered-notifications.php @@ -25,4 +25,5 @@ 'comment_spam_to_approved' => ['comments_in_post'], 'rhs_add_user_follow_author' => ['user_follow_author'], 'rhs_ticket_replied' => ['replied_ticket', 10, 3], + 'rhs_add_recommend_post' => ['post_recommend'] ]; \ No newline at end of file diff --git a/public/wp-content/themes/rhs/inc/notification/types/post_recommend.php b/public/wp-content/themes/rhs/inc/notification/types/post_recommend.php new file mode 100644 index 00000000..22b163ce --- /dev/null +++ b/public/wp-content/themes/rhs/inc/notification/types/post_recommend.php @@ -0,0 +1,76 @@ +add_notification(RHSNotifications::CHANNEL_PRIVATE, $args['user_id'], self::get_name(), $args['post_id'], $current_user->ID); + } + + } + + function text() { + $post = $this->getObjectAsPost(); + if (!$post) + return; + + if($user = $this->getUser()) { + return sprintf( + 'O usuário %s indicou: %s', + $user->get_id(), + $user->get_link(), + $user->get_name(), + $post->ID, + get_permalink($post->ID), + $post->post_title + ); + } + } + + function textPush() { + $post = $this->getObjectAsPost(); + + if (!$post) + return; + + if($user = $this->getUser()) { + return sprintf( + 'O usuário %s indicou o post %s', + $user->get_name(), + $post->post_title + ); + } + + } + + function image(){ + if($user = $this->getUser()) { + return get_avatar_url($user->get_id()); + } + } + + public function buttons() { + $type = $this->getType(); + $buttons[] = (object) array('id' => 'open_' . $type, 'text' => 'Ver Post'); + $buttons[] = (object) array('id' => 'open_user_' . $type, 'text' => 'Ver Usuário'); + + return $buttons; + } + +} diff --git a/public/wp-content/themes/rhs/inc/perfil/perfil.js b/public/wp-content/themes/rhs/inc/perfil/perfil.js new file mode 100644 index 00000000..1ae00d4c --- /dev/null +++ b/public/wp-content/themes/rhs/inc/perfil/perfil.js @@ -0,0 +1,117 @@ +jQuery( function( $ ) { + + var trigger_modal = ".modal-delete-account"; + $(trigger_modal).on("click", function(e) { + var name = $(this).data('displayname'); + var user_total_posts = $(this).data('total-posts'); + swal({ + type: 'warning', + title: "Deseja realmente excluir sua conta?", + showConfirmButton: true, + showCancelButton: true, + cancelButtonText: "Cancelar", + confirmButtonText: "Sim", + confirmButtonClass: "btn-danger", + closeOnConfirm: false, + closeOnCancel: false + }, function(isConfirm) { + if(isConfirm) { + renderConfirmExclusion(user_total_posts, name, e); + } else { + swal(name, "Obrigado por continuar contribuindo conosco!", "success"); + } + }); + }); + + function renderConfirmExclusion(posts_count, name, el) { + var $other = ""; + var $reason_delete = $(".reason-delete").html(); + var $modal_header_img = $(".encerra-header-img").text(); + var html_content = ""; + if(posts_count > 0) { + var $other = "| Título | +Conteúdo | +Data | +Autor | +Link | +Visualizações | +Compartilhamentos | +Votos | +Comentários | +Estado | +Cidade | +
|---|---|---|---|---|---|---|---|---|---|---|
| " . $row['titulo'] . " | +" . $row['conteudo'] . " | +" . $row['data'] . " | +" . $row['autor'] . " | +" . $row['link'] . " | +" . $row['visualizacoes'] . " | +" . $row['compartilhamentos'] . " | +" . $row['votos'] . " | +" . $row['comentarios'] . " | +" . $row['estado'] . " | +" . $row['cidade'] . " | +
O usuário $user_name ($_deleted_user_email) deletou sua conta em $agora.
"; + + if(!is_null($reason_delete)) { + $_mail_msg .= "Motivo: " . $reason_delete . "
"; + } + + $_mail_msg .= "Deixou seu conteúdo como legado RHS: $send_to_legacy_user
"; + // Notifica admin por email + wp_mail($legacy_user['email'], $subject, $_mail_msg, RHSEmail::EMAIL_HEADERS); + } + } + + private function get_destinatary_user() { + $legacy = get_user_by('email', 'legado@redehumanizasus.net'); + + if( false === $legacy ) { + $admin_email = get_option('admin_email'); + $_id_ = 1; + if(!$admin_email) { + $_admin_users = get_users(['role' => 'administrator']); + if( is_array($_admin_users) && is_object($_admin_users[0]) ) { + $admin_email = $_admin_users[0]->user_email; + $_id_ = $legacy->ID; + } else { + return false; + } + } + } else { + $admin_email = $legacy->user_email; + $_id_ = $legacy->ID; + } + + return [ + 'ID' => $_id_, + 'email' => $admin_email + ]; + } } global $RHSPerfil; diff --git a/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.js b/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.js new file mode 100644 index 00000000..19f13047 --- /dev/null +++ b/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.js @@ -0,0 +1,59 @@ +jQuery( function( $ ) { + var input_recommend_post = '#input-recommend-post'; + + $(input_recommend_post).autocomplete({ + serviceUrl: vars.ajaxurl, + type: 'POST', + dataType: 'json', + paramName: 'string', + params : { + action: 'show_people_to_recommend', + }, + minChars: 3, + onSelect: function (suggestion) { + swal({ + title: "Deseja indicar esse post?", + text: "A indicação será enviada para " + suggestion.value, + type: "info", + showCancelButton: true, + confirmButtonClass: "btn-success", + confirmButtonText: "Sim, enviar!", + cancelButtonText: "Cancelar", + closeOnConfirm: false, + closeOnCancel: false + }, + function (isConfirm) { + var not_sent_title = "Não enviado!"; + if (isConfirm) { + $.ajax({ + async: false, + type: "POST", + dataType: "json", + url: vars.ajaxurl, + data: { + action: 'recommend_the_post', + user_id: suggestion.data, + post_id: $(input_recommend_post).data('post-id') + }, + success: function (data) { + if(data.msgErr) { + swal(not_sent_title, data.msgErr, "error"); + } else if(data.messages.success && data.user.sent_name) { + swal("Enviado!", "Indicação enviada com sucesso para " + data.user.sent_name, "success"); + } else { + swal(not_sent_title, "Tente novamente mais tarde!", "error"); + } + }, + error: function (data) { + swal(not_sent_title, "Sua indicação não foi enviada.", "error"); + } + }); + } else { + swal("Cancelado", not_sent_title, "error"); + } + }); + + return false; + } + }); +}); \ No newline at end of file diff --git a/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.php b/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.php new file mode 100644 index 00000000..2ae781c9 --- /dev/null +++ b/public/wp-content/themes/rhs/inc/recommend-post/recommend_post.php @@ -0,0 +1,93 @@ + admin_url('admin-ajax.php'))); + } + + /** + * Busca de usuários para indicar post + */ + function show_people_to_recommend() { + + $data = array('suggestions' => array()); + + $users = new WP_User_Query(array( + 'search' => '*' . esc_attr( $_POST['string'] ) . '*', + 'search_columns' => array('user_nicename'), + 'number' => 50, + 'orderby' => 'display_name', + ) ); + + foreach ($users->results as $user) { + + $data['suggestions'][] = array( + 'data' => $user->ID, + 'value' => $user->display_name + ); + } + + echo json_encode($data); + exit; + + } + + /** + * Envia indicação de post para usuário + */ + function recommend_the_post() { + + $this->clear_messages(); + + $current_user = wp_get_current_user(); + + $user_id = $_POST['user_id']; + $user = new RHSUser(get_userdata($user_id)); + if($user instanceof RHSUser) { + $post_id = $_POST['post_id']; + $_user_name = $user->get_name(); + $data['user'] = array( + 'user_id' => $user_id, + 'post_id' => $post_id, + 'recommend_from' => $current_user->ID, + 'value' => $user->display_name, + 'sent_name' => $_user_name + ); + $this->set_messages($_user_name . ' recebeu a indicação de leitura', false, 'success'); + $data['messages'] = $this->messages(); + $this->add_recomment_post($post_id, $user_id, $current_user, $data); + } else { + $data['msgErr'] = "Usuário não encontrado. Tente novamente mais tarde!"; + } + + echo json_encode($data); + exit; + } + + function add_recomment_post($post_id, $user_id, $current_user, $data) { + add_user_meta($user_id, self::RECOMMEND_POST_TO_KEY, $data['user']); + $return = add_user_meta($current_user->ID, self::RECOMMEND_POST_FROM_KEY, $data['user']); + + if ($return) + do_action('rhs_add_recommend_post', ['post_id' => $post_id, 'user_id' => $user_id]); + + return $return; + } +} + +add_action('init', function() { + global $RHSRecommendPost; + $RHSRecommendPost = new RHSRecommendPost(); +}); + + diff --git a/public/wp-content/themes/rhs/inc/search/search.php b/public/wp-content/themes/rhs/inc/search/search.php index d93abd91..c47fbc59 100644 --- a/public/wp-content/themes/rhs/inc/search/search.php +++ b/public/wp-content/themes/rhs/inc/search/search.php @@ -393,7 +393,6 @@ public function search_users($params = array()) { break; default: - $q_order = 'ASC';; $q_order_by = 'display_name'; $q_order = 'ASC'; break; diff --git a/public/wp-content/themes/rhs/inc/stats/stats.php b/public/wp-content/themes/rhs/inc/stats/stats.php index 6910c30b..83131a22 100644 --- a/public/wp-content/themes/rhs/inc/stats/stats.php +++ b/public/wp-content/themes/rhs/inc/stats/stats.php @@ -9,12 +9,14 @@ class RHSStats { const ACTION_REGISTER = 'user_register'; const ACTION_FOLLOW_USER = 'user_follow'; const ACTION_UNFOLLOW_USER = 'user_unfollow'; + const ACTION_DELETED_USER = 'user_deleted'; const ACTION_FOLLOW_POST = 'post_follow'; const ACTION_UNFOLLOW_POST = 'post_unfollow'; const ACTION_POST_PROMOTED = 'post_promoted'; const ACTION_USER_PROMOTED = 'user_promoted'; const ACTION_SHARE = 'share'; - + const ACTION_POST_RECOMMEND = 'post_recommend'; + private $table; /** @@ -38,10 +40,9 @@ function __construct() { add_action( 'rhs_add_network_data', array( &$this, 'network_data'), 10, 2); add_action( 'rhs_add_user_follow_post', array( &$this, 'post_follow')); add_action( 'rhs_delete_user_follow_post', array( &$this, 'post_unfollow')); - - - - + add_action( 'rhs_add_recommend_post', array( &$this, 'recommend_post')); + add_action( 'rhs_user_deleted', array( &$this, 'user_deleted')); + } function login($user_login, $user) { @@ -75,7 +76,11 @@ function user_promoted($user_id) { function post_promoted($post_id) { $this->add_event(self::ACTION_POST_PROMOTED, $post_id); } - + + function recommend_post($args) { + $this->add_event(self::ACTION_POST_RECOMMEND, $args['post_id'], $args['user_id']); + } + function network_data($post_id, $type) { if ($type == RHSNetwork::META_KEY_VIEW) // não queremos gerar eventos para views return; @@ -83,6 +88,10 @@ function network_data($post_id, $type) { $this->add_event(self::ACTION_SHARE, $post_id, $user_ID); $this->add_event(self::ACTION_SHARE . '_' . $type, $post_id, $user_ID); } + + function user_deleted($user_id) { + $this->add_event(self::ACTION_DELETED_USER, $user_id, $user_id); + } /** * Adiciona evento @@ -114,7 +123,7 @@ function get_total_events_by_action($action) { } /** - * Verifica se existe tabela, se não, á insere + * Cria a tabela caso não exista */ private function verify_database() { $option_name = 'rhs_database_' . get_class($this); diff --git a/public/wp-content/themes/rhs/inc/ticket/ticket.php b/public/wp-content/themes/rhs/inc/ticket/ticket.php index 837364e1..cc142950 100644 --- a/public/wp-content/themes/rhs/inc/ticket/ticket.php +++ b/public/wp-content/themes/rhs/inc/ticket/ticket.php @@ -69,8 +69,6 @@ function register_post_status() { function add_status_dropdown() { global $post; - $complete = ''; - $label = ''; if ( $post->post_type == self::POST_TYPE ) { $js = ''; diff --git a/public/wp-content/themes/rhs/inc/user/user.php b/public/wp-content/themes/rhs/inc/user/user.php index 072a8af8..ed995f39 100644 --- a/public/wp-content/themes/rhs/inc/user/user.php +++ b/public/wp-content/themes/rhs/inc/user/user.php @@ -391,4 +391,5 @@ class="btn btn-info js-add-link"> '; } + } \ No newline at end of file diff --git a/public/wp-content/themes/rhs/inc/vote/vote.php b/public/wp-content/themes/rhs/inc/vote/vote.php index 47ff353b..c5e23fae 100644 --- a/public/wp-content/themes/rhs/inc/vote/vote.php +++ b/public/wp-content/themes/rhs/inc/vote/vote.php @@ -299,8 +299,6 @@ function fila_query( $wp_query ) { function add_status_dropdown() { global $post; - $complete = ''; - $label = ''; if ( $post->post_type == 'post' ) { $js = ''; diff --git a/public/wp-content/themes/rhs/inc/vote/widget.php b/public/wp-content/themes/rhs/inc/vote/widget.php index e6b85884..db90f27f 100644 --- a/public/wp-content/themes/rhs/inc/vote/widget.php +++ b/public/wp-content/themes/rhs/inc/vote/widget.php @@ -16,8 +16,6 @@ public function widget( $args, $instance ) { return; } $title = apply_filters( 'widget_title', __('Fila de votação') ); - $blog_title = get_bloginfo( 'name' ); - $tagline = get_bloginfo( 'description' ); echo $args['before_widget'] . $args['before_title'] .''. $title .''. $args['after_title']; diff --git a/public/wp-content/themes/rhs/partes-templates/painel-single.php b/public/wp-content/themes/rhs/partes-templates/painel-single.php index f9aa03b2..4a1dc84f 100644 --- a/public/wp-content/themes/rhs/partes-templates/painel-single.php +++ b/public/wp-content/themes/rhs/partes-templates/painel-single.php @@ -127,6 +127,10 @@ + + + +