sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15729 from owncloud/remove-unused-variables 

Remove unused variables
remotes/origin/poc-doctrine-migrations
Robin McCorkell 2015-04-19 12:38:29 +07:00
parent fd3c1484ad ccf47f40aa
commit 80b892e7ed
12 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/appframework/http/request.php
Unescape Escape View File

@ -238,7 +238,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
case 'params':
case 'urlParams':
if(in_array($name, array('put', 'patch'))) {
return $this->getContent($name);
return $this->getContent();
} else {
return isset($this->items[$name])
? $this->items[$name]
@ -252,7 +252,6 @@ class Request implements \ArrayAccess, \Countable, IRequest {
return isset($this[$name])
? $this[$name]
: null;
break;
}
}

1
lib/private/helper.php
Unescape Escape View File

@ -978,7 +978,6 @@ class OC_Helper {
$quota = OC_Util::getUserQuota(\OCP\User::getUser());
if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
// always get free space / total space from root + mount points
$path = '';
return self::getGlobalStorageInfo();
}
}

3
lib/private/l10n.php
Unescape Escape View File

@ -391,13 +391,10 @@ class OC_L10N implements \OCP\IL10N {
switch($type) {
case 'date':
return Punic\Calendar::formatDate($value, $width, $locale);
break;
case 'datetime':
return Punic\Calendar::formatDatetime($value, $width, $locale);
break;
case 'time':
return Punic\Calendar::formatTime($value, $width, $locale);
break;
default:
return false;
}

2
lib/private/ocs/cloud.php
Unescape Escape View File

@ -25,7 +25,7 @@
class OC_OCS_Cloud {
public static function getCapabilities($parameters) {
public static function getCapabilities() {
$result = array();
list($major, $minor, $micro) = OC_Util::getVersion();
$result['version'] = array(

2
lib/private/ocs/config.php
Unescape Escape View File

@ -23,7 +23,7 @@
class OC_OCS_Config {
public static function apiConfig($parameters) {
public static function apiConfig() {
$xml['version'] = '1.7';
$xml['website'] = 'ownCloud';
$xml['host'] = OCP\Util::getServerHost();

2
lib/private/ocs/person.php
Unescape Escape View File

@ -23,7 +23,7 @@
class OC_OCS_Person {
public static function check($parameters) {
public static function check() {
$login = isset($_POST['login']) ? $_POST['login'] : false;
$password = isset($_POST['password']) ? $_POST['password'] : false;
if($login && $password) {

4
lib/private/setup/mssql.php
Unescape Escape View File

@ -32,11 +32,9 @@ class MSSQL extends AbstractDatabase {
$masterConnection = @sqlsrv_connect($this->dbhost, $masterConnectionInfo);
if(!$masterConnection) {
$entry = null;
$entry = '';
if( ($errors = sqlsrv_errors() ) != null) {
$entry='DB Error: "'.print_r(sqlsrv_errors()).'"<br />';
} else {
$entry = '';
}
throw new \OC\DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
$this->trans->t('You need to enter either an existing account or the administrator.'));

2
lib/private/share/hooks.php
Unescape Escape View File

@ -32,7 +32,7 @@ class Hooks extends \OC\Share\Constants {
// Delete any items shared with the deleted user
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share`'
.' WHERE `share_with` = ? AND `share_type` = ? OR `share_type` = ?');
$result = $query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique));
$query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique));
// Delete any items the deleted user shared
$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `uid_owner` = ?');
$result = $query->execute(array($arguments['uid']));

8
lib/private/subadmin.php
Unescape Escape View File

@ -43,7 +43,7 @@ class OC_SubAdmin{
*/
public static function createSubAdmin($uid, $gid) {
$stmt = OC_DB::prepare('INSERT INTO `*PREFIX*group_admin` (`gid`,`uid`) VALUES(?,?)');
$result = $stmt->execute(array($gid, $uid));
$stmt->execute(array($gid, $uid));
OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
return true;
}
@ -56,7 +56,7 @@ class OC_SubAdmin{
*/
public static function deleteSubAdmin($uid, $gid) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ? AND `uid` = ?');
$result = $stmt->execute(array($gid, $uid));
$stmt->execute(array($gid, $uid));
OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
return true;
}
@ -177,7 +177,7 @@ class OC_SubAdmin{
*/
public static function post_deleteUser($parameters) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `uid` = ?');
$result = $stmt->execute(array($parameters['uid']));
$stmt->execute(array($parameters['uid']));
return true;
}
@ -188,7 +188,7 @@ class OC_SubAdmin{
*/
public static function post_deleteGroup($parameters) {
$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ?');
$result = $stmt->execute(array($parameters['gid']));
$stmt->execute(array($parameters['gid']));
return true;
}
}

4
lib/private/tags.php
Unescape Escape View File

@ -228,9 +228,9 @@ class Tags implements \OCP\ITags {
while ($row = $result->fetch()) {
$objId = (int)$row['objid'];
if (!isset($entries[$objId])) {
$entry = $entries[$objId] = array();
$entries[$objId] = array();
}
$entry = $entries[$objId][] = $row['category'];
$entries[$objId][] = $row['category'];
}
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);

2
lib/public/files.php
Unescape Escape View File

@ -81,7 +81,7 @@ class Files {
* @since 5.0.0
*/
public static function streamCopy( $source, $target ) {
list($count, $result) = \OC_Helper::streamCopy( $source, $target );
list($count, ) = \OC_Helper::streamCopy( $source, $target );
return $count;
}

2
lib/repair/repairlegacystorages.php
Unescape Escape View File

@ -102,7 +102,7 @@ class RepairLegacyStorages extends BasicEmitter {
$newNumericId = (int)$newNumericId;
// try and resolve the conflict
// check which one of "local::" or "home::" needs to be kept
$result = $this->findStorageInCacheStatement->execute(array($oldNumericId, $newNumericId));
$this->findStorageInCacheStatement->execute(array($oldNumericId, $newNumericId));
$row1 = $this->findStorageInCacheStatement->fetch();
$row2 = $this->findStorageInCacheStatement->fetch();
$this->findStorageInCacheStatement->closeCursor();