Fixing document in order to use certificates

main/document/create_document.php

@@ -156,16 +156,21 @@ require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 
-if (isset($_REQUEST['certificate'])) {
+
+//I'm in the certification module?
+$is_certificate_mode = false;
+
+if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
+	$is_certificate_mode = true;
+}
+
+if ($is_certificate_mode) {
 	$nameTools = get_lang('CreateCertificate');
 } else {
 	$nameTools = get_lang('CreateDocument');
 }
 
-$nameTools = get_lang('CreateDocument');
-
 /*	Constants and variables */
 
 $document_data = DocumentManager::get_document_data_by_id($_REQUEST['id'], api_get_course_id(), true);    
@@ -205,6 +210,13 @@ if ($dir[strlen($dir) - 1] != '/') {
 	$dir .= '/';
 }
 
+if ($is_certificate_mode) {
+	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
+	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
+	$folder_id = $document_data['id'];
+	$dir = '/certificates/';
+}
+
 // Configuration for the FCKEDITOR
 $doc_tree  = explode('/', $dir);
 $count_dir = count($doc_tree) -2; // "2" because at the begin and end there are 2 "/"
@@ -249,14 +261,6 @@ if (!is_dir($filepath)) {
 	$dir = '/';
 }
 
-
-//I'm in the certification module?
-$is_certificate_mode = false;
-$is_certificate_array = explode('/',$dir);
-array_shift($is_certificate_array);
-if ($is_certificate_array[0]=='certificates') {
-	$is_certificate_mode = true;
-}
 $to_group_id = 0;
 
 if (!$is_certificate_mode) {
@@ -299,10 +303,10 @@ $form = new FormValidator('create_document','post',api_get_self().'?dir='.Securi
 // form title
 $form->addElement('header', '', $nameTools);
 
-if (isset($_REQUEST['certificate'])) {//added condition for certicate in gradebook
+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', intval($_GET['selectcat']));
 
 }
 $renderer = & $form->defaultRenderer();
@@ -533,7 +537,7 @@ if ($form->validate()) {
 
 	if (strpos($content, '/css/frames.css') === false) {
 		$content = str_replace('</head>', '<style> body{margin:10px;}</style> <link rel="stylesheet" href="./css/frames.css" type="text/css" /></head>', $content);
-	}
+	}	
 	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
 		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
 		
@@ -585,7 +589,11 @@ if ($form->validate()) {
 			$selectcat = '';
 			if (isset($_REQUEST['selectcat']))
 				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
-			header('Location: document.php?id='.$folder_id.$selectcat);
+			$certificate_condition = '';
+			if ($is_certificate_mode) {
+				$certificate_condition = '&certificate=true';
+			}
+			header('Location: document.php?id='.$folder_id.$selectcat.$certificate_condition);
 			exit ();
 		} else {
 			Display :: display_header($nameTools, 'Doc');
@@ -594,7 +602,6 @@ if ($form->validate()) {
 		}
 	} else {
 		Display :: display_header($nameTools, 'Doc');
-		//api_display_tool_title($nameTools);
 		Display :: display_error_message(get_lang('Impossible'));
 		Display :: display_footer();
 	}
@@ -629,7 +636,7 @@ if ($form->validate()) {
 	Display :: display_header($nameTools, "Doc");
 	//api_display_tool_title($nameTools);
 	// actions
-	if (isset($_REQUEST['certificate'])) {
+	if ($is_certificate_mode) {
 		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id());
 		
 		$str_info = '';

main/document/document.php

@@ -187,10 +187,13 @@ switch ($action) {
 
 // I'm in the certification module?
 $is_certificate_mode = DocumentManager::is_certificate_mode($_GET['curdirpath']);
+if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
+	$is_certificate_mode = true;	
+}
 
 //If no actions we proceed to show the document (Hack in order to use document.php?id=X) 
 if (isset($document_id)) {
-    $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true); 
+    $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
     
     //If the document is not a folder we show the document
     if ($document_data) {
@@ -250,6 +253,9 @@ if (isset($document_id)) {
 	$parent_id     = $document_data['parent_id'];	
 }
 
+if (isset($document_data) && $document_data['path'] == '/certificates') {
+	$is_certificate_mode = true;	
+}
 
 if (!$parent_id) {
     $parent_id = 0; 
@@ -874,17 +880,17 @@ if ($folders === false) {
 }
 
 echo '<div class="actions">';
-//if ($is_allowed_to_edit || $group_member_with_upload_rights){
-/* BUILD SEARCH FORM */
-    echo '<span style="display:inline-block;">';
-    $form = new FormValidator('search_document', 'get', '', '', null, false);
-    $renderer = & $form->defaultRenderer();
-    $renderer->setElementTemplate('<span>{element}</span> ');
-    $form->add_textfield('keyword', '', false);
-    $form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="search"');
-    $form->display();
-    echo '</span>';
-//}
+	if (!$is_certificate_mode) {
+		/* BUILD SEARCH FORM */
+	    echo '<span style="display:inline-block;">';
+	    $form = new FormValidator('search_document', 'get', '', '', null, false);
+	    $renderer = & $form->defaultRenderer();
+	    $renderer->setElementTemplate('<span>{element}</span> ');
+	    $form->add_textfield('keyword', '', false);
+	    $form->addElement('style_submit_button', 'submit', get_lang('Search'), 'class="search"');
+	    $form->display();
+	    echo '</span>';
+	}
 
 /* GO TO PARENT DIRECTORY */
 if ($curdirpath!= '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) {

main/document/showinframes.php

@@ -86,6 +86,7 @@ if ($is_allowed_in_course == false) {
 //$is_visible = DocumentManager::is_visible_by_id($document_id, $course_info, api_get_session_id(), api_get_user_id());
 $is_visible = DocumentManager::check_visibility_tree($document_id, api_get_course_id(), api_get_session_id(), api_get_user_id());
 
+
 if (!api_is_allowed_to_edit() && !$is_visible) {
     api_not_allowed(true);
 }