PHP warning/notices avoided

skala
Julio Montoya 13 years ago
parent f8031f3e78
commit 45e40247dd
  1. 4
      main/css/base.css
  2. 8
      main/document/create_document.php
  3. 4
      main/document/document.php
  4. 6
      main/document/document_quota.php
  5. 4
      main/inc/ajax/chat.ajax.php
  6. 3
      main/inc/lib/course.lib.php
  7. 2
      main/inc/lib/document.lib.php
  8. 2
      main/inc/lib/formvalidator/FormValidator.class.php
  9. 9
      main/social/myfiles.php
  10. 1
      main/social/profile.php

@ -4718,3 +4718,7 @@ i.size-32.icon-new-work{
.section-social #main_content .span9 {
float: right;
}
.xdebug-error {
margin-top: 20px;
}

@ -271,6 +271,7 @@ if (!is_dir($filepath)) {
$to_group_id = 0;
if (!$is_certificate_mode) {
$req_gid = null;
if (api_is_in_group()) {
$req_gid = '&gidReq='.api_get_group_id();
$interbreadcrumb[] = array ("url" => "../group/group_space.php?gidReq=".api_get_group_id(), "name" => get_lang('GroupSpace'));
@ -296,6 +297,7 @@ if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || is_
/* Header */
event_access_tool(TOOL_DOCUMENT);
$display_dir = $dir;
if (isset ($group_properties)) {
$display_dir = explode('/', $dir);
@ -304,8 +306,10 @@ if (isset ($group_properties)) {
$display_dir = implode('/', $display_dir);
}
$select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
// Create a new form
$form = new FormValidator('create_document','post',api_get_self().'?'.api_get_cidreq().'&dir='.Security::remove_XSS(urlencode($dir)).'&selectcat='.Security::remove_XSS($_GET['selectcat']), null, array('class' =>'form-vertical' ));
$form = new FormValidator('create_document','post',api_get_self().'?'.api_get_cidreq().'&dir='.Security::remove_XSS(urlencode($dir)).'&selectcat='.$select_cat, null, array('class' =>'form-vertical'));
// form title
$form->addElement('header', $nameTools);
@ -313,7 +317,7 @@ $form->addElement('header', $nameTools);
if ($is_certificate_mode) {//added condition for certicate in gradebook
$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
if (isset($_GET['selectcat']))
$form->addElement('hidden','selectcat', intval($_GET['selectcat']));
$form->addElement('hidden','selectcat', $select_cat);
}
// Hidden element with current directory

@ -244,7 +244,10 @@ switch ($action) {
}
// I'm in the certification module?
$is_certificate_mode = false;
if (isset($_GET['curdirpath'])) {
$is_certificate_mode = DocumentManager::is_certificate_mode($_GET['curdirpath']);
}
if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
$is_certificate_mode = true;
}
@ -491,6 +494,7 @@ $mediaplayer_path = api_get_path(WEB_LIBRARY_PATH) . 'mediaplayer/player.swf';
$docs_and_folders = DocumentManager::get_all_document_data($_course, $curdirpath, $to_group_id, null, $is_allowed_to_edit || $group_member_with_upload_rights, false);
$count = 1;
$jquery = null;
if (!empty($docs_and_folders))
foreach ($docs_and_folders as $file) {

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
$language_file = array('document');
@ -97,12 +98,7 @@ $(document).ready(function(){
});
</script>";
$tpl = new Template($tool_name);
$content = Display::page_subheader(get_lang('ShowCourseQuotaUse')).'<div id="chart1"></div>';
$tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

@ -18,8 +18,8 @@ if (api_get_setting('allow_global_chat') == 'false') {
exit;
}
$to_user_id = $_REQUEST['to'];
$message = $_REQUEST['message'];
$to_user_id = isset($_REQUEST['to']) ? $_REQUEST['to'] : null;
$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
if (!isset($_SESSION['chatHistory'])) {
$_SESSION['chatHistory'] = array();

@ -2855,6 +2855,7 @@ class CourseManager {
if (!empty($special_course_list)) {
$with_special_courses = ' course.code IN ("'.implode('","',$special_course_list).'")';
}
$html = null;
if (!empty($with_special_courses)) {
$sql = "SELECT course.id, course.code, course.subscribe subscr, course.unsubscribe unsubscr, course_rel_user.status status,
@ -2867,8 +2868,6 @@ class CourseManager {
$number_of_courses = Database::num_rows($rs_special_course);
$key = 0;
$html = '';
if ($number_of_courses > 0) {
while ($course = Database::fetch_array($rs_special_course)) {
$course_info = api_get_course_info($course['code']);

@ -1536,7 +1536,7 @@ class DocumentManager {
$is_certificate_mode = false;
$is_certificate_array = explode('/', $dir);
array_shift($is_certificate_array);
if ($is_certificate_array[0] == 'certificates') {
if (isset($is_certificate_array[0]) && $is_certificate_array[0] == 'certificates') {
$is_certificate_mode = true;
}
return $is_certificate_mode;

@ -331,7 +331,7 @@ EOT;
$config = array('FullPage' => (bool) $full_page);
}
if ($full_page) {
$html_type = $_SESSION['status'] == COURSEMANAGER ? TEACHER_HTML_FULLPAGE : STUDENT_HTML_FULLPAGE;
$html_type = isset($_SESSION['status']) && $_SESSION['status'] == COURSEMANAGER ? TEACHER_HTML_FULLPAGE : STUDENT_HTML_FULLPAGE;
//First *filter* the HTML (markup, indenting, ...)
//$this->applyFilter($name,'html_filter_teacher_fullpage');
} else {

@ -68,6 +68,8 @@ function register_friend(element_input) {
</script>';
$show_message = null;
// easy links
if (is_array($_GET) && count($_GET)>0) {
foreach($_GET as $key => $value) {
@ -93,21 +95,22 @@ if (is_array($_GET) && count($_GET)>0) {
}
$social_left_content = SocialManager::show_social_menu('myfiles');
$actions = null;
if (isset($_GET['cidReq'])){
$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'document/document.php?cidReq='.Security::remove_XSS($_GET['cidReq']).'&amp;id_session='.Security::remove_XSS($_GET['id_session']).'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&amp;id='.Security::remove_XSS($_GET['parent_id']).'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')').'</a>';
}
$social_right_content .= '<div class="span9">';
$social_right_content = '<div class="span9">';
$social_right_content .= '<iframe name="fileManager" id="fileManager" src="'.api_get_path(WEB_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php?editor=stand_alone" scrolling="no" noresize="noresize" frameborder="no" style="height:450px; width:100%; float:left"></iframe>';
$social_right_content .= '</div>';
$tpl = new Template();
$tpl->assign('social_left_content', $social_left_content);
$tpl->assign('social_left_menu', $social_left_menu);
$tpl->assign('social_right_content', $social_right_content);
$tpl->assign('actions', $actions);
$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$social_layout = $tpl->get_template('layout/social_layout.tpl');
$tpl->display($social_layout);

@ -542,6 +542,7 @@ if ($show_full_profile) {
$social_right_content .= SocialManager::social_wrapper_div($my_groups, 9);
}
$my_courses = null;
// COURSES LIST
if ( is_array($list) ) {
$my_courses .= '<div><h3>'.api_ucfirst(get_lang('MyCourses')).'</h3></div>';

Loading…
Cancel
Save