Whitespace cleanup

This commit is contained in:
Bart Visscher 2013-01-14 20:30:39 +01:00
parent a8f963d9cf
commit 5bfe4adbaa
34 changed files with 105 additions and 107 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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.; * @brief Returns a list of properties for this nodes.;
* @param array $properties * @param array $properties
* @return array * @return array
* @note The properties list is a list of propertynames the client * @note The properties list is a list of propertynames the client
* requested, encoded as xmlnamespace#tagName, for example: * requested, encoded as xmlnamespace#tagName, for example:
* http://www.example.org/namespace#author If the array is empty, all * http://www.example.org/namespace#author If the array is empty, all
* properties should be returned * properties should be returned
*/ */
public function getProperties($properties) { public function getProperties($properties) {

View File

@ -59,7 +59,7 @@ class OC_FileCache{
* @param string $path * @param string $path
* @param array data * @param array data
* @param string root (optional) * @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 * by get
*/ */
public static function put($path, $data, $root=false) { public static function put($path, $data, $root=false) {
@ -206,7 +206,7 @@ class OC_FileCache{
OC_Cache::remove('fileid/'.$root.$path); OC_Cache::remove('fileid/'.$root.$path);
} }
/** /**
* return array of filenames matching the querty * return array of filenames matching the querty
* @param string $query * @param string $query

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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