Răsfoiți Sursa

fix camelCase variable social refs #7539

aragonc 10 ani în urmă
părinte
comite
b3406a3338

+ 5 - 6
main/messages/new_message.php

@@ -309,16 +309,15 @@ if ($group_id != 0) {
 
 // LEFT COLUMN
 $social_left_content = null;
-$user_info    = UserManager::get_user_info_by_id($user_id);
+$userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
     $social_avatar_block = '<div class="panel panel-info social-avatar">';
     $social_avatar_block .= SocialManager::show_social_avatar_block('messages');
-    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
-    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
-    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
-    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
-    $chat_status = $user_info['extra'];
+    $social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
+    $chat_status = $userInfo['extra'];
     if(!empty($chat_status['user_chat_status'])){
         $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
     }else{

+ 5 - 6
main/messages/outbox.php

@@ -108,16 +108,15 @@ if (isset($_REQUEST['action'])) {
 }
 
 $social_right_content = '';
-$user_info    = UserManager::get_user_info_by_id($user_id);
+$userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
     $social_avatar_block = '<div class="panel panel-info social-avatar">';
     $social_avatar_block .= SocialManager::show_social_avatar_block('messages');
-    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
-    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
-    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
-    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
-    $chat_status = $user_info['extra'];
+    $social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
+    $chat_status = $userInfo['extra'];
     if(!empty($chat_status['user_chat_status'])){
         $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
     }else{

+ 5 - 6
main/messages/view_message.php

@@ -53,16 +53,15 @@ if (empty($_GET['id'])) {
 $message  = '';
 
 //LEFT COLUMN
-$user_info    = UserManager::get_user_info_by_id($user_id);
+$userInfo    = UserManager::get_user_info_by_id($user_id);
 if (api_get_setting('allow_social_tool') == 'true') {
     //Block Social Avatar
     $social_avatar_block = '<div class="panel panel-info social-avatar">';
     $social_avatar_block .= SocialManager::show_social_avatar_block($show_menu);
-    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
-    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
-    /* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
-    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
-    $chat_status = $user_info['extra'];
+    $social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
+    $chat_status = $userInfo['extra'];
     if(!empty($chat_status['user_chat_status'])){
         $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
     }else{

+ 5 - 5
main/social/groups.php

@@ -218,7 +218,7 @@ if ($group_id != 0) {
     }
 }
 $create_thread_link = '';
-$user_info    = UserManager::get_user_info_by_id($user_id);
+$userInfo    = UserManager::get_user_info_by_id($user_id);
 if ($group_id != 0) {
     //Block Social Avatar
     $social_avatar_block = '<div class="panel panel-info social-avatar">';
@@ -226,10 +226,10 @@ if ($group_id != 0) {
         'groups',
         $group_id
     );
-    $social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
-    $social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
-    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
-    $chat_status = $user_info['extra'];
+    $social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
+    $social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
+    $social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
+    $chat_status = $userInfo['extra'];
     if(!empty($chat_status['user_chat_status'])){
         $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
     }else{

+ 5 - 6
main/social/home.php

@@ -83,15 +83,14 @@ if (api_get_setting('profile', 'picture') == 'true') {
     }
 }
 
-$user_info = UserManager :: get_user_info_by_id(api_get_user_id());
+$userInfo = UserManager :: get_user_info_by_id(api_get_user_id());
 
 $social_avatar_block = '<div class="panel panel-default social-avatar">';
 $social_avatar_block .= SocialManager::show_social_avatar_block('home');
-$social_avatar_block .= '<div class="lastname">'.$user_info['lastname'].'</div>';
-$social_avatar_block .= '<div class="firstname">'.$user_info['firstname'].'</div>';
-/* $social_avatar_block .= '<div class="username">'.Display::return_icon('user.png','','',ICON_SIZE_TINY).$user_info['username'].'</div>'; */
-$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$user_info['email'].'</div>';
-$chat_status = $user_info['extra'];
+$social_avatar_block .= '<div class="lastname">'.$userInfo['lastname'].'</div>';
+$social_avatar_block .= '<div class="firstname">'.$userInfo['firstname'].'</div>';
+$social_avatar_block .= '<div class="email">'.Display::return_icon('instant_message.png').'&nbsp;' .$userInfo['email'].'</div>';
+$chat_status = $userInfo['extra'];
  if(!empty($chat_status['user_chat_status'])){
      $social_avatar_block.= '<div class="status">'.Display::return_icon('online.png').get_lang('Chat')." (".get_lang('Online').')</div>';
  }else{