merge master into filesystem
This commit is contained in:
commit
74f6f85628
|
@ -21,10 +21,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
// Init owncloud
|
||||
|
||||
|
||||
OCP\User::checkAdminUser();
|
||||
|
||||
$htaccessWorking=(getenv('htaccessWorking')=='true');
|
||||
|
|
|
@ -9,6 +9,3 @@
|
|||
$this->create('download', 'download{file}')
|
||||
->requirements(array('file' => '.*'))
|
||||
->actionInclude('files/download.php');
|
||||
// oC JS config
|
||||
$this->create('publicListView', 'js/publiclistview.js')
|
||||
->actionInclude('files/js/publiclistview.php');
|
|
@ -21,9 +21,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
// Init owncloud
|
||||
|
||||
|
||||
// Check if we are a user
|
||||
OCP\User::checkLoggedIn();
|
||||
|
||||
|
|
|
@ -93,6 +93,7 @@ $list = new OCP\Template('files', 'part.list', '');
|
|||
$list->assign('files', $files, false);
|
||||
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
|
||||
$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
|
||||
$list->assign('disableSharing', false);
|
||||
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
|
||||
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
|
||||
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
|
||||
|
@ -100,6 +101,9 @@ $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir
|
|||
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
|
||||
|
||||
$permissions = OCP\PERMISSION_READ;
|
||||
if (\OC\Files\Filesystem::isCreatable($dir . '/')) {
|
||||
$permissions |= OCP\PERMISSION_CREATE;
|
||||
}
|
||||
if (\OC\Files\Filesystem::isUpdatable($dir . '/')) {
|
||||
$permissions |= OCP\PERMISSION_UPDATE;
|
||||
}
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
// Set the content type to Javascript
|
||||
header("Content-type: text/javascript");
|
||||
|
||||
// Disallow caching
|
||||
header("Cache-Control: no-cache, must-revalidate");
|
||||
header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
|
||||
|
||||
if ( array_key_exists('disableSharing', $_) && $_['disableSharing'] == true ) {
|
||||
echo "var disableSharing = true;";
|
||||
} else {
|
||||
echo "var disableSharing = false;";
|
||||
}
|
|
@ -21,10 +21,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
// Init owncloud
|
||||
|
||||
|
||||
// Check if we are a user
|
||||
OCP\User::checkLoggedIn();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('publicListView');?>"></script>
|
||||
<input type="hidden" id="disableSharing" data-status="<?php echo $_['disableSharing']; ?>">
|
||||
|
||||
<?php foreach($_['files'] as $file):
|
||||
$simple_file_size = OCP\simple_file_size($file['size']);
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
$(document).ready(function() {
|
||||
|
||||
var disableSharing = $('#disableSharing').data('status');
|
||||
|
||||
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
|
||||
|
||||
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('publicListView');?>"></script>
|
||||
|
||||
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
|
||||
<input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
|
||||
<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
|
||||
|
|
|
@ -92,6 +92,10 @@ $CONFIG = array(
|
|||
*/
|
||||
"mail_smtpauth" => false,
|
||||
|
||||
/* authentication type needed to send mail, depends on mail_smtpmode if this is used
|
||||
* Can be LOGIN (default), PLAIN or NTLM */
|
||||
"mail_smtpauthtype" => "LOGIN",
|
||||
|
||||
/* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
|
||||
"mail_smtpname" => "",
|
||||
|
||||
|
|
|
@ -17,11 +17,15 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
|
|||
$l = OC_L10N::get('core');
|
||||
|
||||
// Get the config
|
||||
$debug = (defined('DEBUG') && DEBUG) ? 'true' : 'false';
|
||||
$apps_paths = array();
|
||||
foreach(OC_App::getEnabledApps() as $app) {
|
||||
$apps_paths[$app] = OC_App::getAppWebPath($app);
|
||||
}
|
||||
|
||||
$array = array(
|
||||
"oc_debug" => $debug,
|
||||
"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
|
||||
"oc_webroot" => "\"".OC::$WEBROOT."\"",
|
||||
"oc_appswebroots" => "\"".$_['apps_paths']. "\"",
|
||||
"oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
|
||||
"oc_current_user" => "\"".OC_User::getUser(). "\"",
|
||||
"oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
|
||||
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
$(document).ready(function () {
|
||||
var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
|
||||
updateEventSource.listen('success', function(message) {
|
||||
$('<span>').append(message).append('<br />').appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('error', function(message) {
|
||||
$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('failure', function(message) {
|
||||
$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
|
||||
$('<span>')
|
||||
.addClass('error bold')
|
||||
.append('<br />')
|
||||
.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
|
||||
.appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('done', function(message) {
|
||||
$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
|
||||
setTimeout(function () {
|
||||
window.location.href = OC.webroot;
|
||||
}, 3000);
|
||||
});
|
||||
});
|
|
@ -3,28 +3,3 @@
|
|||
<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
|
||||
</li>
|
||||
</ul>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
|
||||
updateEventSource.listen('success', function(message) {
|
||||
$('<span>').append(message).append('<br />').appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('error', function(message) {
|
||||
$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('failure', function(message) {
|
||||
$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
|
||||
$('<span>')
|
||||
.addClass('error bold')
|
||||
.append('<br />')
|
||||
.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
|
||||
.appendTo($('.update'));
|
||||
});
|
||||
updateEventSource.listen('done', function(message) {
|
||||
$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
|
||||
setTimeout(function () {
|
||||
window.location.href = OC.webroot;
|
||||
}, 3000);
|
||||
});
|
||||
});
|
||||
</script>
|
|
@ -261,6 +261,7 @@ class OC
|
|||
if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
|
||||
OC_Config::setValue('maintenance', true);
|
||||
OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG);
|
||||
OC_Util::addscript('update');
|
||||
$tmpl = new OC_Template('', 'update', 'guest');
|
||||
$tmpl->assign('version', OC_Util::getVersionString());
|
||||
$tmpl->printPage();
|
||||
|
@ -431,8 +432,6 @@ class OC
|
|||
self::checkSSL();
|
||||
self::initSession();
|
||||
self::initTemplateEngine();
|
||||
self::checkMaintenanceMode();
|
||||
self::checkUpgrade();
|
||||
|
||||
$errors = OC_Util::checkServer();
|
||||
if (count($errors) > 0) {
|
||||
|
@ -572,10 +571,13 @@ class OC
|
|||
return;
|
||||
}
|
||||
|
||||
// Check if ownCloud is installed or in maintenance (update) mode
|
||||
if (!OC_Config::getValue('installed', false)) {
|
||||
require_once 'core/setup.php';
|
||||
exit();
|
||||
}
|
||||
self::checkMaintenanceMode();
|
||||
self::checkUpgrade();
|
||||
|
||||
// Handle redirect URL for logged in users
|
||||
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
|
||||
|
|
|
@ -38,6 +38,7 @@ class OC_Mail {
|
|||
$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
|
||||
$SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 );
|
||||
$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
|
||||
$SMTPAUTHTYPE = OC_Config::getValue( 'mail_smtpauthtype', 'LOGIN' );
|
||||
$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
|
||||
$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
|
||||
$SMTPDEBUG = OC_Config::getValue( 'mail_smtpdebug', false );
|
||||
|
@ -62,6 +63,7 @@ class OC_Mail {
|
|||
$mailo->SMTPAuth = $SMTPAUTH;
|
||||
$mailo->SMTPDebug = $SMTPDEBUG;
|
||||
$mailo->SMTPSecure = $SMTPSECURE;
|
||||
$mailo->AuthType = $SMTPAUTHTYPE;
|
||||
$mailo->Username = $SMTPUSERNAME;
|
||||
$mailo->Password = $SMTPPASSWORD;
|
||||
$mailo->Timeout = $SMTPTIMEOUT;
|
||||
|
|
|
@ -28,11 +28,6 @@ class OC_TemplateLayout extends OC_Template {
|
|||
break;
|
||||
}
|
||||
}
|
||||
$apps_paths = array();
|
||||
foreach(OC_App::getEnabledApps() as $app) {
|
||||
$apps_paths[$app] = OC_App::getAppWebPath($app);
|
||||
}
|
||||
$this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
|
||||
} else if ($renderas == 'guest') {
|
||||
parent::__construct('core', 'layout.guest');
|
||||
} else {
|
||||
|
|
|
@ -383,8 +383,8 @@ class OC_User {
|
|||
|
||||
/**
|
||||
* @brief Check if the password is correct
|
||||
* @param $uid The username
|
||||
* @param $password The password
|
||||
* @param string $uid The username
|
||||
* @param string $password The password
|
||||
* @returns string
|
||||
*
|
||||
* returns the path to the users home directory
|
||||
|
|
Loading…
Reference in New Issue