[Phpgroupware-cvs] [19112] fix: indentation

[Pascal Vilarem]

Revision: 19112
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19112
Author:   maat
Date:     2009-04-21 17:28:26 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
fix: indentation
improve : print of error messages

Modified Paths:
--------------
    modules/ged/trunk/inc/class.flow_client.inc.php

Modified: modules/ged/trunk/inc/class.flow_client.inc.php
===================================================================
--- modules/ged/trunk/inc/class.flow_client.inc.php     2009-04-21 15:22:43 UTC 
(rev 19111)
+++ modules/ged/trunk/inc/class.flow_client.inc.php     2009-04-21 17:28:26 UTC 
(rev 19112)
@@ -161,8 +161,8 @@
                                
$new_file['file_tmp_name']=$_FILES['file']['tmp_name'];
                                
$new_file['file_mime_type']=$_FILES['file']['type'];
                                
-                               
$new_file['doc_type']=$review_file_type_for_transition;
-                               
$new_file['name']=$this->ged_dm->get_type_desc($new_file['doc_type'])." / 
".$element['name'];
+                               
$new_file['doc_type_ref']=$review_file_type_for_transition;
+                               
$new_file['name']=$this->ged_dm->get_type_desc($new_file['doc_type_ref'])." / 
".$element['reference'];
                                $new_file['description']=$comment;
                                
$new_file['reference']=$next_reference_for_review_file;
                                $new_file['major']=0;
@@ -232,6 +232,7 @@
        function update($object,$status,$context=null)
        {
                $function_result=Array('status' => 'processing');
+               $errormessage='';
                
                $version=$this->ged_dm->get_version_info($object['version_id']);
                
$element=$this->ged_dm->get_element_info($version['element_id']);
@@ -282,60 +283,60 @@
                        $function_result=Array('status' => 'ok');
                        $function_result['comment']="updated file info";
                }
-    elseif ( $context['custom_fields']['update_mode'] == 'new'  && 
$update_version==lang('New') )
-    {
+               elseif ( $context['custom_fields']['update_mode'] == 'new'  && 
$update_version==lang('New') )
+               {
+                       $new_version['element_id']=$version['element_id'];
+                       
$new_version['file_name']=$_FILES['version_file']['name'];
+                       
$new_version['file_size']=$_FILES['version_file']['size'];
+                       
$new_version['file_tmp_name']=$_FILES['version_file']['tmp_name'];
+                       
$new_version['file_mime_type']=$_FILES['version_file']['type'];
+                       $new_version['relations']=$new_relations;
 
-      $new_version['element_id']=$version['element_id'];
-      $new_version['file_name']=$_FILES['version_file']['name'];
-      $new_version['file_size']=$_FILES['version_file']['size'];
-      $new_version['file_tmp_name']=$_FILES['version_file']['tmp_name'];
-      $new_version['file_mime_type']=$_FILES['version_file']['type'];
-      $new_version['relations']=$new_relations;
-      
-      // TODO : version numbering
-      $new_version['major']=$new_major_value;
-      $new_version['minor']=$new_minor_value;
-      $new_version['draft']=$new_draft_value;
-       
-      $new_version['description']=$new_version_description;
-               
-      $version_added=$this->ged_dm->add_version($new_version);
-      
-      if ($version_added=='OK')
-      {
+                       // TODO : version numbering
+                       $new_version['major']=$new_major_value;
+                       $new_version['minor']=$new_minor_value;
+                       $new_version['draft']=$new_draft_value;
+
+                       $new_version['description']=$new_version_description;
+
+                       $version_added=$this->ged_dm->add_version($new_version);
+
+                       if ($version_added=='OK')
+                       {
                                $function_result=Array('status' => 'ok', 
'mute_history' => 'mute');
-      }
-      else
-      {
-        print ( $version_added);
-               $function_result=Array('status' => 'error');
-      }
-       
-    }
+                       }
+                       else
+                       {
+                               print ($version_added);
+                               $function_result=Array('status' => 'error');
+                       }
+           }
                elseif ($context['custom_fields']['update_mode'] == 'update'  
&& $update_version==lang('Update') )
                {
-      $amended_version['element_id']=$version['element_id'];
-      $amended_version['file_name']=$_FILES['version_file']['name'];
-      $amended_version['file_size']=$_FILES['version_file']['size'];
-      $amended_version['file_tmp_name']=$_FILES['version_file']['tmp_name'];
-      $amended_version['file_mime_type']=$_FILES['version_file']['type'];
-      
-      // TODO : version numbering
-      $amended_version['major']=$new_major_value;
-      $amended_version['minor']=$new_minor_value;
-      $amended_version['draft']=$new_draft_value;
+                       $amended_version['element_id']=$version['element_id'];
+                       
$amended_version['file_name']=$_FILES['version_file']['name'];
+                       
$amended_version['file_size']=$_FILES['version_file']['size'];
+                       
$amended_version['file_tmp_name']=$_FILES['version_file']['tmp_name'];
+                       
$amended_version['file_mime_type']=$_FILES['version_file']['type'];
+
+                       // TODO : version numbering
+                       $amended_version['major']=$new_major_value;
+                       $amended_version['minor']=$new_minor_value;
+                       $amended_version['draft']=$new_draft_value;
              
-      if ( is_array($new_relations))
-      {
-       $amended_version['relations']=$new_relations;
-      }
-      else
-       $amended_version['relations']=null;
+                       if ( is_array($new_relations))
+                       {
+                               $amended_version['relations']=$new_relations;
+                       }
+                       else
+                       {
+                               $amended_version['relations']=null;
+                       }
       
-      $amended_version['description']=$new_version_description;
-      $amended_version['version_id']=$version['version_id'];
+                       
$amended_version['description']=$new_version_description;
+                       $amended_version['version_id']=$version['version_id'];
       
-      $version_updated=$this->ged_dm->update_version($amended_version);
+                       
$version_updated=$this->ged_dm->update_version($amended_version);
 
                        if ($version_updated=='OK')
                        {
@@ -583,10 +584,15 @@
                        
                        $this->t->set_var('add-image', 
$GLOBALS['phpgw']->common->image('ged', "add-16"));
                        $this->t->set_var('remove-image', 
$GLOBALS['phpgw']->common->image('ged', "remove-16"));
-           
-           /*
-            * file zone
-            */
+                       if($errormessage!='')
+                       {
+                       
$this->t->set_var('errormessage',"<p><b>".lang("error"). 
$errormessage."</b></p>");
+               }
+               $this->t->set_var('lang_Required',lang('Required field'));
+               
+               /*
+                        * file zone
+                        */
             
                        $this->t->set_var('file_description_value', 
$file_description);         
                        $this->t->set_var('file_name_value', $file_name);