+
+Help.
\ No newline at end of file
diff --git a/img/layout/back.png b/img/layout/back.png
new file mode 100644
index 0000000000..a2d5c84133
Binary files /dev/null and b/img/layout/back.png differ
diff --git a/img/layout/help.png b/img/layout/help.png
new file mode 100644
index 0000000000..a2d5c84133
Binary files /dev/null and b/img/layout/help.png differ
diff --git a/img/layout/logout.png b/img/layout/logout.png
new file mode 100644
index 0000000000..a2d5c84133
Binary files /dev/null and b/img/layout/logout.png differ
diff --git a/img/layout/settings.png b/img/layout/settings.png
new file mode 100644
index 0000000000..a2d5c84133
Binary files /dev/null and b/img/layout/settings.png differ
diff --git a/lib/app.php b/lib/app.php
index 9f1ce6f104..5db3e047fd 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -34,7 +34,6 @@ class OC_APP{
static private $settingspages = array();
static private $navigation = array();
static private $subnavigation = array();
- static private $personalmenu = array();
/**
* @brief loads all apps
@@ -53,7 +52,7 @@ class OC_APP{
}
// Our very own core apps are hardcoded
- foreach( array( "admin", "files", "log", "settings" ) as $app ){
+ foreach( array( "admin", "files", "log", "help", "settings" ) as $app ){
require( "$app/appinfo/app.php" );
}
@@ -165,31 +164,20 @@ class OC_APP{
* property from all other entries. The templates can use this for
* highlighting the current position of the user.
*/
- public static function activateNavigationEntry( $id ){
+ public static function setActiveNavigationEntry( $id ){
self::$activeapp = $id;
return true;
}
/**
- * @brief adds an entry to the personal menu
- * @param $data array containing the data
- * @returns true/false
+ * @brief gets the active Menu entry
+ * @returns id or empty string
*
- * This function adds a new entry to the personal menu visible to users
- * only. $data is an associative array.
- * The following keys are required:
- * - id: unique id for this entry ("logout")
- * - href: link to the page
- * - name: Human readable name ("Logout")
- *
- * The following keys are optional:
- * - order: integer, that influences the position of your application in
- * the personal menu. Lower values come first.
+ * This function returns the id of the active navigation entry (set by
+ * setActiveNavigationEntry
*/
- public static function addPersonalMenuEntry( $data ){
- // TODO: write function
- OC_APP::$personalmenu[] = $data;
- return true;
+ public static function getActiveNavigationEntry(){
+ return self::$activeapp;
}
/**
@@ -255,18 +243,6 @@ class OC_APP{
return OC_APP::$navigation;
}
- /**
- * @brief Returns the personal menu
- * @returns associative array
- *
- * This function returns an array containing all personal menu entries
- * added. The entries are sorted by the key "order" ascending.
- */
- public static function getPersonalMenu(){
- // TODO: write function
- return OC_APP::$personalmenu;
- }
-
/**
* @brief Returns the admin pages
* @returns associative array
diff --git a/lib/base.php b/lib/base.php
index 31d4142900..9ecf7db077 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -85,6 +85,7 @@ require_once('log.php');
require_once('user.php');
require_once('group.php');
require_once('ocs.php');
+require_once('ocsclient.php');
require_once('connect.php');
require_once('remotestorage.php');
require_once('plugin.php');
@@ -104,7 +105,6 @@ if(!$error and !$RUNTIME_NOSETUPFS ){
}
// Add the stuff we need always
-OC_APP::addPersonalMenuEntry( array( "order" => 1000, "href" => OC_HELPER::linkTo( "", "index.php?logout=1" ), "name" => "Logout" ));
OC_UTIL::addScript( "jquery-1.5.min" );
OC_UTIL::addScript( "jquery-ui-1.8.10.custom.min" );
OC_UTIL::addScript( "js" );
@@ -223,7 +223,7 @@ class OC_UTIL {
/**
* check if the current server configuration is suitable for ownCloud
- * @return array with error messages
+ * @return array arrays with error messages and hints
*/
public static function checkServer(){
global $SERVERROOT;
@@ -233,14 +233,26 @@ class OC_UTIL {
$CONFIG_BACKUPDIRECTORY = OC_CONFIG::getValue( "backupdirectory", "$SERVERROOT/backup" );
$CONFIG_INSTALLED = OC_CONFIG::getValue( "installed", false );
$errors=array();
-
+
//check for database drivers
if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
- $errors[]='No database drivers (sqlite or mysql) installed. ';
+ $errors[]=array('error'=>'No database drivers (sqlite or mysql) installed. ','hint'=>'');//TODO: sane hint
}
$CONFIG_DBTYPE = OC_CONFIG::getValue( "dbtype", "sqlite" );
$CONFIG_DBNAME = OC_CONFIG::getValue( "dbname", "owncloud" );
+ //try to get the username the httpd server runs on, used in hints
+ $stat=stat($_SERVER['DOCUMENT_ROOT']);
+ if(is_callable('posix_getpwuid')){
+ $serverUser=posix_getpwuid($stat['uid']);
+ $serverUser='\''.$serverUser['name'].'\'';
+ }else{
+ $serverUser='\'www-data\' for ubuntu/debian';//TODO: try to detect the distro and give a guess based on that
+ }
+
+ //common hint for all file permissons error messages
+ $permissionsHint="Permissions can usually be fixed by setting the owner of the directory to the user the web server runs as ($serverUser)";
+
//check for correct file permissions
if(!stristr(PHP_OS, 'WIN')){
if($CONFIG_DBTYPE=='sqlite'){
@@ -252,7 +264,7 @@ class OC_UTIL {
clearstatcache();
$prems=substr(decoct(fileperms($file)),-3);
if(substr($prems,2,1)!='0'){
- $errors[]='SQLite database file ('.$file.') is readable from the web ';
+ $errors[]=array('error'=>'SQLite database file ('.$file.') is readable from the web ','hint'=>$permissionsHint);
}
}
}
@@ -263,7 +275,7 @@ class OC_UTIL {
clearstatcache();
$prems=substr(decoct(fileperms($CONFIG_DATADIRECTORY_ROOT)),-3);
if(substr($prems,2,1)!='0'){
- $errors[]='Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web ';
+ $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web ','hint'=>$permissionsHint);
}
}
if( OC_CONFIG::getValue( "enablebackup", false )){
@@ -273,7 +285,7 @@ class OC_UTIL {
clearstatcache();
$prems=substr(decoct(fileperms($CONFIG_BACKUPDIRECTORY)),-3);
if(substr($prems,2,1)!='0'){
- $errors[]='Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web ';
+ $errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web ','hint'=>$permissionsHint);
}
}
}
@@ -281,11 +293,11 @@ class OC_UTIL {
//TODO: premisions checks for windows hosts
}
if(!is_writable($CONFIG_DATADIRECTORY_ROOT)){
- $errors[]='Data directory ('.$CONFIG_BACKUPDIRECTORY.') not writable by ownCloud ';
+ $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud ','hint'=>$permissionsHint);
}
-
+
//TODO: check for php modules
-
+
return $errors;
}
}
diff --git a/lib/template.php b/lib/template.php
index c36b1e7a36..0e1c268efa 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -190,11 +190,24 @@ class OC_TEMPLATE{
{
$page = new OC_TEMPLATE( "core", "layout.user" );
// Add menu data
+
+ // Add navigation entry
+ $page->assign( "navigation", OC_APP::getNavigation());
}
elseif( $this->renderas == "admin" )
{
$page = new OC_TEMPLATE( "core", "layout.admin" );
// Add menu data
+ $navigation = array();
+ if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
+ foreach( OC_APP::getAdminPages() as $i ){
+ $navigation[] = $i;
+ }
+ }
+ foreach( OC_APP::getSettingsPages() as $i ){
+ $navigation[] = $i;
+ }
+ $page->assign( "navigation", $navigation );
}
else
{
@@ -210,10 +223,6 @@ class OC_TEMPLATE{
$page->append( "cssfiles", "$WEBROOT/$style.css" );
}
- // Add navigation entry and personal menu
- $page->assign( "navigation", OC_APP::getNavigation());
- $page->assign( "personalmenu", OC_APP::getPersonalMenu());
-
// Add css files and js files
$page->assign( "content", $data );
return $page->fetchPage();
diff --git a/log/appinfo/app.php b/log/appinfo/app.php
index d3e848e960..fd53d1ec22 100644
--- a/log/appinfo/app.php
+++ b/log/appinfo/app.php
@@ -1,6 +1,6 @@
1, "id" => "log", "name" => "Log" ));
-OC_APP::addPersonalMenuEntry( array( "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log" ));
+OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
?>
diff --git a/log/index.php b/log/index.php
index a401a38fa1..23194f18a6 100644
--- a/log/index.php
+++ b/log/index.php
@@ -37,7 +37,7 @@ foreach( $logs as &$i ){
$i["action"] = OC_LOG::$TYPE[$i['type']];
}
-$tmpl = new OC_TEMPLATE( "log", "index", "user" );
+$tmpl = new OC_TEMPLATE( "log", "index", "admin" );
$tmpl->assign( "logs", $logs );
$tmpl->printPage();
diff --git a/plugins/blacklist.txt b/plugins/blacklist.txt
index 08c79e5e75..e113a39d0b 100644
--- a/plugins/blacklist.txt
+++ b/plugins/blacklist.txt
@@ -2,3 +2,4 @@ audioplayer
ldap
test
textviewer
+publiclink
diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
index a781389303..5f78b83dc2 100644
--- a/settings/appinfo/app.php
+++ b/settings/appinfo/app.php
@@ -1,6 +1,5 @@
"settings", "name" => "Settings" ));
-OC_APP::addPersonalMenuEntry( array( "order" => 1, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Settings" ));
?>
diff --git a/settings/img/information.png b/settings/img/information.png
new file mode 100644
index 0000000000..cbabb0e54a
Binary files /dev/null and b/settings/img/information.png differ
diff --git a/settings/index.php b/settings/index.php
index 85e4281c91..31db326f6b 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -7,27 +7,8 @@ if( !OC_USER::isLoggedIn()){
exit();
}
-$settings = array();
-// Do the work ...
-if( $_POST["submit"] )
-{
- if( $_POST["newpassword"] != $_POST["newpasswordconfirm"] ){
- // Say "Passwords not equal"
- }
- else{
- if( OC_USER::checkPassword( $_SESSION["username"], $_POST["password"] )){
- // Set password
- OC_USER::setPassord( $_SESSION["username"], $_POST["newpassword"] );
- }
- else{
- // Say "old password bad"
- }
- }
-}
-
-$tmpl = new OC_TEMPLATE( "settings", "index", "user" );
-$tmpl->assign( "settings", $settings );
+$tmpl = new OC_TEMPLATE( "settings", "index", "admin" );
$tmpl->printPage();
?>
diff --git a/settings/templates/index.php b/settings/templates/index.php
index 20410e06d1..106d313c01 100644
--- a/settings/templates/index.php
+++ b/settings/templates/index.php
@@ -5,20 +5,4 @@
?>
Settings
-
+Welcome to the settings! Bla bla bla
\ No newline at end of file
diff --git a/templates/error.php b/templates/error.php
index e8f56d63bd..5b71c1ef75 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -5,10 +5,12 @@
?>