|
diff --git a/help/templates/index.php b/help/templates/index.php
index ac7e12b757..7105507f5e 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -1,23 +1,27 @@
t( 'Questions and Answers' ); ?>
-
-
-
-
- "") { echo(' '); } ?> |
-
'.$kb['description'].''); ?>
- '') echo('
Answer:
'.$kb['answer'].'');?>
- |
-
-
-
-
-printPage();
-?>
-t( 'ASK A QUESTION' ); ?>
+
+ Can't connect to Q&A database
+
+
+
+
+
+ | "") { echo(''); } ?> |
+
'.$kb['description'].''); ?>
+ '') echo('
Answer:
'.$kb['answer'].'');?>
+ |
+
+
+
+
+ printPage();
+ ?>
+ t( 'ASK A QUESTION' ); ?>
+
diff --git a/index.php b/index.php
index d1726676c6..2e2d495fda 100644
--- a/index.php
+++ b/index.php
@@ -31,7 +31,6 @@ OC_UTIL::addScript('setup');
$not_installed = !OC_CONFIG::getValue('installed', false);
$install_called = (isset($_POST['install']) AND $_POST['install']=='true');
-
// First step : check if the server is correctly configured for ownCloud :
$errors = OC_UTIL::checkServer();
if(count($errors) > 0) {
@@ -61,17 +60,23 @@ elseif(isset($_POST["user"])) {
OC_APP::loadApps();
if(OC_USER::login($_POST["user"], $_POST["password"])) {
header("Location: ".$WEBROOT.'/'.OC_APPCONFIG::getValue("core", "defaultpage", "files/index.php"));
+ if(!empty($_POST["remember_login"])){
+ OC_USER::setUsernameInCookie($_POST["user"]);
+ }
+ else {
+ OC_USER::unsetUsernameInCookie();
+ }
exit();
}
else {
- OC_TEMPLATE::printGuestPage("", "login", array("error" => true));
+ OC_TEMPLATE::printGuestPage("", "login", array("error" => true, "username" => $_COOKIE["username"]));
}
}
// For all others cases, we display the guest page :
else {
OC_APP::loadApps();
- OC_TEMPLATE::printGuestPage("", "login", array("error" => false));
+ OC_TEMPLATE::printGuestPage("", "login", array("error" => false, "username" => $_COOKIE["username"]));
}
?>
\ No newline at end of file
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 819ad2e60b..c2614dc5dc 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -65,6 +65,7 @@ OC_FILESYSTEM::registerStorageType('local','OC_FILESTORAGE_LOCAL',array('datadir
*/
class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
private $datadir;
+ private static $mimetypes=null;
public function __construct($arguments){
$this->datadir=$arguments['datadir'];
if(substr($this->datadir,-1)!=='/'){
@@ -209,71 +210,14 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
$mime_type=substr($reply,0,strrpos($reply,' '));
}
if (empty($mime_type)) {
- // Fallback solution: try to guess the type by the file extension
- // TODO: add more ...
- switch (strtolower(strrchr(basename($fspath), "."))) {
- case '.css':
- $mime_type = 'text/css';
- break;
- case '.flac':
- $mime_type = 'audio/flac';
- break;
- case '.gif':
- $mime_type = 'image/gif';
- break;
- case '.gzip':
- case '.gz':
- $mime_type = 'application/x-gzip';
- break;
- case '.htm':
- case '.html':
- $mime_type = 'text/html';
- break;
- case '.jpeg':
- case '.jpg':
- $mime_type = 'image/jpeg';
- break;
- case '.js':
- $mime_type = 'application/x-javascript';
- break;
- case '.oga':
- case '.ogg':
- $mime_type = 'audio/ogg';
- break;
- case '.ogv':
- $mime_type = 'video/ogg';
- break;
- case '.pdf':
- $mime_type = 'application/pdf';
- break;
- case '.png':
- $mime_type = 'image/png';
- break;
- case '.svg':
- $mime_type = 'image/svg+xml';
- break;
- case '.tar':
- $mime_type = 'application/x-tar';
- break;
- case '.tgz':
- $mime_type = 'application/x-compressed';
- break;
- case '.tif':
- case '.tiff':
- $mime_type = 'image/tiff';
- break;
- case '.txt':
- $mime_type = 'text/plain';
- break;
- case '.zip':
- $mime_type = 'application/zip';
- break;
- default:
- $mime_type = 'application/octet-stream';
- break;
+ // Fallback solution: (try to guess the type by the file extension
+ if(!self::$mimetypes){
+ self::$mimetypes=include('mimetypes.list.php');
}
+ $extention=strtolower(strrchr(basename($fspath), "."));
+ $extention=substr($extention,1);//remove leading .
+ $mime_type=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
}
-
return $mime_type;
}
}
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
new file mode 100644
index 0000000000..6d8b3b9abc
--- /dev/null
+++ b/lib/mimetypes.list.php
@@ -0,0 +1,81 @@
+.
+*
+*/
+
+/**
+ * list of mimetypes by extention
+ */
+
+return array(
+ 'css'=>'text/css',
+ 'flac'=>'audio/flac',
+ 'gif'=>'image/gif',
+ 'gzip'=>'application/x-gzip',
+ 'gz'=>'application/x-gzip',
+ 'html'=>'text/html',
+ 'htm'=>'text/html',
+ 'jpeg'=>'image/jpeg',
+ 'jpg'=>'image/jpeg',
+ 'js'=>'application/javascript',
+ 'oga'=>'audio/ogg',
+ 'ogg'=>'audio/ogg',
+ 'ogv'=>'video/ogg',
+ 'pdf'=>'application/pdf',
+ 'png'=>'image/png',
+ 'svg'=>'image/svg+xml',
+ 'tar'=>'application/x-tar',
+ 'tgz'=>'application/x-compressed',
+ 'tar.gz'=>'application/x-compressed',
+ 'tif'=>'image/tiff',
+ 'tiff'=>'image/tiff',
+ 'txt'=>'text/plain',
+ 'zip'=>'application/zip',
+ 'wav'=>'audio/wav',
+ 'odt'=>'application/vnd.oasis.opendocument.text',
+ 'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
+ 'odg'=>'application/vnd.oasis.opendocument.graphics',
+ 'odp'=>'application/vnd.oasis.opendocument.presentation',
+ 'kra'=>'application/x-krita',
+ 'mp3'=>'audio/mpeg',
+ 'doc'=>'application/msword',
+ 'docx'=>'application/msword',
+ 'xls'=>'application/msexcel',
+ 'xlsx'=>'application/msexcel',
+ 'php'=>'application/x-php',
+ 'exe'=>'application/x-ms-dos-executable',
+ 'pl'=>'application/x-pearl',
+ 'py'=>'application/x-python',
+ 'blend'=>'application/x-blender',
+ 'xcf'=>'application/x-gimp',
+ 'psd'=>'application/x-photoshop',
+ 'xml'=>'application/xml',
+ 'avi'=>'video/x-msvideo',
+ 'dv'=>'video/dv',
+ 'm2t'=>'video/mp2t',
+ 'mp4'=>'video/mp4',
+ 'm4v'=>'video/mp4',
+ 'mpg'=>'video/mpeg',
+ 'mpeg'=>'video/mpeg',
+ 'mov'=>'video/quicktime',
+ 'webm'=>'video/webm',
+ 'wmv'=>'video/x-ms-asf'
+);
+?>
\ No newline at end of file
diff --git a/lib/setup.php b/lib/setup.php
index 1be4dea286..1a33209ec5 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -102,12 +102,12 @@ class OC_SETUP {
//add prefix to the mysql user name to prevent collissions
$dbusername='oc_mysql_'.$username;
//hash the password so we don't need to store the admin config in the config file
- $dbpassowrd=md5(time().$password);
+ $dbpassword=md5(time().$password);
- self::createDBUser($dbusername, $dbpassowrd, $connection);
+ self::createDBUser($dbusername, $dbpassword, $connection);
OC_CONFIG::setValue('dbuser', $dbusername);
- OC_CONFIG::setValue('dbpassword', $dbpassowrd);
+ OC_CONFIG::setValue('dbpassword', $dbpassword);
//create the database
self::createDatabase($dbname, $dbusername, $connection);
diff --git a/lib/user.php b/lib/user.php
index 25f555b47b..a64ce05f2c 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -337,4 +337,20 @@ class OC_USER {
}
return false;
}
+
+ /**
+ * @brief Set cookie value to use in next page load
+ * @param string $username username to be set
+ */
+ public static function setUsernameInCookie($username){
+ setcookie("username", $username, mktime().time()+60*60*24*15);
+ }
+
+ /**
+ * @brief Remove cookie for "remember username"
+ */
+ public static function unsetUsernameInCookie(){
+ unset($_COOKIE["username"]);
+ setcookie("username", NULL, -1);
+ }
}
|