Whitespace cleanup
This commit is contained in:
Bart Visscher
parent
a8f963d9cf
commit
5bfe4adbaa
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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')));
|
||||
|
|
|
|||
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -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')) {
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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'])
|
||||
|
|
|
|||
|
|
@ -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
22
lib/api.php
|
|
@ -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 {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@ class OC_Helper {
|
|||
fclose($fh);
|
||||
return $file;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* create a temporary folder with an unique filename
|
||||
* @return string
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class OC_JSON{
|
|||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send json error msg
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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'])) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,5 +38,5 @@ class OC_OCS_Person {
|
|||
return new OC_OCS_Result(null, 101);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2;
|
|||
const PERMISSION_DELETE = 8;
|
||||
const PERMISSION_SHARE = 16;
|
||||
const PERMISSION_ALL = 31;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -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 ) {
|
||||
|
|
|
|||
|
|
@ -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']);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -763,4 +763,3 @@ class OC_VCategories {
|
|||
return array_search(strtolower($needle), array_map('strtolower', $haystack));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue