chamilo / chamilo-lms

main/admin/ldap_users_list.php

Braces +15 added lines, -20 removed lines

@@ -51,8 +51,7 @@ 
 				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
 				{
 					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('CannotDeleteUser'));
 				}
@@ -88,8 +87,7 @@ 
 						{
 							$message .= '- '.$login.'<br />';
 						}
-					}
-					else
+					} else
 					{
 						$message=get_lang('NoUserAdded');
 					}
@@ -100,13 +98,11 @@ 
 				Display :: display_header($tool_name);
 		}
 		Security::clear_token();
-	}
-	else
+	} else
 	{
 		Display::display_header($tool_name);
 	}
-}
-else
+} else
 {
 	Display::display_header($tool_name);
 }
@@ -133,8 +129,7 @@ 
 				if($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
 				}
@@ -150,13 +145,13 @@ 
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
+				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!="")) {
+									addUserToSession($UserList, $_GET['id_session']);
+				}
 				if(count($UserList)>0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
+				} else
 				{
 					Display :: display_normal_message(get_lang('NoUserAdded'));
 				}
@@ -173,14 +168,14 @@ 
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 	$form->addText('keyword_lastname', get_lang('LastName'), false);
-}
-else
+} else
 {
 	$form->addText('keyword_lastname',get_lang('LastName'),false);
 	$form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$form->addElement('hidden','id_session',$_GET['id_session']);
+}
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -201,8 +196,9 @@ 
 $parameters['keyword_firstname'] = @$_GET['keyword_firstname'] ?: null;
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$parameters['id_session'] = $_GET['id_session'];
+}
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -214,8 +210,7 @@ 
 {
 	$table->set_header(2, get_lang('FirstName'));
 	$table->set_header(3, get_lang('LastName'));
-}
-else
+} else
 {
 	$table->set_header(2, get_lang('LastName'));
 	$table->set_header(3, get_lang('FirstName'));

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));

Spacing +30 added lines, -30 removed lines

@@ -30,7 +30,7 @@ 
 }
 */
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 $tool_name = get_lang('SearchLDAPUsers');
 //Display :: display_header($tool_name); //cannot display now as we need to redirect
 //api_display_tool_title($tool_name);
@@ -38,7 +38,7 @@ 
 if (isset ($_GET['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_GET['action'])
 		{
@@ -59,41 +59,41 @@ 
 				break;
 			case 'lock' :
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
+				$message = lock_unlock_user('lock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'unlock';
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
+				$message = lock_unlock_user('unlock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
+				$id = $_GET['id'];
+				$UserList = array();
 				$userid_match_login = array();
 				foreach ($id as $user_id) {
 					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
+					$UserList[] = $tmp;
 					$userid_match_login[$tmp] = $user_id;
 				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session'] > 0)) {
 					ldap_add_user_to_session($UserList, $_GET['id_session']);
 					header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
 				} else {
 					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
+					if (count($userid_match_login) > 0)
 					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
+						$message = get_lang('LDAPUsersAddedOrUpdated').':<br />';
+						foreach ($userid_match_login as $user_id => $login)
 						{
 							$message .= '- '.$login.'<br />';
 						}
 					}
 					else
 					{
-						$message=get_lang('NoUserAdded');
+						$message = get_lang('NoUserAdded');
 					}
-					Display :: display_normal_message($message,false);
+					Display :: display_normal_message($message, false);
 				}
 				break;
 			default :
@@ -113,7 +113,7 @@ 
 if (isset ($_POST['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_POST['action'])
 		{
@@ -122,15 +122,15 @@ 
 				$number_of_deleted_users = 0;
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
-						if(UserManager :: delete_user($user_id))
+						if (UserManager :: delete_user($user_id))
 						{
 							$number_of_deleted_users++;
 						}
 					}
 				}
-				if($number_of_selected_users == $number_of_deleted_users)
+				if ($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
 				}
@@ -142,17 +142,17 @@ 
 			case 'add_user' :
 				$number_of_selected_users = count($_POST['id']);
 				$number_of_added_users = 0;
-				$UserList=array();
+				$UserList = array();
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+				if (isset($_GET['id_session']) && (trim($_GET['id_session']) != ""))
 					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
+				if (count($UserList) > 0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
 				}
@@ -167,8 +167,8 @@ 
 	}
 }
 
-$form = new FormValidator('advanced_search','get');
-$form->addText('keyword_username',get_lang('LoginName'),false);
+$form = new FormValidator('advanced_search', 'get');
+$form->addText('keyword_username', get_lang('LoginName'), false);
 if (api_is_western_name_order())
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
@@ -176,20 +176,20 @@ 
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+	$form->addText('keyword_lastname', get_lang('LastName'), false);
+	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+	$form->addElement('hidden', 'id_session', $_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
-$type["employee"]  = get_lang('Teacher');
+$type["employee"] = get_lang('Teacher');
 $type["student"] = get_lang('Student');
 
-$form->addElement('select','keyword_type',get_lang('Status'),$type);
+$form->addElement('select', 'keyword_type', get_lang('Status'), $type);
 // Structure a rajouer ??
-$form->addElement('submit','submit',get_lang('Ok'));
+$form->addElement('submit', 'submit', get_lang('Ok'));
 //$defaults['keyword_active'] = 1;
 //$defaults['keyword_inactive'] = 1;
 //$form->setDefaults($defaults);
@@ -225,7 +225,7 @@ 
 //$table->set_column_filter(5, 'email_filter');
 //$table->set_column_filter(5, 'active_filter');
 $table->set_column_filter(5, 'modify_filter');
-$table->set_form_actions(array ('add_user' => get_lang('AddLDAPUsers')));
+$table->set_form_actions(array('add_user' => get_lang('AddLDAPUsers')));
 $table->display();
 
 /*

main/admin/access_url_edit_course_category_to_url.php

Braces +5 added lines, -4 removed lines

@@ -240,10 +240,11 @@
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		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>';
+		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>';
+		}
 		?>
 	</td>
 </tr>

Indentation +9 added lines, -9 removed lines

@@ -120,12 +120,12 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.
         get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.
         get_lang('SessionAddTypeMultiple').'</a>';
 }
 
@@ -223,11 +223,11 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		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>';
-		?>
+        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>';
+        ?>
 	</td>
 </tr>
 </table>

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/extra_field_options.php

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $tool_name = null;
 
@@ -39,23 +39,23 @@ 
 $token = Security::get_token();
 
 if ($action == 'add') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']);
-    $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']);
+    $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['display_text']);
-    $interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'], 'name' => $extra_field_info['display_text']);
+    $interbreadcrumb[] = array('url' => 'extra_field_options.php?type='.$extra_field->type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
 
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extra_field->type,'name' => $extra_field->pageName);
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extra_field->type, 'name' => $extra_field->pageName);
+    $interbreadcrumb[] = array(
         'url' =>  'extra_fields.php?type='.$extra_field->type.'&action=edit&id='.$extra_field_info['id'],
         'name' => $extra_field_info['display_text']
     );
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditExtraFieldOptions'));
 }
 
 //jqgrid will use this URL to do the selects
@@ -108,12 +108,12 @@ 
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="?action=edit&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(get_lang("ConfirmYourChoice"))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&'.$params.'&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
     '\';
  }';
 
-$htmlHeadXtra[]='<script>
+$htmlHeadXtra[] = '<script>
 $(function() {
     // grid definition see the $obj->display() function
     '.Display::grid_js(

main/admin/add_users_to_usergroup.php

Braces +8 added lines, -2 removed lines

@@ -345,7 +345,10 @@ 
 $searchForm->display();
 echo '</div>';
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) {
+    echo '&add=true' ;
+}
+?>" style="margin:0px;">
 <?php
 echo '<legend>'.$tool_name.': '.$data['name'].'</legend>';
 
@@ -420,7 +423,10 @@ 
     ?>
     <br />
       <label class="control-label">
-          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
+          <input type="checkbox" <?php if ($user_with_any_group) {
+    echo 'checked="checked"';
+}
+?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
           <?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
       </label>
     </div>

Spacing +19 added lines, -19 removed lines

@@ -18,8 +18,8 @@ 
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[]= array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]= array('url' => 'usergroups.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
 
 // Database Table Definitions
 
@@ -90,7 +90,7 @@ 
 
 </script>';
 
-$form_sent  = 0;
+$form_sent = 0;
 
 $extra_field_list = UserManager::get_extra_fields();
 $new_field_list = array();
@@ -144,7 +144,7 @@ 
         foreach ($users as $user) {
             $data[] = array($user['username'], $groupInfo['name']);
         }
-        $filename = 'export_user_class_' . api_get_local_time();
+        $filename = 'export_user_class_'.api_get_local_time();
         Export::arrayToCsv($data, $filename);
         exit;
     }
@@ -157,7 +157,7 @@ 
         foreach ($new_field_list as $new_field) {
             $varname = 'field_'.$new_field['variable'];
             if (UserManager::is_extra_field_available($new_field['variable'])) {
-                if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
+                if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                     $use_extra_fields = true;
                     $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                         $new_field['variable'],
@@ -171,10 +171,10 @@ 
 
 if ($use_extra_fields) {
     $final_result = array();
-    if (count($extra_field_result)>1) {
-        for ($i=0; $i<count($extra_field_result)-1; $i++) {
-            if (is_array($extra_field_result[$i+1])) {
-                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
+    if (count($extra_field_result) > 1) {
+        for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+            if (is_array($extra_field_result[$i + 1])) {
+                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]);
             }
         }
     } else {
@@ -193,7 +193,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?id='.$id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 
 $searchForm->addElement('hidden', 'id', $id);
 foreach ($filters as $param) {
@@ -341,12 +341,12 @@ 
 $searchForm->display();
 echo '</div>';
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;">
 <?php
 echo '<legend>'.$tool_name.': '.$data['name'].'</legend>';
 
 if (is_array($extra_field_list)) {
-    if (is_array($new_field_list) && count($new_field_list)>0) {
+    if (is_array($new_field_list) && count($new_field_list) > 0) {
         echo '<h3>'.get_lang('FilterByUser').'</h3>';
         foreach ($new_field_list as $new_field) {
             echo $new_field['name'];
@@ -354,7 +354,7 @@ 
             echo '&nbsp;<select name="'.$varname.'">';
             echo '<option value="0">--'.get_lang('Select').'--</option>';
             foreach ($new_field['data'] as $option) {
-                $checked='';
+                $checked = '';
                 if (isset($_POST[$varname])) {
                     if ($_POST[$varname] == $option[1]) {
                         $checked = 'selected="true"';
@@ -380,15 +380,15 @@ 
         <?php if ($data['group_type'] == UserGroup::SOCIAL_CLASS) { ?>
         <select name="relation" id="relation">
             <option value=""><?php echo get_lang('SelectARelationType')?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_ADMIN ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_ADMIN) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Admin') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_READER ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_READER) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Reader') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_PENDING_INVITATION ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_PENDING_INVITATION) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('PendingInvitation') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_MODERATOR ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_MODERATOR) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Moderator') ?></option>
-            <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM)?'selected=selected':'') ?> >
+            <option value="<?php echo GROUP_USER_PERMISSION_HRM ?>" <?php echo ((isset($relation) && $relation == GROUP_USER_PERMISSION_HRM) ? 'selected=selected' : '') ?> >
                 <?php echo get_lang('Drh') ?></option>
         </select>
         <?php } ?>
@@ -419,7 +419,7 @@ 
     ?>
     <br />
       <label class="control-label">
-          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"';?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
+          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"'; ?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
           <?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
       </label>
     </div>

main/admin/system_status.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $this_section = SECTION_PLATFORM_ADMIN;
 // User permissions
 api_protect_admin_script();
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 Display :: display_header(get_lang('SystemStatus'));
 $diag = new Diagnoser();
 $diag->show_html();

main/announcements/download.php

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
     //remove last slash if present
     //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
     //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
-    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+    while ($doc_url{$dul = strlen($doc_url)-1}=='/') {
+        $doc_url = substr($doc_url,0,$dul);
+    }
     //create the path
     $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
     //redirect

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 $doc_url = str_replace(' ', '+', $doc_url);
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
 
-if (strpos($doc_url,'../') OR strpos($doc_url,'/..')) {
+if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) {
     $doc_url = '';
 }
 
@@ -43,7 +43,7 @@ 
     //remove last slash if present
     //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
     //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
-    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
+    while ($doc_url{$dul = strlen($doc_url) - 1} == '/') $doc_url = substr($doc_url, 0, $dul);
     //create the path
     $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
     //redirect
@@ -64,10 +64,10 @@ 
 
 $result = Database::query($sql);
 if (Database::num_rows($result) > 0) {
-    $row= Database::fetch_array($result);
-    $title = str_replace(' ','_', $row['filename']);
+    $row = Database::fetch_array($result);
+    $title = str_replace(' ', '_', $row['filename']);
     if (Security::check_abs_path($full_file_name,
-        api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/upload/announcements/')
+        api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/announcements/')
     ) {
         $result = DocumentManager::file_send_for_download($full_file_name, true, $title);
         if ($result === false) {

main/survey/survey_invite.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 $tool_name = get_lang('SurveyPublication');
 
 // Displaying the header
-Display::display_header($tool_name,'Survey');
+Display::display_header($tool_name, 'Survey');
 
 echo '<script>
 $(function() {
@@ -132,7 +132,7 @@ 
 );
 
 $form->addElement('html', '<div id="check_mail">');
-$form->addElement('checkbox', 'send_mail','', get_lang('SendMail'));
+$form->addElement('checkbox', 'send_mail', '', get_lang('SendMail'));
 $form->addElement('html', '</div>');
 
 $form->addElement('html', '<div id="mail_text_wrapper">');
@@ -219,8 +219,8 @@ 
 	);
 
 	// Saving the invitations for the additional users
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
+	$values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email
+	$temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators
 	$additional_users = explode(';', $temp);
 	for ($i = 0; $i < count($additional_users); $i++) {
 		$additional_users[$i] = trim($additional_users[$i]);

Indentation +93 added lines, -93 removed lines

@@ -18,10 +18,10 @@ 
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -37,15 +37,15 @@ 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = SurveyManager::get_survey($survey_id);
 if (empty($survey_data)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 // Breadcrumbs
@@ -80,23 +80,23 @@ 
 		WHERE c_id = $course_id AND code='".Database::escape_string($survey_data['code'])."'";
 $result = Database::query($sql);
 if (Database::num_rows($result) > 1) {
-	Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
+    Display::display_warning_message(get_lang('IdenticalSurveycodeWarning'));
 }
 
 // Invited / answered message
 if ($survey_data['invited'] > 0 && !isset($_POST['submit'])) {
-	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
-	$message .= get_lang('HaveAnswered').' ';
-	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
-	$message .= get_lang('WereInvited');
-	Display::display_normal_message($message, false);
+    $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.$survey_data['answered'].'</a> ';
+    $message .= get_lang('HaveAnswered').' ';
+    $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.$survey_data['invited'].'</a> ';
+    $message .= get_lang('WereInvited');
+    Display::display_normal_message($message, false);
 }
 
 // Building the form for publishing the survey
 $form = new FormValidator(
-	'publish_form',
-	'post',
-	api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
+    'publish_form',
+    'post',
+    api_get_self().'?survey_id='.$survey_id.'&'.api_get_cidreq()
 );
 $form->addElement('header', '', $tool_name);
 
@@ -109,7 +109,7 @@ 
 );
 $possible_users = array();
 foreach ($complete_user_list as & $user) {
-	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+    $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 }
 
 
@@ -125,10 +125,10 @@ 
 
 // Additional users
 $form->addElement(
-	'textarea',
-	'additional_users',
-	array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
-	array('rows' => 5)
+    'textarea',
+    'additional_users',
+    array(get_lang('AdditonalUsers'), get_lang('AdditonalUsersComment')),
+    array('rows' => 5)
 );
 
 $form->addElement('html', '<div id="check_mail">');
@@ -141,15 +141,15 @@ 
 $form->addText('mail_title', get_lang('MailTitle'), false);
 // The text of the mail
 $form->addHtmlEditor(
-	'mail_text',
-	array(get_lang('MailText'), get_lang('UseLinkSyntax')),
-	false,
-	array('ToolbarSet' => 'Survey', 'Height' => '150')
+    'mail_text',
+    array(get_lang('MailText'), get_lang('UseLinkSyntax')),
+    false,
+    array('ToolbarSet' => 'Survey', 'Height' => '150')
 );
 $form->addElement('html', '</div>');
 // You cab send a reminder to unanswered people if the survey is not anonymous
 if ($survey_data['anonymous'] != 1) {
-	$form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
+    $form->addElement('checkbox', 'remindUnAnswered', '', get_lang('RemindUnanswered'));
 }
 // Allow resending to all selected users
 $form->addElement('checkbox', 'resend_to_all', '', get_lang('ReminderResendToAllUsers'));
@@ -163,11 +163,11 @@ 
 }*/
 $portal_url = api_get_path(WEB_PATH);
 if (api_is_multiple_url_enabled()) {
-	$access_url_id = api_get_current_access_url_id();
-	if ($access_url_id != -1) {
-		$url = api_get_access_url($access_url_id);
-		$portal_url = $url['url'];
-	}
+    $access_url_id = api_get_current_access_url_id();
+    if ($access_url_id != -1) {
+        $url = api_get_access_url($access_url_id);
+        $portal_url = $url['url'];
+    }
 }
 
 // Show the URL that can be used by users to fill a survey without invitation
@@ -177,56 +177,56 @@ 
 $form->addElement('label', null, $auto_survey_link);
 
 if ($form->validate()) {
-   	$values = $form->exportValues();
+        $values = $form->exportValues();
     if (isset($values['send_mail']) && $values['send_mail'] == 1) {
         if (empty($values['mail_title']) || empty($values['mail_text'])) {
             Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete'));
             // Getting the invited users
-        	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-        	// Getting the survey mail text
-        	if (!empty($survey_data['reminder_mail'])) {
-        		$defaults['mail_text'] = $survey_data['reminder_mail'];
-        	} else {
-        		$defaults['mail_text'] = $survey_data['invite_mail'];
-        	}
-        	$defaults['mail_title'] = $survey_data['mail_subject'];
-        	$defaults['send_mail'] = 1;
-        	$form->setDefaults($defaults);
+            $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+            // Getting the survey mail text
+            if (!empty($survey_data['reminder_mail'])) {
+                $defaults['mail_text'] = $survey_data['reminder_mail'];
+            } else {
+                $defaults['mail_text'] = $survey_data['invite_mail'];
+            }
+            $defaults['mail_title'] = $survey_data['mail_subject'];
+            $defaults['send_mail'] = 1;
+            $form->setDefaults($defaults);
             $form->display();
             return;
         }
     }
     // Save the invitation mail
-	SurveyUtil::save_invite_mail(
-		$values['mail_text'],
-		$values['mail_title'],
-		!empty($survey_data['invite_mail'])
-	);
+    SurveyUtil::save_invite_mail(
+        $values['mail_text'],
+        $values['mail_title'],
+        !empty($survey_data['invite_mail'])
+    );
 
     $resendAll = isset($values['resend_to_all']) ? $values['resend_to_all'] : '';
     $sendMail = isset($values['send_mail']) ? $values['send_mail'] : '';
     $remindUnAnswered = isset($values['remindUnAnswered']) ? $values['remindUnAnswered'] : '';
 
-	// Saving the invitations for the course users
-	$count_course_users = SurveyUtil::saveInvitations(
-		$values['users'],
-		$values['mail_title'],
-		$values['mail_text'],
+    // Saving the invitations for the course users
+    $count_course_users = SurveyUtil::saveInvitations(
+        $values['users'],
+        $values['mail_title'],
+        $values['mail_text'],
         $resendAll,
         $sendMail,
         $remindUnAnswered
-	);
+    );
 
-	// Saving the invitations for the additional users
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
-	$additional_users = explode(';', $temp);
-	for ($i = 0; $i < count($additional_users); $i++) {
-		$additional_users[$i] = trim($additional_users[$i]);
-	}
+    // Saving the invitations for the additional users
+    $values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
+    $temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
+    $additional_users = explode(';', $temp);
+    for ($i = 0; $i < count($additional_users); $i++) {
+        $additional_users[$i] = trim($additional_users[$i]);
+    }
 
-	$counter_additional_users = SurveyUtil::saveInvitations(
+    $counter_additional_users = SurveyUtil::saveInvitations(
         $additional_users,
         $values['mail_title'],
         $values['mail_text'],
@@ -235,43 +235,43 @@ 
         $remindUnAnswered
     );
 
-	// Updating the invited field in the survey table
-	SurveyUtil::update_count_invited($survey_data['code']);
-	$total_count = $count_course_users + $counter_additional_users;
+    // Updating the invited field in the survey table
+    SurveyUtil::update_count_invited($survey_data['code']);
+    $total_count = $count_course_users + $counter_additional_users;
     $table_survey = Database :: get_course_table(TABLE_SURVEY);
-	// Counting the number of people that are invited
-	$sql = "SELECT * FROM $table_survey
+    // Counting the number of people that are invited
+    $sql = "SELECT * FROM $table_survey
 	        WHERE
 	        	c_id = $course_id AND
 	        	code = '".Database::escape_string($survey_data['code'])."'
 			";
-	$result = Database::query($sql);
-	$row = Database::fetch_array($result);
-	$total_invited = $row['invited'];
+    $result = Database::query($sql);
+    $row = Database::fetch_array($result);
+    $total_invited = $row['invited'];
     if ($total_invited > 0) {
-    	$message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
-			$survey_data['answered'].'</a> ';
-    	$message .= get_lang('HaveAnswered').' ';
-    	$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
-			$total_invited.'</a> ';
-    	$message .= get_lang('WereInvited');
-    	Display::display_normal_message($message, false);
-    	Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
+        $message  = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=answered&survey_id='.$survey_data['survey_id'].'">'.
+            $survey_data['answered'].'</a> ';
+        $message .= get_lang('HaveAnswered').' ';
+        $message .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invitation.php?view=invited&survey_id='.$survey_data['survey_id'].'">'.
+            $total_invited.'</a> ';
+        $message .= get_lang('WereInvited');
+        Display::display_normal_message($message, false);
+        Display::display_confirmation_message($total_count.' '.get_lang('InvitationsSend'));
     }
 } else {
-	// Getting the invited users
-	$defaults = SurveyUtil::get_invited_users($survey_data['code']);
-
-	// Getting the survey mail text
-	if (!empty($survey_data['reminder_mail'])) {
-		$defaults['mail_text'] = $survey_data['reminder_mail'];
-	} else {
-		$defaults['mail_text'] = $survey_data['invite_mail'];
-	}
-	$defaults['mail_title'] = $survey_data['mail_subject'];
-	$defaults['send_mail'] = 1;
-
-	$form->setDefaults($defaults);
+    // Getting the invited users
+    $defaults = SurveyUtil::get_invited_users($survey_data['code']);
+
+    // Getting the survey mail text
+    if (!empty($survey_data['reminder_mail'])) {
+        $defaults['mail_text'] = $survey_data['reminder_mail'];
+    } else {
+        $defaults['mail_text'] = $survey_data['invite_mail'];
+    }
+    $defaults['mail_title'] = $survey_data['mail_subject'];
+    $defaults['send_mail'] = 1;
+
+    $form->setDefaults($defaults);
     $form->display();
 }
 Display :: display_footer();

main/survey/fillsurvey.php

Indentation +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 * @author unknown, the initial survey that did not make it in 1.8 because of bad code
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
 * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code as well
-
-* @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
+ * @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
 * @todo performance could be improved if not the survey_id was stored with the invitation but the survey_code
  */
 // Unsetting the course id (because it is in the URL)

Spacing +6 added lines, -6 removed lines

@@ -112,7 +112,7 @@ 
         $now = api_get_utc_datetime();
         if (Database :: num_rows($result) == 0) {
             $params = [
-                'c_id' => $course_id ,
+                'c_id' => $course_id,
                 'survey_code' => $surveyCode,
                 'user' => $userid,
                 'invitation_code' => $autoInvitationcode,
@@ -471,7 +471,7 @@ 
     $jquery_ready_content = $returnParams['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
-    $htmlHeadXtra[] ='<script>
+    $htmlHeadXtra[] = '<script>
     $(document).ready(function(){
         '.$jquery_ready_content.'
     });
@@ -904,16 +904,16 @@ 
                             $group2 = $groups[0];
                             $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                             $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                            $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                            $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                         } else {
                             if ($i != 0) {
                                 $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                             } else {
                                 $secondary .= " ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                             }
                         }
                     }
@@ -1132,7 +1132,7 @@ 
                         $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
                         $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
                         $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
-                    }  else {
+                    } else {
                         // If the type is a page break we are finished loading the questions for this page
                         break;
                     }

Braces +1 added lines, -1 removed lines

@@ -1132,7 +1132,7 @@
                         $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
                         $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
                         $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
-                    }  else {
+                    } else {
                         // If the type is a page break we are finished loading the questions for this page
                         break;
                     }

main/survey/ch_yesno.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
                 $class = 'radio-inline';
             }
 
-            $name = 'question' . $questionData['question_id'];
+            $name = 'question'.$questionData['question_id'];
 
             $form->addRadio(
                 $name,