Changeset 3013

Timestamp:

09/02/08 02:06:03 (3 months ago)

Author:

auno

Message:

Fixed error for during upgrade from MT3.x. BugzID:81774

Files:

• trunk/lib/MT/Upgrade.pm (modified) (2 diffs)
• trunk/lib/MT/Upgrade/v3.pm (modified) (1 diff)
• trunk/lib/MT/Upgrade/v4.pm (modified) (4 diffs)

trunk/lib/MT/Upgrade.pm

@@ -17 +17 @@
-#    * Template check for all blogs
-
-$App $DryRun $Installing $SuperUser 
+%LegacyPerms $App $DryRun $Installing $SuperUser
-            $CLI $MAX_TIME $MAX_ROWS @steps);
-
@@ -71 +71 @@
-        },
-    );
+
+    %LegacyPerms = (
+        # System-wide permissions
+        #[ 2**0, 'administer', 'System Administrator', 2, 'system' ],
+        #[ 2**1, 'create_blog', 'Create Blogs', 2, 'system' ],
+        #[ 2**2, 'view_log', 'View System Activity Log', 2, 'system' ],
+        #[ 2**3, 'manage_plugins', 'Manage Plugins', 'system' ],
+
+        # Blog-specific permissions:
+        # The order here is the same order they are presented on the
+        # role definition screen.
+        2**0 => 'comment',# 'Add Comments', 1, 'blog'], 
+        2**12 => 'administer_blog',# 'Blog Administrator', 1, 'blog'], 
+        2**6 => 'edit_config',# 'Configure Blog', 1, 'blog'], 
+        2**3 => 'edit_all_posts',# 'Edit All Entries', 1, 'blog'], 
+        2**4 => 'edit_templates',# 'Manage Templates', 1, 'blog'], 
+        2**2 => 'upload',# 'Upload File', 1, 'blog'], 
+        2**1 => 'post',# 'Create Entry', 1, 'blog'], 
+        2**16 => 'edit_assets',# 'Manage Assets', 1, 'blog'],
+        2**15 => 'save_image_defaults',# 'Save Image Defaults', 1, 'blog'], 
+        2**9 => 'edit_categories',# 'Add/Manage Categories', 1, 'blog'], 
+        2**14 => 'edit_tags',# 'Manage Tags', 1, 'blog'], 
+        2**10 => 'edit_notifications',# 'Manage Notification List', 1, 'blog'], 
+        2**8 => 'send_notifications',# 'Send Notifications', 1, 'blog'], 
+        2**13 => 'view_blog_log',# 'View Activity Log', 1, 'blog'], 
+        #[ 2**17, 'publish_post', 'Publish Post', 1, 'blog'],
+        #[ 2**18, 'manage_feedback', 'Manage Feedback', 1, 'blog'],
+        #[ 2**19, 'set_publish_paths', 'Set Publishing Paths', 1, 'blog'],
+        #[ 2**20, 'manage_pages', 'Manage Pages', 1, 'blog'],
+        # 2**5 == 32 is deprecated; reserved for future use 
+        2**7 => 'rebuild',# 'Rebuild Files', 1, 'blog'], 
+        # Not a real permission but a denial thereeof; unlisted because it 
+        # has no label. 
+        2**11 => 'not_comment',# '', 1, 'blog'],
+    );
-}
-

trunk/lib/MT/Upgrade/v3.pm

@@ -379 +379 @@
-        },
-    };
+}
+
+my $perm_role_names = {
+    4096 => 'Blog Administrator',  # administer_blog
+    30687 => 'Blog Administrator', # 32767 - 2048(not comment) - 32(reserved) = all permissions in MT3.3
+    14303 => 'Blog Administrator', # 16383 - 2048(not comment) - 32(reserved) = all permissions in MT3.2
+    2 => 'Writer', # post
+    6 => 'Writer (can upload)', # post + upload
+    17032 => 'Editor',  # edit_all_posts + edit_tags + edit_categories + rebuild
+    17036 => 'Editor (can upload)', # Editor + upload
+    144 => 'Designer', # edit_templates + rebuild
+    17292 => 'Publisher', # Editor (can upload) + send_notifications
+};
+
+sub _migrate_permission_to_role {
+    my $perm = shift;
+    my $full_perm_mask = 0;
+
+    return unless $perm->author_id;
+    my $user = MT::Author->load($perm->author_id);
+    if (!$user) {
+        $perm->remove;
+        return;
+    }
+    # Don't bother with non-AUTHOR types
+    return unless $user->type == 1;
+
+    my $role_mask = $perm->role_mask;
+    $role_mask -= 32 if (32 & $role_mask) == 32; # for permissions before 3.2
+
+    if (!$full_perm_mask) {
+        # only consider blog permissions that are supported (exclude
+        # now reserved permission bits like 32).
+        foreach my $key (keys %MT::Upgrade::LegacyPerms) {
+            next if $MT::Upgrade::LegacyPerms{$key} =~ m/^not_/; # skip exclusion permissions
+            $full_perm_mask |= $key;
+        }
+    }
+
+    $role_mask = $full_perm_mask & $role_mask;
+
+    # '0' permission, not used for permissions, just prefs
+    return unless $role_mask;
+
+    my $name;
+    $name = MT->translate($perm_role_names->{$role_mask})
+        if $perm_role_names->{$role_mask};
+    $name ||= MT->translate("Custom ([_1])", $role_mask);
+    require MT::Role;
+    my $role = MT::Role->load({ name => $name });
+    if ($role) {
+        if (($role->role_mask != $role_mask) && 
+            ((4096 != $role->role_mask) && (30687 != $role_mask))) {
+            $role = undef;
+        }
+    }
+    unless ($role) {
+        $role = new MT::Role;
+        $role->name($name);
+        $role->description(MT->translate("This role was generated by Movable Type upon upgrade."));
+        $role->role_mask($role_mask);
+        $role->save;
+    }
+    my $blog = MT::Blog->load($perm->blog_id);
+    $user->add_role($role, $blog) if $blog;
-}
-

trunk/lib/MT/Upgrade/v4.pm

@@ -523 +523 @@
-### Subroutines
-
-my $perm_role_names = {
-    4096 => 'Blog Administrator',  # administer_blog
-    30687 => 'Blog Administrator', # 32767 - 2048(not comment) - 32(reserved) = all permissions in MT3.3
-    14303 => 'Blog Administrator', # 16383 - 2048(not comment) - 32(reserved) = all permissions in MT3.2
-    2 => 'Writer', # post
-    6 => 'Writer (can upload)', # post + upload
-    17032 => 'Editor',  # edit_all_posts + edit_tags + edit_categories + rebuild
-    17036 => 'Editor (can upload)', # Editor + upload
-    144 => 'Designer', # edit_templates + rebuild
-    17292 => 'Publisher', # Editor (can upload) + send_notifications
-};
-
-{
-    my $full_perm_mask = 0;
-    my %LegacyPerms = (
-        # System-wide permissions
-        #[ 2**0, 'administer', 'System Administrator', 2, 'system' ],
-        #[ 2**1, 'create_blog', 'Create Blogs', 2, 'system' ],
-        #[ 2**2, 'view_log', 'View System Activity Log', 2, 'system' ],
-        #[ 2**3, 'manage_plugins', 'Manage Plugins', 'system' ],
- 
-        # Blog-specific permissions:
-        # The order here is the same order they are presented on the
-        # role definition screen.
-        2**0 => 'comment',# 'Add Comments', 1, 'blog'], 
-        2**12 => 'administer_blog',# 'Blog Administrator', 1, 'blog'], 
-        2**6 => 'edit_config',# 'Configure Blog', 1, 'blog'], 
-        2**3 => 'edit_all_posts',# 'Edit All Entries', 1, 'blog'], 
-        2**4 => 'edit_templates',# 'Manage Templates', 1, 'blog'], 
-        2**2 => 'upload',# 'Upload File', 1, 'blog'], 
-        2**1 => 'post',# 'Create Entry', 1, 'blog'], 
-        2**16 => 'edit_assets',# 'Manage Assets', 1, 'blog'],
-        2**15 => 'save_image_defaults',# 'Save Image Defaults', 1, 'blog'], 
-        2**9 => 'edit_categories',# 'Add/Manage Categories', 1, 'blog'], 
-        2**14 => 'edit_tags',# 'Manage Tags', 1, 'blog'], 
-        2**10 => 'edit_notifications',# 'Manage Notification List', 1, 'blog'], 
-        2**8 => 'send_notifications',# 'Send Notifications', 1, 'blog'], 
-        2**13 => 'view_blog_log',# 'View Activity Log', 1, 'blog'], 
-        #[ 2**17, 'publish_post', 'Publish Post', 1, 'blog'],
-        #[ 2**18, 'manage_feedback', 'Manage Feedback', 1, 'blog'],
-        #[ 2**19, 'set_publish_paths', 'Set Publishing Paths', 1, 'blog'],
-        #[ 2**20, 'manage_pages', 'Manage Pages', 1, 'blog'],
-        # 2**5 == 32 is deprecated; reserved for future use 
-        2**7 => 'rebuild',# 'Rebuild Files', 1, 'blog'], 
-        # Not a real permission but a denial thereeof; unlisted because it 
-        # has no label. 
-        2**11 => 'not_comment',# '', 1, 'blog'],
-    );
-
-
-sub _migrate_permission_to_role {
-    my $perm = shift;
-
-    return unless $perm->author_id;
-    my $user = MT::Author->load($perm->author_id);
-    if (!$user) {
-        $perm->remove;
-        return;
-    }
-    # Don't bother with non-AUTHOR types
-    return unless $user->type == 1;
-
-    my $role_mask = $perm->role_mask;
-    $role_mask -= 32 if (32 & $role_mask) == 32; # for permissions before 3.2
-
-    if (!$full_perm_mask) {
-        # only consider blog permissions that are supported (exclude
-        # now reserved permission bits like 32).
-        foreach my $key (keys %LegacyPerms) {
-            next if $LegacyPerms{$key} =~ m/^not_/; # skip exclusion permissions
-            $full_perm_mask |= $key;
-        }
-    }
-
-    $role_mask = $full_perm_mask & $role_mask;
-
-    # '0' permission, not used for permissions, just prefs
-    return unless $role_mask;
-
-    my $name;
-    $name = MT->translate($perm_role_names->{$role_mask})
-        if $perm_role_names->{$role_mask};
-    $name ||= MT->translate("Custom ([_1])", $role_mask);
-    require MT::Role;
-    my $role = MT::Role->load({ name => $name });
-    if ($role) {
-        if (($role->role_mask != $role_mask) && 
-            ((4096 != $role->role_mask) && (30687 != $role_mask))) {
-            $role = undef;
-        }
-    }
-    unless ($role) {
-        $role = new MT::Role;
-        $role->name($name);
-        $role->description(MT->translate("This role was generated by Movable Type upon upgrade."));
-        $role->role_mask($role_mask);
-        $role->save;
-    }
-    my $blog = MT::Blog->load($perm->blog_id);
-    $user->add_role($role, $blog) if $blog;
-}
-
-sub _process_masks {
-    my ($perm) = @_;
@@ -631 +529 @@
-    return unless $mask;
-    my @perms;
-
+MT::Upgrade::
-        if (int($mask) & int($key)) {
-            if (2 eq $key) { # post
@@ -642 +540 @@
-                $perm->restrictions("'comment'");
-            } else {
-
+MT::Upgrade::
-            }
-        }
@@ -674 +572 @@
-        }
-    }
-}
-}
-