Diff of /branches/2.6/cgi-bin/yabb2/Convert2x.pl [r1501] .. [r1502]  Maximize  Restore

Switch to side-by-side view

--- a/branches/2.6/cgi-bin/yabb2/Convert2x.pl
+++ b/branches/2.6/cgi-bin/yabb2/Convert2x.pl
@@ -24,7 +24,7 @@
 
 our $VERSION = '2.6.0';
 
-$convert2xplver = 'YaBB 2.6.0 $Revision: 1498 $';
+$convert2xplver = 'YaBB 2.6.0 $Revision: 1502 $';
 
 if ( $ENV{'SERVER_SOFTWARE'} =~ /IIS/sm ) {
     $yyIIS = 1;
@@ -51,13 +51,13 @@
 elsif ( -e './Variables/Paths.pm' ) { require './Variables/Paths.pm'; }
 
 $boardsdir = './Boards';
-    $sourcedir = './Sources';
-    $memberdir = './Members';
-    $vardir    = './Variables';
+$sourcedir = './Sources';
+$memberdir = './Members';
+$vardir    = './Variables';
 
 $thisscript = "$ENV{'SCRIPT_NAME'}";
 if   ( -e ('YaBB.cgi') ) { $yyext = 'cgi'; }
-else                   { $yyext = 'pl'; }
+else                     { $yyext = 'pl'; }
 if   ($boardurl) { $set_cgi = "$boardurl/Convert2x.$yyext"; }
 else             { $set_cgi = "Convert2x.$yyext"; }
 $scripturl = "$boardurl/YaBB.$yyext";
@@ -152,12 +152,12 @@
         if ( !-d "$convertdir/Messages" ) {
             setup_fatal_error( "Directory: $convertdir/Messages", 1 );
         }
-        else { $convdatadir = "$convertdir/Messages";}
+        else { $convdatadir = "$convertdir/Messages"; }
 
         if ( !-d "$convertdir/Variables" ) {
             setup_fatal_error( "Directory: $convertdir/Variables", 1 );
         }
-        else {$convvardir = "$convertdir/Variables";}
+        else { $convvardir = "$convertdir/Variables"; }
 
         my $setfile = << "EOF";
 \$convertdir = qq~$convertdir~;
@@ -654,7 +654,7 @@
 
         $formsession = cloak("$mbname$username");
 
-            $convtext .=
+        $convtext .=
 q~<br /><br />After you have tested your forum and made sure everything was converted correctly you can go to your Admin Center and delete /Convert/Boards, /Convert/Members, /Convert/Messages and /Convert/Variables folders and their contents.~;
 
         $yymain = qq~
@@ -937,10 +937,10 @@
               . @memlist
               . qq~;mstart1=$i~;
             redirectexit();
-            }
-        }
+        }
+    }
     return;
-    }
+}
 
 # / Member Conversion ##
 
@@ -1002,7 +1002,7 @@
             my ( $old, $oldboard ) = split /[|]/xsm, $_;
             push @oldboard, $oldboard;
         }
-        my $j = 0;
+        my $j        = 0;
         my @newboard = ();
         foreach my $x (@oldboard) {
 #$cat|$board|$pic|$description|$mods|$modgroups|$topicperms|$replyperms|$pollperms|$zero|$membergroups|$ann|$rbin|$attperms|$minageperms|$maxageperms|$genderperms|$canpost|$parent|$rules|$rulestitle|$rulesdesc|$rulescollapse|$brdpasswr|$brdpassw|$bdrss
@@ -1010,7 +1010,7 @@
 qq~${$x}{'cat'}|$x|${$x}{'pic'}|${$x}{'description'}|${$x}{'mods'}|${$x}{'modgroups'}|${$x}{'topicperms'}|${$x}{'replyperms'}|${$x}{'pollperms'}|${$x}{'zero'}|${$x}{'membergroups'}|${$x}{'ann'}|${$x}{'rbin'}|${$x}{'attperms'}|${$x}{'minageperms'}|${$x}{'maxageperms'}|${$x}{'genderperms'}|${$x}{'canpost'}|${$x}{'parent'}|${$x}{'rules'}|${$x}{'rulestitle'}|${$x}{'rulesdesc'}|${$x}{'rulescollapse'}|${$x}{'brdpasswr'}|${$x}{'brdpassw'}|${$x}{'brdrss'}\n~;
             $j++;
         }
-       fopen( FORUMCONTROL, ">$boardsdir/forum.control" )
+        fopen( FORUMCONTROL, ">$boardsdir/forum.control" )
           || setup_fatal_error( "$maintext_23 $boardsdir/forum.control: ", 1 );
         print {FORUMCONTROL} @newboard
           or croak 'cannot print FORUMCONTROL';
@@ -1219,7 +1219,7 @@
         $INFO{'tcount'} = 0;
     }
     return;
-        }
+}
 
 # / Messages Conversion ##
 
@@ -1258,7 +1258,7 @@
 qq~$eventline[0]|$eventline[1]|$eventline[2]|$eventline[3]||$eventline[4]|$eventline[5]|$eventline[6]|$eventline[7]||$g\n~;
                     }
                     else { push @newvar, qq~$eventline\n~; }
-    }
+                }
 
                 fopen( NEWVAR, ">$vardir/$varfl" );
                 print {NEWVAR} @newvar
@@ -1678,7 +1678,7 @@
         $yyurl = $scripturl;
         $curline =~ s/{yabb\s+(\w+)}/${"yy$1"}/gxsm;
         $curline =~ s/<yabb\s+(\w+)>/${"yy$1"}/gxsm;
-        $curline =~ s/img src\=\"$imagesdir\/(.+?)\"/SetupImgLoc($1)/eisgm; #";
+        $curline =~ s/img src\=\"$imagesdir\/(.+?)\"/SetupImgLoc($1)/eisgm;  #";
         $output .= $curline;
     }
     if ( $yycopyin == 0 ) {

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks