Browse Source

Minor - format code, comment code

Julio Montoya 6 years ago
parent
commit
8e2e03f559
2 changed files with 32 additions and 34 deletions
  1. 30 32
      main/inc/lib/pear/HTML/QuickForm/file.php
  2. 2 2
      main/inc/lib/social.lib.php

+ 30 - 32
main/inc/lib/pear/HTML/QuickForm/file.php

@@ -401,15 +401,14 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
             case FormValidator::LAYOUT_HORIZONTAL:
                 if (isset($attributes['custom']) && $attributes['custom'] == true) {
                     $template = '
-                                <div class="input-file-container">  
-                                    {element}
-                                    <label tabindex="0" {label-for} class="input-file-trigger">
-                                        <i class="fa fa-picture-o fa-lg" aria-hidden="true"></i> {label}
-                                    </label>
-                                </div>
-                                <p class="file-return"></p>
-                        
-                        <script type="text/javascript">
+                        <div class="input-file-container">  
+                            {element}
+                            <label tabindex="0" {label-for} class="input-file-trigger">
+                                <i class="fa fa-picture-o fa-lg" aria-hidden="true"></i> {label}
+                            </label>
+                        </div>
+                        <p class="file-return"></p>                        
+                        <script>
                             document.querySelector("html").classList.add(\'js\');
                             var fileInput  = document.querySelector( ".input-file" ),  
                                 button     = document.querySelector( ".input-file-trigger" ),
@@ -430,33 +429,32 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
                                     fileName = this.files[0].name;
                                 }
                                 the_return.innerHTML = fileName;  
-                            });
-                            
+                            });                            
                         </script>
                     ';
                 } else {
                     $template = '
-                <div  id="file_' . $name . '" class="form-group {error_class}">
-                    <label {label-for} class="col-sm-3 control-label" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-7">
-                        {icon}
-                        {element}
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-2">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
+                    <div  id="file_' . $name . '" class="form-group {error_class}">
+                        <label {label-for} class="col-sm-3 control-label" >
+                            <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                            {label}
+                        </label>
+                        <div class="col-sm-7">
+                            {icon}
+                            {element}
+                            <!-- BEGIN label_2 -->
+                                <p class="help-block">{label_2}</p>
+                            <!-- END label_2 -->
+                            <!-- BEGIN error -->
+                                <span class="help-inline help-block">{error}</span>
+                            <!-- END error -->
+                        </div>
+                        <div class="col-sm-2">
+                            <!-- BEGIN label_3 -->
+                                {label_3}
+                            <!-- END label_3 -->
+                        </div>
+                    </div>';
                 }
                 return $template;
                 break;

+ 2 - 2
main/inc/lib/social.lib.php

@@ -1874,9 +1874,9 @@ class SocialManager extends UserManager
         $userIdLoop = $message['user_sender_id'];
         $receiverId = $message['user_receiver_id'];
         $iconStatus = null;
-        $userStatus = $users[$userIdLoop]['status'];
+        /*$userStatus = $users[$userIdLoop]['status'];
         $urlImg = api_get_path(WEB_IMG_PATH);
-        $isAdmin = self::is_admin($users[$userIdLoop]['id']);
+        $isAdmin = self::is_admin($users[$userIdLoop]['id']);*/
 
         if (!isset($users[$userIdLoop])) {
             $users[$userIdLoop] = api_get_user_info($userIdLoop);