diff --git a/index.php b/index.php index 398dbf4067..28b30097c9 100755 --- a/index.php +++ b/index.php @@ -707,7 +707,7 @@ function display_anonymous_course_list() { foreach ($course_list as $course) { // $setting_show_also_closed_courses - if ($setting_show_also_closed_courses == false) { + if (!$setting_show_also_closed_courses) { // If we do not show the closed courses // we only show the courses that are open to the world (to everybody) // and the courses that are open to the platform (if the current user is a registered user diff --git a/main/install/install.lib.php b/main/install/install.lib.php old mode 100755 new mode 100644 index 60c02b3c2b..0c2e41fde5 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -1346,7 +1346,7 @@ function display_license_agreement() { - + diff --git a/main/install/update-db-scorm-1.6.x-1.8.0.inc.php b/main/install/update-db-scorm-1.6.x-1.8.0.inc.php old mode 100644 new mode 100755 index 735e112133..bc28776f1f --- a/main/install/update-db-scorm-1.6.x-1.8.0.inc.php +++ b/main/install/update-db-scorm-1.6.x-1.8.0.inc.php @@ -137,7 +137,7 @@ foreach ($courses_id_full_table_prefix_list as $course_code => $db) { "'".Database::escape_string($row['learnpath_description'])."',$dsp_ord,'Dokeos')"; $ins_lp_res = Database::query($ins_lp_sql); $in_id = Database::insert_id(); - if (empty($in_id) or $in_id == false) die('Could not insert lp: '.$ins_lp_sql); + if (!$in_id) die('Could not insert lp: '.$ins_lp_sql); $lp_ids[$row['learnpath_id']] = $in_id; $dsp_ord++; $max_dsp_lp = $dsp_ord; @@ -181,7 +181,7 @@ foreach ($courses_id_full_table_prefix_list as $course_code => $db) { $ins_res = Database::query($ins_lp_sql); $in_id = Database::insert_id(); //echo "  Inserted item $in_id
\n"; - if (empty($in_id) OR $in_id == false) die('Could not insert lp: '.$ins_sql); + if (!$in_id) die('Could not insert lp: '.$ins_sql); $parent_chaps[$row['id']] = $row['parent_chapter_id']; $lp_chap_items[$row['id']] = $in_id; $parent_lps[$row['id']] = $row['learnpath_id']; @@ -330,7 +330,7 @@ foreach ($courses_id_full_table_prefix_list as $course_code => $db) { $ins_res = Database::query($ins_lp_sql); $in_id = Database::insert_id(); //echo "  Inserted item $in_id (".$row['title'].")
\n"; - if (empty($in_id) OR $in_id == false) die('Could not insert lp_item: '.$ins_sql); + if (!$in_id) die('Could not insert lp_item: '.$ins_sql); $lp_items[$parent_lps[$row['chapter_id']]][$row['id']] = $in_id; $lp_ordered_items[$parent_lps[$row['chapter_id']]][$row['chapter_id']][] = $in_id; } @@ -973,7 +973,7 @@ foreach ($scorms as $my_course_code => $paths_list) { if ($loglevel > 1) { error_log("$sql_ins", 0); } $sql_res = Database::query($sql_ins); $in_id = Database::insert_id(); - if (empty($in_id) or $in_id == false) die('Could not insert scorm lp: '.$sql_ins); + if (!$in_id) die('Could not insert scorm lp: '.$sql_ins); //echo "  Inserted item $in_id
\n"; $lp_ids[$my_content_id] = $in_id; //contains the old LP ID => the new LP ID $lp_course[$my_content_id] = $courses_id_list[$my_course_code]; // Contains the old learnpath ID => the course DB name diff --git a/main/link/linkfunctions.php b/main/link/linkfunctions.php index 273c59fcb3..d921927fcb 100755 --- a/main/link/linkfunctions.php +++ b/main/link/linkfunctions.php @@ -53,7 +53,7 @@ function addlinkcategory($type) { $description = trim($description); // If title is empty, an error occurs - if (filter_var($urllink, FILTER_VALIDATE_URL) == false) { + if (!filter_var($urllink, FILTER_VALIDATE_URL)) { $msgErr = get_lang('GiveURL'); Display::display_error_message(get_lang('GiveURL')); $ok = false; diff --git a/main/metadata/phpdig/search_function.php b/main/metadata/phpdig/search_function.php index a4eb0ee131..777401bd26 100755 --- a/main/metadata/phpdig/search_function.php +++ b/main/metadata/phpdig/search_function.php @@ -342,7 +342,7 @@ if ($ncrit && is_array($strings)) { reset($final_result); $query_for_phrase_array = explode(" ",$query_for_phrase); $reg_strings = str_replace('@#@',' ',phpdigPregQuotes(str_replace('\\','',implode('@#@',$query_for_phrase_array)))); - $stop_regs = "[][(){}[:blank:]=&?!&#%\$£*@+%:;,/\.'\"]"; + $stop_regs = "[][(){}[:blank:]=&?!&#%\$�*@+%:;,/\.'\"]"; $reg_strings = "($stop_regs{1}|^)($reg_strings)($stop_regs{1}|\$)"; while (list($spider_id,$weight) = each($final_result)) { $content_file = $relative_script_path.'/'.TEXT_CONTENT_PATH.$spider_id.'.txt'; @@ -416,7 +416,7 @@ if ((is_array($final_result)) && (count($final_result) > 0)) { else { $reg_strings = str_replace('@#@','|',phpdigPregQuotes(str_replace('\\','',implode('@#@',$strings)))); } - $stop_regs = "[][(){}[:blank:]=&?!&#%\$£*@+%:;,/\.'\"]"; + $stop_regs = "[][(){}[:blank:]=&?!&#%\$�*@+%:;,/\.'\"]"; switch($option) { case 'any': @@ -641,7 +641,7 @@ else { } $timer->start('Logs'); -if (PHPDIG_LOGS == true && !$browse && !$refine && $adlog_flag == 0) { +if (PHPDIG_LOGS && !$browse && !$refine && $adlog_flag == 0) { if (is_array($final_result)) { phpdigAddLog ($id_connect,$option,$strings,$exclude,count($final_result),$search_time); } diff --git a/main/mySpace/myspace.lib.php b/main/mySpace/myspace.lib.php index 54b7adc006..6ee1082044 100755 --- a/main/mySpace/myspace.lib.php +++ b/main/mySpace/myspace.lib.php @@ -180,8 +180,8 @@ class MySpace { } else { $$avg_score = '-'; } - - $return .= '
'.$avg_score.'
'; + + $return .= '
'.$avg_score.'
'; // student tes score //$return .= '
'.round(Tracking :: get_avg_student_exercise_score ($user_id, $row[0]),2).'%
'; // student messages @@ -333,7 +333,7 @@ class MySpace { } } } - + /** * Display a sortable table that contains an overview of all the reporting progress of all courses */ @@ -361,17 +361,17 @@ class MySpace { $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1); $table->additional_parameters = $addparams; - + $table->set_header(0, '', false, null, array('style' => 'display: none')); $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); $table->set_column_filter(2, array('MySpace','course_tracking_filter')); $table->display(); } - + /** * Get the total number of courses - * + * * @return integer Total number of courses */ public function get_total_number_courses() { @@ -379,7 +379,7 @@ class MySpace { $main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE); return Database::count_rows($main_course_table); } - + /** * Get data for the courses * @@ -395,11 +395,11 @@ class MySpace { //$access_url_id = api_get_current_access_url_id(); //$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE); - + /*if ($_configuration['multiple_access_urls']) { $condition_multi_url = ", $tbl_url_rel_user as url_user WHERE user.user_id=url_user.user_id AND access_url_id='$access_url_id'"; } - + global $export_csv; if ($export_csv) { $is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT); @@ -416,7 +416,7 @@ class MySpace { } return $return; } - + /** * Fills in course reporting data * @@ -477,17 +477,17 @@ class MySpace { } $nb_messages += Tracking::count_student_messages($row->user_id, $course_code); $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); - + $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course ($row->user_id, $course_code, null, false); - if($last_login_date_tmp != false && $last_login_date == false) { + if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned $last_login_date = $last_login_date_tmp; - } else if($last_login_date_tmp != false && $last_login_date == false) { + } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. // Find the max and assign it to first_login_date if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { $last_login_date = $last_login_date_tmp; } } - + $exercise_results_tmp = MySpace::exercises_results($row->user_id, $course_code); $total_score_obtained += $exercise_results_tmp['score_obtained']; $total_score_possible += $exercise_results_tmp['score_possible']; @@ -503,7 +503,7 @@ class MySpace { } else { $avg_score = '-'; } - if($last_login_date != false) { + if($last_login_date) { $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); } else { $last_login_date = '-'; @@ -538,7 +538,7 @@ class MySpace { $return .= ''; return $return; } - + /** * This function exports the table that we see in display_tracking_course_overview() * @@ -560,7 +560,7 @@ class MySpace { } else { $orderby = 0; } - + if ($_GET['tracking_course_overview_direction']) { $direction = $_GET['tracking_course_overview_direction']; } else { @@ -568,7 +568,7 @@ class MySpace { } $course_data = MySpace::get_course_data_tracking_overview($from, 1000, $orderby, $direction); - + $csv_content = array(); // the first line of the csv file with the column headers @@ -590,10 +590,10 @@ class MySpace { foreach ($course_data as $key => $course) { $course_code = $course[0]; $course_title = $course[1]; - + $csv_row = array(); $csv_row[] = $course_title; - + // getting all the courses of the session $sql = "SELECT * FROM $tbl_user AS u INNER JOIN $tbl_course_rel_user AS cu ON cu.user_id = u.user_id WHERE cu.course_code = '".$course_code."' AND ISNULL(cu.role);"; $result = Database::query($sql); @@ -621,17 +621,17 @@ class MySpace { } $nb_messages += Tracking::count_student_messages($row->user_id, $course_code); $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code); - + $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course ($row->user_id, $course_code, null, false); - if($last_login_date_tmp != false && $last_login_date == false) { + if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. $last_login_date = $last_login_date_tmp; - } else if($last_login_date_tmp != false && $last_login_date == false) { + } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. // Find the max and assign it to first_login_date if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { $last_login_date = $last_login_date_tmp; } } - + $exercise_results_tmp = MySpace::exercises_results($row->user_id, $course_code); $total_score_obtained += $exercise_results_tmp['score_obtained']; $total_score_possible += $exercise_results_tmp['score_possible']; @@ -647,7 +647,7 @@ class MySpace { } else { $avg_score = '-'; } - if($last_login_date != false) { + if($last_login_date) { $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); } else { $last_login_date = '-'; @@ -679,7 +679,7 @@ class MySpace { Export :: export_table_csv($csv_content, 'reporting_course_overview'); exit; } - + /** * Display a sortable table that contains an overview of all the reporting progress of all sessions and all courses the user is subscribed to * @author Guillaume Viguier @@ -709,17 +709,17 @@ class MySpace { $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1); $table->additional_parameters = $addparams; - + $table->set_header(0, '', false, null, array('style' => 'display: none')); $table->set_header(1, get_lang('Session'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt')); $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;')); $table->set_column_filter(2, array('MySpace','session_tracking_filter')); $table->display(); } - + /** * Get the total number of sessions - * + * * @return integer Total number of sessions */ public function get_total_number_sessions() { @@ -727,7 +727,7 @@ class MySpace { $main_session_table = Database :: get_main_table(TABLE_MAIN_SESSION); return Database::count_rows($main_session_table); } - + /** * Get data for the sessions * @@ -743,11 +743,11 @@ class MySpace { //$access_url_id = api_get_current_access_url_id(); //$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $main_session_table = Database :: get_main_table(TABLE_MAIN_SESSION); - + /*if ($_configuration['multiple_access_urls']) { $condition_multi_url = ", $tbl_url_rel_user as url_user WHERE user.user_id=url_user.user_id AND access_url_id='$access_url_id'"; } - + global $export_csv; if ($export_csv) { $is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT); @@ -764,7 +764,7 @@ class MySpace { } return $return; } - + /** * Fills in session reporting data * @@ -833,17 +833,17 @@ class MySpace { } $nb_messages += Tracking::count_student_messages($row_user->user_id, $row->code, $session_id); $nb_assignments += Tracking::count_student_assignments($row_user->user_id, $row->code, $session_id); - + $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course ($row_user->user_id, $row->code, $session_id, false); - if($last_login_date_tmp != false && $last_login_date == false) { + if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. $last_login_date = $last_login_date_tmp; - } else if($last_login_date_tmp != false && $last_login_date == false) { + } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition! To be cleaned. // Find the max and assign it to first_login_date if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { $last_login_date = $last_login_date_tmp; } } - + $exercise_results_tmp = MySpace::exercises_results($row_user->user_id, $row->code, $session_id); $total_score_obtained += $exercise_results_tmp['score_obtained']; $total_score_possible += $exercise_results_tmp['score_possible']; @@ -859,7 +859,7 @@ class MySpace { } else { $avg_score = '-'; } - if($last_login_date != false) { + if($last_login_date) { $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); } else { $last_login_date = '-'; @@ -894,7 +894,7 @@ class MySpace { $return .= ''; return $return; } - + /** * This function exports the table that we see in display_tracking_session_overview() * @@ -917,7 +917,7 @@ class MySpace { } else { $orderby = 0; } - + if ($_GET['tracking_session_overview_direction']) { $direction = $_GET['tracking_session_overview_direction']; } else { @@ -925,7 +925,7 @@ class MySpace { } $session_data = MySpace::get_session_data_tracking_overview($from, 1000, $orderby, $direction); - + $csv_content = array(); // the first line of the csv file with the column headers @@ -948,7 +948,7 @@ class MySpace { foreach ($session_data as $key => $session) { $session_id = $session[0]; $session_title = $session[1]; - + // getting all the courses of the session $sql = "SELECT * FROM $tbl_course AS c INNER JOIN $tbl_session_rel_course AS sc ON sc.course_code = c.code WHERE sc.id_session = '".$session_id."';"; $result = Database::query($sql); @@ -983,17 +983,17 @@ class MySpace { } $nb_messages += Tracking::count_student_messages($row_user->user_id, $row->code, $session_id); $nb_assignments += Tracking::count_student_assignments($row_user->user_id, $row->code, $session_id); - + $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course ($row_user->user_id, $row->code, $session_id, false); - if($last_login_date_tmp != false && $last_login_date == false) { + if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned. $last_login_date = $last_login_date_tmp; - } else if($last_login_date_tmp != false && $last_login_date == false) { + } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned. // Find the max and assign it to first_login_date if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) { $last_login_date = $last_login_date_tmp; } } - + $exercise_results_tmp = MySpace::exercises_results($row_user->user_id, $row->code, $session_id); $total_score_obtained += $exercise_results_tmp['score_obtained']; $total_score_possible += $exercise_results_tmp['score_possible']; @@ -1009,7 +1009,7 @@ class MySpace { } else { $avg_score = '-'; } - if($last_login_date != false) { + if($last_login_date) { $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); } else { $last_login_date = '-'; @@ -1047,8 +1047,8 @@ class MySpace { Export :: export_table_csv($csv_content, 'reporting_session_overview'); exit; } - - + + /** * Get general information about the exercise performance of the user * the total obtained score (all the score on all the questions) @@ -1349,11 +1349,11 @@ class MySpace { $access_url_id = api_get_current_access_url_id(); $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $main_user_table = Database :: get_main_table(TABLE_MAIN_USER); - + if ($_configuration['multiple_access_urls']) { $condition_multi_url = ", $tbl_url_rel_user as url_user WHERE user.user_id=url_user.user_id AND access_url_id='$access_url_id'"; } - + global $export_csv; if ($export_csv) { $is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT); diff --git a/main/newscorm/aicc.class.php b/main/newscorm/aicc.class.php index b48ce5aeea..737aacaca9 100755 --- a/main/newscorm/aicc.class.php +++ b/main/newscorm/aicc.class.php @@ -450,7 +450,7 @@ class aicc extends learnpath { } } - if($package_type== '' OR $mandatory!=true) + if ($package_type == '' || !$mandatory) // && defined('CHECK_FOR_AICC') && CHECK_FOR_AICC) { return api_failure::set_failure('not_aicc_content'); diff --git a/main/newscorm/aicc_api.php b/main/newscorm/aicc_api.php index 955ab8eea1..f660fa6af4 100755 --- a/main/newscorm/aicc_api.php +++ b/main/newscorm/aicc_api.php @@ -312,10 +312,10 @@ function LMSCommit(val) { return('true'); } function LMSFinish(val) { - if (( commit == false )) { + if ( !commit ) { logit_scorm('LMSFinish() (no LMSCommit())',1); } - if ( commit == true ) { + if ( commit ) { logit_scorm('LMSFinish() called',1); savedata('finish'); } diff --git a/main/newscorm/js/api_wrapper.js b/main/newscorm/js/api_wrapper.js index 132b27e8af..0b514da98c 100755 --- a/main/newscorm/js/api_wrapper.js +++ b/main/newscorm/js/api_wrapper.js @@ -98,7 +98,7 @@ function ErrorHandler() if(errCode == _NotImplementedError) { var errDescription = "The LMS doesn't support this feature"; - if(_debug == true) + if(_debug) { errDescription += "\n"; errDescription += api.LMSGetDiagnostic(null); @@ -108,7 +108,7 @@ function ErrorHandler() else { var errDescription = API.LMSGetErrorString(errCode); - if(_debug == true) + if(_debug) { errDescription += "\n"; errDescription += api.LMSGetDiagnostic(null); @@ -278,7 +278,7 @@ var exitPageStatus; function loadPage() { var result = doLMSInitialize(); - if(result != false) + if(result) { var status = doLMSGetValue("cmi.core.lesson_status"); if(status == "not attempted") @@ -407,7 +407,7 @@ function doQuit() */ function unloadPage(status) { - if (exitPageStatus != true) + if (!exitPageStatus) { // doQuit( status ); } @@ -445,7 +445,7 @@ function checkAnswers(interrupted) { var idAnswer = questions_answers[idQuestion][j]; var answer = document.getElementById('question_'+(idQuestion)+'_multiple_'+(idAnswer)); - if(answer.checked == true) + if(answer.checked) { interactionAnswers += idAnswer+'__|';// changed by isaac flores myScore +=questions_answers_ponderation[idQuestion][idAnswer]; @@ -482,7 +482,7 @@ function checkAnswers(interrupted) { var idAnswer = questions_answers[idQuestion][j]; var answer = document.getElementById('question_'+(idQuestion)+'_unique_'+(idAnswer)); - if(answer.checked == true) + if(answer.checked) { interactionAnswers += idAnswer; if(questions_answers_correct[idQuestion] == idAnswer) @@ -511,7 +511,7 @@ function checkAnswers(interrupted) { var idAnswer = questions_answers[idQuestion][j]; var answer = document.getElementById('question_'+(idQuestion)+'_tf_'+(idAnswer)); - if(answer.checked.value == true) + if(answer.checked.value) { interactionAnswers += idAnswer; for(k=0;k - * @author Julio Montoya Improvements + * @author Julio Montoya Improvements * @license GNU/GPL - See license in root directory for details */ /** @@ -69,7 +69,7 @@ class learnpath { var $lp_session_id =0; var $prerequisite = 0; - + /** * Class constructor. Needs a database handler, a course code and a learnpath id from the database. * Also builds the list of items into $this->items. @@ -712,7 +712,7 @@ class learnpath { } } } - if ($completed == true) { //if all the children were completed + if ($completed) { //if all the children were completed $parent->set_status('completed'); $parent->save(false, $this->prerequisites_match($parent->get_id())); $this->update_queue[$parent->get_id()] = $parent->get_status(); @@ -1416,7 +1416,7 @@ class learnpath { return $current; } - /** + /** * Force to get the first learnpath item id * @return integer The current learnpath item id */ @@ -1469,7 +1469,7 @@ class learnpath { if (count($this->ordered_items) == 0) { $this->index = 0; } - if (!empty ($this->last_item_seen) && !empty ($this->items[$this->last_item_seen]) && $this->items[$this->last_item_seen]->get_type() != 'dir' && $this->items[$this->last_item_seen]->get_type() != 'dokeos_chapter' && $this->items[$this->last_item_seen]->is_done() != true) { + if (!empty ($this->last_item_seen) && !empty ($this->items[$this->last_item_seen]) && $this->items[$this->last_item_seen]->get_type() != 'dir' && $this->items[$this->last_item_seen]->get_type() != 'dokeos_chapter' && !$this->items[$this->last_item_seen]->is_done()) { if ($this->debug > 2) { error_log('New LP - In learnpath::first() - Last item seen is ' . $this->last_item_seen . ' of type ' . $this->items[$this->last_item_seen]->get_type(), 0); } @@ -1751,7 +1751,7 @@ class learnpath { $package_type = 'scorm'; break; //exit the foreach loop } - elseif (preg_match('/aicc\//i', $thisContent['filename']) != false) { + elseif (preg_match('/aicc\//i', $thisContent['filename'])) { //if found an aicc directory... (!= false means it cannot be false (error) or 0 (no match)) $package_type = 'aicc'; //break;//don't exit the loop, because if we find an imsmanifest afterwards, we want it, not the AICC @@ -1941,7 +1941,7 @@ class learnpath { function is_lp_visible_for_student($lp_id, $student_id) { $tbl_learnpath = Database :: get_course_table(TABLE_LP_MAIN); - + // get current prerequisite $sql = "SELECT prerequisite FROM $tbl_learnpath WHERE id = $lp_id"; $rs = Database::query($sql); @@ -1949,17 +1949,17 @@ class learnpath { $prerequisite = $row['prerequisite']; $is_visible = true; $progress = 0; - + if (!empty($prerequisite)) { $progress = self::get_db_progress($prerequisite,$student_id,'%'); - $progress = intval($progress); + $progress = intval($progress); if ($progress < 100) { - $is_visible = false; - } + $is_visible = false; + } } - + return $is_visible; - + } /** @@ -2509,7 +2509,7 @@ class learnpath { } } if ($this->debug > 2) { - error_log('New LP - In learnpath::get_type() - Returning ' . ($res == false ? 'false' : $res), 0); + error_log('New LP - In learnpath::get_type() - Returning ' . ($res ? $res : 'false'), 0); } return $res; } @@ -2805,15 +2805,15 @@ class learnpath { } else { $course_path = $sys_course_path; //system path } - - + + //Fixed issue BT#1272 - If the item type is a Chamilo Item (quiz, link, etc), then change the lp type to thread it as a normal Chamilo LP not a SCO. if (in_array($lp_item_type, array('quiz', 'document', 'link', 'forum', 'thread', 'student_publication'))) { $lp_type = 1; } //Now go through the specific cases to get the end of the path - - //@todo use constants instead of int values + + //@todo use constants instead of int values switch ($lp_type) { case 1 : if ($lp_item_type == 'dokeos_chapter') { @@ -3892,7 +3892,7 @@ class learnpath { $res = Database::query($sql); return true; } - + /** * Sets the prerequisite of a LP (and save) * @param int integer giving the new prerequisite of this learnpath @@ -4330,7 +4330,7 @@ class learnpath { if ($is_allowed_to_edit) { $token = Security::get_token(); - + $gradebook = Security :: remove_XSS($_GET['gradebook']); $return .= '
'; $return .= '' . Display :: return_icon('learnpath_build.gif', get_lang('Build')) . ' ' . get_lang('Build') . ''; @@ -4721,14 +4721,14 @@ class learnpath { $sql = "SELECT lp.* FROM " . $tbl_lp_item . " as lp WHERE lp.id = " . Database :: escape_string($item_id); $result = Database::query($sql); - while ($row = Database :: fetch_array($result)) { + while ($row = Database :: fetch_array($result)) { $_SESSION['parent_item_id'] = ($row['item_type'] == 'dokeos_chapter' || $row['item_type'] == 'dokeos_module' || $row['item_type'] == 'dir') ? $item_id : 0; - - //Prevents wrong parent selection for document see Bug#1251 + + //Prevents wrong parent selection for document see Bug#1251 if ($row['item_type'] != 'dokeos_chapter' || $row['item_type'] != 'dokeos_module') { - $_SESSION['parent_item_id'] = $row['parent_item_id']; + $_SESSION['parent_item_id'] = $row['parent_item_id']; } - + $return .= $this->display_manipulate($item_id, $row['item_type']); $return .= '
'; if ($msg != '') @@ -6058,7 +6058,7 @@ class learnpath { 'min_score' => $row['min_score'], 'mastery_score' => $row['mastery_score'], 'prerequisite' => $row['prerequisite'] - ); + ); } $this->tree_array($arrLP); @@ -6117,7 +6117,7 @@ class learnpath { } } } - + $parent_select = & $form->addElement('select', 'parent', get_lang('Parent'), '', 'class="learnpath_item_form" style="width:40%;" onchange="load_cbo(this.value);"'); $my_count=0; foreach ($arrHide as $key => $value) { @@ -6131,15 +6131,15 @@ class learnpath { } $my_count++; } - + if (!empty ($id)) { $parent_select->setSelected($parent); - } else { + } else { $parent_item_id = $_SESSION['parent_item_id']; $parent_select->setSelected($parent_item_id); } - - + + if (is_array($arrLP)) { reset($arrLP); @@ -7151,7 +7151,7 @@ class learnpath { global $charset; $lp_id = $this->lp_id; $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN); - + // get current prerequisite $sql = "SELECT * FROM $tbl_lp WHERE id = $lp_id "; $result = Database::query($sql); @@ -7159,18 +7159,18 @@ class learnpath { $preq_id = $row['prerequisite']; $session_id = api_get_session_id(); $session_condition = api_get_session_condition($session_id, false); - $sql = "SELECT * FROM $tbl_lp $session_condition ORDER BY display_order "; + $sql = "SELECT * FROM $tbl_lp $session_condition ORDER BY display_order "; $rs = Database::query($sql); $return = ''; $return .= ''; return $return; @@ -7250,21 +7250,21 @@ class learnpath { */ function write_resources_tree($resources_sorted, $num = 0) { - require_once (api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php'); + require_once (api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php'); if (count($resources_sorted) > 0) { foreach ($resources_sorted as $key => $resource) { - if (is_int($resource['id'])) { + if (is_int($resource['id'])) { // it's a folder $return .= '
 ' . $key . '
'; } else { if (!is_array($resource)) { - // it's a file + // it's a file $icon = choose_image($resource); $position = strrpos($icon, '.'); - $icon = substr($icon, 0, $position) . '_small.gif'; - $file_info = explode('/', $resource); + $icon = substr($icon, 0, $position) . '_small.gif'; + $file_info = explode('/', $resource); $my_file_title = $file_info[0]; $my_file_name = $file_info[1]; //$return .= ''; diff --git a/main/newscorm/learnpathItem.class.php b/main/newscorm/learnpathItem.class.php index d80054e3da..03d3fd4082 100755 --- a/main/newscorm/learnpathItem.class.php +++ b/main/newscorm/learnpathItem.class.php @@ -65,7 +65,7 @@ class learnpathItem { * @param integer User ID * @return boolean True on success, false on failure */ - function learnpathItem($db_id, $user_id) { + function learnpathItem($db_id, $user_id) { //get items table if(self::debug>0){error_log('New LP - In learnpathItem constructor: '.$db_id.','.$user_id,0);} $items_table = Database::get_course_table(TABLE_LP_ITEM); @@ -1016,7 +1016,7 @@ class learnpathItem { $res = Database::query($sql); if (Database::num_rows($res)==1) { $row = Database::fetch_array($res); - if($update_local==true){ + if ($update_local) { $this->set_status($row['status']); } if(self::debug>2){error_log('New LP - In learnpathItem::get_status() - Returning db value '.$row['status'],0);} @@ -1108,7 +1108,7 @@ class learnpathItem { if (empty($this->title)) {return '';} return $this->title; } - + /** * Returns the total time used to see that item * @return integer Total time @@ -1233,7 +1233,7 @@ class learnpathItem { }*/ // if we don't init start time here, the time is sometimes calculated from the las start time $this->current_start_time = time(); - + //error_log('New LP - reinit blocked by setting',0); } } @@ -1260,7 +1260,7 @@ class learnpathItem { * @param integer The user ID. In some cases like Dokeos quizzes, it's necessary to have the user ID to query other tables (like the results of quizzes) * @return boolean True if the list of prerequisites given is entirely satisfied, false otherwise */ - function parse_prereq($prereqs_string, $items, $refs_list,$user_id){ + function parse_prereq($prereqs_string, $items, $refs_list,$user_id){ if(self::debug>0){error_log('New LP - In learnpathItem::parse_prereq() for learnpath '.$this->lp_id.' with string '.$prereqs_string,0);} //deal with &, |, ~, =, <>, {}, ,, X*, () in reverse order $this->prereq_alert = ''; @@ -1287,9 +1287,9 @@ class learnpathItem { } } } - + //parenthesis removed, now look for ORs as it is the lesser-priority binary operator (= always uses one text operand) - if (strpos($prereqs_string,"|")===false) { + if (strpos($prereqs_string,"|")===false) { if(self::debug>1){error_log('New LP - Didnt find any OR, looking for AND',0);} if(strpos($prereqs_string,"&")!==false){ $list = split("&",$prereqs_string); @@ -1297,7 +1297,7 @@ class learnpathItem { $andstatus = true; foreach($list as $condition){ $andstatus = $andstatus && $this->parse_prereq($condition,$items,$refs_list,$user_id); - if($andstatus==false){ + if (!$andstatus) { if(self::debug>1){error_log('New LP - One condition in AND was false, short-circuit',0);} break; } @@ -1306,7 +1306,7 @@ class learnpathItem { $this->prereq_alert = get_lang('_prereq_not_complete'); } return $andstatus; - } else { + } else { if(isset($items[$refs_list[$list[0]]])){ $status = $items[$refs_list[$list[0]]]->get_status(true); $returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3])); @@ -1450,38 +1450,38 @@ class learnpathItem { } else { //Nothing found there either. Now return the value of the corresponding resource completion status - if(self::debug>1){error_log('New LP - Didnt find any group, returning value for '.$prereqs_string,0);} - + if(self::debug>1){error_log('New LP - Didnt find any group, returning value for '.$prereqs_string,0);} + if (isset($items[$refs_list[$prereqs_string]])) { if ($items[$refs_list[$prereqs_string]]->type == 'quiz') { - - //1. Checking the status in current items + + //1. Checking the status in current items $status = $items[$refs_list[$prereqs_string]]->get_status(true); - //error_log('hello '.$status); + //error_log('hello '.$status); $returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3])); - + if(!$returnstatus) { if(self::debug>1){error_log('New LP - Prerequisite '.$prereqs_string.' not complete',0);} } else { if(self::debug>1){error_log('New LP - Prerequisite '.$prereqs_string.' complete',0);} } - - //for one attempt LPs - if ($this->prevent_reinit == 1) { - //2. If is completed we check the results in the DB of the quiz - if ($returnstatus) { + //for one attempt LPs + if ($this->prevent_reinit == 1) { + + //2. If is completed we check the results in the DB of the quiz + if ($returnstatus) { //AND origin_lp_item_id = '.$user_id.' $sql = 'SELECT exe_result, exe_weighting FROM '.Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES).' WHERE exe_exo_id = '.$items[$refs_list[$prereqs_string]]->path.' AND exe_user_id = '.$user_id.' - AND orig_lp_id = '.$this->lp_id.' AND orig_lp_item_id = '.$prereqs_string.' + AND orig_lp_id = '.$this->lp_id.' AND orig_lp_item_id = '.$prereqs_string.' AND status <> "incomplete" ORDER BY exe_date DESC LIMIT 0, 1'; //error_log('results :'.$items[$refs_list[$prereqs_string]]->path. ':'.$user_id); - + $rs_quiz = Database::query($sql); if($quiz = Database :: fetch_array($rs_quiz)) { if($quiz['exe_result'] >= $items[$refs_list[$prereqs_string]]->get_mastery_score()) { @@ -1493,19 +1493,19 @@ class learnpathItem { } else { $this->prereq_alert = get_lang('_prereq_not_complete'); $returnstatus = false; - } - } - + } + } + } else { //2. for multiple attempts we check that there are minimun 1 item completed - + //checking in the database $sql = 'SELECT exe_result, exe_weighting FROM '.Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES).' WHERE exe_exo_id = '.$items[$refs_list[$prereqs_string]]->path.' AND exe_user_id = '.$user_id.' AND orig_lp_id = '.$this->lp_id.' AND orig_lp_item_id = '.$prereqs_string.' '; //error_log('results 2:'.$items[$refs_list[$prereqs_string]]->path. ':'.$user_id); - + $rs_quiz = Database::query($sql); if (Database::num_rows($rs_quiz) > 0 ) { while ($quiz = Database :: fetch_array($rs_quiz)) { @@ -1521,11 +1521,11 @@ class learnpathItem { $this->prereq_alert = get_lang('_prereq_not_complete'); $returnstatus = false; } - - } + + } return $returnstatus; } else { - + $status = $items[$refs_list[$prereqs_string]]->get_status(false); $returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3])); @@ -1537,23 +1537,23 @@ class learnpathItem { //error_log('status of document'.$status); //var_dump($returnstatus); //$returnstatus = true; - if ($returnstatus && $this->prevent_reinit == 1 ) { + if ($returnstatus && $this->prevent_reinit == 1 ) { // i would prefer check in the database $lp_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW); $lp_view = Database::get_course_table(TABLE_LP_VIEW); - + $sql = 'SELECT id FROM '.$lp_view.' WHERE user_id = '.$user_id.' AND lp_id = '.$this->lp_id.' LIMIT 0, 1'; $rs_lp = Database::query($sql); $lp_id = Database :: fetch_row($rs_lp); $my_lp_id = $lp_id[0]; - + $sql = 'SELECT status FROM '.$lp_item_view.' WHERE lp_view_id = '.$my_lp_id.' AND lp_item_id = '.$refs_list[$prereqs_string].' LIMIT 0, 1'; $rs_lp = Database::query($sql); $status_array = Database :: fetch_row($rs_lp); $status = $status_array[0]; - + //var_dump($status); $returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3])); if (!$returnstatus && empty($this->prereq_alert)){ @@ -1565,7 +1565,7 @@ class learnpathItem { if(self::debug>1){error_log('New LP - Prerequisite '.$prereqs_string.' complete',0);} } } - + //error_log('results :'.$items[$refs_list[$prereqs_string]]->path. ':'.$user_id); /*$rs_quiz = Database::query($sql); if($quiz = Database :: fetch_array($rs_quiz)) @@ -1585,12 +1585,12 @@ class learnpathItem { $this->prereq_alert = get_lang('_prereq_not_complete'); $returnstatus = false; }*/ - + /* $status = $items[$refs_list[$prereqs_string]]->get_status(true); //error_log(print_r($items,1)); //error_log($refs_list[$prereqs_string]); - + $returnstatus = (($status == $this->possible_status[2]) OR ($status == $this->possible_status[3])); if(!$returnstatus && empty($this->prereq_alert)){ $this->prereq_alert = get_lang('_prereq_not_complete'); @@ -1601,7 +1601,7 @@ class learnpathItem { if(self::debug>1){error_log('New LP - Prerequisite '.$prereqs_string.' complete',0);} } */ - + //$returnstatus =false; return $returnstatus; } @@ -1621,7 +1621,7 @@ class learnpathItem { foreach($list as $condition){ if(self::debug>1){error_log('New LP - Found OR, adding it ('.$condition.')',0);} $orstatus = $orstatus || $this->parse_prereq($condition,$items,$refs_list,$user_id); - if($orstatus == true){ + if ($orstatus) { //shortcircuit OR if(self::debug>1){error_log('New LP - One condition in OR was true, short-circuit',0);} break; @@ -1711,7 +1711,7 @@ class learnpathItem { }else{ if(self::debug>1){error_log('New LP - In learnpathItem::save() - SCORM save request received',0);} //get all new settings from the URL - if($from_outside==true){ + if ($from_outside) { if(self::debug>1){error_log('New LP - In learnpathItem::save() - Getting item data from outside',0);} foreach($_GET as $param => $value) { @@ -1778,7 +1778,7 @@ class learnpathItem { } } }else{ //if not SCO, such messages should not be expected - $type = strtolower($this->type); + $type = strtolower($this->type); switch($type){ case 'asset': if($prereqs_complete) @@ -1877,7 +1877,7 @@ class learnpathItem { { if(self::debug>0){error_log('New LP - In learnpathItem::set_lp_view('.$lp_view_id.')',0);} if(!empty($lp_view_id) and $lp_view_id = intval(strval($lp_view_id))) - { + { $this->view_id = $lp_view_id; $item_view_table = Database::get_course_table(TABLE_LP_ITEM_VIEW); //get the lp_item_view with the highest view_count @@ -2304,7 +2304,7 @@ class learnpathItem { //depending on what we want (really), we'll update or insert a new row //now save into DB $res = 0; - if( $inserted==false && Database::num_rows($check_res)<1){ + if (!$inserted && Database::num_rows($check_res) < 1) { /*$my_status = ''; if ($this->type!=TOOL_QUIZ) { $my_status = $this->get_status(false); diff --git a/main/newscorm/lp_add_item.php b/main/newscorm/lp_add_item.php index f2adecb776..2f35a606ec 100755 --- a/main/newscorm/lp_add_item.php +++ b/main/newscorm/lp_add_item.php @@ -50,7 +50,7 @@ function FCKeditor_OnComplete( editorInstance ) { } function check_for_title() { - if (temp==true) { + if (temp) { // This functions shows that you can interact directly with the editor area // DOM. In this way you have the freedom to do anything you want with it. @@ -119,7 +119,7 @@ function InnerDialogLoaded() { $htmlHeadXtra[] = $_SESSION['oLP']->create_js(); /* Constants and variables -*/ +*/ $is_allowed_to_edit = api_is_allowed_to_edit(null,true); diff --git a/main/newscorm/lp_controller.php b/main/newscorm/lp_controller.php index 9117a8a97e..f42b8da139 100755 --- a/main/newscorm/lp_controller.php +++ b/main/newscorm/lp_controller.php @@ -71,7 +71,7 @@ if($debug>0) error_log('New LP - Included aiccItem',0); require_once('back_compat.inc.php'); if($debug>0) error_log('New LP - Included back_compat',0); -if ($is_allowed_in_course == false){ +if (!$is_allowed_in_course) { api_not_allowed(true); } @@ -115,9 +115,9 @@ if(isset($_SESSION['lpobject'])) } } -if($debug>0) error_log('New LP - Passed data remains check',0); +if ($debug>0) error_log('New LP - Passed data remains check',0); -if($lp_found == false || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) { +if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) { if($debug>0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new',0); //regenerate a new lp object? Not always as some pages don't need the object (like upload?) if(!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)){ @@ -436,7 +436,7 @@ switch($action) else { $_SESSION['refresh'] = 1; - if (isset($_POST['submit_button'])) { + if (isset($_POST['submit_button'])) { $_SESSION['oLP']->edit_item($_GET['id'], $_POST['parent'], $_POST['previous'], $_POST['title'] , $_POST['description'] ); $is_success = true; } @@ -447,7 +447,7 @@ switch($action) //avoids weird behaviours see CT#967 $check = Security::check_token('get'); if ($check) { - $_SESSION['oLP']->move_item($_GET['id'], $_GET['direction']); + $_SESSION['oLP']->move_item($_GET['id'], $_GET['direction']); } Security::clear_token(); require('lp_admin_view.php'); diff --git a/main/newscorm/lp_header.php b/main/newscorm/lp_header.php index 1514850e00..99e281cc65 100755 --- a/main/newscorm/lp_header.php +++ b/main/newscorm/lp_header.php @@ -23,7 +23,7 @@ $path_name = $_SESSION['oLP']->get_name(); $path_id = $_SESSION['oLP']->get_id(); // use the flag set in lp_view.php to check if this script has been loaded // as a frame of lp_view.php. Otherwise, redirect to lp_controller -if(!isset($_SESSION['loaded_lp_view']) || $_SESSION['loaded_lp_view']==false) +if (!$_SESSION['loaded_lp_view']) { header('location: lp_controller.php?'.api_get_cidreq().'&action=view&item_id='.$path_id); } diff --git a/main/newscorm/lp_upload.php b/main/newscorm/lp_upload.php index 6ff5308be1..f764e723e6 100755 --- a/main/newscorm/lp_upload.php +++ b/main/newscorm/lp_upload.php @@ -55,7 +55,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' require_once('scorm.class.php'); $oScorm = new scorm(); $manifest = $oScorm->import_package($_FILES['user_file'],$current_dir); - if ($manifest == false ) { //if api_set_failure + if (!$manifest) { //if api_set_failure return api_failure::set_failure(api_failure::get_last_failure()); } if(!empty($manifest)){ diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index d562cd28ca..e06b3f071e 100755 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -1,4 +1,4 @@ -encoding)) { @@ -100,12 +100,12 @@ if (!isset($src)) { $htmlHeadXtra[] = ''; $prereq_check = $_SESSION['oLP']->prerequisites_match($lp_item_id); if($prereq_check === true){ - $src = $_SESSION['oLP']->get_link('http',$lp_item_id); + $src = $_SESSION['oLP']->get_link('http',$lp_item_id); //Prevents FF 3.6 + Adobe Reader 9 bug see BT#794 when calling a pdf file in a LP - $file_info = pathinfo($src); + $file_info = pathinfo($src); if (api_strtolower(substr($file_info['extension'], 0, 3) == 'pdf')) { $src = 'lp_view_item.php?src='.$src; - } + } $_SESSION['oLP']->start_current_item(); //starts time counter manually if asset } else { $src = 'blank.php?error=prerequisites'; @@ -327,7 +327,7 @@ if($_SESSION['oLP']->mode == 'fullscreen') {
get_html_toc(); ?> - scorm_debug)) { //only show log + scorm_debug)) { //only show log ?>
@@ -342,7 +342,7 @@ if($_SESSION['oLP']->mode == 'fullscreen') {
- +
'') $styling = ' class="'.$style.'"'; - if($new_window == true){ $target = ' target = "_blank" ';}else{$target = ' target = "_self" ';} + if ($new_window) { $target = ' target = "_blank" '; } else { $target = ' target = "_self" '; } $output = ''; diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php index 86201da8e2..d6de454fe7 100755 --- a/main/newscorm/scorm_api.php +++ b/main/newscorm/scorm_api.php @@ -854,12 +854,11 @@ function LMSFinish(val) { olms.G_LastErrorMessage = 'No error'; // if olms.commit == false, then the SCORM didn't ask for a commit, so we // should at least report that - if (( olms.commit == false )) { + if ( !olms.commit ) { logit_scorm('LMSFinish() (no LMSCommit())',1); - } - //if ( olms.commit == true ) { + //if ( olms.commit ) { logit_scorm('LMSFinish() called',1); savedata('finish'); olms.commit = false; @@ -1017,7 +1016,7 @@ function addListeners(){ */ function lms_save_asset(){ // only for dokeos lps - if (olms.execute_stats==true) { + if (olms.execute_stats) { olms.execute_stats=false; } else { olms.execute_stats=true; @@ -1178,7 +1177,7 @@ function update_toc(update_action,update_id,change_ids) * Update the stats frame using a reload of the frame to avoid unsynched data */ function update_stats() { - if (olms.execute_stats==true) { + if (olms.execute_stats) { try { cont_f = document.getElementById('content_id'); cont_f.src="lp_controller.php?action=stats"; @@ -1254,7 +1253,7 @@ function process_scorm_values () { for (i=0;iexportValues(); $res = NotebookManager::save_note($values); - if ($res == true){ + if ($res) { Display::display_confirmation_message(get_lang('NoteAdded')); } } diff --git a/main/online/online_message.php b/main/online/online_message.php index 31fff6cb75..4d02821f21 100755 --- a/main/online/online_message.php +++ b/main/online/online_message.php @@ -118,7 +118,7 @@ include('header_frame.inc.php'); - +
  
diff --git a/main/permissions/permissions_functions.inc.php b/main/permissions/permissions_functions.inc.php index 24e632670f..635d0d60a0 100755 --- a/main/permissions/permissions_functions.inc.php +++ b/main/permissions/permissions_functions.inc.php @@ -247,7 +247,7 @@ function display_checkbox_matrix($permission_array, $tool, $permission, $inherit */ function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true) { - if($course_admin==true) + if ($course_admin) { echo "\t\t\t"; } @@ -331,7 +331,7 @@ function display_image_matrix($permission_array, $tool, $permission,$inherited_p function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true) { - if($course_admin==true) + if ($course_admin) { echo "\t\t\t"; } diff --git a/main/reservation/m_item.php b/main/reservation/m_item.php old mode 100644 new mode 100755 index 805759ed68..a13b1844a5 --- a/main/reservation/m_item.php +++ b/main/reservation/m_item.php @@ -85,7 +85,7 @@ if (isset ($_POST['action'])) { if (count($ids) > 0) { foreach ($ids as $id) { $result = Rsys :: delete_item($id); - if ($result != 0 && $warning <> true) + if ($result != 0 && $warning <> true) // TODO: A strange looking logical condition, to be cleaned. $warning = true; } ob_start(); diff --git a/main/reservation/m_item_origineel.php b/main/reservation/m_item_origineel.php old mode 100644 new mode 100755 index c60a1c7834..43d80b706a --- a/main/reservation/m_item_origineel.php +++ b/main/reservation/m_item_origineel.php @@ -79,7 +79,7 @@ if (isset ($_POST['action'])) { if (count($ids) > 0) { foreach ($ids as $id) { $result = Rsys :: delete_item($id); - if ($result != 0 && $warning <> true) + if ($result != 0 && $warning <> true) // TODO: A strange looking logical condition, to be cleaned. $warning = true; } ob_start(); diff --git a/main/social/profile.php b/main/social/profile.php index 08a4680f55..342975c565 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -27,7 +27,7 @@ if (isset($_GET['u'])) { if (api_get_user_id() != $user_id) { $user_info = UserManager::get_user_info_by_id($user_id); $show_full_profile = false; - if ($user_info==false) { + if (!$user_info) { // user does no exist !! api_not_allowed(); } else { @@ -517,7 +517,7 @@ echo '
'; } // COURSES LIST - + if ($show_full_profile) { if ( is_array($list) ) { echo '