diff --git a/img/favicon-touch.png b/img/favicon-touch.png
new file mode 100644
index 0000000000000000000000000000000000000000..20af826523cfdb9da47ba1208c81df38ecb3973c
Binary files /dev/null and b/img/favicon-touch.png differ
diff --git a/img/favicon.png b/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7ee766dfa8931c9a707520176aa02aee76bb7b0
Binary files /dev/null and b/img/favicon.png differ
diff --git a/img/layout/back.png b/img/layout/back.png
index a2d5c841335d19c0f64b9b6aafdc275dd09a2bb7..900ae719adce3a4da03c8cb58d9c637be8eb1540 100644
Binary files a/img/layout/back.png and b/img/layout/back.png differ
diff --git a/img/layout/help.png b/img/layout/help.png
index a2d5c841335d19c0f64b9b6aafdc275dd09a2bb7..bf29c09f8c171eaff20d4fd4983aa1b32f54a027 100644
Binary files a/img/layout/help.png and b/img/layout/help.png differ
diff --git a/img/layout/logout.png b/img/layout/logout.png
index a2d5c841335d19c0f64b9b6aafdc275dd09a2bb7..0ee7e1b14cd38dd869f46ebefdca8f293c6bb9d6 100644
Binary files a/img/layout/logout.png and b/img/layout/logout.png differ
diff --git a/img/layout/settings.png b/img/layout/settings.png
index a2d5c841335d19c0f64b9b6aafdc275dd09a2bb7..8821c353e5d38e23e1f32a29dc0e62369dc0c148 100644
Binary files a/img/layout/settings.png and b/img/layout/settings.png differ
diff --git a/lib/Group/backend.php b/lib/Group/backend.php
index c70bd6665cb871274d50c3c4b4d711cf0e563780..f34c340be8cfbf4ab6cb07ad787204d2f13b9802 100644
--- a/lib/Group/backend.php
+++ b/lib/Group/backend.php
@@ -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(){}
}
diff --git a/lib/User/backend.php b/lib/User/backend.php
index ab053661f88d1d054abdc124260e973af5d7327f..0483d72bf02f1f98cdc91323f7d1659113ebd5a5 100644
--- a/lib/User/backend.php
+++ b/lib/User/backend.php
@@ -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(){}
}
diff --git a/lib/fileobserver.php b/lib/fileobserver.php
index 08a67521f037bdcd957ba9c1178f760337b88ee5..ac9f2513c7bff34caa0ccc39c096d3da3056209e 100644
--- a/lib/fileobserver.php
+++ b/lib/fileobserver.php
@@ -41,7 +41,7 @@ class OC_FILEOBSERVER{
}
}
- public function notify($path,$action){}
+ public function notify($path,$action,$storage){}
}
/**
diff --git a/lib/helper.php b/lib/helper.php
index 4fff7c28fead34d4ce3be064bf2c0ebabdb8c0cd..7c7fe2757e7d94355fc420c5c8a1c7618d6d5f87 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -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";
}
diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index ea352a0fb71bcf01937b606fbfd6e191bdd9cc50..52912f48767058d3b7c342d86092567809f2e2fb 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -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>
diff --git a/templates/layout.guest.php b/templates/layout.guest.php
index a163a97103f2cef408e4902059823e213c01c0a3..8d567759ffcb5714c07c47719ad0de85914c85d5 100644
--- a/templates/layout.guest.php
+++ b/templates/layout.guest.php
@@ -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>.
diff --git a/templates/layout.user.php b/templates/layout.user.php
index be14cc0fc0d61bdf7ed772e999393a8e7d8e34a9..0ee49623151105c12b4b1bf2414a97b4591d55a8 100644
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@ -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>