aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/ajax/changepassword.php4
-rw-r--r--admin/ajax/creategroup.php6
-rw-r--r--admin/ajax/createuser.php10
-rw-r--r--admin/ajax/disableapp.php2
-rw-r--r--admin/ajax/enableapp.php2
-rw-r--r--admin/ajax/removegroup.php4
-rw-r--r--admin/ajax/removeuser.php4
-rw-r--r--admin/ajax/togglegroups.php8
-rw-r--r--admin/appinfo/app.php10
-rw-r--r--admin/apps.php40
-rw-r--r--admin/system.php8
-rw-r--r--admin/templates/apps.php4
-rw-r--r--admin/templates/users.php2
-rw-r--r--admin/users.php18
14 files changed, 61 insertions, 61 deletions
diff --git a/admin/ajax/changepassword.php b/admin/ajax/changepassword.php
index 51634908a76..98c2a8b37a1 100644
--- a/admin/ajax/changepassword.php
+++ b/admin/ajax/changepassword.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -16,7 +16,7 @@ $username = $_POST["username"];
$password = $_POST["password"];
// Return Success story
-if( OC_USER::setPassword( $username, $password )){
+if( OC_User::setPassword( $username, $password )){
echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
}
else{
diff --git a/admin/ajax/creategroup.php b/admin/ajax/creategroup.php
index df9a36aaa2f..2631937b14d 100644
--- a/admin/ajax/creategroup.php
+++ b/admin/ajax/creategroup.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -15,13 +15,13 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
$groupname = $_POST["groupname"];
// Does the group exist?
-if( in_array( $groupname, OC_GROUP::getGroups())){
+if( in_array( $groupname, OC_Group::getGroups())){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Group already exists" )));
exit();
}
// Return Success story
-if( OC_GROUP::createGroup( $groupname )){
+if( OC_Group::createGroup( $groupname )){
echo json_encode( array( "status" => "success", "data" => array( "groupname" => $groupname )));
}
else{
diff --git a/admin/ajax/createuser.php b/admin/ajax/createuser.php
index 507ded9079f..1bb655ed336 100644
--- a/admin/ajax/createuser.php
+++ b/admin/ajax/createuser.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -20,17 +20,17 @@ $username = $_POST["username"];
$password = $_POST["password"];
// Does the group exist?
-if( in_array( $username, OC_USER::getUsers())){
+if( in_array( $username, OC_User::getUsers())){
echo json_encode( array( "status" => "error", "data" => array( "message" => "User already exists" )));
exit();
}
// Return Success story
-if( OC_USER::createUser( $username, $password )){
+if( OC_User::createUser( $username, $password )){
foreach( $groups as $i ){
- OC_GROUP::addToGroup( $username, $i );
+ OC_Group::addToGroup( $username, $i );
}
- echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", OC_GROUP::getUserGroups( $username )))));
+ echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
}
else{
echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to add user" )));
diff --git a/admin/ajax/disableapp.php b/admin/ajax/disableapp.php
index d23f8de7ef0..dce62fa11d4 100644
--- a/admin/ajax/disableapp.php
+++ b/admin/ajax/disableapp.php
@@ -4,6 +4,6 @@
require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
-OC_APP::disable($_POST['appid']);
+OC_App::disable($_POST['appid']);
?>
diff --git a/admin/ajax/enableapp.php b/admin/ajax/enableapp.php
index d988d7fd2df..eb1bfc54a04 100644
--- a/admin/ajax/enableapp.php
+++ b/admin/ajax/enableapp.php
@@ -4,6 +4,6 @@
require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
-OC_APP::enable($_POST['appid']);
+OC_App::enable($_POST['appid']);
?>
diff --git a/admin/ajax/removegroup.php b/admin/ajax/removegroup.php
index e3d62e5fac8..bf80da741c7 100644
--- a/admin/ajax/removegroup.php
+++ b/admin/ajax/removegroup.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -15,7 +15,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
$name = $_POST["groupname"];
// Return Success story
-if( OC_GROUP::deleteGroup( $name )){
+if( OC_Group::deleteGroup( $name )){
echo json_encode( array( "status" => "success", "data" => array( "groupname" => $name )));
}
else{
diff --git a/admin/ajax/removeuser.php b/admin/ajax/removeuser.php
index 6b48146ad45..0a94884cb96 100644
--- a/admin/ajax/removeuser.php
+++ b/admin/ajax/removeuser.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -15,7 +15,7 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' ))
$username = $_POST["username"];
// Return Success story
-if( OC_USER::deleteUser( $username )){
+if( OC_User::deleteUser( $username )){
echo json_encode( array( "status" => "success", "data" => array( "username" => $username )));
}
else{
diff --git a/admin/ajax/togglegroups.php b/admin/ajax/togglegroups.php
index 5c7bd393e92..808e57dc9d6 100644
--- a/admin/ajax/togglegroups.php
+++ b/admin/ajax/togglegroups.php
@@ -7,7 +7,7 @@ require_once('../../lib/base.php');
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
-if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
@@ -20,13 +20,13 @@ $username = $_POST["username"];
$group = $_POST["group"];
// Toggle group
-if( OC_GROUP::inGroup( $username, $group )){
+if( OC_Group::inGroup( $username, $group )){
$action = "remove";
$error = "remove user from";
- $success = OC_GROUP::removeFromGroup( $username, $group );
+ $success = OC_Group::removeFromGroup( $username, $group );
}
else{
- $success = OC_GROUP::addToGroup( $username, $group );
+ $success = OC_Group::addToGroup( $username, $group );
}
// Return Success story
diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index 7ce784cfb98..dfb9aee8159 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -1,12 +1,12 @@
<?php
-OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
+OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
-// OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
-OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
-OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
+// OC_App::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_Helper::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_Helper::imagePath( "admin", "administration.png" )));
+OC_App::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_Helper::imagePath( "admin", "users.png" )));
+OC_App::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_Helper::imagePath( "admin", "apps.png" )));
// Add subentries for App installer
-OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_App::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_Helper::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_Helper::imagePath( "admin", "navicon.png" )));
?>
diff --git a/admin/apps.php b/admin/apps.php
index 4bbf1c813b0..4f39feab0c5 100644
--- a/admin/apps.php
+++ b/admin/apps.php
@@ -22,14 +22,14 @@
*/
require_once('../lib/base.php');
-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();
}
// Load the files we need
-OC_UTIL::addStyle( "admin", "apps" );
-OC_UTIL::addScript( "admin", "apps" );
+OC_Util::addStyle( "admin", "apps" );
+OC_Util::addScript( "admin", "apps" );
if(isset($_GET['id'])) $id=$_GET['id']; else $id=0;
@@ -38,32 +38,32 @@ if(isset($_GET['installed'])) $installed=true; else $installed=false;
if($installed){
global $SERVERROOT;
- OC_INSTALLER::installShippedApps(false);
- $apps = OC_APPCONFIG::getApps();
+ OC_Installer::installShippedApps(false);
+ $apps = OC_Appconfig::getApps();
$records = array();
- OC_APP::setActiveNavigationEntry( "core_apps" );
+ OC_App::setActiveNavigationEntry( "core_apps" );
foreach($apps as $app){
- $info=OC_APP::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
+ $info=OC_App::getAppInfo("$SERVERROOT/apps/$app/appinfo/info.xml");
$record = array( 'id' => $app,
'name' => $info['name'],
'version' => $info['version'],
'author' => $info['author'],
- 'enabled' => OC_APP::isEnabled( $app ));
+ 'enabled' => OC_App::isEnabled( $app ));
$records[]=$record;
}
- $tmpl = new OC_TEMPLATE( "admin", "appsinst", "admin" );
+ $tmpl = new OC_Template( "admin", "appsinst", "admin" );
$tmpl->assign( "apps", $records );
$tmpl->printPage();
unset($tmpl);
exit();
}else{
- $categories=OC_OCSCLIENT::getCategories();
+ $categories=OC_OCSClient::getCategories();
if($categories==NULL){
- OC_APP::setActiveNavigationEntry( "core_apps" );
+ OC_App::setActiveNavigationEntry( "core_apps" );
- $tmpl = new OC_TEMPLATE( "admin", "app_noconn", "admin" );
+ $tmpl = new OC_Template( "admin", "app_noconn", "admin" );
$tmpl->printPage();
unset($tmpl);
exit();
@@ -71,18 +71,18 @@ if($installed){
if($id==0) {
- OC_APP::setActiveNavigationEntry( "core_apps_get" );
+ OC_App::setActiveNavigationEntry( "core_apps_get" );
if($cat==0){
$numcats=array();
foreach($categories as $key=>$value) $numcats[]=$key;
- $apps=OC_OCSCLIENT::getApplications($numcats);
+ $apps=OC_OCSClient::getApplications($numcats);
}else{
- $apps=OC_OCSCLIENT::getApplications($cat);
+ $apps=OC_OCSClient::getApplications($cat);
}
// return template
- $tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
+ $tmpl = new OC_Template( "admin", "apps", "admin" );
$tmpl->assign( "categories", $categories );
$tmpl->assign( "apps", $apps );
@@ -90,11 +90,11 @@ if($installed){
unset($tmpl);
}else{
- OC_APP::setActiveNavigationEntry( "core_apps" );
+ OC_App::setActiveNavigationEntry( "core_apps" );
- $app=OC_OCSCLIENT::getApplication($id);
+ $app=OC_OCSClient::getApplication($id);
- $tmpl = new OC_TEMPLATE( "admin", "app", "admin" );
+ $tmpl = new OC_Template( "admin", "app", "admin" );
$tmpl->assign( "categories", $categories );
$tmpl->assign( "app", $app );
$tmpl->printPage();
diff --git a/admin/system.php b/admin/system.php
index 9286ab9c2b3..11a76132b4c 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -22,14 +22,14 @@
*/
require_once('../lib/base.php');
-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();
}
-OC_APP::setActiveNavigationEntry( "administration" );
+OC_App::setActiveNavigationEntry( "administration" );
-$tmpl = new OC_TEMPLATE( "admin", "system", "admin" );
+$tmpl = new OC_Template( "admin", "system", "admin" );
$tmpl->printPage();
?>
diff --git a/admin/templates/apps.php b/admin/templates/apps.php
index 593aad63182..50dd497c333 100644
--- a/admin/templates/apps.php
+++ b/admin/templates/apps.php
@@ -17,8 +17,8 @@
<tbody>
<?php foreach($_["apps"] as $app): ?>
<tr>
- <td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td>
- <td class="name"><a href="<?php echo(OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php echo('<span class="type">'.$app['typename'].'</span>'); ?></td>
+ <td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_Helper::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td>
+ <td class="name"><a href="<?php echo(OC_Helper::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php echo('<span class="type">'.$app['typename'].'</span>'); ?></td>
<td class="date"><?php echo $l->l('datetime', $app["changed"]); ?></td>
</tr>
<?php endforeach; ?>
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 147db7c7aa4..6fc3e643010 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -33,7 +33,7 @@
<td x-use="username"><span x-use="usernamediv"><?php echo $user["name"]; ?></span></td>
<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
<td>
- <?php if($user['name']!=OC_USER::getUser()):?>
+ <?php if($user['name']!=OC_User::getUser()):?>
<a class="removeuserbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
<?php endif;?>
</td>
diff --git a/admin/users.php b/admin/users.php
index 4065cc471f1..fd0b6fec01b 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -22,34 +22,34 @@
*/
require_once('../lib/base.php');
-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();
}
// We have some javascript foo!
-OC_UTIL::addScript( "admin", "users" );
-OC_UTIL::addStyle( "admin", "users" );
-OC_APP::setActiveNavigationEntry( "core_users" );
+OC_Util::addScript( "admin", "users" );
+OC_Util::addStyle( "admin", "users" );
+OC_App::setActiveNavigationEntry( "core_users" );
$users = array();
$groups = array();
-foreach( OC_USER::getUsers() as $i ){
+foreach( OC_User::getUsers() as $i ){
// Do some more work here soon
$ingroups = array();
- foreach( OC_GROUP::getUserGroups( $i ) as $userGroup ){
+ foreach( OC_Group::getUserGroups( $i ) as $userGroup ){
$ingroups[] = $userGroup;
}
$users[] = array( "name" => $i, "groups" => join( ", ", $ingroups ));
}
-foreach( OC_GROUP::getGroups() as $i ){
+foreach( OC_Group::getGroups() as $i ){
// Do some more work here soon
$groups[] = array( "name" => $i );
}
-$tmpl = new OC_TEMPLATE( "admin", "users", "admin" );
+$tmpl = new OC_Template( "admin", "users", "admin" );
$tmpl->assign( "users", $users );
$tmpl->assign( "groups", $groups );
$tmpl->printPage();
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 09:09:52 +0000