mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

This commit is contained in:
Frank Karlitschek 2011-04-16 19:58:07 +02:00
parent 219c4a2c78 18ff5f0a7d
commit cf50c497b9
13 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/favicon-touch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
img/favicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 565 B

BIN
img/layout/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 257 B

BIN
img/layout/help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 354 B

BIN
img/layout/logout.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 446 B

BIN
img/layout/settings.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 435 B

12
lib/Group/backend.php
View File

@ -33,7 +33,7 @@ abstract class OC_GROUP_BACKEND {
*
* @param string $groupName The name of the group to create
*/
abstract public static function createGroup($groupName);
public static function createGroup($groupName){}
/**
* Check if a user belongs to a group
@ -41,7 +41,7 @@ abstract class OC_GROUP_BACKEND {
* @param string $username Name of the user to check
* @param string $groupName Name of the group
*/
abstract public static function inGroup($username, $groupName);
public static function inGroup($username, $groupName){}
/**
* Add a user to a group
@ -49,7 +49,7 @@ abstract class OC_GROUP_BACKEND {
* @param string $username Name of the user to add to group
* @param string $groupName Name of the group in which add the user
*/
abstract public static function addToGroup($username, $groupName);
public static function addToGroup($username, $groupName){}
/**
* Remove a user from a group
@ -57,18 +57,18 @@ abstract class OC_GROUP_BACKEND {
* @param string $username Name of the user to remove from group
* @param string $groupName Name of the group from which remove the user
*/
abstract public static function removeFromGroup($username,$groupName);
public static function removeFromGroup($username,$groupName){}
/**
* Get all groups the user belongs to
*
* @param string $username Name of the user
*/
abstract public static function getUserGroups($username);
public static function getUserGroups($username){}
/**
* get a list of all groups
*
*/
abstract public static function getGroups();
public static function getGroups(){}
}

14
lib/User/backend.php
View File

@ -35,7 +35,7 @@ abstract class OC_USER_BACKEND {
* @param string $username The username of the user to create
* @param string $password The password of the new user
*/
abstract public static function createUser($username, $password);
public static function createUser($username, $password){}
/**
* Try to login a user
@ -43,18 +43,18 @@ abstract class OC_USER_BACKEND {
* @param string $username The username of the user to log in
* @param string $password The password of the user
*/
abstract public static function login($username, $password);
public static function login($username, $password){}
/**
* Check if some user is logged in
*
*/
abstract public static function isLoggedIn();
public static function isLoggedIn(){}
/**
* Generate a random password
*/
abstract public static function generatePassword();
public static function generatePassword(){}
/**
* Set the password of a user
@ -62,7 +62,7 @@ abstract class OC_USER_BACKEND {
* @param string $username User who password will be changed
* @param string $password The new password for the user
*/
abstract public static function setPassword($username, $password);
public static function setPassword($username, $password){}
/**
* Check if the password of the user is correct
@ -70,12 +70,12 @@ abstract class OC_USER_BACKEND {
* @param string $username Name of the user
* @param string $password Password of the user
*/
abstract public static function checkPassword($username, $password);
public static function checkPassword($username, $password){}
/**
* get a list of all users
*
*/
abstract public static function getUsers();
public static function getUsers(){}
}

2
lib/fileobserver.php
View File

@ -41,7 +41,7 @@ class OC_FILEOBSERVER{
}
}
public function notify($path,$action){}
public function notify($path,$action,$storage){}
}
/**

4
lib/helper.php
View File

@ -60,8 +60,8 @@ class OC_HELPER {
global $SERVERROOT;
global $WEBROOT;
// Check if the app is in the app folder
if( file_exists( "$SERVERROOT/apps/img/$app/$file" )){
return "$WEBROOT/apps/img/$app/$file";
if( file_exists( "$SERVERROOT/apps/img/$app/$image" )){
return "$WEBROOT/apps/img/$app/$image";
}
return "$WEBROOT/$app/img/$image";
}

24
templates/layout.admin.php
View File

@ -8,39 +8,39 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="favicon.ico" />
<?php foreach($_["cssfiles"] as $cssfile): ?>
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
<?php foreach($_["jsfiles"] as $jsfile): ?>
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body>
<div id="header">
<a href="<?php echo link_to("", "index.php"); ?>" title="" id="owncloud"><img src="<?php echo image_path("", "owncloud-logo-small-white.png"); ?>" alt="ownCloud" /></a>
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<div id="user">
<a href="<?php echo link_to("","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/back.png"); ?>"></a>
<a href="<?php echo link_to("settings","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/settings.png"); ?>"></a>
<a href="<?php echo link_to("help","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/help.png"); ?>"></a>
<a href="<?php echo link_to("","index.php?logout=true"); ?>" title=""><img src="<?php echo image_path("", "layout/logout.png"); ?>"></a>
<a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a>
<a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a>
<a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a>
<a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a>
</div>
</div>
<div id="main">
<div id="plugins">
<ul>
<li><a style="background-image:url(<?php echo image_path("settings", "information.png"); ?>)" href="<?php echo link_to("settings", "index.php"); ?>" title="">Information</a></li>
<?php foreach($_["navigation"] as $entry):?>
<li><a style="background-image:url(<?php echo $entry["icon"]; ?>)" href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"] ?></a></li>
<li><a style="background-image:url(<?php echo image_path('settings', 'information.png'); ?>)" href="<?php echo link_to('settings', 'index.php'); ?>" title="">Information</a></li>
<?php foreach($_['navigation'] as $entry):?>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name'] ?></a></li>
<?php endforeach; ?>
</ul>
</div>
<div id="content">
<?php echo $_["content"]; ?>
<?php echo $_['content']; ?>
</div>
</div>
</body>

8
templates/layout.guest.php
View File

@ -8,17 +8,17 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="favicon.ico" />
<?php foreach($_["cssfiles"] as $cssfile): ?>
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
<?php foreach($_["jsfiles"] as $jsfile): ?>
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body class="login">
<?php echo $_["content"]; ?>
<?php echo $_['content']; ?>
<p class="info">
ownCloud is an open personal cloud which runs on your personal server.<br />
To learn more, please visit <a href="http://www.owncloud.org/">owncloud.org</a>.

22
templates/layout.user.php
View File

@ -8,40 +8,40 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="favicon.ico" />
<?php foreach($_["cssfiles"] as $cssfile): ?>
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
<?php foreach($_["jsfiles"] as $jsfile): ?>
<?php foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>
<body>
<div id="header">
<a href="<?php echo link_to("", "index.php"); ?>" title="" id="owncloud"><img src="<?php echo image_path("", "owncloud-logo-small-white.png"); ?>" alt="ownCloud" /></a>
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<div id="user">
<?php if( OC_APP::getActiveNavigationEntry() == "help" ): ?>
<a href="<?php echo link_to("","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/back.png"); ?>"></a>
<a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a>
<?php endif; ?>
<a href="<?php echo link_to("settings","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/settings.png"); ?>"></a>
<a href="<?php echo link_to("help","index.php"); ?>" title=""><img src="<?php echo image_path("", "layout/help.png"); ?>"></a>
<a href="<?php echo link_to("","index.php"); ?>?logout=true" title=""><img src="<?php echo image_path("", "layout/logout.png"); ?>"></a>
<a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a>
<a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a>
<a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a>
</div>
</div>
<div id="main">
<div id="plugins">
<ul>
<?php foreach($_["navigation"] as $entry): ?>
<li><a style="background-image:url(<?php echo $entry["icon"]; ?>)" href="<?php echo $entry["href"]; ?>" title=""><?php echo $entry["name"]; ?></a></li>
<?php foreach($_['navigation'] as $entry): ?>
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title=""><?php echo $entry['name']; ?></a></li>
<?php endforeach; ?>
</ul>
</div>
<div id="content">
<?php echo $_["content"]; ?>
<?php echo $_['content']; ?>
</div>
</div>
</body>