chamilo / chamilo-lms

main/upload/upload.document.php

Spacing +23 added lines, -23 removed lines

@@ -9,9 +9,9 @@ 
  * @author Yannick Warnier <ywarnier@beeznest.org>
  */
 
-$courseDir = $_course['path'] . "/document";
+$courseDir = $_course['path']."/document";
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $courseDir;
+$base_work_dir = $sys_course_path.$courseDir;
 $noPHP_SELF = true;
 $max_filled_space = DocumentManager::get_course_quota();
 
@@ -34,14 +34,14 @@ 
 
 $nameTools = get_lang('UplUploadDocument');
 $interbreadcrumb[] = array(
-    "url" => "./document.php?curdirpath=" . urlencode(
+    "url" => "./document.php?curdirpath=".urlencode(
             $path
-        ) . $req_gid,
+        ).$req_gid,
     "name" => $langDocuments
 );
 Display::display_header($nameTools, "Doc");
 //show the title
-api_display_tool_title($nameTools . $add_group_to_title);
+api_display_tool_title($nameTools.$add_group_to_title);
 
 /**
  * Process
@@ -71,11 +71,11 @@ 
         	$ct = '';
         	if ($new_comment) $ct .= ", comment='$new_comment'";
         	if ($new_title)   $ct .= ", title='$new_title'";
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        	Database::query("UPDATE $table_document SET".substr($ct, 1)." WHERE id = '$docid'");
     	}
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
-        if ($missing_files)  {
+        if ($missing_files) {
             //show a form to upload the missing files
             Display::display_normal_message(
                 build_missing_files_form(
@@ -94,7 +94,7 @@ 
     if ($number_of_uploaded_images > 0) {
         //we could also create a function for this, I'm not sure...
         //create a directory for the missing files
-        $img_directory = str_replace('.','_',$_POST['related_file']."_files");
+        $img_directory = str_replace('.', '_', $_POST['related_file']."_files");
         $folderData = create_unexisting_directory(
             $_course,
             $_user['user_id'],
@@ -120,15 +120,15 @@ 
         replace_img_path_in_html_file(
             $_POST['img_file_path'],
             $paths_to_replace_in_file,
-            $base_work_dir . $_POST['related_file']
+            $base_work_dir.$_POST['related_file']
         );
         //update parent folders
-        item_property_update_on_folder($_course,$_POST['curdirpath'],$_user['user_id']);
+        item_property_update_on_folder($_course, $_POST['curdirpath'], $_user['user_id']);
     }
 }
 //they want to create a directory
-if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
-	$added_slash = ($path=='/')?'':'/';
+if (isset($_POST['create_dir']) && $_POST['dirname'] != '') {
+	$added_slash = ($path == '/') ? '' : '/';
 	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
@@ -152,7 +152,7 @@ 
 	//create the form that asks for the directory name
 	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
 	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
+	$new_folder_text .= get_lang('NewDir').' ';
 	$new_folder_text .= '<input type="text" name="dirname"/>';
 	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
 	$new_folder_text .= '</form>';
@@ -163,7 +163,7 @@ 
 	<p>
         <a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
             <?php echo Display::return_icon('new_folder.gif'); ?>
-            <?php echo(get_lang('CreateDir'));?>
+            <?php echo(get_lang('CreateDir')); ?>
         </a>
     </p>
 <?php
@@ -186,11 +186,11 @@ 
 </td>
 </tr>
 <tr>
-<td><?php echo get_lang('Title');?></td>
+<td><?php echo get_lang('Title'); ?></td>
 <td><input type="text" size="20" name="title" style="width:300px;"></td>
 </tr>
 <tr>
-<td valign="top"><?php echo get_lang('Comment');?></td>
+<td valign="top"><?php echo get_lang('Comment'); ?></td>
 <td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
 </tr>
 <tr>
@@ -198,22 +198,22 @@ 
 <?php echo get_lang('Options'); ?>
 </td>
 <td>
-- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress'));?><br/>
-- <?php echo (get_lang('UplWhatIfFileExists'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong'));?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong'));?>"/> <?php echo (get_lang('UplOverwrite'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong'));?>"/> <?php echo (get_lang('UplRename'));?>
+- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress')); ?><br/>
+- <?php echo (get_lang('UplWhatIfFileExists')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong')); ?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong')); ?>"/> <?php echo (get_lang('UplOverwrite')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong')); ?>"/> <?php echo (get_lang('UplRename')); ?>
 
 </td>
 </tr>
 </table>
 
-<input type="submit" value="<?php echo(get_lang('Ok'));?>">
+<input type="submit" value="<?php echo(get_lang('Ok')); ?>">
 </form>
 <!-- end upload form -->
 
  <!-- so they can get back to the documents   -->
- <p><?php echo (get_lang('Back'));?> <?php echo (get_lang('To'));?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview'));?></a></p>
+ <p><?php echo (get_lang('Back')); ?> <?php echo (get_lang('To')); ?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview')); ?></a></p>
 <?php
 
 Display::display_footer();

main/social/search.php

Spacing +14 added lines, -14 removed lines

@@ -20,13 +20,13 @@ 
 $tool_name = get_lang('Search');
 $interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNetwork'));
 
-$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']): null;
-$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0','1','2')) ? $_GET['search_type'] : null;
+$query = isset($_GET['q']) ? Security::remove_XSS($_GET['q']) : null;
+$query_search_type = isset($_GET['search_type']) && in_array($_GET['search_type'], array('0', '1', '2')) ? $_GET['search_type'] : null;
 $extra_fields = UserManager::get_extra_filtrable_fields();
 $query_vars = array('q' => $query, 'search_type' => $query_search_type);
 if (!empty($extra_fields)) {
     foreach ($extra_fields as $extra_field) {
-        $field_name = 'field_' . $extra_field['variable'];
+        $field_name = 'field_'.$extra_field['variable'];
         if (isset($_GET[$field_name]) && $_GET[$field_name] != '0') {
             $query_vars[$field_name] = $_GET[$field_name];
         }
@@ -46,10 +46,10 @@ 
 $usergroup = new UserGroup();
 
 // I'm searching something
-if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) ) {
+if ($query != '' || ($query_vars['search_type'] == '1' && count($query_vars) > 2)) {
     $itemPerPage = 8;
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='1') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '1') {
         $page = isset($_GET['users_page_nr']) ? intval($_GET['users_page_nr']) : 1;
         $totalUsers = UserManager::get_all_user_tags($_GET['q'], 0, 0, $itemPerPage, true);
 
@@ -58,7 +58,7 @@ 
         $users = UserManager::get_all_user_tags($_GET['q'], 0, $from, $itemPerPage);
     }
 
-    if ($_GET['search_type']=='0' || $_GET['search_type']=='2') {
+    if ($_GET['search_type'] == '0' || $_GET['search_type'] == '2') {
         $pageGroup = isset($_GET['groups_page_nr']) ? intval($_GET['groups_page_nr']) : 1;
         // Groups
         $fromGroups = intval(($pageGroup - 1) * $itemPerPage);
@@ -84,7 +84,7 @@ 
 
             // Show send invitation icon if they are not friends yet
             if ($relation_type != 3 && $relation_type != 4 && $user_info['user_id'] != api_get_user_id()) {
-                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="' . $user_info['user_id'] . '">
+                $send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="'.$user_info['user_id'].'">
                              <em class="fa fa-user"></em> '.get_lang('SendInvitation').'</a>';
             }
 
@@ -130,7 +130,7 @@ 
                                 </div>
                                 <div class="user-info">
                                    <p>'.$user_info['complete_name'].'</p>
-                                   <div class="items-user-status">' . $status_icon . $user_icon . '</div>
+                                   <div class="items-user-status">' . $status_icon.$user_icon.'</div>
                                    <div class="toolbar">
                                     '.$invitations.'
                                    </div>
@@ -187,7 +187,7 @@ 
             $tags = null;
             $group['picture'] = '<img class="img-responsive img-circle" src="'.$picture['file'].'" />';
 
-            $members = Display::returnFontAwesomeIcon('user') . '( ' .$count_users_group . ' )';
+            $members = Display::returnFontAwesomeIcon('user').'( '.$count_users_group.' )';
             $item_1  = Display::tag('p', $url_open.$name.$url_close);
 
             $block_groups .= '
@@ -198,10 +198,10 @@ 
                         </div>
                         <div class="user-info">
                             '.$item_1.'
-                            <p>' . $members . '</p>    
-                            <p>' . $group['description'] . '</p>
-                            <p>' . $tags . '</p>
-                            <p>' . $url_open.get_lang('SeeMore') . $url_close . '</p>
+                            <p>' . $members.'</p>    
+                            <p>' . $group['description'].'</p>
+                            <p>' . $tags.'</p>
+                            <p>' . $url_open.get_lang('SeeMore').$url_close.'</p>
                         </div>
                     </div>
                 </div>';
@@ -241,7 +241,7 @@ 
 $tpl->assign('social_search', $block_search);
 $tpl->assign('search_form', $searchForm);
 
-$formModalTpl =  new Template();
+$formModalTpl = new Template();
 $formModalTpl->assign('invitation_form', MessageManager::generate_invitation_form('send_invitation'));
 $formModals = $formModalTpl->fetch('default/social/form_modals.tpl');
 

main/inc/lib/search/tool_processors/link_processor.class.php

Spacing +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process links before pass it to search listing scripts
@@ -104,11 +104,11 @@ 
 
             $link_id = intval($link_id);
             $sql = "SELECT insert_user_id FROM $item_property_table
-              		WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id
+              		WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
               		LIMIT 1";
 
             $name = get_lang('Links');
-            $url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
+            $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
             $url = sprintf($url, $course_id_alpha);
             // Get the image path
             $thumbnail = Display::returnIconPath('link.png');

main/inc/lib/search/tool_processors/document_processor.class.php

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@ 
             $dk_result = Database::query($sql);
 
             $sql = "SELECT insert_user_id FROM       $item_property_table
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
                     LIMIT 1";
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {

main/inc/lib/agenda.lib.php

Spacing +54 added lines, -54 removed lines

@@ -1499,12 +1499,12 @@ 
             }
 
             if (empty($session_id)) {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = 0 AND (ip.session_id IS NULL OR ip.session_id = 0)
                 ) ";
             } else {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = $session_id AND
                     ip.session_id = $session_id
@@ -1543,13 +1543,13 @@ 
             }
 
             if (empty($session_id)) {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = 0 AND
                     (ip.session_id IS NULL OR ip.session_id = 0)
                 ) ";
             } else {
-                $sessionCondition =  "
+                $sessionCondition = "
                 (
                     agenda.session_id = $session_id AND
                     ip.session_id = $session_id
@@ -1601,7 +1601,7 @@ 
             while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $event = array();
                 $event['id'] = 'course_'.$row['id'];
-                $event['unique_id']  = $row['iid'];
+                $event['unique_id'] = $row['iid'];
                 // To avoid doubles
                 if (in_array($event['unique_id'], $eventsAdded)) {
                     continue;
@@ -2151,7 +2151,7 @@ 
             );
 
             $form->addLabel('',
-                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
+                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')');
 
 
             //if ($showAttachmentForm) {
@@ -2729,8 +2729,8 @@ 
 
                 $startDateTime = api_get_local_time($start->format('Y-m-d H:i:s'), $currentTimeZone, $start->format('e'));
                 $endDateTime = api_get_local_time($end->format('Y-m-d H:i'), $currentTimeZone, $end->format('e'));
-                $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8');
-                $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8');
+                $title = api_convert_encoding((string) $event->summary, $charset, 'UTF-8');
+                $description = api_convert_encoding((string) $event->description, $charset, 'UTF-8');
 
                 $id = $this->addEvent(
                     $startDateTime,
@@ -2872,7 +2872,7 @@ 
 							ORDER BY start_date ";
             } else {
                 // if the user is not an administrator of that course
-                if (is_array($group_memberships) && count($group_memberships)>0) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sqlquery = "SELECT	agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
 								FROM ".$TABLEAGENDA." agenda,
 									".$TABLE_ITEMPROPERTY." ip
@@ -2902,14 +2902,14 @@ 
                 $agendaday = -1;
                 if ($item['start_date'] != '0000-00-00 00:00:00') {
                     $item['start_date'] = api_get_local_time($item['start_date']);
-                    $item['start_date_tms']  = api_strtotime($item['start_date']);
+                    $item['start_date_tms'] = api_strtotime($item['start_date']);
                     $agendaday = date("j", $item['start_date_tms']);
                 }
                 if ($item['end_date'] != '0000-00-00 00:00:00') {
                     $item['end_date'] = api_get_local_time($item['end_date']);
                 }
 
-                $url  = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
+                $url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
 
                 $item['url'] = $url;
                 $item['course_name'] = $array_course_info['title'];
@@ -2921,9 +2921,9 @@ 
         }
 
         // sorting by hour for every day
-        $agendaitems = array ();
+        $agendaitems = array();
         while (list ($agendaday, $tmpitems) = each($items)) {
-            if(!isset($agendaitems[$agendaday])) {
+            if (!isset($agendaitems[$agendaday])) {
                 $agendaitems[$agendaday] = '';
             }
             sort($tmpitems);
@@ -3097,9 +3097,9 @@ 
             $end_year = $start_end_day_of_week['end']['year'];
             // in sql statements you have to use year-month-day for date calculations
             $start_filter = $start_year."-".$start_month."-".$start_day." 00:00:00";
-            $start_filter  = api_get_utc_datetime($start_filter);
+            $start_filter = api_get_utc_datetime($start_filter);
             $end_filter = $end_year."-".$end_month."-".$end_day." 23:59:59";
-            $end_filter  = api_get_utc_datetime($end_filter);
+            $end_filter = api_get_utc_datetime($end_filter);
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
         }
         // 3. creating the SQL statement for getting the personal agenda items in DAY view
@@ -3107,18 +3107,18 @@ 
             // we are in day view
             // we could use mysql date() function but this is only available from 4.1 and higher
             $start_filter = $year."-".$month."-".$day." 00:00:00";
-            $start_filter  = api_get_utc_datetime($start_filter);
+            $start_filter = api_get_utc_datetime($start_filter);
             $end_filter = $year."-".$month."-".$day." 23:59:59";
-            $end_filter  = api_get_utc_datetime($end_filter);
+            $end_filter = api_get_utc_datetime($end_filter);
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
         }
 
         $result = Database::query($sql);
         while ($item = Database::fetch_array($result, 'ASSOC')) {
 
-            $time_minute 	= api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
-            $item['date']   = api_get_local_time($item['date']);
-            $item['start_date_tms']  = api_strtotime($item['date']);
+            $time_minute = api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
+            $item['date'] = api_get_local_time($item['date']);
+            $item['start_date_tms'] = api_strtotime($item['date']);
             $item['content'] = $item['text'];
 
             // we break the date field in the database into a date and a time part
@@ -3138,7 +3138,7 @@ 
             $second = $agendatime[2];
 
             if ($type == 'month_view') {
-                $item['calendar_type']  = 'personal';
+                $item['calendar_type'] = 'personal';
                 $item['start_date']  	= $item['date'];
                 $agendaitems[$day][] 	= $item;
                 continue;
@@ -3163,7 +3163,7 @@ 
                 // this is the array construction for the DAY view
                 $halfhour = 2 * $agendatime['0'];
                 if ($agendatime['1'] >= '30') {
-                    $halfhour = $halfhour +1;
+                    $halfhour = $halfhour + 1;
                 }
 
                 //Display events by list
@@ -3187,22 +3187,22 @@ 
     {
         global $DaysShort, $course_path;
         //Handle leap year
-        $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+        $numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
         if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
             $numberofdays[2] = 29;
         //Get the first day of the month
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
         //Start the week on monday
         $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
-        $g_cc = (isset($_GET['courseCode'])?$_GET['courseCode']:'');
+        $g_cc = (isset($_GET['courseCode']) ? $_GET['courseCode'] : '');
 
-        $next_month = ($month == 1 ? 12 : $month -1);
-        $prev_month = ($month == 12 ? 1 : $month +1);
+        $next_month = ($month == 1 ? 12 : $month - 1);
+        $prev_month = ($month == 12 ? 1 : $month + 1);
 
-        $next_year = ($month == 1 ? $year -1 : $year);
-        $prev_year = ($month == 12 ? $year +1 : $year);
+        $next_year = ($month == 1 ? $year - 1 : $year);
+        $prev_year = ($month == 12 ? $year + 1 : $year);
 
-        if ($show_content)  {
+        if ($show_content) {
             $back_url = Display::url(get_lang('Previous'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$next_month."&year=".$next_year);
             $next_url = Display::url(get_lang('Next'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$prev_month."&year=".$prev_year);
         } else {
@@ -3219,7 +3219,7 @@ 
         $html .= '</div>';
         $html .= '<table id="agenda_list2" class="table table-bordered">';
         $html .= '<tr>';
-        for ($ii = 1; $ii < 8; $ii ++) {
+        for ($ii = 1; $ii < 8; $ii++) {
             $html .= '<td class="weekdays">'.$DaysShort[$ii % 7].'</td>';
         }
         $html .= '</tr>';
@@ -3228,7 +3228,7 @@ 
         $today = getdate();
         while ($curday <= $numberofdays[$month]) {
             $html .= "<tr>";
-            for ($ii = 0; $ii < 7; $ii ++) {
+            for ($ii = 0; $ii < 7; $ii++) {
                 if (($curday == -1) && ($ii == $startdayofweek)) {
                     $curday = 1;
                 }
@@ -3242,21 +3242,21 @@ 
                     $html .= "<td ".$class.">".$dayheader;
 
                     if (!empty($agendaitems[$curday])) {
-                        $items =  $agendaitems[$curday];
-                        $items =  msort($items, 'start_date_tms');
+                        $items = $agendaitems[$curday];
+                        $items = msort($items, 'start_date_tms');
 
-                        foreach($items  as $value) {
+                        foreach ($items  as $value) {
                             $value['title'] = Security::remove_XSS($value['title']);
                             $start_time = api_format_date($value['start_date'], TIME_NO_SEC_FORMAT);
                             $end_time = '';
 
                             if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
-                                $end_time    = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
+                                $end_time = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
                             }
                             $complete_time = '<i>'.api_format_date($value['start_date'], DATE_TIME_FORMAT_LONG).'</i>&nbsp;'.$end_time;
                             $time = '<i>'.$start_time.'</i>';
 
-                            switch($value['calendar_type']) {
+                            switch ($value['calendar_type']) {
                                 case 'personal':
                                     $bg_color = '#D0E7F4';
                                     $icon = Display::return_icon('user.png', get_lang('MyAgenda'), array(), ICON_SIZE_SMALL);
@@ -3308,7 +3308,7 @@ 
                         }
                     }
                     $html .= "</td>";
-                    $curday ++;
+                    $curday++;
                 } else {
                     $html .= "<td></td>";
                 }
@@ -3329,18 +3329,18 @@ 
      * where datestart and dateend are in yyyyMMddhhmmss format.
      * @TODO Implement really personal events (from user DB) and global events (from main DB)
      */
-    public static function get_personal_agenda_items_between_dates($user_id, $date_start='', $date_end='')
+    public static function get_personal_agenda_items_between_dates($user_id, $date_start = '', $date_end = '')
     {
-        $items = array ();
+        $items = array();
         if ($user_id != strval(intval($user_id))) { return $items; }
-        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s');}
-        if (empty($date_end))   { $date_end = date('Y-m-d H:i:s',mktime(0, 0, 0, date("m"),   date("d"),   date("Y")+1));}
+        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s'); }
+        if (empty($date_end)) { $date_end = date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y") + 1)); }
         $expr = '/\d{4}-\d{2}-\d{2}\ \d{2}:\d{2}:\d{2}/';
-        if(!preg_match($expr,$date_start)) { return $items; }
-        if(!preg_match($expr,$date_end)) { return $items; }
+        if (!preg_match($expr, $date_start)) { return $items; }
+        if (!preg_match($expr, $date_end)) { return $items; }
 
         // get agenda-items for every course
-        $courses = api_get_user_courses($user_id,false);
+        $courses = api_get_user_courses($user_id, false);
         foreach ($courses as $id => $course) {
             $c = api_get_course_info_by_id($course['real_id']);
             //databases of the courses
@@ -3364,9 +3364,9 @@ 
                     " ORDER BY start_date ";
             } else {
                 // if the user is not an administrator of that course, then...
-                if (is_array($group_memberships) && count($group_memberships)>0)
+                if (is_array($group_memberships) && count($group_memberships) > 0)
                 {
-                    $sqlquery = "SELECT " .
+                    $sqlquery = "SELECT ".
                         "DISTINCT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref ".
                         " FROM ".$t_a." agenda, ".
                         $t_ip." ip ".
@@ -3394,13 +3394,13 @@ 
 
             $result = Database::query($sqlquery);
             while ($item = Database::fetch_array($result)) {
-                $agendaday = date("j",strtotime($item['start_date']));
-                $month = date("n",strtotime($item['start_date']));
-                $year = date("Y",strtotime($item['start_date']));
+                $agendaday = date("j", strtotime($item['start_date']));
+                $month = date("n", strtotime($item['start_date']));
+                $year = date("Y", strtotime($item['start_date']));
                 $URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($course["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['start_date']);
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['start_date']);
                 $start_date = $year.$month.$day.$hour.$min;
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['end_date']);
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['end_date']);
                 $end_date = $year.$month.$day.$hour.$min;
 
                 $items[] = array(
@@ -3429,7 +3429,7 @@ 
         $user = api_get_user_id();
         $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE id=".$id." AND user = ".$user;
         $result = Database::query($sql);
-        if(Database::num_rows($result)==1) {
+        if (Database::num_rows($result) == 1) {
             $item = Database::fetch_array($result);
         } else {
             $item = null;
@@ -3451,9 +3451,9 @@ 
         // step 2: we which day this is (0=sunday, 1=monday, ...)
         $number_day_in_week = date('w', $random_day_in_week);
         // step 3: we calculate the timestamp of the monday of the week we are in
-        $start_timestamp = $random_day_in_week - (($number_day_in_week -1) * 24 * 60 * 60);
+        $start_timestamp = $random_day_in_week - (($number_day_in_week - 1) * 24 * 60 * 60);
         // step 4: we calculate the timestamp of the sunday of the week we are in
-        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week +1) * 24 * 60 * 60) - 3600;
+        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week + 1) * 24 * 60 * 60) - 3600;
         // step 5: calculating the start_day, end_day, start_month, end_month, start_year, end_year
         $start_day = date('j', $start_timestamp);
         $start_month = date('n', $start_timestamp);

main/admin/specific_fields.php

Spacing +14 added lines, -14 removed lines

@@ -15,36 +15,36 @@ 
 api_protect_admin_script();
 
 // Breadcrumb
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
 
 $libpath = api_get_path(LIBRARY_PATH);
 
 include_once $libpath.'specific_fields_manager.lib.php';
 
 // Create an add-field box
-$form = new FormValidator('add_field','post','','',null,false);
-$renderer =& $form->defaultRenderer();
+$form = new FormValidator('add_field', 'post', '', '', null, false);
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
 
 // Create a sortable table with specific fields data
-$column_show = array(1,1,1);
-$column_order = array(3,2,1);
+$column_show = array(1, 1, 1);
+$column_order = array(3, 2, 1);
 $extra_fields = get_specific_field_list();
 $number_of_extra_fields = count($extra_fields);
 
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
 $table->set_header(2, get_lang('Name'));
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
 $table->set_column_filter(3, 'edit_filter');
 
-function edit_filter($id,$url_params,$row) {
+function edit_filter($id, $url_params, $row) {
 	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
 	return $return;
 }
 
@@ -60,7 +60,7 @@ 
 Display::display_header(get_lang('SpecificSearchFields'));
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
-if(!empty($_GET['message'])) {
+if (!empty($_GET['message'])) {
   Display::display_confirmation_message($_GET['message']);
 }
 

main/admin/specific_fields_add.php

Spacing +7 added lines, -7 removed lines

@@ -32,18 +32,18 @@ 
 // Create the form
 $form = new FormValidator('specific_fields_add');
 // Field variable name
-$form->addElement('hidden','field_id', $fieldId);
-$form->addElement('text','field_name',get_lang('FieldName'));
-$form->applyFilter('field_name','html_filter');
-$form->applyFilter('field_name','trim');
+$form->addElement('hidden', 'field_id', $fieldId);
+$form->addElement('text', 'field_name', get_lang('FieldName'));
+$form->applyFilter('field_name', 'html_filter');
+$form->applyFilter('field_name', 'trim');
 $form->addRule('field_name', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('field_name', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('field_name', '', 'maxlength',20);
+$form->addRule('field_name', '', 'maxlength', 20);
 
 // Set default values (only not empty when editing)
 $defaults = array();
 if ($fieldId) {
-    $form_information = get_specific_field_list(array( 'id' => $fieldId ));
+    $form_information = get_specific_field_list(array('id' => $fieldId));
     $defaults['field_name'] = $form_information[0]['name'];
 }
 $form->setDefaults($defaults);
@@ -54,7 +54,7 @@ 
 if ($form->validate()) {
     $field = $form->exportValues();
     $field_name = $field['field_name'];
-    if (is_numeric($field['field_id']) && $field['field_id']<>0 && !empty($field['field_id'])) {
+    if (is_numeric($field['field_id']) && $field['field_id'] <> 0 && !empty($field['field_id'])) {
         edit_specific_field($field['field_id'], $field['field_name']);
         $message = get_lang('FieldEdited');
     } else {

main/inc/lib/search/search_widget.php

Spacing +68 added lines, -68 removed lines

@@ -7,7 +7,7 @@ 
 /**
  * Code
  */
-require_once dirname(__FILE__) . '/IndexableChunk.class.php';
+require_once dirname(__FILE__).'/IndexableChunk.class.php';
 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
 /**
@@ -29,13 +29,13 @@ 
 /**
  * Get one term html select
  */
-function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') {
+function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr = 'size="7" class="sf-select-multiple"') {
 	global $charset;
-    $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">';
+    $multiple_select = '<select '.$extra_select_attr.' title="'.$prefix.'" id="sf-'.$prefix.'" name="sf_'.$prefix.'[]">';
 
     $all_selected = '';
-    if (!empty($_REQUEST['sf_'. $prefix]) ) {
-        if (in_array('__all__', $_REQUEST['sf_'. $prefix])) {
+    if (!empty($_REQUEST['sf_'.$prefix])) {
+        if (in_array('__all__', $_REQUEST['sf_'.$prefix])) {
             $all_selected = 'selected="selected"';
         }
     }
@@ -44,17 +44,17 @@ 
     } else if ($op == 'or') {
         $all_selected_name = get_lang('Any');
     }
-    $multiple_select .= '<option value="__all__" '. $all_selected .' >-- '. $all_selected_name .' --</option>';
+    $multiple_select .= '<option value="__all__" '.$all_selected.' >-- '.$all_selected_name.' --</option>';
 
     foreach ($sf_term_array as $raw_term) {
         $term = substr($raw_term, 1);
         if (empty($term)) continue;
         $html_term = htmlspecialchars($term, ENT_QUOTES, $charset);
         $selected = '';
-        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) {
+        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term, $_REQUEST['sf_'.$prefix])) {
             $selected = 'selected="selected"';
         }
-        $multiple_select .= '<option value="'. $html_term .'" '.$selected.'>'. $html_term .'</option>';
+        $multiple_select .= '<option value="'.$html_term.'" '.$selected.'>'.$html_term.'</option>';
     }
     $multiple_select .= '</select>';
     return $multiple_select;
@@ -63,15 +63,15 @@ 
 /**
  * Get terms html selects
  */
-function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix='') {
+function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix = '') {
     // Process each prefix type term
     $i = 0;
     $max = count($sf_terms);
-    $multiple_selects ='';
+    $multiple_selects = '';
     foreach ($sf_terms as $prefix => $sf_term_array) {
         if ($prefix == $prefilter_prefix) continue;
         $multiple_select = '';
-        if ($i>0) {
+        if ($i > 0) {
             //print "+" image
             $multiple_select .= '<td><img class="sf-select-splitter" src="../img/search-big-plus.gif" alt="plus-sign-decoration"/></td>';
         }
@@ -89,9 +89,9 @@ 
 
         $sf_copy = $sf_term_array;
         // get specific field name
-        $sf_value = get_specific_field_list(array( 'code' => "'$prefix'" ));
+        $sf_value = get_specific_field_list(array('code' => "'$prefix'"));
         $sf_value = array_shift($sf_value);
-        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">' . $sf_value['name'].'</label><br />';
+        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$sf_value['name'].'</label><br />';
         $multiple_select .= format_one_specific_field_select($prefix, $sf_term_array, $op, 'multiple="multiple" size="7" class="sf-select-multiple"');
         $multiple_select .= '</td>';
         $multiple_selects .= $multiple_select;
@@ -107,11 +107,11 @@ 
  */
 function search_widget_normal_form($action, $show_thesaurus, $sf_terms, $op) {
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     /**
      * POST avoid long urls, but we are using GET because
@@ -119,36 +119,36 @@ 
      * could not send a form in pagination
      */
 
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
+		$action = 'index.php';
 	}
 	$navigator_info = api_get_navigator();
 
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-		$submit_button1	= '<input type="submit" id="submit" value="'. get_lang('Search') .'" />';
-		$submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />';
-        $reset_button 	= '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />';
+	if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
+		$submit_button1	= '<input type="submit" id="submit" value="'.get_lang('Search').'" />';
+		$submit_button2 = '<input class="lower-submit" type="submit" value="'.get_lang('Search').'" />';
+        $reset_button = '<input type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />';
 	} else {
-		$submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>';
-		$submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>';
-        $reset_button 	= '<button class="save"   type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> ';
+		$submit_button1 = '<button class="search" type="submit" id="submit" value="'.get_lang("Search").'" /> '.get_lang('Search').'</button>';
+		$submit_button2 = '<button class="search" type="submit" value="'.get_lang('Search').'" />'.get_lang('Search').'</button>';
+        $reset_button = '<button class="save"   type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />'.get_lang('SearchResetKeywords').'</button> ';
 	}
 
     $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null;
 
-    $form = '<form id="chamilo_search" action="'. $action .'" method="GET">
-            <input type="text" id="query" name="query" size="40" value="' . $query . '" />
-            <input type="hidden" name="mode" value="'. $mode .'"/>
-            <input type="hidden" name="type" value="'. $type .'"/>
+    $form = '<form id="chamilo_search" action="'.$action.'" method="GET">
+            <input type="text" id="query" name="query" size="40" value="' . $query.'" />
+            <input type="hidden" name="mode" value="'. $mode.'"/>
+            <input type="hidden" name="type" value="'. $type.'"/>
             <input type="hidden" name="tablename_page_nr" value="1" />
           	'.$submit_button1.'
             <br /><br />';
     $list = get_specific_field_list();
 
-    if(!empty($list)) {
-        $form .= '<span class="search-links-box">'. $advanced_options .'&nbsp;</span>
-            <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
-                <div class="search-help-box">'. $help .'</div>
+    if (!empty($list)) {
+        $form .= '<span class="search-links-box">'.$advanced_options.'&nbsp;</span>
+            <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
+                <div class="search-help-box">'. $help.'</div>
                 <table>
                 <tr>';
         $form .= format_specific_fields_selects($sf_terms, $op);
@@ -162,9 +162,9 @@ 
         $form .= '</tr>
                     <tr>
                         <td id="operator-select">
-                            '. get_lang('SearchCombineSearchWith') .':<br />
-                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
-                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
+                            '. get_lang('SearchCombineSearchWith').':<br />
+                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
+                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
                         </td>
                         <td></td>
                         <td>
@@ -176,7 +176,7 @@ 
                     </table>
                 </div>';
     }
-    $form .='</form>
+    $form .= '</form>
     <br style="clear: both;"/>';
     return $form;
 }
@@ -186,36 +186,36 @@ 
  *
  * This type allow filter all other multiple select terms by one term in a dinamic way
  */
-function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) {
+function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix = NULL) {
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     /**
      * POST avoid long urls, but we are using GET because
      * SortableTableFromArray pagination is done with simple links, so now we
      * could not send a form in pagination
      */
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
+		$action = 'index.php';
 	}
 
     $form = '
-        <form id="chamilo_search" action="'. $action .'" method="GET">
+        <form id="chamilo_search" action="'. $action.'" method="GET">
             <input type="text" id="query" name="query" size="40" />
-            <input type="hidden" name="mode" value="'. $mode .'"/>
-            <input type="hidden" name="type" value="'. $type .'"/>
+            <input type="hidden" name="mode" value="'. $mode.'"/>
+            <input type="hidden" name="type" value="'. $type.'"/>
             <input type="hidden" name="tablename_page_nr" value="1" />
-            <input type="submit" id="submit" value="'. get_lang("Search") .'" />
+            <input type="submit" id="submit" value="'. get_lang("Search").'" />
             <br /><br />';
         $list = get_specific_field_list();
-        if(!empty($list)) {
-            $form .=' <span class="search-links-box">'. $thesaurus_icon . $advanced_options .'&nbsp;</span>
-                    <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
-                        <div class="search-help-box">'. $help .'</div>
+        if (!empty($list)) {
+            $form .= ' <span class="search-links-box">'.$thesaurus_icon.$advanced_options.'&nbsp;</span>
+                    <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
+                        <div class="search-help-box">'. $help.'</div>
                         <table>
                         <tr>';
             if (!is_null($prefilter_prefix)) {
@@ -230,9 +230,9 @@ 
                 $sf_term_array = $temp;
 
                 // get specific field name
-                $sf_value = get_specific_field_list(array( 'code' => "'$prefilter_prefix'" ));
+                $sf_value = get_specific_field_list(array('code' => "'$prefilter_prefix'"));
                 $sf_value = array_shift($sf_value);
-                $form .= '<label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
+                $form .= '<label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
 
                 $form .= format_one_specific_field_select($prefilter_prefix, $sf_term_array, $op, 'id="prefilter"');
                 $form .= format_specific_fields_selects($sf_terms, $op, $prefilter_prefix);
@@ -252,15 +252,15 @@ 
                         </tr>
                         <tr>
                             <td id="operator-select">
-                                '. get_lang('SearchCombineSearchWith') .':<br />
-                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
-                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
+                                '. get_lang('SearchCombineSearchWith').':<br />
+                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
+                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
                             </td>
                             <td></td>
                             <td>
                                 <br />
-                                <input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />
-                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />
+                                <input class="lower-submit" type="submit" value="'. get_lang('Search').'" />
+                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords').'" />
                             </td>
                         </tr>
                         </table>
@@ -277,7 +277,7 @@ 
  * Show search form
  */
 function display_search_form($action, $show_thesaurus, $sf_terms, $op) {
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     switch ($type) {
         case 'prefilter':
@@ -304,7 +304,7 @@ 
  * @param   string $action     Just in case your action is not
  * index.php
  */
-function search_widget_show($action='index.php')
+function search_widget_show($action = 'index.php')
 {
     require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
     // TODO: load images dinamically when they're avalaible from specific field ui to add
@@ -317,14 +317,14 @@ 
     if (($cid = api_get_course_id()) != -1) { // with cid
 
         // get search engine terms
-        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
+        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
         $dkterms = chamilo_query_simple_query('', 0, 1000, array($course_filter));
 
         //prepare specific fields names (and also get possible URL param names)
         foreach ($specific_fields as $specific_field) {
             $temp = array();
-            if (is_array($dkterms) && count($dkterms)>0) {
-            	foreach($dkterms[1] as $obj) {
+            if (is_array($dkterms) && count($dkterms) > 0) {
+            	foreach ($dkterms[1] as $obj) {
                 	$temp = array_merge($obj['sf-'.$specific_field['code']], $temp);
             	}
         	}
@@ -352,7 +352,7 @@ 
     }
 
     $op = 'or';
-    if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) {
+    if (!empty($_REQUEST['operator']) && in_array($op, array('or', 'and'))) {
         $op = $_REQUEST['operator'];
     }
 

main/document/upload.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
 }
 
 if (empty($document_data)) {
-    $document_id  = $parent_id =  0;
+    $document_id = $parent_id = 0;
     $path = '/';
 } else {
     $document_id = $document_data['id'];
@@ -201,11 +201,11 @@ 
 
 // Link back to the documents overview
 if ($is_certificate_mode) {
-    $actions = '<a href="document.php?id='.$document_id.'&selectcat=' . $selectcat.'&'.api_get_cidreq().'">'.
-        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions = '<a href="document.php?id='.$document_id.'&selectcat='.$selectcat.'&'.api_get_cidreq().'">'.
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('CertificateOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 } else {
     $actions = '<a href="document.php?id='.$document_id.'&'.api_get_cidreq().'">'.
-        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 // Link to create a folder