hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused functions

Browse Source
This commit is contained in:
Romain Neutron
2014-03-05 02:45:10 +01:00
parent 024b5353b1
commit b48d95d6a5
3 changed files with 1 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php
View File

@@ -214,7 +214,7 @@ class FtpJob extends AbstractJob
} }
} }
$current_folder = \p4string::delEndSlash(str_replace('//', '/', $basefolder . $exportElement->getFolder())); $current_folder = rtrim(str_replace('//', '/', $basefolder . $exportElement->getFolder()), '/');
if ($ftp_client->pwd() != $current_folder) { if ($ftp_client->pwd() != $current_folder) {
try { try {

65
lib/classes/p4string.php
View File

@@ -11,47 +11,6 @@
class p4string class p4string
{ {
public static function addFirstSlash($path)
{
if ($path == "") {
return("./");
}
$c = substr($path, 0, 1);
if ($c != "/" && $c != "\\") {
return "/" . $path;
}
return($path);
}
public static function delFirstSlash($path)
{
if ($path == "/" || $path == "\\") {
return("");
}
$c = substr($path, 0, 1);
if ($c == "/" || $c == "\\") {
return substr($path, 1, strlen($path));
}
$c = substr($path, 0, 2);
if ($c == "\\") {
return substr($path, 2, strlen($path) - 1);
}
if ($path == "") {
return "./";
}
return($path);
}
public static function addEndSlash($path) public static function addEndSlash($path)
{ {
if ($path == "") { if ($path == "") {
@@ -67,30 +26,6 @@ class p4string
return $path; return $path;
} }
public static function delEndSlash($path)
{
if ($path == "/" || $path == "\\") {
return("");
}
$c = substr($path, -1, 1);
if ($c == "/" || $c == "\\") {
$path = substr($path, 0, strlen($path) - 1);
}
if ($path == "") {
$path = ".";
}
return($path);
}
public static function cleanTags($string)
{
return strip_tags($string); //, '<p><a><b><i><div><ul><ol><li><br>');
}
/** /**
* deprecated * deprecated
* *

57
tests/classes/p4stringTest.php
View File

@@ -2,39 +2,6 @@
class p4stringTest extends \PhraseanetTestCase class p4stringTest extends \PhraseanetTestCase
{ {
public function testAddFirstSlash()
{
$string = '';
$this->assertEquals('./', p4string::addFirstSlash($string));
$string = '/';
$this->assertEquals('/', p4string::addFirstSlash($string));
$string = '//';
$this->assertEquals('//', p4string::addFirstSlash($string));
$string = '\\';
$this->assertEquals('\\', p4string::addFirstSlash($string));
$string = '\\\\';
$this->assertEquals('\\\\', p4string::addFirstSlash($string));
$string = 'alalal';
$this->assertEquals('/alalal', p4string::addFirstSlash($string));
}
public function testDelFirstSlash()
{
$string = '';
$this->assertEquals('./', p4string::delFirstSlash($string));
$string = '/';
$this->assertEquals('', p4string::delFirstSlash($string));
$string = '//';
$this->assertEquals('/', p4string::delFirstSlash($string));
$string = '\\';
$this->assertEquals('', p4string::delFirstSlash($string));
$string = '\\\\';
$this->assertEquals('\\', p4string::delFirstSlash($string));
$string = '/alalal/';
$this->assertEquals('alalal/', p4string::delFirstSlash($string));
}
public function testAddEndSlash() public function testAddEndSlash()
{ {
$string = ''; $string = '';
@@ -51,30 +18,6 @@ class p4stringTest extends \PhraseanetTestCase
$this->assertEquals('/alalal/', p4string::addEndSlash($string)); $this->assertEquals('/alalal/', p4string::addEndSlash($string));
} }
public function testDelEndSlash()
{
$string = '';
$this->assertEquals('.', p4string::delEndSlash($string));
$string = '/';
$this->assertEquals('', p4string::delEndSlash($string));
$string = '//';
$this->assertEquals('/', p4string::delEndSlash($string));
$string = '\\';
$this->assertEquals('', p4string::delEndSlash($string));
$string = '\\\\';
$this->assertEquals('\\', p4string::delEndSlash($string));
$string = '/alalal/';
$this->assertEquals('/alalal', p4string::delEndSlash($string));
}
public function testCleanTags()
{
$string = ' yuh i jkn lkk jk ';
$this->assertEquals($string, p4string::cleanTags($string));
$stringb = ' <a>yuh i jkn lkk jk</a> ';
$this->assertEquals($string, p4string::cleanTags($stringb));
}
public function testJSstring() public function testJSstring()
{ {
$this->assertEquals('babébibobu & marcel \'\"', p4string::JSstring('babébibobu & marcel \'"')); $this->assertEquals('babébibobu & marcel \'\"', p4string::JSstring('babébibobu & marcel \'"'));