Alex Aragón 5 anos atrás
pai
commit
b33f94b5fd

+ 3 - 1
main/admin/user_list.php

@@ -504,7 +504,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
  */
 function email_filter($email)
 {
-    return Display::encrypted_mailto_link($email, $email);
+    return Display::encrypted_mailto_link($email, cut($email, 26));
 }
 
 /**
@@ -518,6 +518,8 @@ function email_filter($email)
  */
 function user_filter($name, $params, $row)
 {
+    $name = cut($name, 26);
+
     return '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.$row[0].'">'.$name.'</a>';
 }
 

+ 3 - 1
main/inc/lib/message.lib.php

@@ -1076,7 +1076,9 @@ class MessageManager
                 WHERE
                     user_receiver_id = ".$user_id." AND
                     id = '".$message_id."'";
-        Database::query($sql);
+        $result = Database::query($sql);
+
+        return Database::affected_rows($result) > 0;
     }
 
     /**

+ 5 - 1
main/inc/lib/webservices/Rest.php

@@ -19,6 +19,8 @@ class Rest extends WebService
 
     const GET_AUTH = 'authenticate';
     const GET_USER_MESSAGES = 'user_messages';
+    const POST_USER_MESSAGE_READ = 'user_message_read';
+    const POST_USER_MESSAGE_UNREAD = 'user_message_unread';
     const SAVE_GCM_ID = 'gcm_id';
     const GET_USER_COURSES = 'user_courses';
     const GET_PROFILE = 'user_profile';
@@ -201,7 +203,8 @@ class Rest extends WebService
                 'sendDate' => $message['send_date'],
                 'content' => $message['content'],
                 'hasAttachments' => $hasAttachments,
-                'url' => '',
+                'url' => api_get_path(WEB_CODE_PATH).'messages/view_message.php?'
+                    .http_build_query(['type' => 1, 'id' => $message['id']]),
             ];
         }
 
@@ -915,6 +918,7 @@ class Rest extends WebService
                         'code' => $courseInfo['code'],
                         'directory' => $courseInfo['directory'],
                         'pictureUrl' => $courseInfo['course_image_large'],
+                        'urlPicture' => $courseInfo['course_image_large'],
                         'teachers' => $teachers,
                     ];
                 }

+ 8 - 0
main/inc/lib/webservices/WebService.class.php

@@ -99,4 +99,12 @@ class WebService
             $user->getSalt()
         );
     }
+
+    /**
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
 }

+ 1 - 1
main/template/rainbow/layout/layout_2_col.tpl

@@ -185,7 +185,7 @@
 
                     <!-- MESSAGE -->
                     <section id="demo-home">
-                        <h3>{{ 'Curieuse/curieux ? Essaye la démo' | get_lang  }}  </h3>
+                        <h2 class="section-title">{{ 'TestDemoTitle' | get_lang  }}  </h2>
                         <div class="demostration">
                             <a href="{{ _p.web }}web/page-de-dmo-francais" class="btn btn-primary btn-demo">
                                 {{ 'demo' | get_lang }}

+ 26 - 0
main/webservices/api/v2.php

@@ -58,6 +58,32 @@ try {
             $messages = $restApi->getUserMessages($lastMessageId);
             $restResponse->setData($messages);
             break;
+        case Rest::POST_USER_MESSAGE_READ:
+        case Rest::POST_USER_MESSAGE_UNREAD:
+            $messagesId = isset($_POST['messages']) && is_array($_POST['messages'])
+                ? array_map('intval', $_POST['messages'])
+                : [];
+
+            $messagesId = array_filter($messagesId);
+
+            if (empty($messagesId)) {
+                throw new Exception(get_lang('NoData'));
+            }
+
+            $messageStatus = $action === Rest::POST_USER_MESSAGE_READ ? MESSAGE_STATUS_NEW : MESSAGE_STATUS_UNREAD;
+
+            $data = array_flip($messagesId);
+
+            foreach ($messagesId as $messageId) {
+                $data[$messageId] = MessageManager::update_message_status(
+                    $restApi->getUser()->getId(),
+                    $messageId,
+                    $messageStatus
+                );
+            }
+
+            $restResponse->setData($data);
+            break;
         case Rest::GET_USER_COURSES:
             $courses = $restApi->getUserCourses();
             $restResponse->setData($courses);