*** empty log message ***
git-svn-id: http://piwigo.org/svn/trunk@6 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
867c2379ff
commit
d32690e674
1 changed files with 22 additions and 22 deletions
|
|
@ -20,9 +20,9 @@ include( 'functions_category.inc.php' );
|
||||||
|
|
||||||
//----------------------------------------------------------- generic functions
|
//----------------------------------------------------------- generic functions
|
||||||
|
|
||||||
// The function get_boolean transforms a string to a boolean value. If the
|
// get_boolean transforms a string to a boolean value. If the string is
|
||||||
// string is "false" (case insensitive), then the boolean value false is
|
// "false" (case insensitive), then the boolean value false is returned. In
|
||||||
// returned. In any other case, true is returned.
|
// any other case, true is returned.
|
||||||
function get_boolean( $string )
|
function get_boolean( $string )
|
||||||
{
|
{
|
||||||
$boolean = true;
|
$boolean = true;
|
||||||
|
|
@ -33,8 +33,8 @@ function get_boolean( $string )
|
||||||
return $boolean;
|
return $boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The function array_remove removes a value from the given array if the value
|
// array_remove removes a value from the given array if the value existed in
|
||||||
// existed in this array.
|
// this array.
|
||||||
function array_remove( $array, $value )
|
function array_remove( $array, $value )
|
||||||
{
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
@ -81,21 +81,21 @@ function replace_space( $string )
|
||||||
|
|
||||||
$start = 0;
|
$start = 0;
|
||||||
$end = 0;
|
$end = 0;
|
||||||
$start = strpos ( $remaining, "<" );
|
$start = strpos ( $remaining, '<' );
|
||||||
$end = strpos ( $remaining, ">" );
|
$end = strpos ( $remaining, '>' );
|
||||||
while ( is_numeric( $start ) and is_numeric( $end ) )
|
while ( is_numeric( $start ) and is_numeric( $end ) )
|
||||||
{
|
{
|
||||||
$treatment = substr ( $remaining, 0, $start );
|
$treatment = substr ( $remaining, 0, $start );
|
||||||
$treatment = str_replace( " ", " ", $treatment );
|
$treatment = str_replace( ' ', ' ', $treatment );
|
||||||
$treatment = str_replace( "-", "−", $treatment );
|
$treatment = str_replace( '-', '−', $treatment );
|
||||||
$return_string.= $treatment.substr ( $remaining, $start,
|
$return_string.= $treatment.substr ( $remaining, $start,
|
||||||
$end - $start + 1 );
|
$end - $start + 1 );
|
||||||
$remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
|
$remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
|
||||||
$start = strpos ( $remaining, "<" );
|
$start = strpos ( $remaining, '<' );
|
||||||
$end = strpos ( $remaining, ">" );
|
$end = strpos ( $remaining, '>' );
|
||||||
}
|
}
|
||||||
$treatment = str_replace( " ", " ", $remaining );
|
$treatment = str_replace( ' ', ' ', $remaining );
|
||||||
$treatment = str_replace( "-", "−", $treatment );
|
$treatment = str_replace( '-', '−', $treatment );
|
||||||
$return_string.= $treatment;
|
$return_string.= $treatment;
|
||||||
|
|
||||||
return $return_string;
|
return $return_string;
|
||||||
|
|
@ -218,7 +218,7 @@ function get_themes( $theme_dir )
|
||||||
}
|
}
|
||||||
|
|
||||||
// - The replace_search function replaces a $search string by the search in
|
// - The replace_search function replaces a $search string by the search in
|
||||||
// another color
|
// another color
|
||||||
// - The function does not replace characters in HTML tags
|
// - The function does not replace characters in HTML tags
|
||||||
function replace_search( $string, $search )
|
function replace_search( $string, $search )
|
||||||
{
|
{
|
||||||
|
|
@ -229,21 +229,21 @@ function replace_search( $string, $search )
|
||||||
|
|
||||||
$start = 0;
|
$start = 0;
|
||||||
$end = 0;
|
$end = 0;
|
||||||
$start = strpos ( $remaining, "<" );
|
$start = strpos ( $remaining, '<' );
|
||||||
$end = strpos ( $remaining, ">" );
|
$end = strpos ( $remaining, '>' );
|
||||||
while ( is_numeric( $start ) and is_numeric( $end ) )
|
while ( is_numeric( $start ) and is_numeric( $end ) )
|
||||||
{
|
{
|
||||||
$treatment = substr ( $remaining, 0, $start );
|
$treatment = substr ( $remaining, 0, $start );
|
||||||
$treatment = eregi_replace( $search, "<span style=\"".$style_search."\">".
|
$treatment = str_replace( $search, '<span style="'.$style_search.'">'.
|
||||||
$search."</span>", $treatment );
|
$search.'</span>', $treatment );
|
||||||
$return_string.= $treatment.substr ( $remaining, $start,
|
$return_string.= $treatment.substr ( $remaining, $start,
|
||||||
$end - $start + 1 );
|
$end - $start + 1 );
|
||||||
$remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
|
$remaining = substr ( $remaining, $end + 1, strlen( $remaining ) );
|
||||||
$start = strpos ( $remaining, "<" );
|
$start = strpos ( $remaining, '<' );
|
||||||
$end = strpos ( $remaining, ">" );
|
$end = strpos ( $remaining, '>' );
|
||||||
}
|
}
|
||||||
$treatment = eregi_replace( $search, "<span style=\"".$style_search."\">".
|
$treatment = str_replace( $search, '<span style="'.$style_search.'">'.
|
||||||
$search."</span>", $remaining );
|
$search.'</span>', $remaining );
|
||||||
$return_string.= $treatment;
|
$return_string.= $treatment;
|
||||||
|
|
||||||
return $return_string;
|
return $return_string;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue