Index: set_properties.msn
===================================================================
--- set_properties.msn	(revision 53)
+++ set_properties.msn	(revision 54)
@@ -1,23 +1,21 @@
 <%ARGS>
 
-	$object => undef
-	$SETS => undef
+	$object	=> undef
+	$SETS	=> undef
 
 </%ARGS>
 <%INIT>
-  use Contenido::File;
+	use Contenido::File;
 	use vars qw($keeper $request );
 
 	$request->{local_codepage} = 'KOI8';
-	$request->{local_codepage} = 'WIN' if Convert::Cyrillic::cstocs('WIN', 'KOI8', $SETS->{control_charset}) eq 'Контроль';
-        $request->{local_codepage} = 'UTF8' if Convert::Cyrillic::cstocs('UTF8', 'KOI8', $SETS->{control_charset}) eq 'Контроль';
+	$request->{local_codepage} = 'WIN'	if Convert::Cyrillic::cstocs('WIN', 'KOI8', $SETS->{control_charset}) eq 'Контроль';
+        $request->{local_codepage} = 'UTF8'	if Convert::Cyrillic::cstocs('UTF8', 'KOI8', $SETS->{control_charset}) eq 'Контроль';
 
 	warn "Contenido Debug: Форма для редактирования пришла в кодировке ".$request->{local_codepage}."\n"		if ($state->debug());
 
-
 	my @properties = $object->structure();
-	for (0..$#properties)
-	{
+	for (0..$#properties) {
 		my $prop = $properties[$_];
 		my $name = $prop->{attr};
                 my $type = $prop->{type};
@@ -25,26 +23,22 @@
 		next	if ($name eq 'sections');
 		next 	if ($name eq 'id');
 
-		my $component = '/contenido/components/outputs/'.$prop->{attr}.'.msn';
-		if ($m->comp_exists($component)) {
-			$object->{$name} = $m->comp($component, SETS => $SETS, name => $name, object => $object );
-                } elsif ($m->comp_exists("/contenido/components/outputs/$type.msn")) {
+		if ($m->comp_exists("/contenido/components/outputs/$type.msn")) {
 			$object->{$name} = $m->comp("/contenido/components/outputs/$type.msn", SETS => $SETS, name => $name, object => $object );
-		} elsif ( $prop->{type} eq 'image' )
-		{
+
+		} elsif ( $prop->{type} eq 'image' ) {
 			# --------------------------------------------------------------------------------------
 			# Добавление одной, отдельно стоящей картинки...
 
-			if ($SETS->{'_delete_image.'.$name} == 1)
-			{
-                my $IMAGE = eval ('my '.$object->{ $name });
-                Contenido::File::remove($IMAGE->{'filename'});
-                Contenido::File::remove($IMAGE->{'mini'}{'filename'});
-                foreach my $key (keys %{$IMAGE->{'mini'}}) {
-                    if (ref $IMAGE->{'mini'}{$key} && ref $IMAGE->{'mini'}{$key} eq 'HASH' && $IMAGE->{'mini'}{$key}->{'filename'}) {
-                        Contenido::File::remove($IMAGE->{'mini'}{$key}->{'filename'}) if $IMAGE->{'mini'}{$key}->{'filename'} ne $IMAGE->{'mini'}{'filename'};
-                    }
-                }
+			if ($SETS->{'_delete_image.'.$name} == 1) {
+				my $IMAGE = eval ('my '.$object->{ $name });
+				Contenido::File::remove($IMAGE->{'filename'});
+				Contenido::File::remove($IMAGE->{'mini'}{'filename'});
+				foreach my $key (keys %{$IMAGE->{'mini'}}) {
+					if (ref $IMAGE->{'mini'}{$key} && ref $IMAGE->{'mini'}{$key} eq 'HASH' && $IMAGE->{'mini'}{$key}->{'filename'}) {
+						Contenido::File::remove($IMAGE->{'mini'}{$key}->{'filename'}) if $IMAGE->{'mini'}{$key}->{'filename'} ne $IMAGE->{'mini'}{'filename'};
+					}
+				}
 				$object->{$name} = '';
 			} else {
 				my $IMAGE = undef;
@@ -60,9 +54,8 @@
 					$object->{$name} = Data::Dumper::Dumper($IMAGE);
 				}
 			}
-		}
-		elsif ($prop->{type} =~ /^images/)
-		{
+
+		} elsif ($prop->{type} =~ /^images/) {
 			# --------------------------------------------------------------------------------------
 			# А вот это уже сложнее - составление блока из всех картинок...
 
@@ -80,8 +73,7 @@
 			my $maxnumber_ = 0;
 
 			# Теперь надо просмотреть все аргументы - а вдруг это то, что нам нужно...
-			foreach my $arg (keys(%{ $SETS }))
-			{
+			foreach my $arg (keys(%{ $SETS })) {
 				# Разбиваем все на части, отделяем...
 				my ($partname,undef) = split(/\./,$arg);
 				$partname =~ /^(.+)_(\d+)$/;
@@ -92,27 +84,22 @@
 
 					my $partname = $localname.'_'.$number;
 
-					if ($SETS->{'_delete_image.'.$partname} == 1)
-					{
-                        Contenido::File::remove($IMAGES->{'image_'.$number}{"filename"});
-                        Contenido::File::remove($IMAGES->{'image_'.$number}{"mini"}{"filename"});
-                        foreach my $key (keys %{$IMAGES->{'image_'.$number}{'mini'}}) {
-                            if (ref $IMAGES->{'image_'.$number}{'mini'}{$key} && ref $IMAGES->{'image_'.$number}{'mini'}{$key} eq 'HASH' && $IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'}) {
-                                Contenido::File::remove($IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'}) if $IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'} ne $IMAGES->{'image_'.$number}{'mini'}{'filename'};
-                            }
-                        }
+					if ($SETS->{'_delete_image.'.$partname} == 1) {
+						Contenido::File::remove($IMAGES->{'image_'.$number}{"filename"});
+						Contenido::File::remove($IMAGES->{'image_'.$number}{"mini"}{"filename"});
+						foreach my $key (keys %{$IMAGES->{'image_'.$number}{'mini'}}) {
+							if (ref $IMAGES->{'image_'.$number}{'mini'}{$key} && ref $IMAGES->{'image_'.$number}{'mini'}{$key} eq 'HASH' && $IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'}) {
+								Contenido::File::remove($IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'}) if $IMAGES->{'image_'.$number}{'mini'}{$key}->{'filename'} ne $IMAGES->{'image_'.$number}{'mini'}{'filename'};
+							}
+						}
 						delete $IMAGES->{'image_'.$number};
-					}
-					else
-					{
+					} else {
 						my $IMAGE = undef;
-						if (exists($IMAGES->{'image_'.$number}))
-						{
+						if (exists($IMAGES->{'image_'.$number})) {
 							$IMAGE = $IMAGES->{'image_'.$number};
 						};
 						$IMAGE = $m->comp('/contenido/components/set_image.msn', default=>$IMAGE, field=>$partname, SETS=>$SETS, object=>$object, prop => $prop);
-						if (exists($IMAGE->{filename}))
-						{
+						if (exists($IMAGE->{filename})) {
 							local $Data::Dumper::Indent = 0;
 							$IMAGE->{number} = $number;
 							$IMAGES->{'image_'.$number} = $IMAGE;
@@ -123,15 +110,12 @@
 
 			}
 
-			if ( scalar(keys(%{ $IMAGES })) > 0)
-			{
+			if ( scalar(keys(%{ $IMAGES })) > 0) {
 				local $Data::Dumper::Indent = 0;
 				$object->{$name} = Data::Dumper::Dumper($IMAGES);
 			}
 
-		}
-		elsif ( $prop->{type} eq 'multimedia' )
-		{
+		} elsif ( $prop->{type} eq 'multimedia' ) {
 			# --------------------------------------------------------------------------------------
 			# Добавление одного объект Мультимедиа
 
@@ -155,9 +139,7 @@
 				}
 			}
 
-		}
-		elsif ( $prop->{type} eq 'multimedia_new' )
-		{
+		} elsif ( $prop->{type} eq 'multimedia_new' ) {
 			# --------------------------------------------------------------------------------------
 			# Добавление одного объект Мультимедиа
 
@@ -181,39 +163,32 @@
 				}
 			}
 
-		}
-		elsif ( $prop->{type} eq 'audio' )
-		{
+		} elsif ( $prop->{type} eq 'audio' ) {
 			# --------------------------------------------------------------------------------------
 			# Добавление одного объект Мультимедиа
 
-			if ($SETS->{'_delete_multi.'.$name} == 1)
-			{
-                my $VAR1 = undef;
-                eval "\$object->{$name}";
+			if ($SETS->{'_delete_multi.'.$name} == 1) {
+				my $VAR1 = undef;
+				eval "\$object->{$name}";
 				my $BINARY = $VAR1;
 				if (ref $BINARY) {$BINARY->remove}
 				$object->{$name} = '';
 			} else {
 				my $MULTI = undef;
-				if (length($object->$name) > 8)
-				{
-                    my $VAR1 = undef;
-                    eval "\$object->{$name}";
+				if (length($object->$name) > 8) {
+					my $VAR1 = undef;
+					eval "\$object->{$name}";
 					$MULTI = $VAR1;
 					unless (ref $MULTI) {$MULTI = undef};
 				}
 				$MULTI = $m->comp('/contenido/components/set_audio.msn', default=>$MULTI, field=>$name, SETS=>$SETS, object=>$object, prop => $prop);
-				if (exists($MULTI->{filename}))
-				{
+				if (exists($MULTI->{filename})) {
 					local $Data::Dumper::Indent = 0;
 					$object->{$name} = Data::Dumper::Dumper($MULTI);
 				}
 			}
 
-		}
-		else 
-		{
+		} else {
 			$object->{$name} = $m->comp('/contenido/components/filter.msn', str => $SETS->{$name} );
 		}