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

Merge pull request #75 from fmms/master 

More Checkstyle cleanup
This commit is contained in:
Lukas Reschke 2012-10-23 15:07:14 -07:00
parent 9185cd5dae 2d61f03452
commit f112d8cd69
14 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_encryption/lib/crypt.php
View File

@ -151,7 +151,7 @@ class OC_Crypt {
*/ */
public static function encryptFile( $source, $target, $key='') { public static function encryptFile( $source, $target, $key='') {
$handleread = fopen($source, "rb"); $handleread = fopen($source, "rb");
if($handleread!=FALSE) { if($handleread!=false) {
$handlewrite = fopen($target, "wb"); $handlewrite = fopen($target, "wb");
while (!feof($handleread)) { while (!feof($handleread)) {
$content = fread($handleread, 8192); $content = fread($handleread, 8192);
@ -174,7 +174,7 @@ class OC_Crypt {
*/ */
public static function decryptFile( $source, $target, $key='') { public static function decryptFile( $source, $target, $key='') {
$handleread = fopen($source, "rb"); $handleread = fopen($source, "rb");
if($handleread!=FALSE) { if($handleread!=false) {
$handlewrite = fopen($target, "wb"); $handlewrite = fopen($target, "wb");
while (!feof($handleread)) { while (!feof($handleread)) {
$content = fread($handleread, 8192); $content = fread($handleread, 8192);

4
core/ajax/requesttoken.php
View File

@ -29,8 +29,8 @@
require_once '../../lib/base.php'; require_once '../../lib/base.php';
// don't load apps or filesystem for this task // don't load apps or filesystem for this task
$RUNTIME_NOAPPS = TRUE; $RUNTIME_NOAPPS = true;
$RUNTIME_NOSETUPFS = TRUE; $RUNTIME_NOSETUPFS = true;
// Sanity checks // Sanity checks
// using OCP\JSON::callCheck() below protects the token refreshing itself. // using OCP\JSON::callCheck() below protects the token refreshing itself.

2
core/lostpassword/index.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$RUNTIME_NOAPPS = TRUE; //no apps $RUNTIME_NOAPPS = true; //no apps
require_once '../../lib/base.php'; require_once '../../lib/base.php';

2
core/lostpassword/resetpassword.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$RUNTIME_NOAPPS = TRUE; //no apps $RUNTIME_NOAPPS = true; //no apps
require_once '../../lib/base.php'; require_once '../../lib/base.php';
// Someone wants to reset their password: // Someone wants to reset their password:

6
lib/files.php
View File

@ -146,7 +146,7 @@ class OC_Files {
set_time_limit(0); set_time_limit(0);
$zip = new ZipArchive(); $zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip'); $filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==TRUE) { if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
exit("cannot open <$filename>\n"); exit("cannot open <$filename>\n");
} }
foreach($files as $file) { foreach($files as $file) {
@ -167,7 +167,7 @@ class OC_Files {
set_time_limit(0); set_time_limit(0);
$zip = new ZipArchive(); $zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip'); $filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==TRUE) { if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
exit("cannot open <$filename>\n"); exit("cannot open <$filename>\n");
} }
$file=$dir.'/'.$files; $file=$dir.'/'.$files;
@ -447,7 +447,7 @@ class OC_Files {
$setting = 'php_value '.$key.' '.$size; $setting = 'php_value '.$key.' '.$size;
$hasReplaced = 0; $hasReplaced = 0;
$content = preg_replace($pattern, $setting, $htaccess, 1, $hasReplaced); $content = preg_replace($pattern, $setting, $htaccess, 1, $hasReplaced);
if($content !== NULL) { if($content !== null) {
$htaccess = $content; $htaccess = $content;
} }
if($hasReplaced == 0) { if($hasReplaced == 0) {

10
lib/helper.php
View File

@ -274,18 +274,18 @@ class OC_Helper {
if($file != '.' && $file != '..') { if($file != '.' && $file != '..') {
$fullpath = $path.'/'.$file; $fullpath = $path.'/'.$file;
if(is_link($fullpath)) if(is_link($fullpath))
return FALSE; return false;
elseif(!is_dir($fullpath) && !@chmod($fullpath, $filemode)) elseif(!is_dir($fullpath) && !@chmod($fullpath, $filemode))
return FALSE; return false;
elseif(!self::chmodr($fullpath, $filemode)) elseif(!self::chmodr($fullpath, $filemode))
return FALSE; return false;
} }
} }
closedir($dh); closedir($dh);
if(@chmod($path, $filemode)) if(@chmod($path, $filemode))
return TRUE; return true;
else else
return FALSE; return false;
} }
/** /**

4
lib/migrate.php
View File

@ -347,7 +347,7 @@ class OC_Migrate{
OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR ); OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
return false; return false;
} }
if ( self::$zip->open( $path ) != TRUE ) { if ( self::$zip->open( $path ) != true ) {
OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR ); OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR );
return false; return false;
} }
@ -576,7 +576,7 @@ class OC_Migrate{
OC_Log::write('migration', 'createZip() called but $zip and/or $zippath have not been set', OC_Log::ERROR); OC_Log::write('migration', 'createZip() called but $zip and/or $zippath have not been set', OC_Log::ERROR);
return false; return false;
} }
if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== TRUE ) { if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== true ) {
OC_Log::write('migration', 'Failed to create the zip with error: '.self::$zip->getStatusString(), OC_Log::ERROR); OC_Log::write('migration', 'Failed to create the zip with error: '.self::$zip->getStatusString(), OC_Log::ERROR);
return false; return false;
} else { } else {

20
lib/ocsclient.php
View File

@ -76,12 +76,12 @@ class OC_OCSClient{
*/ */
public static function getCategories() { public static function getCategories() {
if(OC_Config::getValue('appstoreenabled', true)==false) { if(OC_Config::getValue('appstoreenabled', true)==false) {
return NULL; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/categories'; $url=OC_OCSClient::getAppStoreURL().'/content/categories';
$xml=OC_OCSClient::getOCSresponse($url); $xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) { if($xml==FALSE) {
return NULL; return null;
} }
$data=simplexml_load_string($xml); $data=simplexml_load_string($xml);
@ -156,14 +156,14 @@ class OC_OCSClient{
*/ */
public static function getApplication($id) { public static function getApplication($id) {
if(OC_Config::getValue('appstoreenabled', true)==false) { if(OC_Config::getValue('appstoreenabled', true)==false) {
return NULL; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id); $url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
$xml=OC_OCSClient::getOCSresponse($url); $xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) { if($xml==false) {
OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL); OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
return NULL; return null;
} }
$data=simplexml_load_string($xml); $data=simplexml_load_string($xml);
@ -194,14 +194,14 @@ class OC_OCSClient{
*/ */
public static function getApplicationDownload($id,$item) { public static function getApplicationDownload($id,$item) {
if(OC_Config::getValue('appstoreenabled', true)==false) { if(OC_Config::getValue('appstoreenabled', true)==false) {
return NULL; return null;
} }
$url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item); $url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
$xml=OC_OCSClient::getOCSresponse($url); $xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) { if($xml==false) {
OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL); OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
return NULL; return null;
} }
$data=simplexml_load_string($xml); $data=simplexml_load_string($xml);
@ -237,9 +237,9 @@ class OC_OCSClient{
$kbe=array(); $kbe=array();
$xml=OC_OCSClient::getOCSresponse($url); $xml=OC_OCSClient::getOCSresponse($url);
if($xml==FALSE) { if($xml==false) {
OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL); OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL);
return NULL; return null;
} }
$data=simplexml_load_string($xml); $data=simplexml_load_string($xml);

2
lib/updater.php
View File

@ -52,7 +52,7 @@ class OC_Updater{
) )
); );
$xml=@file_get_contents($url, 0, $ctx); $xml=@file_get_contents($url, 0, $ctx);
if($xml==FALSE) { if($xml==false) {
return array(); return array();
} }
$data=@simplexml_load_string($xml); $data=@simplexml_load_string($xml);

6
lib/user.php
View File

@ -491,8 +491,8 @@ class OC_User {
unset($_COOKIE["oc_username"]); unset($_COOKIE["oc_username"]);
unset($_COOKIE["oc_token"]); unset($_COOKIE["oc_token"]);
unset($_COOKIE["oc_remember_login"]); unset($_COOKIE["oc_remember_login"]);
setcookie("oc_username", NULL, -1); setcookie("oc_username", null, -1);
setcookie("oc_token", NULL, -1); setcookie("oc_token", null, -1);
setcookie("oc_remember_login", NULL, -1); setcookie("oc_remember_login", null, -1);
} }
} }

8
lib/util.php
View File

@ -611,14 +611,14 @@ class OC_Util {
// Try to use openssl_random_pseudo_bytes // Try to use openssl_random_pseudo_bytes
if(function_exists('openssl_random_pseudo_bytes')) { if(function_exists('openssl_random_pseudo_bytes')) {
$pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong)); $pseudo_byte = bin2hex(openssl_random_pseudo_bytes($length, $strong));
if($strong == TRUE) { if($strong == true) {
return substr($pseudo_byte, 0, $length); // Truncate it to match the length return substr($pseudo_byte, 0, $length); // Truncate it to match the length
} }
} }
// Try to use /dev/urandom // Try to use /dev/urandom
$fp = @file_get_contents('/dev/urandom', false, null, 0, $length); $fp = @file_get_contents('/dev/urandom', false, null, 0, $length);
if ($fp !== FALSE) { if ($fp !== false) {
$string = substr(bin2hex($fp), 0, $length); $string = substr(bin2hex($fp), 0, $length);
return $string; return $string;
} }
@ -645,14 +645,14 @@ class OC_Util {
// Check openssl_random_pseudo_bytes // Check openssl_random_pseudo_bytes
if(function_exists('openssl_random_pseudo_bytes')) { if(function_exists('openssl_random_pseudo_bytes')) {
openssl_random_pseudo_bytes(1, $strong); openssl_random_pseudo_bytes(1, $strong);
if($strong == TRUE) { if($strong == true) {
return true; return true;
} }
} }
// Check /dev/urandom // Check /dev/urandom
$fp = @file_get_contents('/dev/urandom', false, null, 0, 1); $fp = @file_get_contents('/dev/urandom', false, null, 0, 1);
if ($fp !== FALSE) { if ($fp !== false) {
return true; return true;
} }

2
public.php
View File

@ -1,5 +1,5 @@
<?php <?php
$RUNTIME_NOAPPS = TRUE; $RUNTIME_NOAPPS = true;
require_once 'lib/base.php'; require_once 'lib/base.php';
if (!isset($_GET['service'])) { if (!isset($_GET['service'])) {
header('HTTP/1.0 404 Not Found'); header('HTTP/1.0 404 Not Found');

2
remote.php
View File

@ -1,5 +1,5 @@
<?php <?php
$RUNTIME_NOAPPS = TRUE; $RUNTIME_NOAPPS = true;
require_once 'lib/base.php'; require_once 'lib/base.php';
$path_info = OC_Request::getPathInfo(); $path_info = OC_Request::getPathInfo();
if ($path_info === false || $path_info === '') { if ($path_info === false || $path_info === '') {

2
status.php
View File

@ -21,7 +21,7 @@
* *
*/ */
$RUNTIME_NOAPPS = TRUE; //no apps, yet $RUNTIME_NOAPPS = true; //no apps, yet
require_once 'lib/base.php'; require_once 'lib/base.php';