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

Merge pull request #7176 from owncloud/style 

Some style fixes
This commit is contained in:
Lukas Reschke 2014-02-18 17:30:26 +01:00
parent 92560c5b86 2c6411b897
commit 3b1083f46e
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_encryption/lib/proxy.php
View File

@ -262,7 +262,7 @@ class Proxy extends \OC_FileProxy {
} elseif (
self::shouldEncrypt($path)
and $meta ['mode'] !== 'r'
and $meta['mode'] !== 'r'
and $meta['mode'] !== 'rb'
) {
$result = fopen('crypt://' . $path, $meta['mode']);

4
lib/private/allconfig.php
View File

@ -17,7 +17,7 @@ class AllConfig implements \OCP\IConfig {
* Sets a new system wide value
*
* @param string $key the key of the value, under which will be saved
* @param string $value the value that should be stored
* @param mixed $value the value that should be stored
* @todo need a use case for this
*/
// public function setSystemValue($key, $value) {
@ -28,7 +28,7 @@ class AllConfig implements \OCP\IConfig {
* Looks up a system wide defined value
*
* @param string $key the key of the value, under which it was saved
* @param string $default the default value to be returned if the value isn't set
* @param mixed $default the default value to be returned if the value isn't set
* @return string the saved value
*/
public function getSystemValue($key, $default = '') {

4
lib/private/config.php
View File

@ -77,7 +77,7 @@ class Config {
/**
* @brief Gets a value from config.php
* @param string $key key
* @param string $default = null default value
* @param mixed $default = null default value
* @return string the value or $default
*
* This function gets the value from config.php. If it does not exist,
@ -94,7 +94,7 @@ class Config {
/**
* @brief Sets a value
* @param string $key key
* @param string $value value
* @param mixed $value value
*
* This function sets the value and writes the config.php.
*

3
lib/private/db/mdb2schemareader.php
View File

@ -288,12 +288,13 @@ class MDB2SchemaReader {
if (!empty($fields)) {
if (isset($primary) && $primary) {
$table->setPrimaryKey($fields, $name);
} else
} else {
if (isset($unique) && $unique) {
$table->addUniqueIndex($fields, $name);
} else {
$table->addIndex($fields, $name);
}
}
} else {
throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
}

4
lib/public/config.php
View File

@ -42,7 +42,7 @@ class Config {
/**
* Gets a value from config.php
* @param string $key key
* @param string $default = null default value
* @param mixed $default = null default value
* @return string the value or $default
*
* This function gets the value from config.php. If it does not exist,
@ -55,7 +55,7 @@ class Config {
/**
* Sets a value
* @param string $key key
* @param string $value value
* @param mixed $value value
* @return bool
*
* This function sets the value and writes the config.php. If the file can

4
lib/public/iconfig.php
View File

@ -38,7 +38,7 @@ interface IConfig {
* Sets a new system wide value
*
* @param string $key the key of the value, under which will be saved
* @param string $value the value that should be stored
* @param mixed $value the value that should be stored
* @todo need a use case for this
*/
// public function setSystemValue($key, $value);
@ -47,7 +47,7 @@ interface IConfig {
* Looks up a system wide defined value
*
* @param string $key the key of the value, under which it was saved
* @param string $default the default value to be returned if the value isn't set
* @param mixed $default the default value to be returned if the value isn't set
* @return string the saved value
*/
public function getSystemValue($key, $default = '');

2
tests/lib/db.php
View File

@ -30,7 +30,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
public function setUp() {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
$r = '_'.OC_Util::generateRandomBytes('4').'_';
$r = '_'.OC_Util::generateRandomBytes(4).'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( self::$schema_file, $content );

2
tests/lib/dbschema.php
View File

@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
$r = '_'.OC_Util::generateRandomBytes('4').'_';
$r = '_'.OC_Util::generateRandomBytes(4).'_';
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( $this->schema_file, $content );