chamilo / chamilo-lms

main/webservices/webservice_user.php

Spacing +33 added lines, -33 removed lines

@@ -20,12 +20,12 @@ 
 	 */
 	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($state == 0) {
+			if ($state == 0) {
 				UserManager::disable($user_id);
-			} else if($state == 1) {
+			} else if ($state == 1) {
 				UserManager::enable($user_id);
 			}
 		}
@@ -40,11 +40,11 @@ 
 	 */
 	protected function changeUsersActiveState($users, $state) {
 		$results = array();
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$result_tmp = array();
 			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
 			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
+			if ($result_op instanceof WSError) {
 				// Return the error in the results
 				$result_tmp['result'] = $result_op->toArray();
 			} else {
@@ -64,12 +64,12 @@ 
 	 */
 	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -85,7 +85,7 @@ 
 	 */
 	public function DisableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -102,11 +102,11 @@ 
 	 */
 	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -122,7 +122,7 @@ 
 	 */
 	public function EnableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -139,10 +139,10 @@ 
 	 */
 	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if(!UserManager::delete_user($user_id)) {
+			if (!UserManager::delete_user($user_id)) {
 				return new WSError(101, "There was a problem while deleting this user");
 			} else {
 				return true;
@@ -159,11 +159,11 @@ 
 	 */
 	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 */
 	public function DeleteUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
 				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -223,11 +223,11 @@ 
 
 		// Add the original user id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
+		if ($user_id_field_name != "chamilo_user_id") {
 			$extras_associative[$user_id_field_name] = $user_id_value;
 		}
                 if (!empty($extras)) {
-                    foreach($extras as $extra) {
+                    foreach ($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
@@ -273,11 +273,11 @@ 
 	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -294,17 +294,17 @@ 
 	 */
 	public function CreateUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['user_id_value'] = $user_id_value;
 					$result_tmp['user_id_generated'] = 0;
@@ -353,10 +353,10 @@ 
 		$extras
 	) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($password == '') {
+			if ($password == '') {
 				$password = null;
 			}
 			$user_info = api_get_user_info($user_id);
@@ -417,19 +417,19 @@ 
 	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 
 			$extras_associative = array();
 			if (!empty($extras)) {
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
 			}
 
 			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -445,18 +445,18 @@ 
 	 */
 	public function EditUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {

main/admin/access_url_edit_course_category_to_url.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
 
     foreach ($userGroups as $item) {
         if ($item['access_url_id'] == $access_url_id) {
-            $userGroupList[$item['id']] = $item ;
+            $userGroupList[$item['id']] = $item;
         }
     }
     $noUserGroupList = CourseCategory::getCourseCategoryNotInList(array_keys($userGroupList));
@@ -151,11 +151,11 @@ 
         if (!empty($access_url_id)) {
             if ($url_obj[0] == $access_url_id) {
                 $checked = 'selected=true';
-                $url_selected=$url_obj[1];
+                $url_selected = $url_obj[1];
             }
         }
-        if ($url_obj['active']==1) { ?>
-            <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
+        if ($url_obj['active'] == 1) { ?>
+            <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
             </option>
         <?php
         }
@@ -171,7 +171,7 @@ 
   <td align="center"><b><?php echo get_lang('CourseCategoryInPlatform') ?> :</b>
   </td>
   <td></td>
-  <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'),$url_selected); ?></b></td>
+  <td align="center"><b><?php printf(get_lang('CourseCategoryListInX'), $url_selected); ?></b></td>
 </tr>
 
 <tr>
@@ -208,7 +208,7 @@ 
   <td align="center">
   <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
 <?php
-foreach($userGroupList as $item) {
+foreach ($userGroupList as $item) {
 ?>
 	<option value="<?php echo $item['id']; ?>">
         <?php echo $item['name']; ?>
@@ -223,7 +223,7 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
+		if (isset($_GET['add']))
 			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
 		else
 			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';

main/admin/access_url_edit_courses_to_url.php

Spacing +13 added lines, -13 removed lines

@@ -35,12 +35,12 @@ 
 $interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $access_url_id = 1;
-if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!='') {
+if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') {
 	$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
 }
 
@@ -157,23 +157,23 @@ 
 		<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
 	</div>
 	<br /><br />
-	<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?> >
+	<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?> >
 		<?php echo get_lang('SelectUrl').' : '; ?>
 		<select name="access_url_id" onchange="javascript:send();">
 			<option value="0">-- <?php echo get_lang('SelectUrl')?> -- </option>
 			<?php
-			$url_selected='';
+			$url_selected = '';
 			foreach ($url_list as $url_obj) {
 				$checked = '';
 				if (!empty($access_url_id)) {
-					if ($url_obj[0]==$access_url_id) {
+					if ($url_obj[0] == $access_url_id) {
 						$checked = 'selected=true';
-						$url_selected=$url_obj[1];
+						$url_selected = $url_obj[1];
 					}
 				}
-				if ($url_obj['active']==1) {
+				if ($url_obj['active'] == 1) {
 					?>
-					<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
+					<option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
 				<?php
 				}
 			}
@@ -196,7 +196,7 @@ 
 				<td align="center">
 					<div id="content_source">
 						<?php
-						if($ajax_search) {
+						if ($ajax_search) {
 							?>
 							<input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" />
 							<div id="ajax_list_courses"></div>
@@ -205,7 +205,7 @@ 
 							?>
 							<select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
 								<?php
-								foreach($no_course_list as $no_course) {
+								foreach ($no_course_list as $no_course) {
 									?>
 									<option value="<?php echo $no_course['id']; ?>"><?php echo $no_course['title'].' ('.$no_course['code'].')'; ?></option>
 								<?php
@@ -220,7 +220,7 @@ 
 				</td>
 				<td width="10%" valign="middle" align="center">
 					<?php
-					if($ajax_search) {
+					if ($ajax_search) {
 						?>
 						<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
                             <em class="fa fa-arrow-left"></em>
@@ -243,7 +243,7 @@ 
 				<td align="center">
 					<select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
 						<?php
-						foreach($course_list as $course) {
+						foreach ($course_list as $course) {
 							$courseInfo = api_get_course_info_by_id($course['id']);
 							?>
 							<option value="<?php echo $course['id']; ?>"><?php echo $course['title'].' ('.$courseInfo['code'].')'; ?></option>
@@ -258,7 +258,7 @@ 
 				<td colspan="3" align="center">
 					<br />
 					<?php
-					if(isset($_GET['add']))
+					if (isset($_GET['add']))
 						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('AddCoursesToURL').'</button>';
 					else
 						echo '<button class="btn btn-default" onclick="valide()" >'.get_lang('EditCoursesToURL').'</button>';

main/exercise/export/aiken/aiken_import.inc.php

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
         $dir .= '/';
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -39,8 +39,8 @@ 
 {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">' .
-        Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test&'.api_get_cidreq().'">'.
+        Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form_validator = new FormValidator(
         'aiken_upload',
@@ -93,7 +93,7 @@ 
 function aiken_import_exercise($file)
 {
     global $exercise_info;
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -130,9 +130,9 @@ 
 
     // Parse every subdirectory to search txt question files
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             //find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.txt$/i', $questionFile)) {
                     $result = aiken_parse_file(
@@ -216,7 +216,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -239,8 +239,8 @@ 
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!is_file($questionFilePath)) {
         return 'FileNotFound';
@@ -252,13 +252,13 @@ 
     $answers_array = array();
     $new_question = true;
     foreach ($data as $line => $info) {
-        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) {
+        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) {
             // double empty line
             continue;
         }
         $new_question = false;
         //make sure it is transformed from iso-8859-1 to utf-8 if in that form
-        if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) {
+        if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) {
             $info = utf8_encode($info);
         }
         $exercise_info['question'][$question_index]['type'] = 'MCUA';
@@ -290,7 +290,7 @@ 
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
-        } elseif (preg_match('/^(\r)?\n/',$info)) {
+        } elseif (preg_match('/^(\r)?\n/', $info)) {
             //moving to next question (tolerate \r\n or just \n)
             if (empty($exercise_info['question'][$question_index]['correct_answers'])) {
                 error_log('Aiken: Error in question index '.$question_index.': no correct answer defined');
@@ -310,7 +310,7 @@ 
                     $exercise_info['question'][$question_index]['title'] = $info;
                 } else {
                     //Question itself (use a 100-chars long title and a larger description)
-                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...';
+                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...';
                     $exercise_info['question'][$question_index]['description'] = $info;
                 }
             } else {
@@ -320,7 +320,7 @@ 
     }
     $total_questions = count($exercise_info['question']);
     $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
-    foreach  ($exercise_info['question'] as $key => $question) {
+    foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
     return true;

main/exercise/aiken.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     if (isset($_POST['submit'])) {
         $id = aiken_import_file($_FILES['userFile']);
         if (is_numeric($id) && !empty($id)) {
-            header('Location: admin.php?' . api_get_cidreq() . '&exerciseId=' . $id);
+            header('Location: admin.php?'.api_get_cidreq().'&exerciseId='.$id);
             exit;
         }
     }

main/admin/configure_extensions.php

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
 
 			$rs = Database::query($sql);
 
-			if (Database::affected_rows($rs)>0){
+			if (Database::affected_rows($rs) > 0) {
 				$message = get_lang('ServiceActivated');
 			}
 
@@ -76,18 +76,18 @@ 
 		WHERE variable LIKE "service_%" AND subkey="active" and selected_value="true"';
 
 $rs = Database::query($sql);
-while($row = Database::fetch_array($rs)){
+while ($row = Database::fetch_array($rs)) {
 	$listActiveServices[] = $row['variable'];
 }
 
 // javascript to handle accordion behaviour
 $javascript_message = '';
-if(!empty($message)){
+if (!empty($message)) {
 	$javascript_message = '
 	document.getElementById("message").style.display = "block";
 	var timer = setTimeout(hideMessage, 5000);';
 }
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 var listeDiv;
 var extensionsHeader = new Array();
 var extensionsContent = new Array();
@@ -135,7 +135,7 @@ 
 ?>
 <div id="message" style="display: none">
 	<?php
-	if(!empty($message))
+	if (!empty($message))
 		Display::display_normal_message($message)
 	?>
 </div>

main/admin/skill_badge_create.php

Spacing +12 added lines, -12 removed lines

@@ -22,16 +22,16 @@ 
 $objSkill = new Skill();
 $skill = $objSkill->get($skillId);
 
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/css/core.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/css/core.css" rel="stylesheet">';
 
 // Add badge studio paths
 
 $badgeStudio = [
-    'core' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/',
-    'media' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/',
-    'templates' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/templates/',
-    'masks' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/masks/',
-    'script_js' => '<script src="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/js/studio.js?"></script>'
+    'core' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/',
+    'media' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/',
+    'templates' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/templates/',
+    'masks' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/masks/',
+    'script_js' => '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/js/studio.js?"></script>'
 ];
 
 
@@ -59,10 +59,10 @@ 
         if ($existsBadgesDirectory) {
 
             if (!empty($skill['icon'])) {
-                $iconFileAbsolutePath = $badgePath . $skill['icon'];
+                $iconFileAbsolutePath = $badgePath.$skill['icon'];
 
                 if (Security::check_abs_path($iconFileAbsolutePath, $badgePath)) {
-                    unlink($badgePath . $skill['icon']);
+                    unlink($badgePath.$skill['icon']);
                 }
             }
 
@@ -85,24 +85,24 @@ 
 
     $objSkill->update($params);
 
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php');
     exit;
 }
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     ),
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
         'name' => get_lang('Badges')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]

main/social/group_view.php

Spacing +35 added lines, -35 removed lines

@@ -86,31 +86,31 @@ 
 
 </script>';
 
-$allowed_views = array('mygroups','newest','pop');
+$allowed_views = array('mygroups', 'newest', 'pop');
 $content = null;
 
-if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
+if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
     if ($_GET['view'] == 'mygroups') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups'));
-    } else if ( $_GET['view'] == 'newest') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest'));
-    } else  {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups'));
+    } else if ($_GET['view'] == 'newest') {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest'));
+    } else {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular'));
     }
 } else {
-    $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
     if (!isset($_GET['id'])) {
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList'));
     } else {
         //$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Group'));
     }
 }
 
 // getting group information
-$group_id	= isset($_GET['id']) ? intval($_GET['id']) : null;
+$group_id = isset($_GET['id']) ? intval($_GET['id']) : null;
 $relation_group_title = '';
 $role = 0;
 
@@ -120,9 +120,9 @@ 
     $group_info = $usergroup->get($group_id);
 
 
-    $interbreadcrumb[]= array ('url' =>'#','name' => $group_info['name']);
+    $interbreadcrumb[] = array('url' =>'#', 'name' => $group_info['name']);
 
-    if (isset($_GET['action']) && $_GET['action']=='leave') {
+    if (isset($_GET['action']) && $_GET['action'] == 'leave') {
         $user_leaved = intval($_GET['u']);
         // I can "leave me myself"
         if (api_get_user_id() == $user_leaved) {
@@ -136,7 +136,7 @@ 
     }
 
     // add a user to a group if its open
-    if (isset($_GET['action']) && $_GET['action']=='join') {
+    if (isset($_GET['action']) && $_GET['action'] == 'join') {
         // we add a user only if is a open group
         $user_join = intval($_GET['u']);
         if (api_get_user_id() == $user_join && !empty($group_id)) {
@@ -165,7 +165,7 @@ 
 $group_info = $usergroup->get($group_id);
 
 //Loading group information
-if (isset($_GET['status']) && $_GET['status']=='sent') {
+if (isset($_GET['status']) && $_GET['status'] == 'sent') {
     $social_right_content .= Display::return_message(get_lang('MessageHasBeenSent'), 'confirmation', false);
 }
 
@@ -174,7 +174,7 @@ 
 
 if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
     if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
-        $social_right_content .=  Display::return_message(get_lang('YouAlreadySentAnInvitation'));
+        $social_right_content .= Display::return_message(get_lang('YouAlreadySentAnInvitation'));
     }
 }
 
@@ -185,19 +185,19 @@ 
         ) {
             $social_right_content .= '<div class="group-tool">';
             $social_right_content .= '<div class="pull-right">';
-            $social_right_content .=  '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                 get_lang('JoinGroup').'</a>';
-            $social_right_content .=  '</div>';
-            $social_right_content .=  '</div>';
+            $social_right_content .= '</div>';
+            $social_right_content .= '</div>';
         } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
             $social_right_content .= '<div class="group-tool">';
             $social_right_content .= '<div class="pull-right">';
-            $social_right_content .=  '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                     Display::returnFontAwesomeIcon('envelope').' '.
                 get_lang('YouHaveBeenInvitedJoinNow').'</a>';
         }
-        $social_right_content .=  '</div>';
-        $social_right_content .=  '</div>';
+        $social_right_content .= '</div>';
+        $social_right_content .= '</div>';
     }
     $content = MessageManager::display_messages_for_group($group_id);
     if ($is_group_member) {
@@ -211,7 +211,7 @@ 
                     'action' => 'add_message_group'
                 ]);
             $create_thread_link = Display::url(
-                Display::returnFontAwesomeIcon('commenting') . ' ' .
+                Display::returnFontAwesomeIcon('commenting').' '.
                 get_lang('YouShouldCreateATopic'),
                 $createThreadUrl,
                 [
@@ -231,7 +231,7 @@ 
                     'action' => 'add_message_group',
                 ]);
             $create_thread_link = Display::url(
-                Display::returnFontAwesomeIcon('commenting') . ' ' .
+                Display::returnFontAwesomeIcon('commenting').' '.
                 get_lang('NewTopic'),
                 $createThreadUrl,
                 [
@@ -271,21 +271,21 @@ 
         foreach ($members as $member) {
             // if is a member
             if (in_array($member['relation_type'],
-                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))
+                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR))
             ) {
                 //add icons
                 if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-                    $icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
+                    $icon = Display::return_icon('social_group_admin.png', get_lang('Admin'));
                 } elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-                    $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+                    $icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
                 } else {
-                    $icon= '';
+                    $icon = '';
                 }
 
                 $userPicture = UserManager::getUserPicture($member['id']);
                 $member_content .= '<div class="col-md-3">';
                 $member_content .= '<div class="items-user">';
-                $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'],15),cut($member['user_info']['lastname'],15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
+                $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'], 15), cut($member['user_info']['lastname'], 15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
                 $member_content .= Display::div('<img class="img-circle" src="'.$userPicture.'"/>', array('class' => 'avatar'));
                 $member_content .= Display::div($member_name, array('class' => 'name'));
                 $member_content .= '</div>';
@@ -297,10 +297,10 @@ 
     }
 
     if (!empty($create_thread_link)) {
-        $create_thread_link =  Display::div($create_thread_link, array('class'=>'pull-right'));
+        $create_thread_link = Display::div($create_thread_link, array('class'=>'pull-right'));
     }
     $headers = array(get_lang('Discussions'), get_lang('Members'));
-    $socialForum = Display::tabs($headers, array($content, $member_content),'tabs');
+    $socialForum = Display::tabs($headers, array($content, $member_content), 'tabs');
 
 } else {
     // if I already sent an invitation message
@@ -312,9 +312,9 @@ 
         )
     )
     ) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
     } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
     }
 }
 

main/social/group_invitation.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-$tbl_group_rel_user	= Database::get_main_table(TABLE_USERGROUP_REL_USER);
+$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
 
 // setting the name of the tool
 $tool_name = get_lang('SubscribeUsersToGroup');
@@ -40,7 +40,7 @@ 
     }
 }
 
-$interbreadcrumb[] = array('url' =>'groups.php','name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
 $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('SubscribeUsersToGroup'));
 
@@ -74,7 +74,7 @@ 
 
         if (is_array($user_list) && count($user_list) > 0) {
             //send invitation message
-            foreach ($user_list as $user_id){
+            foreach ($user_list as $user_id) {
                 $result = MessageManager::send_message(
                     $user_id,
                     $title,
@@ -110,8 +110,8 @@ 
 
             if (!isset($group_friend_list[$group_id]) ||
                 isset($group_friend_list[$group_id]) &&
-                $group_friend_list[$group_id]['relation_type'] == '' ) {
-                $Users[$friend['friend_user_id']]= array(
+                $group_friend_list[$group_id]['relation_type'] == '') {
+                $Users[$friend['friend_user_id']] = array(
                     'user_id' => $friend['friend_user_id'],
                     'firstname' => $friend['firstName'],
                     'lastname' => $friend['lastName'],
@@ -120,7 +120,7 @@ 
                 );
             }
         } else {
-            $Users[$friend['friend_user_id']]= array(
+            $Users[$friend['friend_user_id']] = array(
                 'user_id' => $friend['friend_user_id'],
                 'firstname' =>$friend['firstName'],
                 'lastname' => $friend['lastName'],
@@ -131,7 +131,7 @@ 
     }
 }
 
-if (is_array($Users) && count($Users) > 0 ) {
+if (is_array($Users) && count($Users) > 0) {
     foreach ($Users as $user) {
         if ($user['group_id'] != $group_id) {
             $nosessionUsersList[$user['user_id']] = api_get_person_name(
@@ -143,7 +143,7 @@ 
 }
 
 $social_left_content = SocialManager::show_social_menu('invite_friends', $group_id);
-$social_right_content =  '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
+$social_right_content = '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
 
 if (count($nosessionUsersList) == 0) {
     $friends = SocialManager::get_friends(api_get_user_id());
@@ -179,7 +179,7 @@ 
     array(GROUP_USER_PERMISSION_PENDING_INVITATION)
 );
 
-if (is_array($members) && count($members)>0) {
+if (is_array($members) && count($members) > 0) {
     foreach ($members as &$member) {
         $image = UserManager::getUserPicture($member['id']);
         $member['image'] = '<img class="img-circle" src="'.$image.'"  width="50px" height="50px"  />';