Updating from 1.9.x

1.10.x
Julio Montoya 12 years ago
parent 99305282d6
commit 92ec81ec07
  1. 401
      main/wiki/css/default.css
  2. 447
      main/wiki/diff.inc.php
  3. 1995
      main/wiki/index.php
  4. 5074
      main/wiki/wiki.inc.php

@ -1,208 +1,197 @@
/* /* WIKI STYLES */
==============================================================================
WIKI STYLES .wikiTitle h1 {
============================================================================== color: Black;
*/ background: none;
font-size: 200%;
.wikiTitle h1{ font-weight: bold;
color: Black; /*font-weight: normal;*/
background: none; border-bottom: 2px solid #aaaaaa;
font-size: 200%; }
font-weight: bold; .wiki2xhtml a.wikiEdit{
/*font-weight: normal;*/ color: #0000FF;
border-bottom: 2px solid #aaaaaa; }
} .diff{
.wiki2xhtml a.wikiEdit{ font-family: monospace;
color: #0000FF; padding: 5px;
} margin: 5px;
.diff{ border:solid 2px #aaaaaa;
font-family: monospace; }
padding: 5px; .diffEqual{
margin: 5px; background-color: #FFFFFF;
border:solid 2px #aaaaaa; }
} .diffMoved{
.diffEqual{ background-color: #FFFFAA;
background-color: #FFFFFF; }
} .diffAdded{
.diffMoved{ background-color: #CCFFCC;
background-color: #FFFFAA; }
} .diffDeleted{
.diffAdded{ background-color: #FFAAAA;
background-color: #CCFFCC; }
}
.diffDeleted{ .diffAddedTex{
background-color: #FFAAAA; background-color: #CCFFCC;
} text-decoration:underline;
}
.diffAddedTex{
background-color: #CCFFCC; .diffDeletedTex{
text-decoration:underline; background-color: #FFAAAA;
} text-decoration:line-through;
}
.diffDeletedTex{
background-color: #FFAAAA; #wikititle {
text-decoration:line-through; font-size: 100%;
} font-weight: bold;
background-color: #EFEFEF;
#wikititle { border-bottom: 1px solid #cccccc;
font-family: Verdana, Arial, Helvetica, sans-serif; padding: 3px;
font-size: 100%; padding-top:5px;
font-weight: bold; border-top: 1px solid #ccc;
background-color: #EFEFEF; height: auto!important;
border-bottom: 1px solid #cccccc; min-height:20px;
padding: 3px; }
padding-top:5px; #wikititle input {
border-top: 1px solid #ccc; border: 1px solid #333;
height: auto!important; padding-left: 3px;
min-height:20px; }
} #wikicontent {
#wikititle input { padding-top:5px;
border: 1px solid #333; }
padding-left: 3px;
} #menuwiki {
#wikicontent { float:left;
padding-top:5px; border: 2px solid #cccccc;
min-height:300px; margin-right: 10px;
} padding: 2px;
background-color: #efefef;
#menuwiki { width:74px;
float:left; height:30px;
border: 2px solid #cccccc; overflow:hidden;
margin-right: 10px; }
padding: 2px;
background-color: #efefef; #menuwiki li{
width:74px; list-style-type: square;
height:30px; }
overflow:hidden;
} #mainwiki {
}
#menuwiki li{
list-style-type: square; #wikifooter {
} background-color: #EFEFEF;
border-top: 1px solid #cccccc;
#mainwiki { border-bottom: 1px solid #cccccc;
border-left: 1px solid #cccccc; border-left: 1px solid #cccccc;
padding-left:10px; border-right: 1px solid #cccccc;
} }
#wikifooter { .fwiki1{
background-color: #EFEFEF; font-size:larger;
border-top: 1px solid #cccccc; font-style:italic;
border-bottom: 1px solid #cccccc; font-weight:bold;
border-left: 1px solid #cccccc; background-color:#DAFFD9;
border-right: 1px solid #cccccc; }
} .fwiki2{
font-size:smaller;
.fwiki1{ background-color:#ffffff;
font-size:larger; }
font-style:italic;
font-weight:bold; .message {
background-color:#DAFFD9; color: #cccccc;
} }
.fwiki2{ .wiki_warning{
font-size:smaller; color: #FF0000;
background-color:#ffffff; font-weight:bold;
} }
a.new_wiki_link{
.message { color: #FF0000;
color: #cccccc; border-bottom: 1px dotted #cccccc;
}
.wiki_warning{ }
color: #FF0000;
font-weight:bold; a.wiki_link{
} border-bottom: 1px dotted #cccccc;
a.new_wiki_link{ }
color: #FF0000;
border-bottom: 1px dotted #cccccc; a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; }
}
a.wiki_mail_link{
a.wiki_link{ background: url(email.gif) center right no-repeat; padding-right: 18px; }
border-bottom: 1px dotted #cccccc;
} a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; }
a.wiki_link_ext{
background: url(ext.png) center right no-repeat; padding-right: 14px; } a.wiki_ftp_link{
background: url(ftp.gif) center right no-repeat; padding-right: 18px; }
a.wiki_mail_link{
background: url(email.gif) center right no-repeat; padding-right: 18px; } a.wiki_irc_link{
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
a.wiki_news_link{
background: url(news.png) center right no-repeat; padding-right: 18px; } #main_navigation{
height: 20px;
a.wiki_ftp_link{ margin: 0;
background: url(ftp.gif) center right no-repeat; padding-right: 18px; } padding-left: 10px;
background-color:#cccccc;
a.wiki_irc_link{ }
background: url(irc.gif) center right no-repeat; padding-right: 18px; }
#tabnav{
#main_navigation{ height: 20px;
height: 20px; margin: 0;
margin: 0; padding-left: 10px;
padding-left: 10px;
background-color:#cccccc; }
} #tabnav_content {
margin: 0;
#tabnav{ padding-left: 10px;
height: 20px; padding-right: 10px;
margin: 0; padding-bottom: 10px;
padding-left: 10px; padding-top: 4px;
border: 1px solid #ccc;
} }
#tabnav_content {
margin: 0; #tabnav li {
padding-left: 10px; margin: 0;
padding-right: 10px; padding: 0;
padding-bottom: 10px; display: inline;
padding-top: 4px; list-style-type: none;
border: 1px solid #ccc; }
}
#tabnav a:link, #tabnav a:visited {
#tabnav li { float: left;
margin: 0; background: #fff;
padding: 0; font-size: 10px;
display: inline; line-height: 14px;
list-style-type: none; font-weight: bold;
} padding: 2px 10px 2px 10px;
margin-right: 4px;
#tabnav a:link, #tabnav a:visited { border: 1px solid #ccc;
float: left; border-bottom: 1px solid #f3f3f3;
background: #fff; text-decoration: none;
font-size: 10px; color: #666;
line-height: 14px; }
font-weight: bold;
padding: 2px 10px 2px 10px; #tabnav a:link.active, #tabnav a:visited.active {
margin-right: 4px; border-bottom: 2px solid #f3f3f3;
border: 1px solid #ccc; background: #f3f3f3;
border-bottom: 1px solid #f3f3f3; color: #000;
text-decoration: none; }
color: #666;
}
#tabnav a:link.active, #tabnav a:visited.active
{
border-bottom: 2px solid #f3f3f3;
background: #f3f3f3;
color: #000;
}
#tabnav a:link.right, #tabnav a:visited.right #tabnav a:link.right, #tabnav a:visited.right
{ {
border-bottom: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;
background: #f3f3f3; background: #f3f3f3;
color: #666; color: #666;
margin-left: 100px; margin-left: 100px;
} }
#tabnav a:link.rightactive, #tabnav a:visited.rightactive #tabnav a:link.rightactive, #tabnav a:visited.rightactive {
{ border-bottom: 1px solid #fff;
border-bottom: 1px solid #fff; background: #fff;
background: #fff; color: #000;
color: #000; margin-left: 170px;
margin-left: 170px; }
}
#tabnav a:hover {
#tabnav a:hover background: #fff;
{ }
background: #fff;
}

@ -1,298 +1,187 @@
<?php // $Id: lib.diff.php,v 1.12 2005/11/18 20:25:11 zefredz Exp $ <?php
// vim: expandtab sw=4 ts=4 sts=4: /**
/** * CLAROLINE
* CLAROLINE *
* * @version 1.7 $Revision: 1.12 $
* @version 1.7 $Revision: 1.12 $ *
* * @copyright 2001-2005 Universite catholique de Louvain (UCL)
* @copyright 2001-2005 Universite catholique de Louvain (UCL) *
* * @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
* @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE * This program is under the terms of the GENERAL PUBLIC LICENSE (GPL)
* This program is under the terms of the GENERAL PUBLIC LICENSE (GPL) * as published by the FREE SOFTWARE FOUNDATION. The GPL is available
* as published by the FREE SOFTWARE FOUNDATION. The GPL is available * through the world-wide-web at http://www.gnu.org/copyleft/gpl.html
* through the world-wide-web at http://www.gnu.org/copyleft/gpl.html *
* * @author Frederic Minne <zefredz@gmail.com>
* @author Frederic Minne <zefredz@gmail.com> *
* * @package Wiki
* @package Wiki */
*/ /**
/** * Code
* Code */
*/ define("DIFF_EQUAL", "=");
define( "DIFF_EQUAL", "=" ); define("DIFF_ADDED", "+");
define( "DIFF_ADDED", "+" ); define("DIFF_DELETED", "-");
define( "DIFF_DELETED", "-" ); define("DIFF_MOVED", "M");
define( "DIFF_MOVED", "M" );
/**
/** * Get difference between two strings
* Get difference between two strings * @param string old first string
* @param string old first string * @param string new second string
* @param string new second string * @param boolean show_equals set to true to see line that are equal between
* @param boolean show_equals set to true to see line that are equal between * the two strings (default true)
* the two strings (default true) * @param string format_line_function callback function to format line
* @param string format_line_function callback function to format line * (default 'format_line')
* (default 'format_line') * @return string formated diff output
* @return string formated diff output */
*/ function diff(
function diff( $old, $new, $show_equals = false, $format_line_function = 'format_line' ) $old,
{ $new,
$oldArr = str_split_on_new_line( $old ); $show_equals = false,
$newArr = str_split_on_new_line( $new ); $format_line_function = 'format_line'
) {
$oldCount = count ( $oldArr ); $oldArr = str_split_on_new_line($old);
$newCount = count ( $newArr ); $newArr = str_split_on_new_line($new);
$max = max( $oldCount, $newCount ); $oldCount = count($oldArr);
$newCount = count($newArr);
//get added and deleted lines
$max = max($oldCount, $newCount);
$deleted = array_diff_assoc( $oldArr, $newArr );
$added = array_diff_assoc( $newArr, $oldArr ); //get added and deleted lines
$moved = array(); $deleted = array_diff_assoc($oldArr, $newArr);
$added = array_diff_assoc($newArr, $oldArr);
foreach ( $added as $key => $candidate )
{ $moved = array();
foreach ( $deleted as $index => $content )
{ foreach ($added as $key => $candidate) {
if ( $candidate == $content ) foreach ($deleted as $index => $content) {
{ if ($candidate == $content) {
$moved[$key] = $candidate; $moved[$key] = $candidate;
unset( $added[$key] ); unset($added[$key]);
unset( $deleted[$index] ); unset($deleted[$index]);
break; break;
}
} }
} }
}
$output = ''; $output = '';
for ( $i = 0; $i < $max; $i++ ) for ($i = 0; $i < $max; $i++) {
{ // line changed
// line changed if (isset ($deleted[$i]) && isset($added[$i])) {
if ( isset ( $deleted[$i] ) && isset( $added[$i] ) ) $output .= $format_line_function($i, DIFF_DELETED, $deleted[$i]);
{ $output .= $format_line_function($i, DIFF_ADDED, $added[$i]);
$output .= $format_line_function( $i, DIFF_DELETED, $deleted[$i] );
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
} } // line deleted
// line deleted elseif (isset ($deleted[$i]) && !isset ($added[$i])) {
elseif ( isset ( $deleted[$i] ) && ! isset ( $added[$i] ) ) $output .= $format_line_function($i, DIFF_DELETED, $deleted[$i]);
{
$output .= $format_line_function( $i, DIFF_DELETED, $deleted[$i] );
} } // line added
// line added elseif (isset ($added[$i]) && !isset ($deleted[$i])) {
elseif ( isset ( $added[$i] ) && ! isset ( $deleted[$i] ) ) $output .= $format_line_function($i, DIFF_ADDED, $added[$i]);
{
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
} } // line moved
// line moved elseif (isset ($moved[$i])) {
elseif ( isset ( $moved[$i] ) ) $output .= $format_line_function($i, DIFF_MOVED, $newArr[$i]);
{
$output .= $format_line_function( $i, DIFF_MOVED, $newArr[$i] );
} } // line unchanged
// line unchanged elseif ($show_equals) {
elseif ( $show_equals ) $output .= $format_line_function($i, DIFF_EQUAL, $newArr[$i]);
{
$output .= $format_line_function( $i, DIFF_EQUAL, $newArr[$i] );
} } else {
else // skip
{
// skip
}
} }
return $output;
} }
/** return $output;
* Split strings on new line }
*/
function str_split_on_new_line( $str ) /**
{ * Split strings on new line
$content = array(); */
function str_split_on_new_line($str)
if ( api_strpos( $str, "\r\n" ) !== false ) {
{ $content = array();
$content = explode("\r\n", $str );
} if (api_strpos($str, "\r\n") !== false) {
elseif ( api_strpos( $str, "\n" ) !== false ) $content = explode("\r\n", $str);
{ } elseif (api_strpos($str, "\n") !== false) {
$content = explode( "\n", $str ); $content = explode("\n", $str);
} } elseif (api_strpos($str, "\r") !== false) {
elseif ( api_strpos( $str, "\r" ) !== false ) $content = explode("\r", $str);
{ } else {
$content = explode( "\r", $str ); $content[] = $str;
}
else
{
$content[] = $str;
}
return $content;
} }
/** return $content;
* Default and prototype format line function }
* @param int line line number
* @param mixed type line type, must be one of the following : /**
* DIFF_EQUAL, DIFF_MOVED, DIFF_ADDED, DIFF_DELETED * Default and prototype format line function
* @param string value line content * @param int line line number
* @param boolean skip_empty skip empty lines (default false) * @param mixed type line type, must be one of the following :
* @return string formated diff line * DIFF_EQUAL, DIFF_MOVED, DIFF_ADDED, DIFF_DELETED
*/ * @param string value line content
function format_line( $line, $type, $value, $skip_empty = false ) * @param boolean skip_empty skip empty lines (default false)
{ * @return string formated diff line
if ( trim( $value ) == "" && $skip_empty ) */
{ function format_line($line, $type, $value, $skip_empty = false)
return ""; {
} if (trim($value) == "" && $skip_empty) {
elseif ( trim( $value ) == "" ) return "";
{ } elseif (trim($value) == "") {
$value = '&nbsp;'; $value = '&nbsp;';
}
switch ( $type )
{
case DIFF_EQUAL:
{
// return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffEqual" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_MOVED:
{
//return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_ADDED:
{
//return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffAdded" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
case DIFF_DELETED:
{
//return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
}
} }
/** switch ($type) {
* Table format line function case DIFF_EQUAL:
* @see format_line // return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
*/ return '<span class="diffEqual" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
function format_table_line( $line, $type, $value, $skip_empty = false ) break;
{ case DIFF_MOVED:
if ( trim( $value ) == "" && $skip_empty ) //return $line. ' : ' . ' M <span class="diffMoved" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
{ return '<span class="diffMoved" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
return ""; break;
} case DIFF_ADDED:
elseif ( trim( $value ) == "" ) //return $line . ' : ' . ' + <span class="diffAdded" >' . $value . '</span><br />' . "\n" ;
{ return '<span class="diffAdded" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
$value = '&nbsp;'; break;
} case DIFF_DELETED:
//return $line . ' : ' . ' - <span class="diffDeleted" >' . $value . '</span><br />' . "\n" ; //juan carlos ra<EFBFBD>a la sustitye la inverior
switch ( $type ) return '<span class="diffDeleted" >' . $value . '</span><br />' . "\n"; //juan carlos muestra solo color
{ break;
case DIFF_EQUAL: }
{ }
//return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >' . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFFFFF">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente. /**
* Table format line function
break; * @see format_line
} */
case DIFF_MOVED: function format_table_line($line, $type, $value, $skip_empty = false)
{ {
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta if (trim($value) == "" && $skip_empty) {
; return "";
return '<tr><td></td><td bgcolor="#FFFFAA">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente. } elseif (trim($value) == "") {
$value = '&nbsp;';
break;
}
case DIFF_ADDED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#CCFFCC">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
break;
}
case DIFF_DELETED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
return '<tr><td></td><td bgcolor="#FFAAAA">'. $value . '</td></tr>' . "\n" ; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
}
}
} }
switch ($type) {
case DIFF_EQUAL:
//return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;=</td><td><span class="diffEqual" >' . $value . '</span></td></tr>' . "\n"; //juan carlos comentado
if (! function_exists('array_diff_assoc') ) return '<tr><td></td><td bgcolor="#FFFFFF">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
{ break;
/** case DIFF_MOVED:
* Replace array_diff_assoc() // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
*
* @link http://php.net/function.array_diff_assoc return '<tr><td></td><td bgcolor="#FFFFAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
* @author Aidan Lister <aidan@php.net> break;
* @since PHP 4.3.0 case DIFF_ADDED:
* @require PHP 4.0.0 (user_error) // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;+</td><td><span class="diffAdded" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
*/ return '<tr><td></td><td bgcolor="#CCFFCC">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
function array_diff_assoc() break;
{ case DIFF_DELETED:
// Check we have enough arguments // return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;-</td><td><span class="diffDeleted" >' . $value . '</span></td></tr>' . "\n" ; //juan carlos comentado
$args = func_get_args(); return '<tr><td></td><td bgcolor="#FFAAAA">' . $value . '</td></tr>' . "\n"; //juan carlos muestra solo color (no tambi<EFBFBD>n la l<EFBFBD>nea). Adem<EFBFBD>s EN IEXPLORER VA BIEN PERO EN FIREFOX 3 la etiqueta span no muestra el color de fondo que est<EFBFBD> definido en la hoja de estilos como background-color, aceptando s<EFBFBD>lo la propiedad color pero esta solo da color al texto con lo cual los cambios quedan poco resaltados, adem<EFBFBD>s los cambios de otros objetos que no sean texto no se indican por ej. a<EFBFBD>adir una imagen, por esta raz<EFBFBD>n doy el color de fondo al td directamente.
$count = count($args );
if (count($args ) < 2 )
{
trigger_error('Wrong parameter count for array_diff_assoc()', E_USER_WARNING );
return;
}
// Check arrays
for ($i = 0; $i < $count; $i++ )
{
if (! is_array($args[$i] ) )
{
trigger_error('array_diff_assoc() Argument #' . ($i + 1) . ' is not an array', E_USER_WARNING );
return;
}
}
// Get the comparison array
$array_comp = array_shift($args );
--$count;
// Traverse values of the first array
foreach ($array_comp as $key => $value )
{
// Loop through the other arrays
for ($i = 0; $i < $count; $i++ )
{
// Loop through this arrays key/value pairs and compare
foreach ($args[$i] as $comp_key => $comp_value )
{
if ((string) $key === (string)$comp_key && (string) $value === (string) $comp_value )
{
unset($array_comp[$key] );
}
}
}
}
return $array_comp;
}
} }
?> }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save