lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-01-22 02:30:46 +01:00
commit 4f36d348ef
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/files.lib.php
View File

@ -329,7 +329,7 @@ function dol_is_file($pathoffile)
*/ */
function dol_is_url($url) function dol_is_url($url)
{ {
$tmpprot=array('file','http','ftp','zlib','data','ssh2','ogg','expect'); $tmpprot=array('file','http','https','ftp','zlib','data','ssh','ssh2','ogg','expect');
foreach($tmpprot as $prot) foreach($tmpprot as $prot)
{ {
if (preg_match('/^'.$prot.':/i',$url)) return true; if (preg_match('/^'.$prot.':/i',$url)) return true;

5
test/phpunit/FilesLibTest.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2010-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -169,7 +170,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
$this->assertTrue($result); $this->assertTrue($result);
$url='file://www.dolibarr.org/download/file.zip'; $url='file://www.dolibarr.org/download/file.zip';
$result=dol_is_url($file); $result=dol_is_url($url);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertTrue($result); $this->assertTrue($result);