Completed
Push — 1.11.x ( c69862...ecc799 )
by José
207:40 queued 172:00
created
plugin/tour/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
  * @author Angel Fernando Quiroz Campos <[email protected]>
6 6
  * @package chamilo.plugin.tour
7 7
  */
8
-require_once __DIR__ . '/config.php';
8
+require_once __DIR__.'/config.php';
9 9
 
10
-$pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/';
11
-$pluginWebPath = api_get_path(WEB_PLUGIN_PATH) . 'tour/';
10
+$pluginPath = api_get_path(SYS_PLUGIN_PATH).'tour/';
11
+$pluginWebPath = api_get_path(WEB_PLUGIN_PATH).'tour/';
12 12
 
13 13
 $userId = api_get_user_id();
14 14
 
Please login to merge, or discard this patch.
plugin/tour/src/tour_plugin.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,8 +129,8 @@
 block discarded – undo
129 129
      */
130 130
     public function getTourConfig()
131 131
     {
132
-        $pluginPath = api_get_path(SYS_PLUGIN_PATH) . 'tour/';
133
-        $jsonContent = file_get_contents($pluginPath . 'config/tour.json');
132
+        $pluginPath = api_get_path(SYS_PLUGIN_PATH).'tour/';
133
+        $jsonContent = file_get_contents($pluginPath.'config/tour.json');
134 134
         $jsonData = json_decode($jsonContent, true);
135 135
 
136 136
         return $jsonData;
Please login to merge, or discard this patch.
plugin/tour/config.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
 define('TABLE_TOUR_LOG', 'plugin_tour_log');
11 11
 
12
-require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
13
-require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
14
-require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
12
+require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
13
+require_once api_get_path(LIBRARY_PATH).'plugin.class.php';
14
+require_once api_get_path(SYS_PLUGIN_PATH).'tour/src/tour_plugin.class.php';
15 15
 // Edit the config/tour.json file to add more pages or more elements to the guide
Please login to merge, or discard this patch.
plugin/tour/ajax/steps.ajax.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@
 block discarded – undo
6 6
  * @package chamilo.plugin.tour
7 7
  */
8 8
 require_once __DIR__.'/../../../main/inc/global.inc.php';
9
-require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
10
-require_once api_get_path(SYS_PLUGIN_PATH) . 'tour/src/tour_plugin.class.php';
9
+require_once api_get_path(LIBRARY_PATH).'plugin.class.php';
10
+require_once api_get_path(SYS_PLUGIN_PATH).'tour/src/tour_plugin.class.php';
11 11
 
12 12
 if (!api_is_anonymous()) {
13 13
     $currentPageClass = isset($_GET['page_class']) ? $_GET['page_class'] : '';
Please login to merge, or discard this patch.
main/document/edit_paint.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -33,26 +33,26 @@  discard block
 block discarded – undo
33 33
     $my_cur_dir_path = isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : null;
34 34
 }
35 35
 
36
-$dir= str_replace('\\', '/', $dir);//and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
36
+$dir = str_replace('\\', '/', $dir); //and urlencode each url $curdirpath (hack clean $curdirpath under Windows - Bug #3261)
37 37
 
38 38
 /* Constants & Variables */
39
-$current_session_id=api_get_session_id();
39
+$current_session_id = api_get_session_id();
40 40
 //path for pixlr save
41
-$_SESSION['paint_dir']=Security::remove_XSS($dir);
42
-if($_SESSION['paint_dir']=='/'){
43
-    $_SESSION['paint_dir']='';
41
+$_SESSION['paint_dir'] = Security::remove_XSS($dir);
42
+if ($_SESSION['paint_dir'] == '/') {
43
+    $_SESSION['paint_dir'] = '';
44 44
 }
45
-$_SESSION['paint_file']=basename(Security::remove_XSS($file_path));
45
+$_SESSION['paint_file'] = basename(Security::remove_XSS($file_path));
46 46
 
47 47
 $get_file = Security::remove_XSS($file_path);
48 48
 
49 49
 $file = basename($get_file);
50 50
 
51
-$temp_file = explode(".",$file);
52
-$filename=$temp_file[0];
53
-$nameTools = get_lang('EditDocument') . ': '.$filename;
51
+$temp_file = explode(".", $file);
52
+$filename = $temp_file[0];
53
+$nameTools = get_lang('EditDocument').': '.$filename;
54 54
 
55
-$courseDir   = $_course['path'].'/document';
55
+$courseDir = $_course['path'].'/document';
56 56
 
57 57
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
58 58
 
@@ -96,15 +96,15 @@  discard block
 block discarded – undo
96 96
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
97 97
 
98 98
 if (!$is_certificate_mode)
99
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
99
+	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
100 100
 else
101
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
101
+	$interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
102 102
 
103 103
 // Interbreadcrumb for the current directory root path
104 104
 if (empty($document_data['parents'])) {
105 105
     $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
106 106
 } else {
107
-    foreach($document_data['parents'] as $document_sub_data) {
107
+    foreach ($document_data['parents'] as $document_sub_data) {
108 108
         if ($document_data['title'] == $document_sub_data['title']) {
109 109
             continue;
110 110
         }
@@ -124,33 +124,33 @@  discard block
 block discarded – undo
124 124
 Display :: display_header($nameTools, 'Doc');
125 125
 echo '<div class="actions">';
126 126
 echo '<a href="document.php?id='.$parent_id.'&'.api_get_cidreq().'">'.
127
-    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
127
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
128 128
 echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.'&'.api_get_cidreq().'&origin=editpaint">'.
129
-    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'),'',ICON_SIZE_MEDIUM).'</a>';
129
+    Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comment'), '', ICON_SIZE_MEDIUM).'</a>';
130 130
 echo '</div>';
131 131
 
132 132
 ///pixlr
133
-$title=$file;//disk name. No sql name because pixlr return this when save
133
+$title = $file; //disk name. No sql name because pixlr return this when save
134 134
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
135
-$langpixlr  = api_get_language_isocode();
135
+$langpixlr = api_get_language_isocode();
136 136
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
137
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
137
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
138 138
 
139
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
140
-$_SESSION['exit_pixlr']= Security::remove_XSS($parent_id);
139
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
140
+$_SESSION['exit_pixlr'] = Security::remove_XSS($parent_id);
141 141
 
142
-$referrer="Chamilo";
142
+$referrer = "Chamilo";
143 143
 
144
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
145
-$target=$target_path;
144
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
145
+$target = $target_path;
146 146
 
147
-$locktarget="true";
148
-$locktitle="false";
147
+$locktarget = "true";
148
+$locktitle = "false";
149 149
 
150
-if ($_SERVER['HTTP_HOST']=="localhost") {
151
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
150
+if ($_SERVER['HTTP_HOST'] == "localhost") {
151
+	$path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml';
152 152
 	if (!file_exists($path_and_file)) {
153
-		$crossdomain='<?xml version="1.0"?>
153
+		$crossdomain = '<?xml version="1.0"?>
154 154
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
155 155
 			<cross-domain-policy>
156 156
 				<allow-access-from domain="cdn.pixlr.com" />
@@ -159,23 +159,23 @@  discard block
 block discarded – undo
159 159
 			</cross-domain-policy>';//more open domain="*"
160 160
 		@file_put_contents($path_and_file, $crossdomain);
161 161
 	}
162
-	$credentials="true";
162
+	$credentials = "true";
163 163
 }
164 164
 else {
165
-	$credentials="false";
165
+	$credentials = "false";
166 166
 }
167 167
 
168 168
 //make temp images
169
-$temp_folder=api_get_path(SYS_ARCHIVE_PATH).'temp/images';
169
+$temp_folder = api_get_path(SYS_ARCHIVE_PATH).'temp/images';
170 170
 if (!file_exists($temp_folder)) {
171
-    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true);//TODO:check $permissions value, now empty;
171
+    @mkdir($temp_folder, api_get_permissions_for_new_directories(), true); //TODO:check $permissions value, now empty;
172 172
 }
173 173
 
174 174
 //make htaccess with allow from all, and file index.html into temp/images
175
-$htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
175
+$htaccess = api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
176 176
 if (!file_exists($htaccess)) {
177 177
 
178
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
178
+	$htaccess_content = "order deny,allow\r\nallow from all\r\nOptions -Indexes";
179 179
 
180 180
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
181 181
 	if ($fp) {
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	}
185 185
 }
186 186
 
187
-$html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
187
+$html_index = api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
188 188
 if (!file_exists($html_index)) {
189
-	$html_index_content="<html><head></head><body></body></html>";
189
+	$html_index_content = "<html><head></head><body></body></html>";
190 190
 	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
191 191
 	if ($fp) {
192 192
 		fwrite($fp, $html_index_content);
@@ -195,20 +195,20 @@  discard block
 block discarded – undo
195 195
 }
196 196
 
197 197
 //encript temp name file
198
-$name_crip=sha1(uniqid());//encript
199
-$findext= explode(".", $file);
200
-$extension= $findext[count($findext)-1];
201
-$file_crip=$name_crip.'.'.$extension;
198
+$name_crip = sha1(uniqid()); //encript
199
+$findext = explode(".", $file);
200
+$extension = $findext[count($findext) - 1];
201
+$file_crip = $name_crip.'.'.$extension;
202 202
 
203 203
 //copy file to temp/images directory
204
-$from=$filepath.$file;
205
-$to=api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
204
+$from = $filepath.$file;
205
+$to = api_get_path(SYS_ARCHIVE_PATH).'temp/images/'.$file_crip;
206 206
 copy($from, $to);
207
-$_SESSION['temp_realpath_image']=$to;
207
+$_SESSION['temp_realpath_image'] = $to;
208 208
 
209 209
 //load image to url
210
-$to_url=api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
211
-$image=urlencode($to_url);
210
+$to_url = api_get_path(WEB_ARCHIVE_PATH).'temp/images/'.$file_crip;
211
+$image = urlencode($to_url);
212 212
 $pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials;
213 213
 
214 214
 //make frame an send image
Please login to merge, or discard this patch.
main/document/create_paint.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -129,27 +129,27 @@
 block discarded – undo
129 129
 
130 130
 // pixlr
131 131
 // max size 1 Mb ??
132
-$title = urlencode(utf8_encode(get_lang('NewImage')));//TODO:check
132
+$title = urlencode(utf8_encode(get_lang('NewImage'))); //TODO:check
133 133
 //
134 134
 $image = Display::returnIconPath('canvas1024x768.png');
135 135
 //
136 136
 $pixlr_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
137
-$langpixlr  = api_get_language_isocode();
137
+$langpixlr = api_get_language_isocode();
138 138
 $langpixlr = isset($pixlr_code_translation_table[$langpixlr]) ? $pixlredit_code_translation_table[$langpixlr] : $langpixlr;
139
-$loc=$langpixlr;// deprecated ?? TODO:check pixlr read user browser
140
-
141
-$exit_path=api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
142
-$_SESSION['exit_pixlr']=$document_data['path'];
143
-$referrer="Chamilo";
144
-$target_path=api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
145
-$target=$target_path;
146
-$locktarget="true";
147
-$locktitle="false";
148
-
149
-if ($_SERVER['HTTP_HOST']=="localhost") {
150
-	$path_and_file= api_get_path(SYS_PATH).'/crossdomain.xml';
139
+$loc = $langpixlr; // deprecated ?? TODO:check pixlr read user browser
140
+
141
+$exit_path = api_get_path(WEB_CODE_PATH).'document/exit_pixlr.php';
142
+$_SESSION['exit_pixlr'] = $document_data['path'];
143
+$referrer = "Chamilo";
144
+$target_path = api_get_path(WEB_CODE_PATH).'document/save_pixlr.php';
145
+$target = $target_path;
146
+$locktarget = "true";
147
+$locktitle = "false";
148
+
149
+if ($_SERVER['HTTP_HOST'] == "localhost") {
150
+	$path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml';
151 151
 	if (!file_exists($path_and_file)) {
152
-		$crossdomain='<?xml version="1.0"?>
152
+		$crossdomain = '<?xml version="1.0"?>
153 153
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
154 154
 			<cross-domain-policy>
155 155
 				<allow-access-from domain="cdn.pixlr.com" />
Please login to merge, or discard this patch.
main/gradebook/lib/fe/resulttable.class.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	/**
19 19
 	 * Constructor
20 20
 	 */
21
-    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
21
+    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
22 22
 	{
23 23
     	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
24 24
 
@@ -28,14 +28,14 @@  discard block
 block discarded – undo
28 28
 		$this->iscourse = $iscourse;
29 29
 		$this->forprint = $forprint;
30 30
 
31
-		if (isset ($addparams))  {
31
+		if (isset ($addparams)) {
32 32
 			$this->set_additional_parameters($addparams);
33 33
 		}
34 34
 		$scoredisplay = ScoreDisplay :: instance();
35
-		$column= 0;
35
+		$column = 0;
36 36
 		if ($this->iscourse == '1') {
37 37
 			$this->set_header($column++, '', false);
38
-			$this->set_form_actions(array (
38
+			$this->set_form_actions(array(
39 39
 					'delete' => get_lang('Delete')
40 40
 			));
41 41
 		}
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 			$this->set_header($column++, get_lang('Display'));
52 52
 		}
53 53
 		if (!$this->forprint) {
54
-			$this->set_header($column++, get_lang('Modify'),false);
54
+			$this->set_header($column++, get_lang('Modify'), false);
55 55
 		}
56 56
     }
57 57
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	/**
60 60
 	 * Function used by SortableTable to get total number of items in the table
61 61
 	 */
62
-	public function get_total_number_of_items ()
62
+	public function get_total_number_of_items()
63 63
     {
64 64
 		return $this->datagen->get_total_results_count();
65 65
 	}
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 		// generate the data to display
113 113
 		$sortable_data = array();
114 114
 		foreach ($data_array as $item) {
115
-			$row = array ();
115
+			$row = array();
116 116
 			if ($this->iscourse == '1') {
117 117
 				 $row[] = $item['result_id'];
118 118
 			}
@@ -124,13 +124,13 @@  discard block
 block discarded – undo
124 124
 				$row[] = $item['firstname'];
125 125
 			}
126 126
 
127
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
127
+			$row[] = Display::bar_progress($item['percentage_score'], false, $item['score']);
128 128
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
129 129
 			if ($scoredisplay->is_custom()) {
130 130
 				$row[] = $item['display'];
131 131
 			}
132 132
 			if (!$this->forprint) {
133
-				$row[] = $this->build_edit_column ($item);
133
+				$row[] = $this->build_edit_column($item);
134 134
 			}
135 135
 			$sortable_data[] = $row;
136 136
 		}
@@ -138,23 +138,23 @@  discard block
 block discarded – undo
138 138
 		return $sortable_data;
139 139
 	}
140 140
 
141
-	private function build_edit_column ($item)
141
+	private function build_edit_column($item)
142 142
 	{
143 143
 		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
144 144
 		$locked_status = $this->evaluation->get_locked();
145 145
 		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
146 146
 			//api_is_course_admin()
147
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
148
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
149
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
150
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
147
+			$edit_column = '<a href="'.api_get_self().'?editres='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
148
+				Display::return_icon('edit.png', get_lang('Modify'), '', '22').'</a>';
149
+			$edit_column .= ' <a href="'.api_get_self().'?delete_mark='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
150
+				Display::return_icon('delete.png', get_lang('Delete'), '', '22').'</a>';
151 151
 		}
152 152
 
153 153
 		if ($this->evaluation->get_course_code() == null) {
154
-			$edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
154
+			$edit_column .= '&nbsp;<a href="'.api_get_self().'?resultdelete='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'" onclick="return confirmationuser();">';
155 155
 			$edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
156 156
 			$edit_column .= '</a>';
157
-		    $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
157
+		    $edit_column .= '&nbsp;<a href="user_stats.php?userid='.$item['id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">';
158 158
 			$edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
159 159
 		    $edit_column .= '</a>';
160 160
 		}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 			$doc_url = $link->get_view_url($item['id']);
166 166
 
167 167
 			if ($doc_url != null) {
168
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
168
+				$edit_column .= '&nbsp;<a href="'.$doc_url.'" target="_blank">';
169 169
 				$edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
170 170
 			}
171 171
 		}
Please login to merge, or discard this patch.
src/Chamilo/FaqBundle/Entity/Question.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
      */
220 220
     public function getEntityIdentifier()
221 221
     {
222
-        return 'GenjFaqBundle:Question:' . $this->getId();
222
+        return 'GenjFaqBundle:Question:'.$this->getId();
223 223
     }
224 224
 
225 225
     /**
Please login to merge, or discard this patch.
main/course_info/tools.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
         $interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq(), 'name' => get_lang('CustomizeIcons'));
47 47
         $toolName = $tool['name'];
48 48
 
49
-        $currentUrl = api_get_self().'?action=edit_icon&id=' . $id.'&'.api_get_cidreq();
49
+        $currentUrl = api_get_self().'?action=edit_icon&id='.$id.'&'.api_get_cidreq();
50 50
 
51 51
         $form = new FormValidator('icon_edit', 'post', $currentUrl);
52 52
         $form->addElement('header', get_lang('EditIcon'));
53 53
         $form->addHtml('<div class="col-md-7">');
54 54
         $form->addElement('text', 'name', get_lang('Name'));
55 55
         $form->addElement('text', 'link', get_lang('Links'));
56
-        $allowed_picture_types = array ('jpg', 'jpeg', 'png');
56
+        $allowed_picture_types = array('jpg', 'jpeg', 'png');
57 57
         $form->addElement('file', 'icon', get_lang('CustomIcon'));
58 58
         $form->addRule('icon', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
59 59
         $form->addElement(
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         $iconsTools .= Display::page_header(get_lang('CustomizeIcons'), null, 'h4');
119 119
         $iconsTools .= '<div class="row">';
120 120
         foreach ($toolList as $tool) {
121
-            $toolIconName = 'Tool' . api_underscore_to_camel_case($tool['name']);
121
+            $toolIconName = 'Tool'.api_underscore_to_camel_case($tool['name']);
122 122
             $toolIconName = isset($$toolIconName) ? get_lang($toolIconName) : $tool['name'];
123 123
 
124 124
             $iconsTools .= '<div class="col-md-2">';
@@ -140,13 +140,13 @@  discard block
 block discarded – undo
140 140
 
141 141
             $delete = (!empty($tool['custom_icon'])) ? "<a class=\"btn btn-default\" onclick=\"javascript:
142 142
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
143
-                "')) return false;\" href=\"". api_get_self() . '?action=delete_icon&id=' . $tool['iid'] . '&'.api_get_cidreq()."\">
143
+                "')) return false;\" href=\"".api_get_self().'?action=delete_icon&id='.$tool['iid'].'&'.api_get_cidreq()."\">
144 144
             <em class=\"fa fa-trash-o\"></em></a>" : "";
145
-            $edit = '<a class="btn btn-default" href="' . api_get_self() . '?action=edit_icon&id=' . $tool['iid'] . '&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
145
+            $edit = '<a class="btn btn-default" href="'.api_get_self().'?action=edit_icon&id='.$tool['iid'].'&'.api_get_cidreq().'"><em class="fa fa-pencil"></em></a>';
146 146
 
147
-            $iconsTools .= '<div class="icon-tools">'. $icon . '</div>';
148
-            $iconsTools .= '<div class="name-tools">' . $toolIconName . '</div>';
149
-            $iconsTools .= '<div class="toolbar">' . $edit . $delete . '</div>';
147
+            $iconsTools .= '<div class="icon-tools">'.$icon.'</div>';
148
+            $iconsTools .= '<div class="name-tools">'.$toolIconName.'</div>';
149
+            $iconsTools .= '<div class="toolbar">'.$edit.$delete.'</div>';
150 150
             $iconsTools .= '</div>';
151 151
             $iconsTools .= '</div>';
152 152
         }
Please login to merge, or discard this patch.