mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1180 from owncloud/whitespace-cleanup 

Whitespace cleanup
This commit is contained in:
Bart Visscher 2013-01-16 09:25:57 -08:00
parent cb0fd30458 5bfe4adbaa
commit 1d57a2e2a9
51 changed files with 993 additions and 995 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/css/files.css
View File

@ -23,7 +23,7 @@
#new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
#upload {
#upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
}
#upload a {
@ -35,7 +35,7 @@
}
.file_upload_target { display:none; }
.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
#file_upload_start {
#file_upload_start {
left:0; top:0; width:28px; height:27px; padding:0;
font-size:1em;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;

46
apps/files/index.php
View File

@ -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');

14
apps/files/js/fileactions.js
View File

@ -70,23 +70,23 @@ var FileActions = {
}
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var actionHandler = function (event) {
event.stopPropagation();
event.preventDefault();
FileActions.currentFile = event.data.elem;
var file = FileActions.getCurrentFile();
event.data.actionFunc(file);
};
$.each(actions, function (name, action) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') {
return true;
}
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name];
if (img.call) {
@ -97,16 +97,16 @@ var FileActions = {
html += '<img class ="svg" src="' + img + '" /> ';
}
html += t('files', name) + '</a>';
var element = $(html);
element.data('action', name);
//alert(element);
element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
parent.find('a.name>span.fileactions').append(element);
}
});
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
if (img.call) {

2
apps/files/js/files.js
View File

@ -52,7 +52,7 @@ Files={
}
};
$(document).ready(function() {
Files.bindKeyboardShortcuts(document, jQuery);
Files.bindKeyboardShortcuts(document, jQuery);
$('#fileList tr').each(function(){
//little hack to set unescape filenames in attribute
$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));

2
apps/files_external/lib/amazons3.php
View File

@ -108,7 +108,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
$stat['atime'] = time();
$stat['mtime'] = $stat['atime'];
$stat['ctime'] = $stat['atime'];
} else {
} else {
$object = $this->getObject($path);
if ($object) {
$stat['size'] = $object['Size'];

14
apps/files_external/lib/config.php
View File

@ -38,7 +38,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getBackends() {
$backends['OC_Filestorage_Local']=array(
'backend' => 'Local',
'configuration' => array(
@ -77,7 +77,7 @@ class OC_Mount_Config {
'token' => '#token',
'token_secret' => '#token secret'),
'custom' => 'google');
$backends['OC_Filestorage_SWIFT']=array(
'backend' => 'OpenStack Swift',
'configuration' => array(
@ -86,7 +86,7 @@ class OC_Mount_Config {
'token' => '*Token',
'root' => '&Root',
'secure' => '!Secure ftps://'));
if(OC_Mount_Config::checksmbclient()) $backends['OC_Filestorage_SMB']=array(
'backend' => 'SMB / CIFS',
'configuration' => array(
@ -95,7 +95,7 @@ class OC_Mount_Config {
'password' => '*Password',
'share' => 'Share',
'root' => '&Root'));
$backends['OC_Filestorage_DAV']=array(
'backend' => 'ownCloud / WebDAV',
'configuration' => array(
@ -103,7 +103,7 @@ class OC_Mount_Config {
'user' => 'Username',
'password' => '*Password',
'root' => '&Root',
'secure' => '!Secure https://'));
'secure' => '!Secure https://'));
return($backends);
}
@ -403,7 +403,7 @@ class OC_Mount_Config {
}
/**
* check if smbclient is installed
* check if smbclient is installed
*/
public static function checksmbclient() {
if(function_exists('shell_exec')) {
@ -415,7 +415,7 @@ class OC_Mount_Config {
}
/**
* check if php-ftp is installed
* check if php-ftp is installed
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {

6
apps/files_external/templates/settings.php
View File

@ -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>
@ -47,7 +47,7 @@
<?php elseif (strpos($placeholder, '!') !== false): ?>
<label><input type="checkbox"
data-parameter="<?php echo $parameter; ?>"
<?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
<?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
/><?php echo substr($placeholder, 1); ?></label>
<?php elseif (strpos($placeholder, '&') !== false): ?>
<input type="text"
@ -105,7 +105,7 @@
<?php endif; ?>
<td <?php if ($mountPoint != ''): ?>class="remove"
<?php else: ?>style="visibility:hidden;"
<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
title="<?php echo $l->t('Delete'); ?>"
class="svg action"
src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>

2
apps/files_sharing/js/share.js
View File

@ -1,7 +1,7 @@
$(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) {
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
if ($('#dir').val() == '/') {
var item = $('#dir').val() + filename;

12
apps/files_sharing/public.php
View File

@ -66,12 +66,12 @@ if (isset($_GET['t'])) {
$type = $linkItem['item_type'];
$fileSource = $linkItem['file_source'];
$shareOwner = $linkItem['uid_owner'];
if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
$pathAndUser = getPathAndUser($linkItem['file_source']);
$fileOwner = $pathAndUser['user'];
//if this is a reshare check the file owner also exists
if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
OCP\Util::writeLog('share', 'original file owner '.$fileOwner
@ -81,7 +81,7 @@ if (isset($_GET['t'])) {
$tmpl->printPage();
exit();
}
//mount filesystem of file owner
OC_Util::setupFS($fileOwner);
}
@ -104,7 +104,7 @@ if (isset($_GET['t'])) {
}
}
$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
if (OCP\User::userExists($shareOwner)) {
OC_Util::setupFS($shareOwner);
$fileSource = getId($path);
@ -159,7 +159,7 @@ if ($linkItem) {
$tmpl->printPage();
exit();
}
} else {
// Check if item id is set in session
if (!isset($_SESSION['public_link_authenticated'])

8
apps/files_versions/templates/settings.php
View File

@ -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>

16
config/config.sample.php
View File

@ -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')
)
)
);

86
core/templates/login.php
View File

@ -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>

2
lib/MDB2/Driver/sqlite3.php
View File

@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) {
$native_code = $this->connection->lastErrorCode();
}
$native_msg = html_entity_decode($this->_lasterror);
$native_msg = html_entity_decode($this->_lasterror);
// PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599.

22
lib/api.php
View File

@ -42,12 +42,12 @@ class OC_API {
private static function init() {
self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
}
/**
* api actions
*/
protected static $actions = array();
/**
* registers an api call
* @param string $method the http method
@ -58,7 +58,7 @@ class OC_API {
* @param array $defaults
* @param array $requirements
*/
public static function register($method, $url, $action, $app,
public static function register($method, $url, $action, $app,
$authLevel = OC_API::USER_AUTH,
$defaults = array(),
$requirements = array()) {
@ -73,7 +73,7 @@ class OC_API {
}
self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
}
/**
* handles an api call
* @param array $parameters
@ -92,7 +92,7 @@ class OC_API {
$response = call_user_func(self::$actions[$name]['action'], $parameters);
} else {
$response = new OC_OCS_Result(null, 998, 'Api method not found');
}
}
} else {
$response = new OC_OCS_Result(null, 997, 'Unauthorised');
}
@ -103,7 +103,7 @@ class OC_API {
// logout the user to be stateless
OC_User::logout();
}
/**
* authenticate the api call
* @param array $action the action details as supplied to OC_API::register()
@ -148,18 +148,18 @@ class OC_API {
return false;
break;
}
}
}
/**
* http basic auth
* @return string|false (username, or false on failure)
*/
private static function loginUser(){
private static function loginUser(){
$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
return OC_User::login($authUser, $authPw) ? $authUser : false;
}
/**
* respond to a call
* @param int|array $result the result from the api method
@ -195,5 +195,5 @@ class OC_API {
}
}
}
}

2
lib/app.php
View File

@ -137,7 +137,7 @@ class OC_App{
OC_Appconfig::setValue($app, 'types', $appTypes);
}
/**
* check if app is shipped
* @param string $appid the id of the app to check

2
lib/backgroundjob.php
View File

@ -34,7 +34,7 @@ class OC_BackgroundJob{
public static function getExecutionType() {
return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
}
/**
* @brief sets the background jobs execution type
* @param $type execution type

1226
lib/base.php
View File

File diff suppressed because it is too large Load Diff

6
lib/connector/sabre/node.php
View File

@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
* @brief Returns a list of properties for this nodes.;
* @param array $properties
* @return array
* @note The properties list is a list of propertynames the client
* requested, encoded as xmlnamespace#tagName, for example:
* http://www.example.org/namespace#author If the array is empty, all
* @note The properties list is a list of propertynames the client
* requested, encoded as xmlnamespace#tagName, for example:
* http://www.example.org/namespace#author If the array is empty, all
* properties should be returned
*/
public function getProperties($properties) {

4
lib/filecache.php
View File

@ -59,7 +59,7 @@ class OC_FileCache{
* @param string $path
* @param array data
* @param string root (optional)
* @note $data is an associative array in the same format as returned
* @note $data is an associative array in the same format as returned
* by get
*/
public static function put($path, $data, $root=false) {
@ -206,7 +206,7 @@ class OC_FileCache{
OC_Cache::remove('fileid/'.$root.$path);
}
/**
* return array of filenames matching the querty
* @param string $query

2
lib/fileproxy/quota.php
View File

@ -76,7 +76,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
return $totalSpace-$usedSpace;
}
public function postFree_space($path, $space) {
$free=$this->getFreeSpace($path);
if($free==-1) {

2
lib/files.php
View File

@ -141,7 +141,7 @@ class OC_Files {
*/
public static function get($dir, $files, $only_header = false) {
$xsendfile = false;
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
$xsendfile = true;
}

14
lib/filesystem.php
View File

@ -179,11 +179,11 @@ class OC_Filesystem{
$internalPath=substr($path, strlen($mountPoint));
return $internalPath;
}
static private function mountPointsLoaded($user) {
return in_array($user, self::$loadedUsers);
}
/**
* get the storage object for a path
* @param string path
@ -216,7 +216,7 @@ class OC_Filesystem{
self::mount($options['class'], $options['options'], $mountPoint);
}
}
if(isset($mountConfig['group'])) {
foreach($mountConfig['group'] as $group=>$mounts) {
if(OC_Group::inGroup($user, $group)) {
@ -230,7 +230,7 @@ class OC_Filesystem{
}
}
}
if(isset($mountConfig['user'])) {
foreach($mountConfig['user'] as $mountUser=>$mounts) {
if($user==='all' or strtolower($mountUser)===strtolower($user)) {
@ -244,16 +244,16 @@ class OC_Filesystem{
}
}
}
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate();
OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
}
}
}
}
static public function init($root, $user = '') {
if(self::$defaultInstance) {
return false;

38
lib/filesystemview.php
View File

@ -430,10 +430,10 @@ class OC_FilesystemView {
$target = $this->fopen($path2.$postFix2, 'w');
$result = OC_Helper::streamCopy($source, $target);
}
if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
// If the file to be copied originates within
if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
// If the file to be copied originates within
// the user's data directory
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
OC_Filesystem::signal_post_copy,
@ -454,33 +454,33 @@ class OC_FilesystemView {
OC_Filesystem::signal_post_write,
array( OC_Filesystem::signal_param_path => $path2)
);
} else {
// If this is not a normal file copy operation
// and the file originates somewhere else
// (e.g. a version rollback operation), do not
} else {
// If this is not a normal file copy operation
// and the file originates somewhere else
// (e.g. a version rollback operation), do not
// perform all the other post_write actions
// Update webdav properties
OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot);
$splitPath2 = explode( '/', $path2 );
// Only cache information about files
// that are being copied from within
// the user files directory. Caching
// Only cache information about files
// that are being copied from within
// the user files directory. Caching
// other files, like VCS backup files,
// serves no purpose
if ( $splitPath2[1] == 'files' ) {
OC_FileCache_Update::update($path2, $this->fakeRoot);
}
}
return $result;
}
}
}

2
lib/helper.php
View File

@ -553,7 +553,7 @@ class OC_Helper {
fclose($fh);
return $file;
}
/**
* create a temporary folder with an unique filename
* @return string

2
lib/image.php
View File

@ -646,7 +646,7 @@ class OC_Image {
fclose($fh);
return $im;
}
/**
* @brief Resizes the image preserving ratio.
* @param $maxsize The maximum size of either the width or height.

2
lib/json.php
View File

@ -74,7 +74,7 @@ class OC_JSON{
exit();
}
}
/**
* Send json error msg
*/

18
lib/l10n.php
View File

@ -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);
}

4
lib/log.php
View File

@ -39,7 +39,7 @@ class OC_Log {
$log_class::write($app, $message, $level);
}
}
//Fatal errors handler
public static function onShutdown() {
$error = error_get_last();
@ -50,7 +50,7 @@ class OC_Log {
return true;
}
}
// Uncaught exception handler
public static function onException($exception) {
self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);

6
lib/ocs/cloud.php
View File

@ -37,7 +37,7 @@ class OC_OCS_Cloud {
}
return new OC_OCS_Result($values);
}
public static function getUserQuota($parameters) {
$user = OC_User::getUser();
if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
@ -68,7 +68,7 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
public static function getUserPublickey($parameters) {
if(OC_User::userExists($parameters['user'])) {
@ -79,7 +79,7 @@ class OC_OCS_Cloud {
return new OC_OCS_Result(null, 300);
}
}
public static function getUserPrivatekey($parameters) {
$user = OC_User::getUser();
if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {

4
lib/ocs/config.php
View File

@ -23,7 +23,7 @@
*/
class OC_OCS_Config {
public static function apiConfig($parameters) {
$xml['version'] = '1.7';
$xml['website'] = 'ownCloud';
@ -32,5 +32,5 @@ class OC_OCS_Config {
$xml['ssl'] = 'false';
return new OC_OCS_Result($xml);
}
}

2
lib/ocs/person.php
View File

@ -38,5 +38,5 @@ class OC_OCS_Person {
return new OC_OCS_Result(null, 101);
}
}
}

4
lib/ocs/privatedata.php
View File

@ -39,7 +39,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result($xml);
//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
}
public static function set($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();
@ -50,7 +50,7 @@ class OC_OCS_Privatedata {
return new OC_OCS_Result(null, 100);
}
}
public static function delete($parameters) {
OC_Util::checkLoggedIn();
$user = OC_User::getUser();

14
lib/ocs/result.php
View File

@ -21,9 +21,9 @@
*/
class OC_OCS_Result{
private $data, $message, $statusCode, $items, $perPage;
/**
* create the OCS_Result object
* @param $data mixed the data to return
@ -33,7 +33,7 @@ class OC_OCS_Result{
$this->statusCode = $code;
$this->message = $message;
}
/**
* optionally set the total number of items available
* @param $items int
@ -41,7 +41,7 @@ class OC_OCS_Result{
public function setTotalItems(int $items) {
$this->items = $items;
}
/**
* optionally set the the number of items per page
* @param $items int
@ -49,7 +49,7 @@ class OC_OCS_Result{
public function setItemsPerPage(int $items) {
$this->perPage = $items;
}
/**
* returns the data associated with the api result
* @return array
@ -70,6 +70,6 @@ class OC_OCS_Result{
// Return the result data.
return $return;
}
}

14
lib/ocsclient.php
View File

@ -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;
}

4
lib/public/api.php
View File

@ -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
lib/public/constants.php
View File

@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2;
const PERMISSION_DELETE = 8;
const PERMISSION_SHARE = 16;
const PERMISSION_ALL = 31;

6
lib/public/db.php
View File

@ -49,9 +49,9 @@ class DB {
* @brief Insert a row if a matching row doesn't exists.
* @param $table string The table name (will replace *PREFIX*) to perform the replace on.
* @param $input array
*
*
* The input array if in the form:
*
*
* array ( 'id' => array ( 'value' => 6,
* 'key' => true
* ),
@ -65,7 +65,7 @@ class DB {
public static function insertIfNotExist($table, $input) {
return(\OC_DB::insertIfNotExist($table, $input));
}
/**
* @brief gets last value of autoincrement
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix

8
lib/public/share.php
View File

@ -351,14 +351,14 @@ class Share {
//delete the old share
self::delete($checkExists['id']);
}
// Generate hash of password - same method as user passwords
if (isset($shareWith)) {
$forcePortable = (CRYPT_BLOWFISH != 1);
$hasher = new \PasswordHash(8, $forcePortable);
$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
}
// Generate token
if (isset($oldToken)) {
$token = $oldToken;
@ -415,7 +415,7 @@ class Share {
if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) {
for ($i = 0; $i < count($files); $i++) {
$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
if ($files[$i]['mimetype'] == 'httpd/unix-directory'
if ($files[$i]['mimetype'] == 'httpd/unix-directory'
&& $children = \OC_Files::getDirectoryContent($name, '/')
) {
// Continue scanning into child folders
@ -864,7 +864,7 @@ class Share {
}
} else {
if ($fileDependent) {
if (($itemType == 'file' || $itemType == 'folder')
if (($itemType == 'file' || $itemType == 'folder')
&& $format == \OC_Share_Backend_File::FORMAT_FILE_APP
|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
) {

2
lib/public/user.php
View File

@ -65,7 +65,7 @@ class User {
/**
* @brief check if a user exists
* @param string $uid the username
* @param string $excludingBackend (default none)
* @param string $excludingBackend (default none)
* @return boolean
*/
public static function userExists( $uid, $excludingBackend = null ) {

2
lib/public/util.php
View File

@ -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;
}

4
lib/request.php
View File

@ -19,7 +19,7 @@ class OC_Request {
return 'localhost';
}
if(OC_Config::getValue('overwritehost', '')<>'') {
return OC_Config::getValue('overwritehost');
return OC_Config::getValue('overwritehost');
}
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
@ -44,7 +44,7 @@ class OC_Request {
*/
public static function serverProtocol() {
if(OC_Config::getValue('overwriteprotocol', '')<>'') {
return OC_Config::getValue('overwriteprotocol');
return OC_Config::getValue('overwriteprotocol');
}
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);

2
lib/setup.php
View File

@ -153,7 +153,7 @@ class OC_Setup {
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
self::createHtaccess();
}
//and we are done
OC_Config::setValue('installed', true);
}

2
lib/template.php
View File

@ -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);

1
lib/vcategories.php
View File

@ -763,4 +763,3 @@ class OC_VCategories {
return array_search(strtolower($needle), array_map('strtolower', $haystack));
}
}

4
settings/ajax/togglegroups.php
View File

@ -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);

282
settings/templates/admin.php
View File

@ -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>

2
settings/templates/apps.php
View File

@ -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>

22
settings/templates/help.php
View File

@ -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;

2
settings/templates/personal.php
View File

@ -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>

30
settings/templates/users.php
View File

@ -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"';?>

10
settings/users.php
View File

@ -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)));
}