diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
| commit | 11d162751381963e0c8a86cf15c811cc99003654 (patch) | |
| tree | 276b5b1e67a66491ef553346087b2959f35b3bc7 /files/admin.php | |
| parent | d13ba0ee2d93080ba56776442b9d39a53e2b6321 (diff) | |
| parent | d6faa89ed720da7319923cba33a83d0210216d57 (diff) | |
| download | nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.tar.gz nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.zip | |
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
lib/base.php
Diffstat (limited to 'files/admin.php')
| -rw-r--r-- | files/admin.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/files/admin.php b/files/admin.php index 5c9923aff86..0b8639f38ca 100644 --- a/files/admin.php +++ b/files/admin.php @@ -24,26 +24,25 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user -if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){ - header( "Location: ".OC_HELPER::linkTo( "index.php" )); +if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ + header( "Location: ".OC_Helper::linkTo( "index.php" )); exit(); } $htaccessWorking=(getenv('htaccessWorking')=='true'); if(isset($_POST['maxUploadSize'])){ $maxUploadFilesize=$_POST['maxUploadSize']; - OC_FILES::setUploadLimit(OC_HELPER::computerFileSize($maxUploadFilesize)); + OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize)); }else{ $maxUploadFilesize = ini_get('upload_max_filesize').'B'; } -OC_APP::setActiveNavigationEntry( "files_administration" ); +OC_App::setActiveNavigationEntry( "files_administration" ); // return template -$tmpl = new OC_TEMPLATE( "files", "admin", "admin" ); +$tmpl = new OC_Template( "files", "admin", "admin" ); $tmpl->assign( 'htaccessWorking', $htaccessWorking ); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); $tmpl->printPage(); |