diff options
| -rwxr-xr-x | includes/install_version.php | 29 | ||||
| -rwxr-xr-x | templates/install_cleanup.tpl | 2 | ||||
| -rwxr-xr-x | templates/install_cleanup_done.tpl | 2 | ||||
| -rwxr-xr-x | templates/install_packages_done.tpl | 2 | ||||
| -rwxr-xr-x | templates/install_version.tpl | 2 |
5 files changed, 4 insertions, 33 deletions
diff --git a/includes/install_version.php b/includes/install_version.php index 6004133..e2cb5eb 100755 --- a/includes/install_version.php +++ b/includes/install_version.php @@ -16,35 +16,6 @@ if( version_compare( $gBitSystem->getBitVersion(), $gBitSystem->getVersion(), '= $gBitSmarty->assign( 'upToDate', $upToDate ); } -// updating to version 2.1.0-beta -if( version_compare( '2.1.0-beta', $gBitSystem->getVersion(), '>' )) { - // get a list of all groups and their permissions - $listHash = [ - 'only_root_groups' => true, - 'sort_mode' => !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : 'group_name_asc', - ]; - $allGroups = $gBitUser->getAllGroups( $listHash ); - $allPerms = $gBitUser->getGroupPermissions( $_REQUEST ); - - $gBitSmarty->assign( 'allPerms', $allPerms ); - $gBitSmarty->assign( 'allGroups', $allGroups ); - $gBitSmarty->assign( 'version_210beta', TRUE ); - - $versionUpdate = TRUE; - - // deal with assigning permissions to various groups - if( !empty( $_REQUEST['fix_version_210beta'] )) { - foreach( array_keys( $allGroups ) as $groupId ) { - foreach( array_keys( $allPerms ) as $perm ) { - if( !empty( $_REQUEST['perms'][$groupId][$perm] )) { - $gBitUser->assignPermissionToGroup( $perm, $groupId ); - } else { - $gBitUser->removePermissionFromGroup( $perm, $groupId ); - } - } - } - } -} // ===================== Update version to current one ===================== // Only update the version when the form has been submitted diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl index b1cf14d..30aa167 100755 --- a/templates/install_cleanup.tpl +++ b/templates/install_cleanup.tpl @@ -131,7 +131,7 @@ {/if} {if empty( $insPerms ) and empty( $delPerms )} <p class="alert alert-success"> - The permissioning system in your installation is up to date and does not require any adjustments. Even though this is true, we recommend you visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/permissions.php"} page at some point to ensure that all permissions are active. + The permissioning system in your installation is up to date and does not require any adjustments. Even though this is true, we recommend you visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/role_permissions.php"} page at some point to ensure that all permissions are active. </p> {/if} {/legend} diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl index 5ef3445..c9483f0 100755 --- a/templates/install_cleanup_done.tpl +++ b/templates/install_cleanup_done.tpl @@ -19,7 +19,7 @@ {/forminput} </div> - <p>Since permissions have been modified, you should visit the {smartlink ititle="permission maintenance" ipackage=users ifile="admin/permissions.php"} page to make sure that all permissions are assigned to the correct groups.</p> + <p>Since permissions have been modified, you should visit the {smartlink ititle="permission maintenance" ipackage=users ifile="admin/role_permissions.php"} page to make sure that all permissions are assigned to the correct roles.</p> {/if} {if $deActivated} diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl index 9615202..7067ab1 100755 --- a/templates/install_packages_done.tpl +++ b/templates/install_packages_done.tpl @@ -29,7 +29,7 @@ {if !$first_install} <div class="alert alert-warning"> - You have just successfully installed new packages. During installation, new permissions were probably added to the database, but not assigned to any groups. You can use the <strong>{smartlink ititle="permission maintenance" ipackage=users ifile='admin/permissions.php'} </strong> page to assign these permissions quickly and easily. + You have just successfully installed new packages. During installation, new permissions were probably added to the database, but not assigned to any roles. You can use the <strong>{smartlink ititle="permission maintenance" ipackage=users ifile='admin/role_permissions.php'} </strong> page to assign these permissions quickly and easily. </div> {/if} diff --git a/templates/install_version.tpl b/templates/install_version.tpl index 1935e2a..d3ead7b 100755 --- a/templates/install_version.tpl +++ b/templates/install_version.tpl @@ -22,7 +22,7 @@ </p> <p class="help"> - You can visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/permissions.php"} page at any time to make further adjustments. + You can visit the {smartlink ititle="Permission Maintenance" ipackage=users ifile="admin/role_permissions.php"} page at any time to make further adjustments. </p> |