Completed
Push — gcconnex ( ee5ffc...718fe4 )
by Ilia
09:37 queued 04:29
created
mod/wet4/views/default/forms/ideas/saveidea.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
 $guid = elgg_extract('guid', $vars, null);
21 21
 $user = elgg_get_logged_in_user_guid();
22 22
 
23
-$btn_language =  '<ul class="nav nav-tabs nav-tabs-language">
24
-  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li>
25
-  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li>
23
+$btn_language = '<ul class="nav nav-tabs nav-tabs-language">
24
+  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li>
25
+  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li>
26 26
 </ul>';
27 27
 
28 28
 echo $btn_language;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 
72 72
 echo'</div></div>';
73 73
 
74
-if(get_current_language() == 'fr'){
74
+if (get_current_language() == 'fr') {
75 75
 ?>
76 76
     <script>
77 77
         jQuery('.fr').show();
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         jQuery('#description').removeClass('validate-me');
82 82
     </script>
83 83
 <?php
84
-}else{
84
+} else {
85 85
 ?>
86 86
     <script>
87 87
         jQuery('.en').show();
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
         jQuery('#description').removeClass('validate-me');
82 82
     </script>
83 83
 <?php
84
-}else{
84
+} else{
85 85
 ?>
86 86
     <script>
87 87
         jQuery('.en').show();
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/file/upload.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
 
122 122
 if ($guid) {
123 123
 	echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid));
124
-    elgg_unregister_menu_item('title2', 'new_folder');
124
+	elgg_unregister_menu_item('title2', 'new_folder');
125 125
 }
126 126
 
127 127
 echo elgg_view('input/submit', array('value' => $submit_label, 'class' => 'btn btn-primary mrgn-tp-md'));
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -39,12 +39,12 @@  discard block
 block discarded – undo
39 39
 $json_title = json_decode($title);
40 40
 $json_desc = json_decode($desc);
41 41
 
42
-if ( $json_title ){
42
+if ($json_title) {
43 43
   $title2 = $json_title->fr;
44 44
   $title = $json_title->en;
45 45
 }
46 46
 
47
-if ( $json_desc ){
47
+if ($json_desc) {
48 48
   $desc2 = $json_desc->fr;
49 49
   $desc = $json_desc->en;
50 50
 }
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 
53 53
 elgg_unregister_menu_item('title', 'new_folder');
54 54
 
55
-$btn_language =  '<ul class="nav nav-tabs nav-tabs-language">
56
-  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li>
57
-  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li>
55
+$btn_language = '<ul class="nav nav-tabs nav-tabs-language">
56
+  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li>
57
+  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li>
58 58
 </ul>';
59 59
 
60 60
 echo $btn_language;
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
 /// minor edit functionality (TODO: possibly extend view in the future, for all minor edits)
131 131
 if ($edit_file) {
132
-	echo "<h2>".elgg_echo('cp_notify:minor_edit_header')."</h2>";
132
+	echo "<h2>" . elgg_echo('cp_notify:minor_edit_header') . "</h2>";
133 133
 	echo elgg_view('input/checkbox', array(
134 134
 		'name' 		=>	"minor_edit",
135 135
 		'value' 	=>	1,
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 echo'</div></div>';
146 146
 
147 147
 
148
-if(get_current_language() == 'fr'){
148
+if (get_current_language() == 'fr') {
149 149
 ?>
150 150
 	<script>
151 151
 		jQuery('.fr').show();
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 	</script>
156 156
 <?php
157
-}else{
157
+} else {
158 158
 ?>
159 159
 	<script>
160 160
 		jQuery('.en').show();
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
         });
186 186
 });
187 187
 
188
-<?php if(elgg_in_context('embed')){ ?>
188
+<?php if (elgg_in_context('embed')) { ?>
189 189
   var validExtentions = get_file_tools_settings('single');
190 190
   var newExt = validExtentions.replace(/, /g, '|'); //format the extensions for validation
191 191
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
   });
211 211
   <?php } ?>
212 212
 
213
-  <?php if($guid){ ?>
213
+  <?php if ($guid) { ?>
214 214
     //remove required on file input if editing file
215 215
     $('#upload').removeAttr('required');
216 216
   <?php } ?>
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
 
155 155
 	</script>
156 156
 <?php
157
-}else{
157
+} else{
158 158
 ?>
159 159
 	<script>
160 160
 		jQuery('.en').show();
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/file_tools/folder/edit.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 }
25 25
 
26 26
 if ( $json_desc ){
27
-    $desc2 = $json_desc->fr;
27
+	$desc2 = $json_desc->fr;
28 28
   $desc = $json_desc->en;
29 29
 }
30 30
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 if (!empty($folder)) {
96 96
 $form_data .= elgg_view("input/folder_select_move", array("name" => "file_tools_parent_guid", "id" => "file_tools_parent_guid", "folder" => $folder, "value" => $parent, "container_guid" => $page_owner->getGUID(), 'type' => 'folder'));
97 97
 } else {
98
-    $form_data .= elgg_view("input/folder_select", array("name" => "file_tools_parent_guid", "id" => "file_tools_parent_guid", "folder" => $folder, "value" => $parent, "container_guid" => $page_owner->getGUID(), 'type' => 'folder'));
98
+	$form_data .= elgg_view("input/folder_select", array("name" => "file_tools_parent_guid", "id" => "file_tools_parent_guid", "folder" => $folder, "value" => $parent, "container_guid" => $page_owner->getGUID(), 'type' => 'folder'));
99 99
 }
100 100
 $form_data .= "</div>";
101 101
 
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
 $json_title = json_decode($title);
19 19
 $json_desc = json_decode($desc);
20 20
 
21
-if ( $json_title ){
21
+if ($json_title) {
22 22
   $title2 = $json_title->fr;
23
-  $title= $json_title->en;
23
+  $title = $json_title->en;
24 24
 }
25 25
 
26
-if ( $json_desc ){
26
+if ($json_desc) {
27 27
     $desc2 = $json_desc->fr;
28 28
   $desc = $json_desc->en;
29 29
 }
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
 	$submit_text = elgg_echo("save");
59 59
 }
60 60
 
61
-$btn_language =  '<ul class="nav nav-tabs nav-tabs-language nav-tabs-language_folder">
62
-  <li id="btnen_folder"><a href="#" onclick="showen()">'.elgg_echo('lang:english').'</a></li>
63
-  <li id="btnfr_folder"><a href="#" onclick="showfr()">'.elgg_echo('lang:french').'</a></li>
61
+$btn_language = '<ul class="nav nav-tabs nav-tabs-language nav-tabs-language_folder">
62
+  <li id="btnen_folder"><a href="#" onclick="showen()">'.elgg_echo('lang:english') . '</a></li>
63
+  <li id="btnfr_folder"><a href="#" onclick="showfr()">'.elgg_echo('lang:french') . '</a></li>
64 64
 </ul>';
65 65
 
66 66
 $form_data .= $btn_language;
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 
115 115
 if (!empty($folder)) {
116 116
 	$form_data .= "<div id='file_tools_edit_form_access_extra'>";
117
-  $form_data .='<ul class="list-unstyled">';
118
-  $form_data .= '<li>'.elgg_view('input/checkbox', array('id' => 'change_children_access', 'name' => 'change_children_access', 'value' => 'yes')).'<label for="change_children_access">'.elgg_echo("file_tools:forms:edit:change_children_access").'</label></li>';
119
-  $form_data .= '<li>'.elgg_view('input/checkbox', array('id' => 'change_files_access', 'name' => 'change_files_access')).'<label for="change_files_access">'.elgg_echo("file_tools:forms:edit:change_files_access").'</label></li>';
117
+  $form_data .= '<ul class="list-unstyled">';
118
+  $form_data .= '<li>' . elgg_view('input/checkbox', array('id' => 'change_children_access', 'name' => 'change_children_access', 'value' => 'yes')) . '<label for="change_children_access">' . elgg_echo("file_tools:forms:edit:change_children_access") . '</label></li>';
119
+  $form_data .= '<li>' . elgg_view('input/checkbox', array('id' => 'change_files_access', 'name' => 'change_files_access')) . '<label for="change_files_access">' . elgg_echo("file_tools:forms:edit:change_files_access") . '</label></li>';
120 120
 	//$form_data .= "<div>" . elgg_view("input/checkboxes", array("options" => array(elgg_echo("file_tools:forms:edit:change_children_access") => "yes"), "value" => "yes", "name" => "change_children_access")) . "</div>";
121 121
 	//$form_data .= "<div>" . elgg_view("input/checkboxes", array("options" => array(elgg_echo("file_tools:forms:edit:change_files_access") => "yes"), "name" => "change_files_access")) . "</div>";
122 122
 	$form_data .= "</ul></div>";
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
 elgg_unregister_menu_item('title2', 'new_folder');
132 132
 
133
-if(get_current_language() == 'fr'){
133
+if (get_current_language() == 'fr') {
134 134
 ?><!-- Jquerry not working -->
135 135
     <script>
136 136
   var btnfr_folder = document.getElementById('btnfr_folder');
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 
144 144
     </script>
145 145
 <?php
146
-}else{
146
+} else {
147 147
 ?>
148 148
     <script>
149 149
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 
144 144
     </script>
145 145
 <?php
146
-}else{
146
+} else{
147 147
 ?>
148 148
     <script>
149 149
 
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/avatar/upload.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 ?>
13 13
 <div>
14 14
 	<label for="avatar"><?php echo elgg_echo("avatar:upload"); ?></label><br />
15
-    <?php echo elgg_view("input/file",array('name' => 'avatar', 'id' => 'avatar','required '=> "required")); ?>
15
+    <?php echo elgg_view("input/file", array('name' => 'avatar', 'id' => 'avatar', 'required '=> "required")); ?>
16 16
 </div>
17 17
 <div class="elgg-foot mrgn-tp-md">
18 18
 	<?php echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/photos/batch/edit/image.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -24,24 +24,24 @@  discard block
 block discarded – undo
24 24
 echo '</div>';
25 25
 
26 26
 echo '<div class="elgg-body"><fieldset class="mlm">';
27
-echo '<div class="en"><label for="title-'.$imageGUID.'">' . elgg_echo('title:en') . '</label>';
28
-echo elgg_view('input/text', array('name' => 'title[]', 'value' => $title, 'id'=>'title-'.$imageGUID,));
27
+echo '<div class="en"><label for="title-' . $imageGUID . '">' . elgg_echo('title:en') . '</label>';
28
+echo elgg_view('input/text', array('name' => 'title[]', 'value' => $title, 'id'=>'title-' . $imageGUID,));
29 29
 echo '</div>';
30 30
 
31
-echo '<div class="fr"><label for="title2-'.$imageGUID.'">' . elgg_echo('title:fr') . '</label>';
32
-echo elgg_view('input/text', array('name' => 'title2[]', 'value' => $title2, 'id'=>'title2-'.$imageGUID,));
31
+echo '<div class="fr"><label for="title2-' . $imageGUID . '">' . elgg_echo('title:fr') . '</label>';
32
+echo elgg_view('input/text', array('name' => 'title2[]', 'value' => $title2, 'id'=>'title2-' . $imageGUID,));
33 33
 echo '</div>';
34 34
 
35
-echo '<div class="en"><label for="caption-'.$imageGUID.'">' . elgg_echo('caption:en') . '</label>';
36
-echo elgg_view('input/longtext', array('name' => 'caption[]', 'id'=>'caption-'.$imageGUID,));
35
+echo '<div class="en"><label for="caption-' . $imageGUID . '">' . elgg_echo('caption:en') . '</label>';
36
+echo elgg_view('input/longtext', array('name' => 'caption[]', 'id'=>'caption-' . $imageGUID,));
37 37
 echo '</div>';
38 38
 
39
-echo '<div class="fr"><label for="caption2-'.$imageGUID.'">' . elgg_echo('caption:fr') . '</label>';
40
-echo elgg_view('input/longtext', array('name' => 'caption2[]', 'id'=>'caption2-'.$imageGUID,));
39
+echo '<div class="fr"><label for="caption2-' . $imageGUID . '">' . elgg_echo('caption:fr') . '</label>';
40
+echo elgg_view('input/longtext', array('name' => 'caption2[]', 'id'=>'caption2-' . $imageGUID,));
41 41
 echo '</div>';
42 42
 
43
-echo '<div><label for="tags-'.$imageGUID.'">' . elgg_echo("tags") . '</label>';
44
-echo elgg_view('input/tags', array('name' => 'tags[]', 'id'=>'tags-'.$imageGUID,));
43
+echo '<div><label for="tags-' . $imageGUID . '">' . elgg_echo("tags") . '</label>';
44
+echo elgg_view('input/tags', array('name' => 'tags[]', 'id'=>'tags-' . $imageGUID,));
45 45
 echo '</div>';
46 46
 
47 47
 echo elgg_view('input/hidden', array('name' => 'guid[]', 'value' => $image->getGUID()));
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 echo '</div>';
51 51
 
52 52
 
53
-if(get_current_language() == 'fr'){
53
+if (get_current_language() == 'fr') {
54 54
 ?>
55 55
   <script>
56 56
     jQuery('.fr').show();
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
   </script>
61 61
 <?php
62
-}else{
62
+} else {
63 63
 ?>
64 64
   <script>
65 65
     jQuery('.en').show();
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 
60 60
   </script>
61 61
 <?php
62
-}else{
62
+} else{
63 63
 ?>
64 64
   <script>
65 65
     jQuery('.en').show();
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/photos/album/save.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
  $json_title = json_decode($title);
20 20
  $json_desc = json_decode($description);
21 21
  
22
- if ( $json_title ){
22
+ if ($json_title) {
23 23
    $title2 = $json_title->fr;
24 24
    $title = $json_title->en;
25 25
  }
26 26
  
27
- if ( $json_desc ){
27
+ if ($json_desc) {
28 28
    $description2 = $json_desc->fr;
29 29
    $description = $json_desc->en;
30 30
  }
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 $container_guid = elgg_extract('container_guid', $vars, elgg_get_page_owner_guid());
35 35
 $guid = elgg_extract('guid', $vars, 0);
36 36
 
37
-$btn_language =  '<ul class="nav nav-tabs nav-tabs-language">
38
-  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li>
39
-  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li>
37
+$btn_language = '<ul class="nav nav-tabs nav-tabs-language">
38
+  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li>
39
+  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li>
40 40
 </ul>';
41 41
 
42 42
 echo $btn_language;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 echo'</div></div>';
86 86
 
87
-if(get_current_language() == 'fr'){
87
+if (get_current_language() == 'fr') {
88 88
 ?>
89 89
   <script>
90 90
     jQuery('.fr').show();
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
   </script>
95 95
 <?php
96
-}else{
96
+} else {
97 97
 ?>
98 98
   <script>
99 99
     jQuery('.en').show();
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 
60 60
   </script>
61 61
 <?php
62
-}else{
62
+} else{
63 63
 ?>
64 64
   <script>
65 65
     jQuery('.en').show();
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/photos/image/save.php 3 patches
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 $img = elgg_view_entity_icon($photo, 'large', array(
36 36
   //'href' => $image->getIconURL('master'),
37
-    'href' => 'ajax/view/ajax/photo?guid=' . $photo->guid,
37
+	'href' => 'ajax/view/ajax/photo?guid=' . $photo->guid,
38 38
   'img_class' => 'tidypics-photo',
39 39
   'link_class' => 'elgg-lightbox',
40 40
   'id' => 'img',
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 $img = elgg_view_entity_icon($photo, 'large', array(
46 46
   //'href' => $image->getIconURL('master'),
47
-    'href' => 'ajax/view/ajax/photo?guid=' . $photo->guid,
47
+	'href' => 'ajax/view/ajax/photo?guid=' . $photo->guid,
48 48
   'img_class' => 'tidypics-photo',
49 49
   'link_class' => 'elgg-lightbox',
50 50
   'id' => 'img',
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 echo $img;
56 56
 echo '</div>';
57 57
 if (isset($_POST['action'])) {
58
-    switch ($_POST['action']) {
59
-        case 'rotation':
60
-            rotation($photo);
61
-            break;
58
+	switch ($_POST['action']) {
59
+		case 'rotation':
60
+			rotation($photo);
61
+			break;
62 62
 
63
-    }
63
+	}
64 64
 }
65 65
 
66 66
 //function to rotate image
@@ -74,57 +74,57 @@  discard block
 block discarded – undo
74 74
   $picture_size = array('thumb', 'smallthumb', 'largethumb');
75 75
 
76 76
   for($x = 0; $x < 3; $x++) {
77
-      //$imgsrc = $_SERVER['DOCUMENT_ROOT'] .'1/'.$photo->owner_guid.'/'.$picture_size[$x];
78
-        $imgsrc = $path_noname.'/'.$picture_size[$x].$filename;
79
-        error_log($imgsrc);
80
-      if (exif_imagetype($imgsrc) == IMAGETYPE_JPEG) {
81
-          if (file_exists($imgsrc)) {
82
-              $img = imagecreatefromjpeg($imgsrc);
83
-
84
-              if ($img !== false) {
85
-                $imgRotated = imagerotate($img,90,0);
86
-
87
-                if ($imgRotated !== false) {
88
-                    imagejpeg($imgRotated,$imgsrc,100);
89
-                }
90
-              }else{
91
-
92
-                echo 'Error, Image rotate false. JPEG';
93
-
94
-              }
95
-
96
-          }else{
97
-            register_error(elgg_echo('Error, file not exist. JPEG'));
98
-            echo "<script>alert(\"la variable est nulle\")</script>";
99
-
100
-          }
101
-              imagedestroy($img);
102
-              imagedestroy($imgRotated);
103
-      }else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG){
104
-         if (file_exists($imgsrc)) {
105
-              $img = imagecreatefrompng($imgsrc);
106
-              $bgColor = imagecolorallocatealpha($imgsrc, 255, 255, 255, 127);
107
-
108
-              if ($img !== false) {
109
-                $imgRotated = imagerotate($img,90,$bgColor);
110
-
111
-                if ($imgRotated !== false) {
112
-                    imagesavealpha($imgRotated, true);
113
-                    imagepng($imgRotated,$imgsrc);
114
-                }
115
-              }else{
116
-                echo 'Error, Image rotate false. PNG';
117
-              }
118
-
119
-          }else{
120
-               register_error(elgg_echo('Error, file not exist. PNG'));
121
-               echo "<script>alert(\"la variable est nulle\")</script>";
122
-          }
123
-            imagedestroy($img);
124
-            imagedestroy($imgRotated);
125
-      }
126
-       register_error(elgg_echo('Error, file not exist. PNG'));
127
-       error_log("Base Oracle indisponible !");
77
+	  //$imgsrc = $_SERVER['DOCUMENT_ROOT'] .'1/'.$photo->owner_guid.'/'.$picture_size[$x];
78
+		$imgsrc = $path_noname.'/'.$picture_size[$x].$filename;
79
+		error_log($imgsrc);
80
+	  if (exif_imagetype($imgsrc) == IMAGETYPE_JPEG) {
81
+		  if (file_exists($imgsrc)) {
82
+			  $img = imagecreatefromjpeg($imgsrc);
83
+
84
+			  if ($img !== false) {
85
+				$imgRotated = imagerotate($img,90,0);
86
+
87
+				if ($imgRotated !== false) {
88
+					imagejpeg($imgRotated,$imgsrc,100);
89
+				}
90
+			  }else{
91
+
92
+				echo 'Error, Image rotate false. JPEG';
93
+
94
+			  }
95
+
96
+		  }else{
97
+			register_error(elgg_echo('Error, file not exist. JPEG'));
98
+			echo "<script>alert(\"la variable est nulle\")</script>";
99
+
100
+		  }
101
+			  imagedestroy($img);
102
+			  imagedestroy($imgRotated);
103
+	  }else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG){
104
+		 if (file_exists($imgsrc)) {
105
+			  $img = imagecreatefrompng($imgsrc);
106
+			  $bgColor = imagecolorallocatealpha($imgsrc, 255, 255, 255, 127);
107
+
108
+			  if ($img !== false) {
109
+				$imgRotated = imagerotate($img,90,$bgColor);
110
+
111
+				if ($imgRotated !== false) {
112
+					imagesavealpha($imgRotated, true);
113
+					imagepng($imgRotated,$imgsrc);
114
+				}
115
+			  }else{
116
+				echo 'Error, Image rotate false. PNG';
117
+			  }
118
+
119
+		  }else{
120
+			   register_error(elgg_echo('Error, file not exist. PNG'));
121
+			   echo "<script>alert(\"la variable est nulle\")</script>";
122
+		  }
123
+			imagedestroy($img);
124
+			imagedestroy($imgRotated);
125
+	  }
126
+	   register_error(elgg_echo('Error, file not exist. PNG'));
127
+	   error_log("Base Oracle indisponible !");
128 128
 
129 129
   }
130 130
 }
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
  $json_title = json_decode($title);
16 16
  $json_desc = json_decode($description);
17 17
  
18
- if ( $json_title ){
18
+ if ($json_title) {
19 19
    $title2 = $json_title->fr;
20 20
    $title = $json_title->en;
21 21
  }
22 22
  
23
- if ( $json_desc ){
23
+ if ($json_desc) {
24 24
    $description2 = $json_desc->fr;
25 25
    $description = $json_desc->en;
26 26
  }
@@ -64,59 +64,59 @@  discard block
 block discarded – undo
64 64
 }
65 65
 
66 66
 //function to rotate image
67
-function rotation($photo){
67
+function rotation($photo) {
68 68
   $path = $photo->getFilenameOnFilestore();
69
-  $path_noname = substr($path, 0, strrpos( $path, '/'));
69
+  $path_noname = substr($path, 0, strrpos($path, '/'));
70 70
 
71 71
   $filename = $photo->getFilename();
72 72
   $filename = substr($filename, strrpos($filename, '/') + 1);
73 73
 
74 74
   $picture_size = array('thumb', 'smallthumb', 'largethumb');
75 75
 
76
-  for($x = 0; $x < 3; $x++) {
76
+  for ($x = 0; $x < 3; $x++) {
77 77
       //$imgsrc = $_SERVER['DOCUMENT_ROOT'] .'1/'.$photo->owner_guid.'/'.$picture_size[$x];
78
-        $imgsrc = $path_noname.'/'.$picture_size[$x].$filename;
78
+        $imgsrc = $path_noname . '/' . $picture_size[$x] . $filename;
79 79
         error_log($imgsrc);
80 80
       if (exif_imagetype($imgsrc) == IMAGETYPE_JPEG) {
81 81
           if (file_exists($imgsrc)) {
82 82
               $img = imagecreatefromjpeg($imgsrc);
83 83
 
84 84
               if ($img !== false) {
85
-                $imgRotated = imagerotate($img,90,0);
85
+                $imgRotated = imagerotate($img, 90, 0);
86 86
 
87 87
                 if ($imgRotated !== false) {
88
-                    imagejpeg($imgRotated,$imgsrc,100);
88
+                    imagejpeg($imgRotated, $imgsrc, 100);
89 89
                 }
90
-              }else{
90
+              } else {
91 91
 
92 92
                 echo 'Error, Image rotate false. JPEG';
93 93
 
94 94
               }
95 95
 
96
-          }else{
96
+          } else {
97 97
             register_error(elgg_echo('Error, file not exist. JPEG'));
98 98
             echo "<script>alert(\"la variable est nulle\")</script>";
99 99
 
100 100
           }
101 101
               imagedestroy($img);
102 102
               imagedestroy($imgRotated);
103
-      }else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG){
103
+      } else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG) {
104 104
          if (file_exists($imgsrc)) {
105 105
               $img = imagecreatefrompng($imgsrc);
106 106
               $bgColor = imagecolorallocatealpha($imgsrc, 255, 255, 255, 127);
107 107
 
108 108
               if ($img !== false) {
109
-                $imgRotated = imagerotate($img,90,$bgColor);
109
+                $imgRotated = imagerotate($img, 90, $bgColor);
110 110
 
111 111
                 if ($imgRotated !== false) {
112 112
                     imagesavealpha($imgRotated, true);
113
-                    imagepng($imgRotated,$imgsrc);
113
+                    imagepng($imgRotated, $imgsrc);
114 114
                 }
115
-              }else{
115
+              } else {
116 116
                 echo 'Error, Image rotate false. PNG';
117 117
               }
118 118
 
119
-          }else{
119
+          } else {
120 120
                register_error(elgg_echo('Error, file not exist. PNG'));
121 121
                echo "<script>alert(\"la variable est nulle\")</script>";
122 122
           }
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
 
132 132
 
133 133
 //button image rotation
134
-$image_src = elgg_get_site_url().'/photos/thumbnail/'.$photo->guid.'/large/'.$photo->largethumb;
134
+$image_src = elgg_get_site_url() . '/photos/thumbnail/' . $photo->guid . '/large/' . $photo->largethumb;
135 135
 echo'<div class="col-md-7 col-md-offset-5 mrgn-tp-md">';
136
-echo'<span class="btn btn-default" onclick=rotate_ajax("'.$image_src.'")>'.elgg_echo('rotate:image').'</span></div>';
136
+echo'<span class="btn btn-default" onclick=rotate_ajax("' . $image_src . '")>' . elgg_echo('rotate:image') . '</span></div>';
137 137
 
138
-$btn_language =  '<ul class="nav nav-tabs nav-tabs-language">
139
-  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li>
140
-  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li>
138
+$btn_language = '<ul class="nav nav-tabs nav-tabs-language">
139
+  <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li>
140
+  <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li>
141 141
 </ul>';
142 142
 
143 143
 echo $btn_language;
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
 </div>
154 154
 <div class="en">
155 155
 	<label for="id"><?php echo elgg_echo('img:desc:en'); ?></label>
156
-	<?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $description, 'id' => 'description',  'class' => 'mrgn-bttm-md',)); ?>
156
+	<?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $description, 'id' => 'description', 'class' => 'mrgn-bttm-md',)); ?>
157 157
 </div>
158 158
 
159 159
 <div class="fr">
160 160
 	<label for="id"><?php echo elgg_echo('img:desc:fr'); ?></label>
161
-	<?php echo elgg_view('input/longtext', array('name' => 'description2', 'value' => $description2, 'id' => 'description2',  'class' => 'mrgn-bttm-md',)); ?>
161
+	<?php echo elgg_view('input/longtext', array('name' => 'description2', 'value' => $description2, 'id' => 'description2', 'class' => 'mrgn-bttm-md',)); ?>
162 162
 </div>
163 163
 <div>
164 164
 	<label for="tags" class="mrgn-tp-md"><?php echo elgg_echo('tags'); ?></label>
165
-	<?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags, 'id' => 'tags', )); ?>
165
+	<?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags, 'id' => 'tags',)); ?>
166 166
 </div>
167 167
 <?php
168 168
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
 
187 187
 
188
-if(get_current_language() == 'fr'){
188
+if (get_current_language() == 'fr') {
189 189
 ?>
190 190
   <script>
191 191
     jQuery('.fr').show();
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
   </script>
196 196
 <?php
197
-}else{
197
+} else {
198 198
 ?>
199 199
   <script>
200 200
     jQuery('.en').show();
Please login to merge, or discard this patch.
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -87,20 +87,20 @@  discard block
 block discarded – undo
87 87
                 if ($imgRotated !== false) {
88 88
                     imagejpeg($imgRotated,$imgsrc,100);
89 89
                 }
90
-              }else{
90
+              } else{
91 91
 
92 92
                 echo 'Error, Image rotate false. JPEG';
93 93
 
94 94
               }
95 95
 
96
-          }else{
96
+          } else{
97 97
             register_error(elgg_echo('Error, file not exist. JPEG'));
98 98
             echo "<script>alert(\"la variable est nulle\")</script>";
99 99
 
100 100
           }
101 101
               imagedestroy($img);
102 102
               imagedestroy($imgRotated);
103
-      }else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG){
103
+      } else if (exif_imagetype($imgsrc) == IMAGETYPE_PNG){
104 104
          if (file_exists($imgsrc)) {
105 105
               $img = imagecreatefrompng($imgsrc);
106 106
               $bgColor = imagecolorallocatealpha($imgsrc, 255, 255, 255, 127);
@@ -112,11 +112,11 @@  discard block
 block discarded – undo
112 112
                     imagesavealpha($imgRotated, true);
113 113
                     imagepng($imgRotated,$imgsrc);
114 114
                 }
115
-              }else{
115
+              } else{
116 116
                 echo 'Error, Image rotate false. PNG';
117 117
               }
118 118
 
119
-          }else{
119
+          } else{
120 120
                register_error(elgg_echo('Error, file not exist. PNG'));
121 121
                echo "<script>alert(\"la variable est nulle\")</script>";
122 122
           }
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
   </script>
196 196
 <?php
197
-}else{
197
+} else{
198 198
 ?>
199 199
   <script>
200 200
     jQuery('.en').show();
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/messages/reply.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 <div>
36 36
     <label for="subject"><?php echo elgg_echo("messages:title"); ?>: <br /></label>
37 37
 	<?php echo elgg_view('input/text', array(
38
-        'name' => 'subject',
39
-        'id' => 'subject',
38
+		'name' => 'subject',
39
+		'id' => 'subject',
40 40
 		'value' => $reply_title,
41
-    'required' => 'required',
41
+	'required' => 'required',
42 42
 	));
43 43
 	?>
44 44
 </div>
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 	<label for="body"><?php echo elgg_echo("messages:message"); ?>:</label>
47 47
 	<?php echo elgg_view("input/longtext", array(
48 48
 		'name' => 'body',
49
-        'id' => 'body',
49
+		'id' => 'body',
50 50
 		'value' => '',
51
-    'required' => 'required',
52
-    'class' => 'validate-me',
51
+	'required' => 'required',
52
+	'class' => 'validate-me',
53 53
 	));
54 54
 	?>
55 55
 </div>
56 56
 <div class="elgg-foot mrgn-tp-sm">
57 57
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('send')));
58
-          echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview'));?>
58
+		  echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview'));?>
59 59
 </div>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,5 +55,5 @@
 block discarded – undo
55 55
 </div>
56 56
 <div class="elgg-foot mrgn-tp-sm">
57 57
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('send')));
58
-          echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview'));?>
58
+          echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview')); ?>
59 59
 </div>
Please login to merge, or discard this patch.
mod/wet4/views/default/forms/messages/send.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
 $recipient_autocomplete = elgg_view('input/autocomplete', array(
38 38
 	'name' => 'recipient_username',
39
-    'id' => 'recipient_username',
39
+	'id' => 'recipient_username',
40 40
 	'value' => $recipient_username,
41 41
 	'match_on' => array('friends'),
42 42
 ));
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 	<label for="subject"><?php echo elgg_echo("messages:title"); ?>: <br /></label>
96 96
 	<?php echo elgg_view('input/text', array(
97 97
 		'name' => 'subject',
98
-        'id' => 'subject',
99
-    'required' => 'required',
98
+		'id' => 'subject',
99
+	'required' => 'required',
100 100
 		'value' => $subject,
101 101
 	));
102 102
 	?>
@@ -105,17 +105,17 @@  discard block
 block discarded – undo
105 105
 	<label for="body"><?php echo elgg_echo("messages:message"); ?>:</label>
106 106
 	<?php echo elgg_view("input/longtext", array(
107 107
 		'name' => 'body',
108
-        'id' => 'body',
109
-        'required' => 'required',
110
-        'class' => 'validate-me',
108
+		'id' => 'body',
109
+		'required' => 'required',
110
+		'class' => 'validate-me',
111 111
 		'value' => $body,
112 112
 	));
113 113
 	?>
114 114
 </div>
115 115
 <div class="elgg-foot">
116 116
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('send'), 'class' => 'btn btn-primary'));
117
-          echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview'));
118
-    ?>
117
+		  echo  elgg_view('output/url', array('text' => elgg_echo('preview'), 'href' => 'ajax/view/messages/message_preview', 'class' => 'btn-default btn elgg-lightbox', 'id' => 'preview'));
118
+	?>
119 119
 </div>
120 120
 
121 121
 <script>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	foreach ($members as $member) {
23 23
 		$user = get_user($member);
24
-		$recipient_username .= $user->username.',';
24
+		$recipient_username .= $user->username . ',';
25 25
 	}
26 26
 	$recipient_username = rtrim($recipient_username, ',');
27 27
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
 <div class="mrgn-bttm-md">
48 48
 	<label for="recipient_username"><?php echo elgg_echo("colleague_circle_checkbox"); ?>: </label>
49
-	<input id='colleagueCircle' name='colleagueCircle' type='checkbox' value=true <?php if ($collection_id){ echo ' checked="checked"'; } ?> >
49
+	<input id='colleagueCircle' name='colleagueCircle' type='checkbox' value=true <?php if ($collection_id) { echo ' checked="checked"'; } ?> >
50 50
 </div>
51 51
 
52 52
 <div class="mrgn-bttm-md" id="circlecolleague_section" name="circlecolleague_section">
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		if ($collection->id == $collection_id)
75 75
 			echo ' selected="selected"';
76 76
 
77
-		echo '>'.$collection->name.'</option>';
77
+		echo '>' . $collection->name . '</option>';
78 78
 		echo '<br>';
79 79
 	}
80 80
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,8 +71,9 @@
 block discarded – undo
71 71
 		}
72 72
 		echo implode(',', $coll_members);
73 73
 
74
-		if ($collection->id == $collection_id)
75
-			echo ' selected="selected"';
74
+		if ($collection->id == $collection_id) {
75
+					echo ' selected="selected"';
76
+		}
76 77
 
77 78
 		echo '>'.$collection->name.'</option>';
78 79
 		echo '<br>';
Please login to merge, or discard this patch.