mirrors
/
nextcloud
spegling av https://github.com/nextcloud/server.git
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Släpp 989 Wiki Aktiviteter
Bläddra i källkod

Spaces to tabs

tags/v5.0.0alpha1
Bart Visscher 11 år sedan
förälder
cb0fd30458
incheckning
a8f963d9cf
18 ändrade filer med 951 tillägg och 951 borttagningar
Delad Vy Visa Diff Statistik
  1. 23
    23
      apps/files/index.php
  2. 1
    1
      apps/files_external/templates/settings.php
  3. 4
    4
      apps/files_versions/templates/settings.php
  4. 8
    8
      config/config.sample.php
  5. 43
    43
      core/templates/login.php
  6. 676
    676
      lib/base.php
  7. 9
    9
      lib/l10n.php
  8. 7
    7
      lib/ocsclient.php
  9. 2
    2
      lib/public/api.php
  10. 1
    1
      lib/public/util.php
  11. 1
    1
      lib/template.php
  12. 2
    2
      settings/ajax/togglegroups.php
  13. 141
    141
      settings/templates/admin.php
  14. 1
    1
      settings/templates/apps.php
  15. 11
    11
      settings/templates/help.php
  16. 1
    1
      settings/templates/personal.php
  17. 15
    15
      settings/templates/users.php
  18. 5
    5
      settings/users.php

+ 23
- 23
apps/files/index.php Visa fil

@@ -38,36 +38,36 @@ OCP\App::setActiveNavigationEntry('files_index');
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
// Redirect if directory does not exist
if (!OC_Filesystem::is_dir($dir . '/')) {
header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
exit();
header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
exit();
}

$files = array();
foreach (OC_Files::getdirectorycontent($dir) as $i) {
$i['date'] = OCP\Util::formatDate($i['mtime']);
if ($i['type'] == 'file') {
$fileinfo = pathinfo($i['name']);
$i['basename'] = $fileinfo['filename'];
if (!empty($fileinfo['extension'])) {
$i['extension'] = '.' . $fileinfo['extension'];
} else {
$i['extension'] = '';
}
}
if ($i['directory'] == '/') {
$i['directory'] = '';
}
$files[] = $i;
$i['date'] = OCP\Util::formatDate($i['mtime']);
if ($i['type'] == 'file') {
$fileinfo = pathinfo($i['name']);
$i['basename'] = $fileinfo['filename'];
if (!empty($fileinfo['extension'])) {
$i['extension'] = '.' . $fileinfo['extension'];
} else {
$i['extension'] = '';
}
}
if ($i['directory'] == '/') {
$i['directory'] = '';
}
$files[] = $i;
}

// Make breadcrumb
$breadcrumb = array();
$pathtohere = '';
foreach (explode('/', $dir) as $i) {
if ($i != '') {
$pathtohere .= '/' . $i;
$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
}
if ($i != '') {
$pathtohere .= '/' . $i;
$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
}
}

// make breadcrumb und filelist markup
@@ -89,13 +89,13 @@ $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);

$permissions = OCP\PERMISSION_READ;
if (OC_Filesystem::isUpdatable($dir . '/')) {
$permissions |= OCP\PERMISSION_UPDATE;
$permissions |= OCP\PERMISSION_UPDATE;
}
if (OC_Filesystem::isDeletable($dir . '/')) {
$permissions |= OCP\PERMISSION_DELETE;
$permissions |= OCP\PERMISSION_DELETE;
}
if (OC_Filesystem::isSharable($dir . '/')) {
$permissions |= OCP\PERMISSION_SHARE;
$permissions |= OCP\PERMISSION_SHARE;
}

$tmpl = new OCP\Template('files', 'index', 'user');

+ 1
- 1
apps/files_external/templates/settings.php Visa fil

@@ -1,7 +1,7 @@
<form id="files_external">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
<thead>
<tr>

+ 4
- 4
apps/files_versions/templates/settings.php Visa fil

@@ -1,6 +1,6 @@
<form id="versionssettings">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
<input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
</fieldset>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
<input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
</fieldset>
</form>

+ 8
- 8
config/config.sample.php Visa fil

@@ -123,12 +123,12 @@ $CONFIG = array(
'path'=> '/var/www/owncloud/apps',
'url' => '/apps',
'writable' => true,
),
),
'user_backends'=>array(
array(
'class'=>'OC_User_IMAP',
'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
)
)
),
),
'user_backends'=>array(
array(
'class'=>'OC_User_IMAP',
'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
)
)
);

+ 43
- 43
core/templates/login.php Visa fil

@@ -1,50 +1,50 @@
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post">
<fieldset>
<?php if (!empty($_['redirect_url'])) {
echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
} ?>
<ul>
<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
<li class="errors">
<?php echo $l->t('Automatic logon rejected!'); ?><br>
<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
<br>
<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
</li>
<?php endif; ?>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
<a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
<li class="errors">
<?php echo $l->t('Lost your password?'); ?>
</li>
</a>
<?php endif; ?>
</ul>
<p class="infield grouptop">
<input type="text" name="user" id="user"
value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
autocomplete="on" required/>
<label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
</p>
<fieldset>
<?php if (!empty($_['redirect_url'])) {
echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
} ?>
<ul>
<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
<li class="errors">
<?php echo $l->t('Automatic logon rejected!'); ?><br>
<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
<br>
<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
</li>
<?php endif; ?>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
<a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
<li class="errors">
<?php echo $l->t('Lost your password?'); ?>
</li>
</a>
<?php endif; ?>
</ul>
<p class="infield grouptop">
<input type="text" name="user" id="user"
value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
autocomplete="on" required/>
<label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
</p>

<p class="infield groupbottom">
<input type="password" name="password" id="password" value=""
required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
</p>
<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
for="remember_login"><?php echo $l->t('remember'); ?></label>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
</fieldset>
<p class="infield groupbottom">
<input type="password" name="password" id="password" value=""
required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
</p>
<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
for="remember_login"><?php echo $l->t('remember'); ?></label>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
</fieldset>
</form>
<script>
$(document).ready(function () {
var visitortimezone = (-new Date().getTimezoneOffset() / 60);
$('#timezone-offset').val(visitortimezone);
});
$(document).ready(function () {
var visitortimezone = (-new Date().getTimezoneOffset() / 60);
$('#timezone-offset').val(visitortimezone);
});

</script>

+ 676
- 676
lib/base.php
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 9
- 9
lib/l10n.php Visa fil

@@ -141,15 +141,15 @@ class OC_L10N{
}
}

/**
* @brief Translating
* @param $text String The text we need a translation for
* @param array $parameters default:array() Parameters for sprintf
* @return \OC_L10N_String Translation or the same text
*
* Returns the translation. If no translation is found, $text will be
* returned.
*/
/**
* @brief Translating
* @param $text String The text we need a translation for
* @param array $parameters default:array() Parameters for sprintf
* @return \OC_L10N_String Translation or the same text
*
* Returns the translation. If no translation is found, $text will be
* returned.
*/
public function t($text, $parameters = array()) {
return new OC_L10N_String($this, $text, $parameters);
}

+ 7
- 7
lib/ocsclient.php Visa fil

@@ -39,11 +39,11 @@ class OC_OCSClient{
return($url);
}

/**
* @brief Get the url of the OCS KB server.
* @returns string of the KB server
* This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
*/
/**
* @brief Get the url of the OCS KB server.
* @returns string of the KB server
* This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default
*/
private static function getKBURL() {
$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
return($url);
@@ -59,7 +59,7 @@ class OC_OCSClient{
return($data);
}

/**
/**
* @brief Get all the categories from the OCS server
* @returns array with category ids
* @note returns NULL if config value appstoreenabled is set to false
@@ -242,7 +242,7 @@ class OC_OCSClient{
}
$kbe['totalitems'] = $data->meta->totalitems;
}
return $kbe;
return $kbe;
}



+ 2
- 2
lib/public/api.php Visa fil

@@ -26,7 +26,7 @@ namespace OCP;
* This class provides functions to manage apps in ownCloud
*/
class API {
/**
* registers an api call
* @param string $method the http method
@@ -40,5 +40,5 @@ class API {
public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){
\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
}
}

+ 1
- 1
lib/public/util.php Visa fil

@@ -203,7 +203,7 @@ class Util {
$host_name = self::getServerHostName();
// handle localhost installations
if ($host_name === 'localhost') {
$host_name = "example.com";
$host_name = "example.com";
}
return $user_part.'@'.$host_name;
}

+ 1
- 1
lib/template.php Visa fil

@@ -103,7 +103,7 @@ function simple_file_size($bytes) {
}

function relative_modified_date($timestamp) {
$l=OC_L10N::get('lib');
$l=OC_L10N::get('lib');
$timediff = time() - $timestamp;
$diffminutes = round($timediff/60);
$diffhours = round($diffminutes/60);

+ 2
- 2
settings/ajax/togglegroups.php Visa fil

@@ -31,8 +31,8 @@ $action = "add";
// Toggle group
if( OC_Group::inGroup( $username, $group )) {
$action = "remove";
$error = $l->t("Unable to remove user from group %s", $group);
$success = OC_Group::removeFromGroup( $username, $group );
$error = $l->t("Unable to remove user from group %s", $group);
$success = OC_Group::removeFromGroup( $username, $group );
$usersInGroup=OC_Group::usersInGroup($group);
if(count($usersInGroup)==0) {
OC_Group::deleteGroup($group);

+ 141
- 141
settings/templates/admin.php Visa fil

@@ -10,13 +10,13 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');

// is htaccess working ?
if (!$_['htaccessworking']) {
?>
?>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>

<span class="securitywarning">
<?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
</span>
<?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
</span>

</fieldset>
<?php
@@ -24,13 +24,13 @@ if (!$_['htaccessworking']) {

// is locale working ?
if (!$_['islocaleworking']) {
?>
?>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>

<span class="connectionwarning">
<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
</span>
<span class="connectionwarning">
<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
</span>

</fieldset>
<?php
@@ -38,13 +38,13 @@ if (!$_['islocaleworking']) {

// is internet connection working ?
if (!$_['internetconnectionworking']) {
?>
?>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
<legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>

<span class="connectionwarning">
<?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
</span>
<span class="connectionwarning">
<?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
</span>

</fieldset>
<?php
@@ -52,152 +52,152 @@ if (!$_['internetconnectionworking']) {
?>

<?php foreach ($_['forms'] as $form) {
echo $form;
echo $form;
}
;?>

<fieldset class="personalblock" id="backgroundjobs">
<legend><strong><?php echo $l->t('Cron');?></strong></legend>
<table class="nostyle">
<tr>
<td>
<input type="radio" name="mode" value="ajax"
id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_ajax">AJAX</label><br/>
<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
</td>
</tr>
<tr>
<td>
<input type="radio" name="mode" value="webcron"
id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_webcron">Webcron</label><br/>
<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
</td>
</tr>
<tr>
<td>
<input type="radio" name="mode" value="cron"
id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_cron">Cron</label><br/>
<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
</td>
</tr>
</table>
<legend><strong><?php echo $l->t('Cron');?></strong></legend>
<table class="nostyle">
<tr>
<td>
<input type="radio" name="mode" value="ajax"
id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_ajax">AJAX</label><br/>
<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
</td>
</tr>
<tr>
<td>
<input type="radio" name="mode" value="webcron"
id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_webcron">Webcron</label><br/>
<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
</td>
</tr>
<tr>
<td>
<input type="radio" name="mode" value="cron"
id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
echo 'checked="checked"';
} ?>>
<label for="backgroundjobs_cron">Cron</label><br/>
<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
</td>
</tr>
</table>
</fieldset>

<fieldset class="personalblock" id="shareAPI">
<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
<table class="shareAPI nostyle">
<tr>
<td id="enable">
<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
</td>
</tr>
</table>
<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
<table class="shareAPI nostyle">
<tr>
<td id="enable">
<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
</td>
</tr>
<tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
</td>
</tr>
</table>
</fieldset>

<fieldset class="personalblock" id="security">
<legend><strong><?php echo $l->t('Security');?></strong></legend>
<table class="nostyle">
<tr>
<td id="enable">
<input type="checkbox" name="forcessl" id="enforceHTTPSEnabled"
<?php if ($_['enforceHTTPSEnabled']) {
echo 'checked="checked" ';
echo 'value="false"';
} else {
echo 'value="true"';
}
?>
<?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
<label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
<em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
<?php if (!$_['isConnectedViaHTTPS']) {
echo "<br/><em>";
echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
echo "</em>";
}
?>
</td>
</tr>
</table>
<legend><strong><?php echo $l->t('Security');?></strong></legend>
<table class="nostyle">
<tr>
<td id="enable">
<input type="checkbox" name="forcessl" id="enforceHTTPSEnabled"
<?php if ($_['enforceHTTPSEnabled']) {
echo 'checked="checked" ';
echo 'value="false"';
} else {
echo 'value="true"';
}
?>
<?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
<label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
<em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
<?php if (!$_['isConnectedViaHTTPS']) {
echo "<br/><em>";
echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
echo "</em>";
}
?>
</td>
</tr>
</table>
</fieldset>

<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Log');?></strong></legend>
<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
<?php for ($i = 0; $i < 5; $i++):
if ($i != $_['loglevel']):?>
<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
<?php endif;
<legend><strong><?php echo $l->t('Log');?></strong></legend>
<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
<?php for ($i = 0; $i < 5; $i++):
if ($i != $_['loglevel']):?>
<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
<?php endif;
endfor;?>
</select>
<table id='log'>
<?php foreach ($_['entries'] as $entry): ?>
<tr>
<td>
<?php echo $levels[$entry->level];?>
</td>
<td>
<?php echo $entry->app;?>
</td>
<td>
<?php echo $entry->message;?>
</td>
<td>
<?php echo OC_Util::formatDate($entry->time);?>
</td>
</tr>
<?php endforeach;?>
</table>
<?php if ($_['entriesremain']): ?>
<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
<?php endif; ?>
<table id='log'>
<?php foreach ($_['entries'] as $entry): ?>
<tr>
<td>
<?php echo $levels[$entry->level];?>
</td>
<td>
<?php echo $entry->app;?>
</td>
<td>
<?php echo $entry->message;?>
</td>
<td>
<?php echo OC_Util::formatDate($entry->time);?>
</td>
</tr>
<?php endforeach;?>
</table>
<?php if ($_['entriesremain']): ?>
<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
<?php endif; ?>

</fieldset>


<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
(<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
(<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</fieldset>


+ 1
- 1
settings/templates/apps.php Visa fil

@@ -29,7 +29,7 @@
<p class="description"></p>
<img src="" class="preview" />
<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
<p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
<p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
<input class="enable hidden" type="submit" />
</div>
</div>

+ 11
- 11
settings/templates/help.php Visa fil

@@ -1,14 +1,14 @@
<div id="controls">
<?php if($_['admin']) { ?>
<?php if($_['admin']) { ?>
<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
<?php } ?>
<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
<?php if($_['admin']) { ?>
<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
<?php if($_['admin']) { ?>
<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
<?php } ?>
<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
</div>
<br /><br />
<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
@@ -18,14 +18,14 @@
<!--

function pageY(elem) {
return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
}
var buffer = 5; //scroll bar buffer
function resizeIframe() {
var height = document.documentElement.clientHeight;
height -= pageY(document.getElementById('ifm'))+ buffer ;
height = (height < 0) ? 0 : height;
document.getElementById('ifm').style.height = height + 'px';
var height = document.documentElement.clientHeight;
height -= pageY(document.getElementById('ifm'))+ buffer ;
height = (height < 0) ? 0 : height;
document.getElementById('ifm').style.height = height + 'px';
}

document.getElementById('ifm').onload=resizeIframe;

+ 1
- 1
settings/templates/personal.php Visa fil

@@ -62,7 +62,7 @@
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</fieldset>



+ 15
- 15
settings/templates/users.php Visa fil

@@ -36,11 +36,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
<div class="quota-select-wrapper">
<?php if((bool) $_['isadmin']): ?>
<select class='quota'>
<option
<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
value='none'>
<?php echo $l->t('Unlimited');?>
</option>
<option
<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
value='none'>
<?php echo $l->t('Unlimited');?>
</option>
<?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset!='default'):?>
<option
@@ -127,16 +127,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
<td class="quota">
<div class="quota-select-wrapper">
<select class='quota-user'>
<option
<?php if($user['quota']=='default') echo 'selected="selected"';?>
value='default'>
<?php echo $l->t('Default');?>
</option>
<option
<?php if($user['quota']=='none') echo 'selected="selected"';?>
value='none'>
<?php echo $l->t('Unlimited');?>
</option>
<option
<?php if($user['quota']=='default') echo 'selected="selected"';?>
value='default'>
<?php echo $l->t('Default');?>
</option>
<option
<?php if($user['quota']=='none') echo 'selected="selected"';?>
value='none'>
<?php echo $l->t('Unlimited');?>
</option>
<?php foreach($_['quota_preset'] as $preset):?>
<option
<?php if($user['quota']==$preset) echo 'selected="selected"';?>

+ 5
- 5
settings/users.php Visa fil

@@ -34,7 +34,7 @@ if($isadmin) {
$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
$quotaPreset=explode(',', $quotaPreset);
foreach($quotaPreset as &$preset) {
$preset=trim($preset);
$preset=trim($preset);
}
$quotaPreset=array_diff($quotaPreset, array('default', 'none'));

@@ -43,14 +43,14 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false &&

// load users and quota
foreach($accessibleusers as $i) {
$quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
$isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
$quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
$isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;

$users[] = array(
"name" => $i,
"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
'quota'=>$quota,
'isQuotaUserDefined'=>$isQuotaUserDefined,
'quota'=>$quota,
'isQuotaUserDefined'=>$isQuotaUserDefined,
'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
}


Write Förhandsgranska
Laddar…
Avbryt
Spara