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

Don't use substr to get first char of string

This commit is contained in:
Bart Visscher 2012-06-08 21:23:25 +02:00
parent b9a1524508
commit ac36512102
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_archive/lib/storage.php
View File

@ -18,7 +18,7 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{
private static $rootView;
private function stripPath($path){//files should never start with /
if(substr($path,0,1)=='/'){
if(!$path || $path[0]=='/'){
$path=substr($path,1);
}
return $path;

2
apps/files_external/lib/ftp.php
View File

@ -21,7 +21,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
$this->password=$params['password'];
$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
$this->root=isset($params['root'])?$params['root']:'/';
if(substr($this->root,0,1)!='/'){
if(!$this->root || $this->root[0]!='/'){
$this->root='/'.$this->root;
}

8
apps/files_external/lib/smb.php
View File

@ -23,13 +23,13 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
$this->password=$params['password'];
$this->share=$params['share'];
$this->root=isset($params['root'])?$params['root']:'/';
if(!$this->root || $this->root[0]!='/'){
$this->root='/'.$this->root;
}
if(substr($this->root,-1,1)!='/'){
$this->root.='/';
}
if(substr($this->root,0,1)!='/'){
$this->root='/'.$this->root;
}
if(substr($this->share,0,1)!='/'){
if(!$this->share || $this->share[0]!='/'){
$this->share='/'.$this->share;
}
if(substr($this->share,-1,1)=='/'){

2
apps/files_external/lib/swift.php
View File

@ -269,7 +269,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
$this->user=$params['user'];
$this->root=isset($params['root'])?$params['root']:'/';
$this->secure=isset($params['secure'])?(bool)$params['secure']:true;
if(substr($this->root,0,1)!='/'){
if(!$this->root || $this->root[0]!='/'){
$this->root='/'.$this->root;
}
$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);

4
apps/files_external/lib/webdav.php
View File

@ -25,7 +25,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
$this->password=$params['password'];
$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
$this->root=isset($params['root'])?$params['root']:'/';
if(substr($this->root,0,1)!='/'){
if(!$this->root || $this->root[0]!='/'){
$this->root='/'.$this->root;
}
if(substr($this->root,-1,1)!='/'){
@ -273,7 +273,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
}
private function cleanPath($path){
if(substr($path,0,1)=='/'){
if(!$path || $path[0]=='/'){
return substr($path,1);
}else{
return $path;

4
apps/user_ldap/lib_ldap.php
View File

@ -576,7 +576,7 @@ class OC_LDAP {
static private function combineFilter($filters, $operator) {
$combinedFilter = '('.$operator;
foreach($filters as $filter) {
if(substr($filter,0,1) != '(') {
if($filter[0] != '(') {
$filter = '('.$filter.')';
}
$combinedFilter.=$filter;
@ -692,4 +692,4 @@ class OC_LDAP {
return false;
}
}
}

2
lib/app.php
View File

@ -469,7 +469,7 @@ class OC_App{
$apps=array();
$dh=opendir(OC::$APPSROOT.'/apps');
while($file=readdir($dh)){
if(substr($file,0,1)!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
if($file[0]!='.' and is_file(OC::$APPSROOT.'/apps/'.$file.'/appinfo/app.php')){
$apps[]=$file;
}
}

4
lib/archive/tar.php
View File

@ -150,7 +150,7 @@ class OC_Archive_TAR extends OC_Archive{
$folderContent=array();
$pathLength=strlen($path);
foreach($files as $file){
if(substr($file,0,1)=='/'){
if($file[0]=='/'){
$file=substr($file,1);
}
if(substr($file,0,$pathLength)==$path and $file!=$path){
@ -241,7 +241,7 @@ class OC_Archive_TAR extends OC_Archive{
}
}
}
if(substr($path,0,1)!='/'){//not all programs agree on the use of a leading /
if($path[0]!='/'){//not all programs agree on the use of a leading /
return $this->fileExists('/'.$path);
}else{
return false;

2
lib/archive/zip.php
View File

@ -191,7 +191,7 @@ class OC_Archive_ZIP extends OC_Archive{
}
private function stripPath($path){
if(substr($path,0,1)=='/'){
if(!$path || $path[0]=='/'){
return substr($path,1);
}else{
return $path;

10
lib/filesystem.php
View File

@ -150,7 +150,7 @@ class OC_Filesystem{
if(!$path){
$path='/';
}
if(substr($path,0,1)!=='/'){
if($path[0]!=='/'){
$path='/'.$path;
}
$foundMountPoint='';
@ -313,12 +313,12 @@ class OC_Filesystem{
* @param string mountpoint
*/
static public function mount($class,$arguments,$mountpoint){
if($mountpoint[0]!='/'){
$mountpoint='/'.$mountpoint;
}
if(substr($mountpoint,-1)!=='/'){
$mountpoint=$mountpoint.'/';
}
if(substr($mountpoint,0,1)!=='/'){
$mountpoint='/'.$mountpoint;
}
self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
}
@ -349,7 +349,7 @@ class OC_Filesystem{
* @return bool
*/
static public function isValidPath($path){
if(substr($path,0,1)!=='/'){
if(!$path || $path[0]!=='/'){
$path='/'.$path;
}
if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){

2
lib/filesystemview.php
View File

@ -51,7 +51,7 @@ class OC_FilesystemView {
if(!$path){
$path='/';
}
if(substr($path,0,1)!=='/'){
if($path[0]!=='/'){
$path='/'.$path;
}
return $this->fakeRoot.$path;

2
lib/installer.php
View File

@ -110,7 +110,7 @@ class OC_Installer{
//try to find it in a subdir
$dh=opendir($extractDir);
while($folder=readdir($dh)){
if(substr($folder,0,1)!='.' and is_dir($extractDir.'/'.$folder)){
if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)){
if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')){
$extractDir.='/'.$folder;
}

2
lib/user/database.php
View File

@ -129,7 +129,7 @@ class OC_User_Database extends OC_User_Backend {
$row=$result->fetchRow();
if($row){
$storedHash=$row['password'];
if (substr($storedHash,0,1)=='$'){//the new phpass based hashing
if ($storedHash[0]=='$'){//the new phpass based hashing
$hasher=$this->getHasher();
if($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash)){
return $row['uid'];

2
tests/index.php
View File

@ -47,7 +47,7 @@ function loadTests($dir=''){
}
if($dh=opendir($dir)){
while($name=readdir($dh)){
if(substr($name,0,1)!='.'){//no hidden files, '.' or '..'
if($name[0]!='.'){//no hidden files, '.' or '..'
$file=$dir.'/'.$name;
if(is_dir($file)){
loadTests($file);