chamilo / chamilo-lms

main/inc/ajax/record_audio_rtc.ajax.php

Spacing +4 added lines, -4 removed lines

@@ -25,16 +25,16 @@
 $audioFileName = Database::escape_string($audioFileName);
 $audioFileName = api_replace_dangerous_char($audioFileName);
 $audioFileName = disable_dangerous_file($audioFileName);
-$audioDir  = Security::remove_XSS($audioDir);
+$audioDir = Security::remove_XSS($audioDir);
 
-$dirBaseDocuments = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
-$saveDir = $dirBaseDocuments . $audioDir;
+$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
+$saveDir = $dirBaseDocuments.$audioDir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($courseInfo);
 }
 
-$documentPath = $saveDir . '/' . $audioFileName;
+$documentPath = $saveDir.'/'.$audioFileName;
 
 $file['file'] = $file;
 

main/inc/ajax/record_audio_wami.ajax.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 // Do not use here check Fileinfo method because return: text/plain
 
 $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-$saveDir = $dirBaseDocuments . $wamidir;
+$saveDir = $dirBaseDocuments.$wamidir;
 
 if (!is_dir($saveDir)) {
     DocumentManager::createDefaultAudioFolder($_course);
@@ -88,7 +88,7 @@ 
 ob_start();
 
 // Strangely the file path changes with a double extension
-copy($documentPath, $documentPath . '.wav');
+copy($documentPath, $documentPath.'.wav');
 
 $documentData = DocumentManager::upload_document(
     $file,

main/document/showinframes.php

Spacing +10 added lines, -10 removed lines

@@ -149,8 +149,8 @@ 
         );
     }
 } else {
-    foreach($document_data['parents'] as $document_sub_data) {
-        if (!isset($_GET['createdir']) && $document_sub_data['id'] ==  $document_data['id']) {
+    foreach ($document_data['parents'] as $document_sub_data) {
+        if (!isset($_GET['createdir']) && $document_sub_data['id'] == $document_data['id']) {
             $document_sub_data['document_url'] = '#';
         }
         $interbreadcrumb[] = array(
@@ -180,7 +180,7 @@ 
 }
 $js_glossary_in_documents = '';
 
-$js_glossary_in_documents =	'
+$js_glossary_in_documents = '
   $.frameReady(function(){
    //  $("<div>I am a div courses</div>").prependTo("body");
   }, "top.mainFrame",
@@ -200,7 +200,7 @@ 
 // PDF should be displayed with viewerJS
 $web_odf_supported_files[] = 'pdf';
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
-    $show_web_odf  = true;
+    $show_web_odf = true;
     /*
     $htmlHeadXtra[] = api_get_js('webodf/webodf.js');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/webodf/webodf.css');
@@ -243,7 +243,7 @@ 
     $htmlHeadXtra[] = api_get_js('highlight/highlight.pack.js');
     $htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
     $htmlHeadXtra[] = api_get_css(
-        api_get_path(WEB_LIBRARY_PATH) . 'javascript/highlight/styles/github.css'
+        api_get_path(WEB_LIBRARY_PATH).'javascript/highlight/styles/github.css'
     );
     $htmlHeadXtra[] = '
     <script>
@@ -254,7 +254,7 @@ 
 $execute_iframe = true;
 if ($jplayer_supported) {
     $extension = api_strtolower($pathinfo['extension']);
-    if ($extension == 'mp4')  {
+    if ($extension == 'mp4') {
         $extension = 'm4v';
     }
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
@@ -295,7 +295,7 @@ 
     $execute_iframe = false;
 }
 
-$is_freemind_available = $pathinfo['extension']=='mm' && api_get_setting('enable_freemind') == 'true';
+$is_freemind_available = $pathinfo['extension'] == 'mm' && api_get_setting('enable_freemind') == 'true';
 if ($is_freemind_available) {
     $execute_iframe = false;
 }
@@ -339,18 +339,18 @@ 
 $file_url_web = $file_url.'?'.api_get_cidreq();
 
 if (in_array(strtolower($pathinfo['extension']), array('html', "htm"))) {
-    echo '<a class="btn btn-default" href="' . $file_url_web . '" target="_blank">' . get_lang('CutPasteLink') . '</a>';
+    echo '<a class="btn btn-default" href="'.$file_url_web.'" target="_blank">'.get_lang('CutPasteLink').'</a>';
 }
 
 if ($show_web_odf) {
     $browser = api_get_navigator();
-    $pdfUrl = api_get_path(WEB_LIBRARY_PATH) . 'javascript/ViewerJS/index.html#' . $file_url;
+    $pdfUrl = api_get_path(WEB_LIBRARY_PATH).'javascript/ViewerJS/index.html#'.$file_url;
     if ($browser['name'] == 'Mozilla' && preg_match('|.*\.pdf|i', $header_file)) {
         $pdfUrl = $file_url;
     }
     echo '<div id="viewerJS">';
     echo '<iframe id="viewerJSContent" frameborder="0" allowfullscreen="allowfullscreen" webkitallowfullscreen style="width:100%;"
-            src="' . $pdfUrl. '">
+            src="' . $pdfUrl.'">
         </iframe>';
     echo '</div>';
 } elseif (!$originIsLearnpath) {

main/document/show_content.php

Spacing +5 added lines, -5 removed lines

@@ -90,12 +90,12 @@
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
 $pathinfo = pathinfo($header_file);
 
-if ($pathinfo['extension']=='swf') {
-	$width='83%';
-	$height='83%';
+if ($pathinfo['extension'] == 'swf') {
+	$width = '83%';
+	$height = '83%';
 } else {
-	$width='100%';
-	$height='100%';
+	$width = '100%';
+	$height = '100%';
 }
 
 echo '<iframe border="0" frameborder="0" scrolling="no" style="width:'.$width.'; height:'.$height.';background-color:#ffffff;" id="mainFrame" name="mainFrame" src="'.$file_url_web.'?'.api_get_cidreq().'&amp;rand='.mt_rand(1, 1000).'"></iframe>';

main/admin/usergroups.php

Spacing +19 added lines, -19 removed lines

@@ -15,16 +15,16 @@ 
 //Add the JS needed to use the jqgrid
 $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'));
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 if ($action == 'add') {
-    $interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[] = array('url' => '#','name' => get_lang('Classes'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Classes'));
 }
 
 // The header.
@@ -55,13 +55,13 @@ 
 );
 
 //Column config
-$column_model   = array(
-    array('name'=>'name',           'index'=>'name',        'width'=>'35',  'align'=>'left'),
-    array('name'=>'users',    		'index'=>'users', 		'width'=>'15',  'align'=>'left'),
-    array('name'=>'courses',    	'index'=>'courses', 	'width'=>'15',  'align'=>'left'),
-    array('name'=>'sessions',    	'index'=>'sessions', 	'width'=>'15',  'align'=>'left'),
-    array('name'=>'group_type',    	'index'=>'group_type', 	'width'=>'15',  'align'=>'center'),
-    array('name'=>'actions',        'index'=>'actions',     'width'=>'20',  'align'=>'center', 'sortable'=>'false','formatter'=>'action_formatter'),
+$column_model = array(
+    array('name'=>'name', 'index'=>'name', 'width'=>'35', 'align'=>'left'),
+    array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'),
+    array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'center'),
+    array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'center', 'sortable'=>'false', 'formatter'=>'action_formatter'),
 );
 
 //Autowidth
@@ -73,11 +73,11 @@ 
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
     return \''
-    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('user_to_class.png', get_lang('SubscribeUsersToClass'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('course_to_class.png', get_lang('SubscribeClassToCourses'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'">' . Display::return_icon('sessions_to_class.png', get_lang('SubscribeClassToSessions'), null, ICON_SIZE_MEDIUM) . '</a>'
-    .' <a href="?action=edit&id=\'+options.rowId+\'">' . Display::return_icon('edit.png', get_lang('Edit'), null, ICON_SIZE_SMALL) . '</a>'
-    .' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">' . Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_SMALL) . '</a>\';
+    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('user_to_class.png', get_lang('SubscribeUsersToClass'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('course_to_class.png', get_lang('SubscribeClassToCourses'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'">'.Display::return_icon('sessions_to_class.png', get_lang('SubscribeClassToSessions'), null, ICON_SIZE_MEDIUM).'</a>'
+    .' <a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), null, ICON_SIZE_SMALL).'</a>'
+    .' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), null, ICON_SIZE_SMALL).'</a>\';
 }';
 
 ?>
@@ -128,7 +128,7 @@ 
     } else {
         echo '<div class="actions">';
         echo '<a href="'.api_get_self().'">'.
-                Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');

main/admin/ldap_synchro.php

Spacing +46 added lines, -46 removed lines

@@ -8,47 +8,47 @@ 
  */
 exit(); //not yet functional, needs to be revised
 
-$cidReset=true;
+$cidReset = true;
 
 require('../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
 require_once('../auth/ldap/authldap.php');
-$annee_base=date('Y');
+$annee_base = date('Y');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 //api_protect_admin_script(); // on vire la secu... qui n'a pas lieu d'etre ici (script de synchro)
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => api_get_self(),"name" => "Liste des sessions");
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), "name" => "Liste des sessions");
 
 // Database Table Definitions
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_class				= Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_class							= Database::get_main_table(TABLE_MAIN_CLASS);
-$tbl_class_user						= Database::get_main_table(TABLE_MAIN_CLASS_USER);
+$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
-$tbl_session_rel_etape 				= "session_rel_etape";
+$tbl_session_rel_etape = "session_rel_etape";
 
-$message="";
+$message = "";
 
-$result=Database::query("SELECT id, name FROM $tbl_session");
-$Sessions=Database::store_result($result);
+$result = Database::query("SELECT id, name FROM $tbl_session");
+$Sessions = Database::store_result($result);
 
-$result=Database::query($sql);
-$users=Database::store_result($result);
+$result = Database::query($sql);
+$users = Database::store_result($result);
 
-foreach($Sessions as $session){
+foreach ($Sessions as $session) {
 	$id_session = $session['id'];
 	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+	$UserList = array();
+	$UserUpdate = array();
+	$UserAdd = array();
 
 	// Parse des code etape de la session
 	/*
@@ -65,8 +65,8 @@ 
 	{
 		$r = false;
 		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
+		$UserList = array();
+		if ($result !== false)
 		{
 			//while($row = Database::fetch_array($result))
 			//{
@@ -81,7 +81,7 @@ 
 				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
 				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
 				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
+				for ($key = 0; $key < $info["count"]; $key++)
 				{
 					echo "<pre>";
 					print_r($info[$key]);
@@ -90,28 +90,28 @@ 
 					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
 					$email = $info[$key]["mail"][0];
 					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+					$dn_array = ldap_explode_dn($info[$key]["dn"], 1);
 					$username = $dn_array[0]; // uid is first key
 					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
 					$val = ldap_get_values_len($ds, $sr, "userPassword");
 					$password = $val[0];
 					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
+					$official_code = $etape."-".$annee;
+					$auth_source = "ldap";
 					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
+					$expiration_date = '';
+					$active = 1;
 					// Ajout de l'utilisateur
 					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
+						$user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active);
+						$UserAdd[] = $user_id;
 					} else {
 						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
+						$user_id = $user['user_id'];
 						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
+						$UserUpdate[] = $user_id;
 					}
-					$UserList[]=$user_id;
+					$UserList[] = $user_id;
 				}
 			//}
 		}
@@ -125,10 +125,10 @@ 
 		}
 
 		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
+		$result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+		$CourseList = array();
+		while ($row = Database::fetch_array($result)) {
+			$CourseList[] = $row['c_id'];
 		}
 
 		foreach ($CourseList as $enreg_course) {
@@ -138,8 +138,8 @@ 
 						VALUES('$id_session','$enreg_course','$enreg_user')";
 				Database::query($sql);
 			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
+			$sql = "SELECT COUNT(user_id) as nbUsers ".
+					"FROM $tbl_session_rel_course_rel_user ".
 					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
 			$rs = Database::query($sql);
 			list($nbr_users) = Database::fetch_array($rs);
@@ -148,13 +148,13 @@ 
 			Database::query($sql);
 		}
 		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+		foreach ($UserList as $enreg_user) {
+			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) ".
+					"VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')";
 			Database::query($sql);
 		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
+		$sql = "SELECT COUNT(user_id) as nbUsers ".
+				"FROM $tbl_session_rel_user ".
 				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
 		$rs = Database::query($sql);
 		list($nbr_users) = Database::fetch_array($rs);

src/Chamilo/PageBundle/Controller/PageController.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
         return $this->render(
             '@ChamiloPage/latest.html.twig',
-            [ 'pages' => $pagesToShow ]
+            ['pages' => $pagesToShow]
         );
     }
 }
\ No newline at end of file

main/webservices/cm_webservice_forum.php

Spacing +31 added lines, -31 removed lines

@@ -19,14 +19,14 @@ 
 
     public function get_foruns_id($username, $password, $course_code)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
-            $foruns_info = get_forums($id='', $course_db['code']);
+            $foruns_info = get_forums($id = '', $course_db['code']);
             $foruns_id = '#';
             foreach ($foruns_info as $forum)
             {
-                if( isset($forum['forum_id']))
+                if (isset($forum['forum_id']))
                 {
                     $foruns_id .= $forum['forum_id']."#";
                 }
@@ -38,18 +38,18 @@ 
 
     public function get_forum_title($username, $password, $course_code, $forum_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_forums = Database :: get_course_table(TABLE_FORUM, $course_db['db_name']);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM."'
                             AND item_properties.ref='".Database::escape_string($forum_id)."'
                             AND forums.forum_id='".Database::escape_string($forum_id)."'";
-            $result=Database::query($sql);
-            $forum_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $forum_info = Database::fetch_array($result);
             $forum_info['approval_direct_post'] = 0; // we can't anymore change this option, so it should always be activated
 
             $forum_title = utf8_decode($forum_info['forum_title']);
@@ -60,12 +60,12 @@ 
 
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid") {
+        if ($this->verifyUserPass($username, $password) == "valid") {
             $threads_info = get_threads($forum_id, $course_code);
             $threads_id = '#';
             foreach ($threads_info as $thread)
             {
-                if( isset($thread['thread_id']))
+                if (isset($thread['thread_id']))
                 {
                     $threads_id .= $thread['thread_id']."#";
                 }
@@ -79,18 +79,18 @@ 
 
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
-            $result=Database::query($sql);
-            $thread_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $thread_info = Database::fetch_array($result);
 
             switch ($field)
             {
@@ -121,18 +121,18 @@ 
 
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
 
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
-            $result=Database::query($sql);
-            $thread_info=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $thread_info = Database::fetch_array($result);
 
             $htmlcode = true;
             $field_table = "thread_title";
@@ -146,7 +146,7 @@ 
 
     public function get_posts_id($username, $password, $course_code, $thread_id)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
 
@@ -154,7 +154,7 @@ 
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
 
             // note: change these SQL so that only the relevant fields of the user table are used
-            if (api_is_allowed_to_edit(null,true)) {
+            if (api_is_allowed_to_edit(null, true)) {
                 $sql = "SELECT * FROM $table_posts posts
                                     LEFT JOIN  $table_users users
                                             ON posts.poster_id=users.user_id
@@ -169,16 +169,16 @@ 
                                     AND posts.visible='1'
                                     ORDER BY posts.post_id ASC";
             }
-            $result=Database::query($sql);
-            while ($row=Database::fetch_array($result)) {
-                $posts_info[]=$row;
+            $result = Database::query($sql);
+            while ($row = Database::fetch_array($result)) {
+                $posts_info[] = $row;
             }
 
             $posts_id = '#';
 
             foreach ($posts_info as $post)
             {
-                if( isset($post['post_id']))
+                if (isset($post['post_id']))
                 {
                     $posts_id .= $post['post_id']."#";
                 }
@@ -190,16 +190,16 @@ 
 
     public function get_post_data($username, $password, $course_code, $post_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $course_db = CourseManager::get_course_information($course_code);
 
             $table_posts 	= Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
             $table_users 	= Database :: get_main_table(TABLE_MAIN_USER);
 
-            $sql="SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
-            $result=Database::query($sql);
-            $post_info =Database::fetch_array($result);
+            $sql = "SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
+            $result = Database::query($sql);
+            $post_info = Database::fetch_array($result);
 
             $htmlcode = false;
             switch ($field)
@@ -232,7 +232,7 @@ 
 
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $em = Database::getManager();
             $course_db = CourseManager::get_course_information($course_code);
@@ -241,9 +241,9 @@ 
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
             $forum_table_attachment = Database :: get_course_table(TABLE_FORUM_ATTACHMENT, $course_db['db_name']);
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
-            $post_date=date('Y-m-d H:i:s');
-            $visible=1;
-            $has_attachment=false;
+            $post_date = date('Y-m-d H:i:s');
+            $visible = 1;
+            $has_attachment = false;
             $my_post = '';
             $post_notification = '';
 

main/forum/viewthread_nested.inc.php

Spacing +23 added lines, -23 removed lines

@@ -56,7 +56,7 @@ 
     $indent = $post['indent_cnt'];
 
     $html = '';
-    $html .= '<div class="col-md-offset-' . $indent . '" >';
+    $html .= '<div class="col-md-offset-'.$indent.'" >';
     $html .= '<div class="panel panel-default forum-post">';
     $html .= '<div class="panel-body">';
 
@@ -73,7 +73,7 @@ 
 
     if ($origin != 'learnpath') {
         if (api_get_course_setting('allow_user_image_forum')) {
-            $html .= '<div class="thumbnail">' . display_user_image($post['user_id'], $name, $origin) . '</div>';
+            $html .= '<div class="thumbnail">'.display_user_image($post['user_id'], $name, $origin).'</div>';
         }
 
         $html .= Display::tag(
@@ -83,7 +83,7 @@ 
         );
     } else {
         if (api_get_course_setting('allow_user_image_forum')) {
-            $html .= '<div class="thumbnail">' . display_user_image($post['user_id'], $name, $origin) . '</div>';
+            $html .= '<div class="thumbnail">'.display_user_image($post['user_id'], $name, $origin).'</div>';
         }
         
         $html .= Display::tag(
@@ -124,7 +124,7 @@ 
         (api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId))
     ) {
         if ($locked == false) {
-            $iconEdit .= "<a href=\"editpost.php?" . api_get_cidreq()
+            $iconEdit .= "<a href=\"editpost.php?".api_get_cidreq()
                 . "&forum=$clean_forum_id&thread=$clean_thread_id&post={$post['post_id']}&id_attach=$id_attach"
                 . "\">"
                 . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)
@@ -138,7 +138,7 @@ 
         !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)
     ) {
         if ($locked == false) {
-            $deleteUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+            $deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                     'forum' => $clean_forum_id,
                     'thread' => $clean_thread_id,
                     'action' => 'delete',
@@ -176,9 +176,9 @@ 
         );
 
         if ($count > 0) {
-            $iconEdit .= "<a href=\"viewthread.php?" . api_get_cidreq()
+            $iconEdit .= "<a href=\"viewthread.php?".api_get_cidreq()
                 . "&forum=$clean_forum_id&thread=$clean_thread_id&action=move&origin=$origin&post={$post['post_id']}"
-                . "\">" . Display::return_icon('move.png', get_lang('MovePost'), array(), ICON_SIZE_SMALL) . "</a>";
+                . "\">".Display::return_icon('move.png', get_lang('MovePost'), array(), ICON_SIZE_SMALL)."</a>";
         }
     }
 
@@ -197,11 +197,11 @@ 
                 '1', $post['user_id'], $_GET['thread']
             );
             if ($locked == false) {
-                $iconEdit .= "<a href=\"forumqualify.php?" . api_get_cidreq()
+                $iconEdit .= "<a href=\"forumqualify.php?".api_get_cidreq()
                     . "&forum=$clean_forum_id&thread=$clean_thread_id&action=list&post={$post['post_id']}"
                     . "&user={$post['user_id']}&user_id={$post['user_id']}&origin=$origin"
                     . "&idtextqualify=$current_qualify_thread"
-                    . "\" >" . Display::return_icon('quiz.gif', get_lang('Qualify')) . "</a>";
+                    . "\" >".Display::return_icon('quiz.gif', get_lang('Qualify'))."</a>";
             }
         }
     }
@@ -209,7 +209,7 @@ 
     $statusIcon = getPostStatus($current_forum, $post);
 
     if ($iconEdit != '') {
-        $html .= '<div class="tools-icons">' . $iconEdit . ' '.$statusIcon.'</div>';
+        $html .= '<div class="tools-icons">'.$iconEdit.' '.$statusIcon.'</div>';
     }
 
     if (($current_forum_category && $current_forum_category['locked'] == 0) &&
@@ -219,7 +219,7 @@ 
             if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
                 $buttonReply = Display::toolbarButton(
                     get_lang('ReplyToMessage'),
-                    'reply.php?' . api_get_cidreq() . '&' . http_build_query([
+                    'reply.php?'.api_get_cidreq().'&'.http_build_query([
                         'forum' => $clean_forum_id,
                         'thread' => $clean_thread_id,
                         'post' => $post['post_id'],
@@ -232,7 +232,7 @@ 
 
                 $buttonQuote = Display::toolbarButton(
                     get_lang('QuoteMessage'),
-                    'reply.php?' . api_get_cidreq() . '&' . http_build_query([
+                    'reply.php?'.api_get_cidreq().'&'.http_build_query([
                         'forum' => $clean_forum_id,
                         'thread' => $clean_thread_id,
                         'post' => $post['post_id'],
@@ -248,21 +248,21 @@ 
         if ($current_forum_category && $current_forum_category['locked'] == 1) {
             $closedPost = Display::tag(
                 'div',
-                '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ForumcategoryLocked'),
+                '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ForumcategoryLocked'),
                 array('class' => 'alert alert-warning post-closed')
             );
         }
         if ($current_forum['locked'] == 1) {
             $closedPost = Display::tag(
                 'div',
-                '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ForumLocked'),
+                '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ForumLocked'),
                 array('class' => 'alert alert-warning post-closed')
             );
         }
         if ($current_thread['locked'] == 1) {
             $closedPost = Display::tag(
                 'div',
-                '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ThreadLocked'),
+                '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ThreadLocked'),
                 array('class' => 'alert alert-warning post-closed')
             );
         }
@@ -314,24 +314,24 @@ 
             $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
             $html .= '<a href="download.php?file=';
             $html .= $realname;
-            $html .= ' "> ' . $user_filename . ' </a>';
-            $html .= '<span class="forum_attach_comment" >' . $attachment['comment'] . '</span>';
+            $html .= ' "> '.$user_filename.' </a>';
+            $html .= '<span class="forum_attach_comment" >'.$attachment['comment'].'</span>';
             if (($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) ||
                 (api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId))
             ) {
-                $html .= '&nbsp;&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&origin='
-                    . Security::remove_XSS($_GET['origin']) . '&action=delete_attach&id_attach='
-                    . $attachment['iid'] . '&forum=' . $clean_forum_id . '&thread=' . $clean_thread_id
+                $html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='
+                    . Security::remove_XSS($_GET['origin']).'&action=delete_attach&id_attach='
+                    . $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id
                     . '" onclick="javascript:if(!confirm(\''
-                    . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)) . '\')) return false;">'
-                    . Display::return_icon('delete.gif', get_lang('Delete')) . '</a><br />';
+                    . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;">'
+                    . Display::return_icon('delete.gif', get_lang('Delete')).'</a><br />';
             }
         }
     }
 
     $html .= '</div>';
     $html .= '<div class="col-md-6 text-right">';
-    $html .= $buttonReply . ' ' . $buttonQuote;
+    $html .= $buttonReply.' '.$buttonQuote;
     $html .= '</div>';
     $html .= '</div>';
     // The post has been displayed => it can be removed from the what's new array