Merge pull request #10 from Sashi20/main

Update certificate bg

3 files changed, 7 insertions, 6 deletions

diff --git a/cfd_research_migration.module b/cfd_research_migration.module
index 8a4c1f8..12bc8ae 100755
--- a/cfd_research_migration.module
+++ b/cfd_research_migration.module
@@ -8,6 +8,7 @@ require_once 'email.inc';
 /**
  * Implementation of hook_menu().
  */
+
 function cfd_research_migration_menu()
 {
     $items = array();
@@ -26,7 +27,7 @@ function cfd_research_migration_menu()
         'file' => 'add_project_titles.inc',
     );
     $items['research-migration-project/proposal'] = array(
-        'title' => 'Research Migration Proposal Form',
+        'title' => 'Research Migration Project Proposal Form',
         'description' => 'Research Migration Proposal Form',
         'page callback' => 'drupal_get_form',
         'page arguments' => array(
diff --git a/pdf/cert_new.inc b/pdf/cert_new.inc
index 31ee690..7e8d2a2 100755
--- a/pdf/cert_new.inc
+++ b/pdf/cert_new.inc
@@ -162,11 +162,11 @@ function generate_pdf()
 	$urlRelativeFilePath = $path . "/pdf/temp_prcode/" . $fileName;
 	QRcode::png($codeContents, $pngAbsoluteFilePath);
 	$pdf->SetY(85);
-	$pdf->SetX(320);
-	$pdf->Ln(10);
+	$pdf->SetX(350);
+	$pdf->Ln(15);
 	$sign1 = $path . "/pdf/images/sign1.png";
 	$sign2 = $path . "/pdf/images/sign2.png";
-	$pdf->Image($sign1, $pdf->GetX()+75, $pdf->GetY() + 45, 60, 0);
+	$pdf->Image($sign1, $pdf->GetX()+75, $pdf->GetY() + 45, 75, 0);
 	$pdf->Image($sign2, $pdf->GetX()+160, $pdf->GetY() + 45, 75, 0);
 	$pdf->Image($pngAbsoluteFilePath, $pdf->GetX()+15, $pdf->GetY()+70, 30, 0);
 	$fossee = $path . "/pdf/images/fossee.png";
diff --git a/proposal.inc b/proposal.inc
index f69227b..d99931e 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -589,7 +589,7 @@ if (isset($_FILES['files']))
 				if ($_FILES['files']['size'][$file_form_name] <= 0)
 					form_set_error($file_form_name, t('File size cannot be zero.'));
 				/* check if valid file name */
-				if (!textbook_companion_check_valid_filename($_FILES['files']['name'][$file_form_name]))
+				if (!cfd_research_migration_check_valid_filename($_FILES['files']['name'][$file_form_name]))
 					form_set_error($file_form_name, t('Invalid file name specified. Only alphabets and numbers are allowed as a valid filename.'));
 			} //$file_name
 		} //$_FILES['files']['name'] as $file_form_name => $file_name
@@ -625,7 +625,7 @@ function cfd_research_migration_proposal_form_submit($form, &$form_state)
 	$project_title = trim($project_title);
 	$proposar_name = $v['name_title'] . ' ' . $v['contributor_name'];
 	$university = $v['university'];
-	$directory_name = _df_dir_name($project_title, $proposar_name);
+	$directory_name = _rm_df_dir_name($project_title, $proposar_name);
 	$simulation_id = $v['simulation_type'];
 	if($simulation_id < 19){
 		$solver = $v['solver_used'];