[otrs-cvs] otrs/Kernel/Modules AgentTicketProcess.pm,1.28,1.29

Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv28414/Kernel/Modules

Modified Files:
	AgentTicketProcess.pm 
Log Message:
Fixed and improved code style (linear coding, postfix if). No semantic changes.

Author: mg

Index: AgentTicketProcess.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/AgentTicketProcess.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -2 -u -d -r1.28 -r1.29
--- AgentTicketProcess.pm	21 Jan 2013 09:58:41 -0000	1.28
+++ AgentTicketProcess.pm	21 Jan 2013 10:48:15 -0000	1.29
@@ -394,9 +394,9 @@
         );
     }
-    my $ActivityDialog
-        = $Self->{ActivityDialogObject}->ActivityDialogGet(
+    my $ActivityDialog = $Self->{ActivityDialogObject}->ActivityDialogGet(
         ActivityDialogEntityID => $ActivityDialogEntityID,
         Interface              => 'AgentInterface',
-        );
+    );
+
     if ( !IsHashRefWithData($ActivityDialog) ) {
         $Self->{LayoutObject}->FatalError(
@@ -694,8 +694,9 @@
     my %GetParam;
     my %Ticket;
-    my $ProcessEntityID = $Param{ProcessEntityID};
-    my $TicketID = $Self->{ParamObject}->GetParam( Param => 'TicketID' );
-    my $ActivityDialogEntityID
-        = $Self->{ParamObject}->GetParam( Param => 'ActivityDialogEntityID' );
+    my $ProcessEntityID        = $Param{ProcessEntityID};
+    my $TicketID               = $Self->{ParamObject}->GetParam( Param => 'TicketID' );
+    my $ActivityDialogEntityID = $Self->{ParamObject}->GetParam(
+        Param => 'ActivityDialogEntityID',
+    );
     my $ActivityEntityID;
     my %ValuesGotten;
@@ -705,6 +706,7 @@
     # we have to get the Processes' Startpoint
     if ( !$ActivityDialogEntityID && !$TicketID ) {
-        my $ActivityActivityDialog
-            = $Self->{ProcessObject}->ProcessStartpointGet( ProcessEntityID => $ProcessEntityID );
+        my $ActivityActivityDialog = $Self->{ProcessObject}->ProcessStartpointGet(
+            ProcessEntityID => $ProcessEntityID,
+        );
         if (
             !$ActivityActivityDialog->{ActivityDialog}
@@ -721,9 +723,8 @@
                 );
             }
-            else {
-                $Self->{LayoutObject}->FatalError(
-                    Message => $Message,
-                );
-            }
+
+            $Self->{LayoutObject}->FatalError(
+                Message => $Message,
+            );
         }
         $ActivityDialogEntityID = $ActivityActivityDialog->{ActivityDialog};
@@ -731,9 +732,8 @@
     }
 
-    my $ActivityDialog
-        = $Self->{ActivityDialogObject}->ActivityDialogGet(
+    my $ActivityDialog = $Self->{ActivityDialogObject}->ActivityDialogGet(
         ActivityDialogEntityID => $ActivityDialogEntityID,
         Interface              => 'AgentInterface',
-        );
+    );
 
     if ( !IsHashRefWithData($ActivityDialog) ) {
@@ -801,9 +801,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Message,
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Message,
+                );
             }
 
@@ -859,6 +858,7 @@
             $GetParam{Subject} = $Self->{ParamObject}->GetParam( Param => 'Subject' );
             $GetParam{Body}    = $Self->{ParamObject}->GetParam( Param => 'Body' );
-            @{ $GetParam{InformUserID} }
-                = $Self->{ParamObject}->GetArray( Param => 'InformUserID' );
+            @{ $GetParam{InformUserID} } = $Self->{ParamObject}->GetArray(
+                Param => 'InformUserID',
+            );
 
             $ValuesGotten{Article} = 1 if ( $GetParam{Subject} && $GetParam{Body} );
@@ -866,8 +866,7 @@
 
         if ( $CurrentField eq 'CustomerID' ) {
-            $GetParam{Customer}
-                = $Self->{ParamObject}->GetParam( Param => 'SelectedCustomerUser' ) || '';
-            $GetParam{CustomerUserID}
-                = $Self->{ParamObject}->GetParam( Param => 'SelectedCustomerUser' ) || '';
+            $GetParam{CustomerUserID} = $Self->{ParamObject}->GetParam(
+                Param => 'SelectedCustomerUser',
+            ) || '';
         }
 
@@ -980,9 +979,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Message,
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Message,
+                );
             }
             $GetParam{$CurrentField} = $Value;
@@ -1015,9 +1013,8 @@
             );
         }
-        else {
-            $Self->{LayoutObject}->FatalError(
-                Message => $Message,
-            );
-        }
+
+        $Self->{LayoutObject}->FatalError(
+            Message => $Message,
+        );
     }
 
@@ -1030,8 +1027,7 @@
 
     if ( !$TicketID ) {
-        $ActivityActivityDialog
-            = $Self->{ProcessObject}->ProcessStartpointGet(
-            ProcessEntityID => $Param{ProcessEntityID}
-            );
+        $ActivityActivityDialog = $Self->{ProcessObject}->ProcessStartpointGet(
+            ProcessEntityID => $Param{ProcessEntityID},
+        );
 
         if ( !IsHashRefWithData($ActivityActivityDialog) ) {
@@ -1045,9 +1041,8 @@
                 );
             }
-            else {
-                $Self->{LayoutObject}->FatalError(
-                    Message => $Message,
-                );
-            }
+
+            $Self->{LayoutObject}->FatalError(
+                Message => $Message,
+            );
         }
     }
@@ -1071,7 +1066,5 @@
         my $DynamicFieldActivityID
             = 'DynamicField_'
-            . $Self->{ConfigObject}->Get(
-            'Process::DynamicFieldProcessManagementActivityID'
-            );
+            . $Self->{ConfigObject}->Get('Process::DynamicFieldProcessManagementActivityID');
 
         if ( !$Ticket{$DynamicFieldProcessID} || !$Ticket{$DynamicFieldActivityID} ) {
@@ -1102,9 +1095,8 @@
             );
         }
-        else {
-            $Self->{LayoutObject}->FatalError(
-                Message => $Message,
-            );
-        }
+
+        $Self->{LayoutObject}->FatalError(
+            Message => $Message,
+        );
     }
 
@@ -1123,9 +1115,8 @@
             );
         }
-        else {
-            $Self->{LayoutObject}->FatalError(
-                Message => $Message,
-            );
-        }
+
+        $Self->{LayoutObject}->FatalError(
+            Message => $Message,
+        );
     }
 
@@ -1321,9 +1312,8 @@
                 );
             }
-            else {
-                $Self->{LayoutObject}->FatalError(
-                    Message => $Message,
-                );
-            }
+
+            $Self->{LayoutObject}->FatalError(
+                Message => $Message,
+            );
         }
 
@@ -1355,9 +1345,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1395,9 +1384,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1431,9 +1419,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1467,9 +1454,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1503,9 +1489,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1539,9 +1524,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1575,9 +1559,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1611,9 +1594,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1647,9 +1629,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1683,9 +1664,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1710,9 +1690,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Message,
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Message,
+                );
             }
 
@@ -1737,9 +1716,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1771,9 +1749,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1809,9 +1786,8 @@
                     );
                 }
-                else {
-                    $Self->{LayoutObject}->FatalError(
-                        Message => $Response->{Message},
-                    );
-                }
+
+                $Self->{LayoutObject}->FatalError(
+                    Message => $Response->{Message},
+                );
             }
 
@@ -1835,5 +1811,7 @@
         $Self->{LayoutObject}->Block(
             Name => 'FooterJS',
-            Data => { Bindings => $Self->{LayoutObject}->{EnvRef}->{JSOnDocumentComplete} },
+            Data => {
+                Bindings => $Self->{LayoutObject}->{EnvRef}->{JSOnDocumentComplete},
+            },
         );
 
@@ -2443,26 +2421,31 @@
 
             # Fetch DefaultValue from Config
-            $SelectedValue = $Self->{UserObject}->UserLookup(
-                User => $Param{ActivityDialogField}->{DefaultValue} || ''
-                )
-                if !$SelectedValue;
-            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-                if $SelectedValue;
+            if ( !$SelectedValue ) {
+                $SelectedValue = $Self->{UserObject}->UserLookup(
+                    User => $Param{ActivityDialogField}->{DefaultValue} || '',
+                );
+            }
+            if ($SelectedValue) {
+                $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+            }
         }
         else {
-            $SelectedValue = $Self->{UserObject}->UserLookup(
-                UserID => $Param{ActivityDialogField}->{DefaultValue} || ''
-                )
-                if !$SelectedValue;
+            if ( !$SelectedValue ) {
+                $SelectedValue = $Self->{UserObject}->UserLookup(
+                    UserID => $Param{ActivityDialogField}->{DefaultValue} || ''
+                );
+            }
         }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Responsible}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Responsible};
+    }
 
     # use the current user
-    $SelectedValue = $Self->{UserObject}->UserLookup( UserID => $Self->{UserID} )
-        if ( !$SelectedValue );
+    if ( !$SelectedValue ) {
+        $SelectedValue = $Self->{UserObject}->UserLookup( UserID => $Self->{UserID} );
+    }
 
     # set server errors
@@ -2473,8 +2456,10 @@
 
     # look up $SelectedID
-    my $SelectedID = $Self->{UserObject}->UserLookup(
-        UserLogin => $SelectedValue,
-        )
-        if $SelectedValue;
+    my $SelectedID;
+    if ($SelectedValue) {
+        $SelectedID = $Self->{UserObject}->UserLookup(
+            UserLogin => $SelectedValue,
+        );
+    }
 
     # build Responsible string
@@ -2561,6 +2546,9 @@
 
     my $OwnerIDParam = $Param{GetParam}{OwnerID};
-    $SelectedValue = $Self->{UserObject}->UserLookup( UserID => $OwnerIDParam )
-        if $OwnerIDParam;
+    if ($OwnerIDParam) {
+        $SelectedValue = $Self->{UserObject}->UserLookup(
+            UserID => $OwnerIDParam,
+        );
+    }
 
     if ( $Param{ActivityDialogField}->{DefaultValue} ) {
@@ -2568,28 +2556,34 @@
         if ( $Param{FieldName} eq 'Owner' ) {
 
-            # Fetch DefaultValue from Config
-            $SelectedValue = $Self->{UserObject}->UserLookup(
-                User => $Param{ActivityDialogField}->{DefaultValue}
-                )
-                if !$SelectedValue;
+            if ( !$SelectedValue ) {
 
-            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-                if $SelectedValue;
+                # Fetch DefaultValue from Config
+                $SelectedValue = $Self->{UserObject}->UserLookup(
+                    User => $Param{ActivityDialogField}->{DefaultValue},
+                );
+            }
+
+            if ($SelectedValue) {
+                $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+            }
         }
         else {
-            $SelectedValue = $Self->{UserObject}->UserLookup(
-                UserID => $Param{ActivityDialogField}->{DefaultValue}
-                )
-                if !$SelectedValue;
+            if ( !$SelectedValue ) {
+                $SelectedValue = $Self->{UserObject}->UserLookup(
+                    UserID => $Param{ActivityDialogField}->{DefaultValue},
+                );
+            }
         }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Owner}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Owner};
+    }
 
     # use the current user
-    $SelectedValue = $Self->{UserObject}->UserLookup( UserID => $Self->{UserID} )
-        if ( !$SelectedValue );
+    if ( !$SelectedValue ) {
+        $SelectedValue = $Self->{UserObject}->UserLookup( UserID => $Self->{UserID} );
+    }
 
     # set server errors
@@ -2600,8 +2594,10 @@
 
     # look up $SelectedID
-    my $SelectedID = $Self->{UserObject}->UserLookup(
-        UserLogin => $SelectedValue,
-        )
-        if $SelectedValue;
+    my $SelectedID;
+    if ($SelectedValue) {
+        $SelectedID = $Self->{UserObject}->UserLookup(
+            UserLogin => $SelectedValue,
+        );
+    }
 
     # build Owner string
@@ -2697,22 +2693,27 @@
     if ( $Param{FieldName} eq 'SLA' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{SLAObject}->SLALookup(
-            SLA => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+        if ( !$SelectedValue ) {
+
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{SLAObject}->SLALookup(
+                SLA => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
-        $SelectedValue = $Self->{SLAObject}->SLALookup(
-            SLAID => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
+            $SelectedValue = $Self->{SLAObject}->SLALookup(
+                SLAID => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{SLA}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{SLA};
+    }
 
     # set server errors
@@ -2805,27 +2806,35 @@
 
     my $ServiceIDParam = $Param{GetParam}{ServiceID};
-    $SelectedValue = $Self->{ServiceObject}->ServiceLookup( ServiceID => $ServiceIDParam )
-        if $ServiceIDParam;
+    if ($ServiceIDParam) {
+        $SelectedValue = $Self->{ServiceObject}->ServiceLookup(
+            ServiceID => $ServiceIDParam,
+        );
+    }
 
     if ( $Param{FieldName} eq 'Service' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{ServiceObject}->ServiceLookup(
-            Service => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+        if ( !$SelectedValue ) {
+
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{ServiceObject}->ServiceLookup(
+                Service => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
-        $SelectedValue = $Self->{ServiceObject}->ServiceLookup(
-            ServiceID => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
+            $SelectedValue = $Self->{ServiceObject}->ServiceLookup(
+                ServiceID => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Service}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Service};
+    }
 
     # set server errors
@@ -2927,11 +2936,14 @@
     if ( $Param{FieldName} eq 'Lock' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{LockObject}->LockLookup(
-            Lock => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+        if ( !$SelectedValue ) {
+
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{LockObject}->LockLookup(
+                Lock => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
@@ -2943,6 +2955,7 @@
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Lock}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Lock};
+    }
 
     # set server errors
@@ -3035,27 +3048,35 @@
 
     my $PriorityIDParam = $Param{GetParam}{PriorityID};
-    $SelectedValue = $Self->{PriorityObject}->PriorityLookup( PriorityID => $PriorityIDParam )
-        if ($PriorityIDParam);
+    if ($PriorityIDParam) {
+        $SelectedValue = $Self->{PriorityObject}->PriorityLookup(
+            PriorityID => $PriorityIDParam,
+        );
+    }
 
     if ( $Param{FieldName} eq 'Priority' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{PriorityObject}->PriorityLookup(
-            Priority => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+        if ( !$SelectedValue ) {
+
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{PriorityObject}->PriorityLookup(
+                Priority => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
-        $SelectedValue = $Self->{PriorityObject}->PriorityLookup(
-            PriorityID => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
+            $SelectedValue = $Self->{PriorityObject}->PriorityLookup(
+                PriorityID => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Priority}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Priority};
+    }
 
     # set server errors
@@ -3148,27 +3169,35 @@
     # if we got QueueID as Param from the GUI
     my $QueueIDParam = $Param{GetParam}{QueueID};
-    $SelectedValue = $Self->{QueueObject}->QueueLookup( QueueID => $QueueIDParam )
-        if ($QueueIDParam);
+    if ($QueueIDParam) {
+        $SelectedValue = $Self->{QueueObject}->QueueLookup(
+            QueueID => $QueueIDParam,
+        );
+    }
 
     if ( $Param{FieldName} eq 'Queue' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{QueueObject}->QueueLookup(
-            Queue => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+        if ( !$SelectedValue ) {
+
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{QueueObject}->QueueLookup(
+                Queue => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
-        $SelectedValue = $Self->{QueueObject}->QueueLookup(
-            QueueID => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
+            $SelectedValue = $Self->{QueueObject}->QueueLookup(
+                QueueID => $Param{ActivityDialogField}->{DefaultValue} || '',
+                )
+        }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{Queue}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{Queue};
+    }
 
     # set server errors
@@ -3257,28 +3286,34 @@
 
     my $StateIDParam = $Param{GetParam}{StateID};
-    $SelectedValue = $Self->{StateObject}->StateLookup( StateID => $StateIDParam )
-        if ($StateIDParam);
+    if ($StateIDParam) {
+        $SelectedValue = $Self->{StateObject}->StateLookup( StateID => $StateIDParam );
+    }
 
     if ( $Param{FieldName} eq 'State' ) {
 
-        # Fetch DefaultValue from Config
-        $SelectedValue = $Self->{StateObject}->StateLookup(
-            State => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
 
-        $SelectedValue = $Param{ActivityDialogField}->{DefaultValue}
-            if $SelectedValue;
+            # Fetch DefaultValue from Config
+            $SelectedValue = $Self->{StateObject}->StateLookup(
+                State => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
+
+        if ($SelectedValue) {
+            $SelectedValue = $Param{ActivityDialogField}->{DefaultValue};
+        }
     }
     else {
-        $SelectedValue = $Self->{StateObject}->StateLookup(
-            StateID => $Param{ActivityDialogField}->{DefaultValue} || ''
-            )
-            if !$SelectedValue;
+        if ( !$SelectedValue ) {
+            $SelectedValue = $Self->{StateObject}->StateLookup(
+                StateID => $Param{ActivityDialogField}->{DefaultValue} || '',
+            );
+        }
     }
 
     # Get TicketValue
-    $SelectedValue = $Param{Ticket}->{State}
-        if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue );
+    if ( IsHashRefWithData( $Param{Ticket} ) && !$SelectedValue ) {
+        $SelectedValue = $Param{Ticket}->{State};
+    }
 
     # set server errors
@@ -3350,9 +3385,9 @@
     }
 
-    my $ActivityDialog
-        = $Self->{ActivityDialogObject}->ActivityDialogGet(
+    my $ActivityDialog = $Self->{ActivityDialogObject}->ActivityDialogGet(
         ActivityDialogEntityID => $ActivityDialogEntityID,
         Interface              => 'AgentInterface',
-        );
+    );
+
     if ( !IsHashRefWithData($ActivityDialog) ) {
         $Self->{LayoutObject}->FatalError(
@@ -3550,8 +3585,7 @@
         }
 
-        $ProcessStartpoint
-            = $Self->{ProcessObject}->ProcessStartpointGet(
-            ProcessEntityID => $Param{ProcessEntityID}
-            );
+        $ProcessStartpoint = $Self->{ProcessObject}->ProcessStartpointGet(
+            ProcessEntityID => $Param{ProcessEntityID},
+        );
 
         if (
@@ -3856,7 +3890,8 @@
 
                         # ignore attachment if not linked in body
-                        next ATTACHMENT
-                            if $Param{GetParam}{Body}
-                            !~ /(\Q$ContentIDHTMLQuote\E|\Q$ContentID\E)/i;
+                        if ( $Param{GetParam}{Body} !~ /(\Q$ContentIDHTMLQuote\E|\Q$ContentID\E)/i )
+                        {
+                            next ATTACHMENT;
+                        }
                     }
 
@@ -4024,5 +4059,5 @@
         Data         => {
             %Param,
-            }
+        },
     );
 
@@ -4258,10 +4293,8 @@
     }
 
-    if ( !$Value ) {
-        return;
-    }
+    return if ( !$Value );
 
     # return the given ID value if the *Lookup result was a string
-    elsif ( $Param{Field} ne $FieldWithoutID ) {
+    if ( $Param{Field} ne $FieldWithoutID ) {
         return $Param{Value};
     }
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log