Fixing PHP warning/notices

skala
Julio Montoya 13 years ago
parent 622140d8be
commit e193c7a27b
  1. 2
      main/inc/lib/fileUpload.lib.php
  2. 2
      main/inc/lib/userportal.lib.php
  3. 2
      main/newscorm/learnpath.class.php
  4. 7
      main/newscorm/lp_add_item.php
  5. 19
      main/newscorm/lp_controller.php
  6. 6
      main/survey/survey.lib.php
  7. 4
      user_portal.php

@ -789,8 +789,8 @@ function filter_extension(&$filename) {
}
$blacklist = api_get_setting('upload_extensions_list_type');
if ($blacklist != 'whitelist') { // if = blacklist
$extensions = explode(';', strtolower(api_get_setting('upload_extensions_blacklist')));
$extensions = split(';', strtolower(api_get_setting('upload_extensions_blacklist')));
$skip = api_get_setting('upload_extensions_skip');
$ext = strrchr($filename, '.');
$ext = substr($ext, 1);

@ -276,7 +276,7 @@ class IndexManager {
$html = null;
$home_menu = @(string)file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
if (!empty($home_menu)) {
$home_menu_content .= '<ul class="nav nav-list">';
$home_menu_content = '<ul class="nav nav-list">';
$home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu_content .= '</ul>';
$html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');

@ -5051,6 +5051,8 @@ class learnpath {
$default_content = null;
$elements = array();
$return_audio = null;
for ($i = 0; $i < count($arrLP); $i++) {
$title = $arrLP[$i]['title'];

@ -132,10 +132,9 @@ $(function() {
//Already set in lp_controller.php
//$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$isStudentView = (int) $_REQUEST['isStudentView'];
$learnpath_id = (int) $_REQUEST['lp_id'];
$submit = $_POST['submit_button'];
$isStudentView = isset($_REQUEST['isStudentView']) ? $_REQUEST['isStudentView'] : null;
$learnpath_id = isset($_REQUEST['lp_id']) ? intval($_REQUEST['lp_id']) : null;
$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
$type = isset($_GET['type']) ? $_GET['type'] : null;
$action = isset($_GET['action']) ? $_GET['action'] : null;

@ -660,10 +660,19 @@ switch ($action) {
$_SESSION['oLP']->set_author($author_fixed);
$_SESSION['oLP']->set_encoding($_REQUEST['lp_encoding']); // TODO (as of Chamilo 1.8.8): Check in the future whether this field is needed.
$_SESSION['oLP']->set_maker($_REQUEST['lp_maker']);
$_SESSION['oLP']->set_proximity($_REQUEST['lp_proximity']);
if (isset($_REQUEST['lp_maker'])) {
$_SESSION['oLP']->set_maker($_REQUEST['lp_maker']);
}
if (isset($_REQUEST['lp_proximity'])) {
$_SESSION['oLP']->set_proximity($_REQUEST['lp_proximity']);
}
$_SESSION['oLP']->set_theme($_REQUEST['lp_theme']);
$_SESSION['oLP']->set_hide_toc_frame($_REQUEST['hide_toc_frame']);
if (isset($_REQUEST['hide_toc_frame'])) {
$_SESSION['oLP']->set_hide_toc_frame($_REQUEST['hide_toc_frame']);
}
$_SESSION['oLP']->set_prerequisite($_REQUEST['prerequisites']);
$_SESSION['oLP']->set_use_max_score($_REQUEST['use_max_score']);
@ -685,7 +694,7 @@ switch ($action) {
$_SESSION['oLP']->set_publicated_on($publicated_on);
$_SESSION['oLP']->set_expired_on($expired_on);
if ($_REQUEST['remove_picture']) {
if (isset($_REQUEST['remove_picture']) && $_REQUEST['remove_picture']) {
$_SESSION['oLP']->delete_lp_image();
}
@ -710,7 +719,7 @@ switch ($action) {
}
}
}
$url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id);
$url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id).'&'.api_get_cidreq();
header('Location: '.$url);
exit;
}

@ -13,14 +13,14 @@
*/
$config['survey']['debug'] = false;
$htmlHeadXtra[] = '<script type="text/javascript">
$htmlHeadXtra[] = '<script>
function setFocus(){
$("#search_title").focus();
}
$(document).ready(function () {
setFocus();
});
</script>';
</script>';
/**
* Survey manager class
* @package chamilo.survey
@ -95,7 +95,7 @@ class survey_manager {
$return['survey_type'] = $return['survey_type'];
$return['one_question_per_page']= $return['one_question_per_page'];
$return['show_form_profile'] = $return['show_form_profile'];
$return['input_name_list'] = $return['input_name_list'];
$return['input_name_list'] = isset($return['input_name_list']) ? $return['input_name_list'] : null;
$return['shuffle'] = $return['shuffle'];
$return['parent_id'] = $return['parent_id'];
$return['survey_version'] = $return['survey_version'];

@ -173,8 +173,8 @@ if (api_get_setting('allow_browser_sniffer') == 'true') {
//check for flash and message
$sniff_notification = '';
$some_activex=$_SESSION['sniff_check_some_activex'];
$some_plugins=$_SESSION['sniff_check_some_plugins'];
$some_activex = isset($_SESSION['sniff_check_some_activex']) ? $_SESSION['sniff_check_some_activex'] : null;
$some_plugins = isset($_SESSION['sniff_check_some_plugins']) ? $_SESSION['sniff_check_some_plugins'] : null;
if(!empty($some_activex) || !empty($some_plugins)){
if (! preg_match("/flash_yes/", $some_activex) && ! preg_match("/flash_yes/", $some_plugins)) {

Loading…
Cancel
Save