From 78d5d354bac9538f5607496babbdd8bca3a56366 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 18 Jul 2011 16:17:26 +0200
Subject: [PATCH] Fixing PHP warnings & notices

---
 main/admin/careers.php         |  3 ---
 main/admin/promotions.php      |  3 ---
 main/inc/lib/career.lib.php    | 37 +++++++++++++++++-----------------
 main/inc/lib/display.lib.php   |  2 ++
 main/inc/lib/promotion.lib.php | 16 ++++++++++-----
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/main/admin/careers.php b/main/admin/careers.php
index ed78c0cd31..645d9e246c 100644
--- a/main/admin/careers.php
+++ b/main/admin/careers.php
@@ -74,9 +74,6 @@ $(function() {
 });
 </script>
 <?php
-// Tool introduction
-Display::display_introduction_section(get_lang('Careers'));
-
 $career = new Career();
 
 // Action handling: Add
diff --git a/main/admin/promotions.php b/main/admin/promotions.php
index 710aa719c8..5ac16a0cf5 100644
--- a/main/admin/promotions.php
+++ b/main/admin/promotions.php
@@ -78,9 +78,6 @@ $(function() {
 });
 </script>   
 <?php
-// Tool introduction
-Display::display_introduction_section(get_lang('Promotions'));
-
 $promotion = new Promotion();
 
 // Action handling: Adding a note
diff --git a/main/inc/lib/career.lib.php b/main/inc/lib/career.lib.php
index ef7988b02d..7a70fb9524 100644
--- a/main/inc/lib/career.lib.php
+++ b/main/inc/lib/career.lib.php
@@ -72,12 +72,11 @@ class Career extends Model {
     public function return_form($url, $action) {
 		
 		$oFCKeditor = new FCKeditor('description') ;
-				$oFCKeditor->ToolbarSet = 'careers';
-				$oFCKeditor->Width		= '100%';
-				$oFCKeditor->Height		= '200';
-				$oFCKeditor->Value		= $message;
-				$oFCKeditor->CreateHtml();	
-		
+		$oFCKeditor->ToolbarSet = 'careers';
+		$oFCKeditor->Width		= '100%';
+		$oFCKeditor->Height		= '200';
+		$oFCKeditor->Value		= '';
+		$oFCKeditor->CreateHtml();
 		
         $form = new FormValidator('career', 'post', $url);
         // Settting the form elements
@@ -87,10 +86,12 @@ class Career extends Model {
         }
         
         $form->addElement('header', '', $header);
-        $form->addElement('hidden', 'id',intval($_GET['id']));
+        $id = isset($_GET['id']) ? intval($_GET['id']) : '';
+        $form->addElement('hidden', 'id', $id);
+        
         $form->addElement('text', 'name', get_lang('Name'), array('size' => '70'));
         $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));	   
-	   $status_list = $this->get_status_list();         
+	    $status_list = $this->get_status_list();         
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             $form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -100,21 +101,21 @@ class Career extends Model {
         $form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
     
         // Setting the defaults
-        $defaults = $this->get($_GET['id']);
+        $defaults = $this->get($id);
         
-        $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
-        $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+        if (!empty($defaults['created_at'])) {
+        	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+        }
+        if (!empty($defaults['updated_at'])) {
+        	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+        }
         $form->setDefaults($defaults);
     
         // Setting the rules
-        $form->addRule('name', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');
-               
-                                
-        return $form;
-        
-
-                                
+        $form->addRule('name', '<div class="required">'.get_lang('ThisFieldIsRequired'), 'required');               
+		return $form;                                
     }
+    
     /**
      * Copies the career to a new one
      * @param   integer     Career ID
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 7ae9e4f18f..5f2c204171 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -834,6 +834,8 @@ class Display {
         $obj->pager         = $div_id.'_pager';
 
         $obj->datatype  = 'json';
+        
+        $json = '';
         if (!empty($extra_params['datatype'])) {
             $obj->datatype  = $extra_params['datatype'];
         }
diff --git a/main/inc/lib/promotion.lib.php b/main/inc/lib/promotion.lib.php
index 79d06c330f..3a4bf14f62 100644
--- a/main/inc/lib/promotion.lib.php
+++ b/main/inc/lib/promotion.lib.php
@@ -80,7 +80,7 @@ class Promotion extends Model {
 				$oFCKeditor->ToolbarSet = 'careers';
 				$oFCKeditor->Width		= '100%';
 				$oFCKeditor->Height		= '200';
-				$oFCKeditor->Value		= $message;
+				$oFCKeditor->Value		= '';
 				$oFCKeditor->CreateHtml();		
 		
 		$form = new FormValidator('promotion', 'post', $url);
@@ -89,8 +89,10 @@ class Promotion extends Model {
         if ($action == 'edit') {
         	$header = get_lang('Modify');
         }
+        $id = isset($_GET['id']) ? intval($_GET['id']) : '';
+        
         $form->addElement('header', '', $header);
-        $form->addElement('hidden', 'id', intval($_GET['id']));
+        $form->addElement('hidden', 'id', $id);
         $form->addElement('text', 'name', get_lang('Name'), array('size' => '70','id' => 'name'));        
         $form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250'));       
         $career = new Career();
@@ -110,9 +112,13 @@ class Promotion extends Model {
         $form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
     
         // Setting the defaults
-        $defaults = $this->get($_GET['id']);
-        $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
-        $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);            
+        $defaults = $this->get($id);
+        if (!empty($defaults['created_at'])) {
+        	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+        }
+        if (!empty($defaults['updated_at'])) {
+        	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+        }            
         $form->setDefaults($defaults);
     
         // Setting the rules