remove brackets from conditions that are not needed
This commit is contained in:
@@ -138,7 +138,7 @@ sub showComments {
|
||||
my $language = $config->{date}->{language} || 'en';
|
||||
for my $event (@$events) {
|
||||
$event->{start} = time::date_time_format( $config, $event->{start}, $language );
|
||||
$comment_count += $event->{comment_count} if ( defined $event->{comment_count} );
|
||||
$comment_count += $event->{comment_count} if defined $event->{comment_count};
|
||||
$event->{cache_base_url} = $config->{cache}->{base_url};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ if ( defined $r ) {
|
||||
if ( $status =~ /limit/i ) {
|
||||
$error = $status;
|
||||
} else {
|
||||
$upload = $apr->upload('image') if ( defined $params->{image} );
|
||||
$upload = $apr->upload('image') if defined $params->{image};
|
||||
}
|
||||
print STDERR "apr\n";
|
||||
} else {
|
||||
|
||||
@@ -366,7 +366,7 @@ sub show_roles {
|
||||
$out .= qq{</tr>};
|
||||
}
|
||||
$out .= '</table>';
|
||||
$out .= '<input type="submit" name="action" value="save">' if ( defined $permissions->{update_role} );
|
||||
$out .= '<input type="submit" name="action" value="save">' if defined $permissions->{update_role};
|
||||
$out .= '</form>';
|
||||
$out .= '</div>';
|
||||
print $out. "\n";
|
||||
@@ -383,10 +383,8 @@ sub sort_columns {
|
||||
my $action = shift @words;
|
||||
my $group = join( ' ', @words );
|
||||
|
||||
#print "action:'$action' group:'$group' <br>\n";
|
||||
|
||||
my $index = $groups->{$group} || 0;
|
||||
$index += $actions->{$action} if ( defined $actions->{$action} );
|
||||
$index += $actions->{$action} if defined $actions->{$action};
|
||||
$column_level->{$column} = $index;
|
||||
|
||||
# print $index."<br>";
|
||||
|
||||
@@ -148,7 +148,7 @@ sub save_schedule {
|
||||
'nextDay'
|
||||
)
|
||||
{
|
||||
$entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} );
|
||||
$entry->{$attr} = $params->{$attr} if defined $params->{$attr};
|
||||
}
|
||||
|
||||
unless ( project::is_series_assigned( $config, $entry ) == 1 ) {
|
||||
|
||||
@@ -119,11 +119,11 @@ sub save_schedule {
|
||||
|
||||
my $entry = {};
|
||||
for my $attr ( 'project_id', 'start', 'end', 'end_date', 'frequency' ) {
|
||||
$entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} );
|
||||
$entry->{$attr} = $params->{$attr} if defined $params->{$attr};
|
||||
}
|
||||
|
||||
#set schedule's studio to value from schedule_studio_id
|
||||
$entry->{studio_id} = $params->{schedule_studio_id} if ( defined $params->{schedule_studio_id} );
|
||||
$entry->{studio_id} = $params->{schedule_studio_id} if defined $params->{schedule_studio_id};
|
||||
|
||||
if ( ( $entry->{end} ne '' ) && ( $entry->{end} le $entry->{start} ) ) {
|
||||
uac::print_error('start date should be before end date!');
|
||||
|
||||
@@ -327,7 +327,7 @@ sub update_user_roles {
|
||||
my $message =
|
||||
"remove role '$role->{role}' (level $role->{level}) from user $user_id (level $max_user_level) for studio_id=$studio_id, project_id=$project_id. Your level is $max_level";
|
||||
my $update = 0;
|
||||
$update = 1 if ( defined $permissions->{is_admin} );
|
||||
$update = 1 if defined $permissions->{is_admin};
|
||||
$update = 1
|
||||
if ( ( $role_by_id->{ $user_role->{role_id} }->{level} < $max_level )
|
||||
&& ( $max_user_level < $max_level ) );
|
||||
@@ -365,7 +365,7 @@ sub update_user_roles {
|
||||
|
||||
# print "user role id: $role->{id}<br>\n";
|
||||
my $update = 0;
|
||||
$update = 1 if ( defined $permissions->{is_admin} );
|
||||
$update = 1 if defined $permissions->{is_admin};
|
||||
$update = 1
|
||||
if ( ( $role_by_id->{ $role->{id} }->{level} < $max_level )
|
||||
&& ( $max_user_level < $max_level ) );
|
||||
|
||||
@@ -94,7 +94,7 @@ sub save_schedule {
|
||||
'type'
|
||||
)
|
||||
{
|
||||
$entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} );
|
||||
$entry->{$attr} = $params->{$attr} if defined $params->{$attr};
|
||||
}
|
||||
|
||||
my $found = 0;
|
||||
|
||||
Reference in New Issue
Block a user