chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor - Format code

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 74f3b4a8bb
commit e959cab5a1
3 changed files with 311 additions and 496 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 445
      main/wiki/diff.inc.php
  2. 160
      main/wiki/index.php
  3. 202
      main/wiki/wiki.inc.php

445
main/wiki/diff.inc.php
Unescape View File

@ -1,298 +1,235 @@
<?php // $Id: lib.diff.php,v 1.12 2005/11/18 20:25:11 zefredz Exp $
// vim: expandtab sw=4 ts=4 sts=4:
/**
* CLAROLINE
*
* @version 1.7 $Revision: 1.12 $
*
* @copyright 2001-2005 Universite catholique de Louvain (UCL)
*
* @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
* This program is under the terms of the GENERAL PUBLIC LICENSE (GPL)
* as published by the FREE SOFTWARE FOUNDATION. The GPL is available
* through the world-wide-web at http://www.gnu.org/copyleft/gpl.html
*
* @author Frederic Minne <zefredz@gmail.com>
*
* @package Wiki
*/
/**
* Code
*/
define( "DIFF_EQUAL", "=" );
define( "DIFF_ADDED", "+" );
define( "DIFF_DELETED", "-" );
define( "DIFF_MOVED", "M" );
/**
* Get difference between two strings
* @param string old first string
* @param string new second string
* @param boolean show_equals set to true to see line that are equal between
* the two strings (default true)
* @param string format_line_function callback function to format line
* (default 'format_line')
* @return string formated diff output
*/
function diff( $old, $new, $show_equals = false, $format_line_function = 'format_line' )
<?php
/**
* CLAROLINE
*
* @version 1.7 $Revision: 1.12 $
*
* @copyright 2001-2005 Universite catholique de Louvain (UCL)
*
* @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
* This program is under the terms of the GENERAL PUBLIC LICENSE (GPL)
* as published by the FREE SOFTWARE FOUNDATION. The GPL is available
* through the world-wide-web at http://www.gnu.org/copyleft/gpl.html
*
* @author Frederic Minne <zefredz@gmail.com>
*
* @package Wiki
*/
/**
* Code
*/
define( "DIFF_EQUAL", "=" );
define( "DIFF_ADDED", "+" );
define( "DIFF_DELETED", "-" );
define( "DIFF_MOVED", "M" );
/**
* Get difference between two strings
* @param string old first string
* @param string new second string
* @param boolean show_equals set to true to see line that are equal between
* the two strings (default true)
* @param string format_line_function callback function to format line
* (default 'format_line')
* @return string formated diff output
*/
function diff( $old, $new, $show_equals = false, $format_line_function = 'format_line' )
{
$oldArr = str_split_on_new_line( $old );
$newArr = str_split_on_new_line( $new );
$oldCount = count ( $oldArr );
$newCount = count ( $newArr );
$max = max( $oldCount, $newCount );
//get added and deleted lines
$deleted = array_diff_assoc( $oldArr, $newArr );
$added = array_diff_assoc( $newArr, $oldArr );
$moved = array();
foreach ( $added as $key => $candidate )
{
$oldArr = str_split_on_new_line( $old );
$newArr = str_split_on_new_line( $new );
$oldCount = count ( $oldArr );
$newCount = count ( $newArr );
$max = max( $oldCount, $newCount );
//get added and deleted lines
$deleted = array_diff_assoc( $oldArr, $newArr );
$added = array_diff_assoc( $newArr, $oldArr );
$moved = array();
foreach ( $added as $key => $candidate )
foreach ( $deleted as $index => $content )
{
foreach ( $deleted as $index => $content )
if ( $candidate == $content )
{
if ( $candidate == $content )
{
$moved[$key] = $candidate;
unset( $added[$key] );
unset( $deleted[$index] );
break;
}
$moved[$key] = $candidate;
unset( $added[$key] );
unset( $deleted[$index] );
break;
}
}
}
$output = '';
$output = '';
for ( $i = 0; $i < $max; $i++ )
for ( $i = 0; $i < $max; $i++ )
{
// line changed
if ( isset ( $deleted[$i] ) && isset( $added[$i] ) )
{
// line changed
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] );
}
// line deleted
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] );
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
}
// line added
elseif ( isset ( $added[$i] ) && ! isset ( $deleted[$i] ) )
{
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
}
// line moved
elseif ( isset ( $moved[$i] ) )
{
$output .= $format_line_function( $i, DIFF_MOVED, $newArr[$i] );
}
// line unchanged
elseif ( $show_equals )
{
$output .= $format_line_function( $i, DIFF_EQUAL, $newArr[$i] );
}
else
{
// skip
}
}
// line deleted
elseif ( isset ( $deleted[$i] ) && ! isset ( $added[$i] ) )
{
$output .= $format_line_function( $i, DIFF_DELETED, $deleted[$i] );
return $output;
}
/**
* Split strings on new line
*/
function str_split_on_new_line( $str )
{
$content = array();
if ( api_strpos( $str, "\r\n" ) !== false )
}
// line added
elseif ( isset ( $added[$i] ) && ! isset ( $deleted[$i] ) )
{
$content = explode("\r\n", $str );
$output .= $format_line_function( $i, DIFF_ADDED, $added[$i] );
}
elseif ( api_strpos( $str, "\n" ) !== false )
// line moved
elseif ( isset ( $moved[$i] ) )
{
$content = explode( "\n", $str );
$output .= $format_line_function( $i, DIFF_MOVED, $newArr[$i] );
}
elseif ( api_strpos( $str, "\r" ) !== false )
// line unchanged
elseif ( $show_equals )
{
$content = explode( "\r", $str );
$output .= $format_line_function( $i, DIFF_EQUAL, $newArr[$i] );
}
else
{
$content[] = $str;
// skip
}
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
* @param string value line content
* @param boolean skip_empty skip empty lines (default false)
* @return string formated diff line
*/
function format_line( $line, $type, $value, $skip_empty = false )
{
if ( trim( $value ) == "" && $skip_empty )
{
return "";
}
elseif ( trim( $value ) == "" )
{
$value = '&nbsp;';
}
return $output;
}
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
/**
* Split strings on new line
*/
function str_split_on_new_line( $str )
{
$content = array();
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
if ( api_strpos( $str, "\r\n" ) !== false )
{
$content = explode("\r\n", $str );
}
elseif ( api_strpos( $str, "\n" ) !== false )
{
$content = explode( "\n", $str );
}
elseif ( api_strpos( $str, "\r" ) !== false )
{
$content = explode( "\r", $str );
}
else
{
$content[] = $str;
}
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;
}
}
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
* @param string value line content
* @param boolean skip_empty skip empty lines (default false)
* @return string formated diff line
*/
function format_line( $line, $type, $value, $skip_empty = false )
{
if ( trim( $value ) == "" && $skip_empty )
{
return "";
}
elseif ( trim( $value ) == "" )
{
$value = '&nbsp;';
}
/**
* Table format line function
* @see format_line
*/
function format_table_line( $line, $type, $value, $skip_empty = false )
switch ( $type )
{
if ( trim( $value ) == "" && $skip_empty )
case DIFF_EQUAL:
{
return "";
// return $line. ' : ' . ' = <span class="diffEqual" >' . $value . '</span><br />' . "\n" ;
return '<span class="diffEqual" >' . $value . '</span><br />' . "\n" ; //juan carlos muestra solo color
break;
}
elseif ( trim( $value ) == "" )
case DIFF_MOVED:
{
$value = '&nbsp;';
}
//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
switch ( $type )
break;
}
case DIFF_ADDED:
{
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.
break;
}
case DIFF_MOVED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
;
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.
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.
}
//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;
}
}
}
/**
* Table format line function
* @see format_line
*/
function format_table_line( $line, $type, $value, $skip_empty = false )
{
if ( trim( $value ) == "" && $skip_empty )
{
return "";
}
elseif ( trim( $value ) == "" )
{
$value = '&nbsp;';
}
if (! function_exists('array_diff_assoc') )
switch ( $type )
{
/**
* Replace array_diff_assoc()
*
* @link http://php.net/function.array_diff_assoc
* @author Aidan Lister <aidan@php.net>
* @since PHP 4.3.0
* @require PHP 4.0.0 (user_error)
*/
function array_diff_assoc()
case DIFF_EQUAL:
{
// Check we have enough arguments
$args = func_get_args();
$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;
}
}
//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.
// Get the comparison array
$array_comp = array_shift($args );
--$count;
// Traverse values of the first array
foreach ($array_comp as $key => $value )
{
break;
}
case DIFF_MOVED:
{
// return '<tr><td>' . $line. '&nbsp;:&nbsp;' . '&nbsp;M</td><td><span class="diffMoved" >' . $value . '</span></td></tr>' . "\n" //juan carlos comenta
;
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.
// 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 )
{
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.
unset($array_comp[$key] );
}
}
}
}
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.
return $array_comp;
}
}
?>
}

160
main/wiki/index.php
Unescape View File

@ -163,27 +163,27 @@ if (isset($_POST['SaveWikiChange']) AND $_POST['title']<>'') {
//saving a new wiki entry
echo '<div style="overflow:hidden">';
if (isset($_POST['SaveWikiNew'])) {
if (empty($_POST['title'])) {
Display::display_error_message(get_lang("NoWikiPageTitle"));
} elseif (strtotime(get_date_from_select('startdate_assig')) > strtotime(get_date_from_select('enddate_assig'))) {
Display::display_error_message(get_lang("EndDateCannotBeBeforeTheStartDate"));
} elseif(!double_post($_POST['wpost_id'])) {
//double post
} else {
$_clean['assignment']=Database::escape_string($_POST['assignment']); // for mode assignment
if ($_clean['assignment']==1) {
auto_add_page_users($_clean['assignment']);
} else {
$return_message=save_new_wiki();
if ($return_message==false) {
Display::display_error_message(get_lang('NoWikiPageTitle'), false);
} else {
Display::display_confirmation_message($return_message, false);
}
}
}
if (isset($_POST['SaveWikiNew'])) {
if (empty($_POST['title'])) {
Display::display_error_message(get_lang("NoWikiPageTitle"));
} elseif (strtotime(get_date_from_select('startdate_assig')) > strtotime(get_date_from_select('enddate_assig'))) {
Display::display_error_message(get_lang("EndDateCannotBeBeforeTheStartDate"));
} elseif(!double_post($_POST['wpost_id'])) {
//double post
} else {
$_clean['assignment']=Database::escape_string($_POST['assignment']); // for mode assignment
if ($_clean['assignment']==1) {
auto_add_page_users($_clean['assignment']);
} else {
$return_message=save_new_wiki();
if ($return_message==false) {
Display::display_error_message(get_lang('NoWikiPageTitle'), false);
} else {
Display::display_confirmation_message($return_message, false);
}
}
}
}
echo '</div>';
// check last version
@ -713,13 +713,11 @@ $allpages=Database::query($sql);
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY addlock';//group by because mark 0 in all vers, then always is ok
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$wiki_add_lock=$row['addlock'];
}
$wiki_add_lock=$row['addlock'];
}
if ($wiki_add_lock==1){
$status_add_new_pag=get_lang('Yes');
}
else{
} else {
$status_add_new_pag=get_lang('No');
}
@ -737,18 +735,18 @@ $allpages=Database::query($sql);
$last_wiki_date='0000-00-00 00:00:00';
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY dtime DESC LIMIT 1';
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$last_wiki_date=$row['dtime'];
}
while ($row=Database::fetch_array($allpages)) {
$last_wiki_date=$row['dtime'];
}
//Average score of all wiki pages. (If a page has not scored zero rated)
$media_score =0;
$sql="SELECT *, SUM(score) AS TOTAL_SCORE FROM ".$tbl_wiki." WHERE c_id = $course_id AND ".$groupfilter.$condition_session." GROUP BY reflink ";//group by because mark in all versions, then always is ok. Do not use "count" because using "group by", would give a wrong value
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$total_score=$total_score+$row['TOTAL_SCORE'];
}
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$total_score=$total_score+$row['TOTAL_SCORE'];
}
if (!empty($total_pages)) {
$media_score = $total_score/$total_pages;//put always this line alfter check num all pages
@ -758,10 +756,9 @@ if (!empty($total_pages)) {
$media_progress=0;
$sql='SELECT *, SUM(progress) AS TOTAL_PROGRESS FROM '.$tbl_wiki.' s1 WHERE s1.c_id = '.$course_id.' AND id=(SELECT MAX(s2.id) FROM '.$tbl_wiki.' s2 WHERE s2.c_id = '.$course_id.' AND s1.reflink = s2.reflink AND '.$groupfilter.' AND session_id='.$session_id.')';//As the value is only the latest version I can not use group by
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$total_progress = $row['TOTAL_PROGRESS'];
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$total_progress = $row['TOTAL_PROGRESS'];
}
if (!empty($total_pages)) {
@ -778,21 +775,19 @@ while ($row=Database::fetch_array($allpages)) {
}
//Total of different IP addresses that have participated in the wiki
$total_ip=0;
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY user_ip';
$allpages=Database::query($sql);
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' GROUP BY user_ip';
$allpages=Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$total_ip = $total_ip+1;
}
?>
$total_ip = $total_ip+1;
}
?>
<style>
thead {background:#E2E2E2}
tbody tr:hover {
background: #F9F9F9;
cursor:default;
}
background: #F9F9F9;
cursor:default;
}
</style>
<?php
@ -961,7 +956,6 @@ echo '<td>'.$total_tables.'</td>';
echo '</tr>';
echo '</table>';
echo '<br/>';
}
// Most active users Juan Carlos Raña Trabado
@ -1183,9 +1177,7 @@ if ($action =='wanted') {
$allpages = Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
$refs = explode(" ", trim($row["linksto"]));
// Find linksto into reflink. If not found ->page is wanted
foreach ($refs as $v) {
@ -1199,19 +1191,19 @@ if ($action =='wanted') {
$wanted=array_unique($wanted);//make a unique list
//show table
foreach ($wanted as $wanted_show) {
foreach ($wanted as $wanted_show) {
$row = array ();
$wanted_show=Security::remove_XSS($wanted_show);
$row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities
$row = array ();
$wanted_show=Security::remove_XSS($wanted_show);
$row[] = '<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?cidReq=&action=addnew&title='.str_replace('_',' ',$wanted_show).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'" class="new_wiki_link">'.str_replace('_',' ',$wanted_show).'</a>';//meter un remove xss en lugar de htmlentities
$rows[] = $row;
}
$rows[] = $row;
}
$table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC');
$table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action ),'session_id'=>Security::remove_XSS($_GET['session_id']),'group_id'=>Security::remove_XSS($_GET['group_id'])));
$table->set_header(0,get_lang('Title'), true);
$table->display();
$table = new SortableTableFromArrayConfig($rows,0,10,'WantedPages_table','','','DESC');
$table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action ),'session_id'=>Security::remove_XSS($_GET['session_id']),'group_id'=>Security::remove_XSS($_GET['group_id'])));
$table->set_header(0,get_lang('Title'), true);
$table->display();
}
/* Orphaned pages */
@ -1290,7 +1282,7 @@ if ($action =='orphaned') {
$table->display();
}
/////////////////////// Most linked pages /////////////////////// Juan Carlos Raña Trabado
/* Most linked pages */
if ($action =='mostlinked') {
echo '<div class="actions">'.get_lang('MostLinkedPages').'</div>';
@ -1329,24 +1321,21 @@ if ($action =='mostlinked') {
}
$linked=array_unique($linked);//make a unique list. TODO:delete this line and count how many for each page
//show table
foreach ($linked as $linked_show) {
$row = array ();
$row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.str_replace('_',' ',$linked_show).'</a>';
$rows[] = $row;
}
//show table
foreach ($linked as $linked_show) {
$row = array ();
$row[] = '<a href="'.api_get_self().'?cidReq='.$_course['id'].'&action=showpage&title='.api_htmlentities(urlencode(str_replace('_',' ',$linked_show))).'&session_id='.api_htmlentities($_GET['session_id']).'&group_id='.api_htmlentities($_GET['group_id']).'">'.str_replace('_',' ',$linked_show).'</a>';
$rows[] = $row;
}
$table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC');
$table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action ),'session_id'=>Security::remove_XSS($_GET['session_id']),'group_id'=>Security::remove_XSS($_GET['group_id'])));
$table->set_header(0,get_lang('Title'), true);
$table->display();
$table = new SortableTableFromArrayConfig($rows,0,10,'LinkedPages_table','','','DESC');
$table->set_additional_parameters(array('cidReq' =>Security::remove_XSS($_GET['cidReq']),'action'=>Security::remove_XSS($action ),'session_id'=>Security::remove_XSS($_GET['session_id']),'group_id'=>Security::remove_XSS($_GET['group_id'])));
$table->set_header(0,get_lang('Title'), true);
$table->display();
}
/////////////////////// delete current page /////////////////////// Juan Carlos Raña Trabado
/* Deete current page */
if ($action =='delete') {
@ -1415,7 +1404,7 @@ if ($action =='deletewiki') {
echo '</div>';
}
/////////////////////// search wiki pages ///////////////////////
/* Search wiki pages */
if ($action =='searchpages') {
@ -1452,12 +1441,10 @@ if ($action =='searchpages') {
$form->display();
}
}
echo '</div>';
}
/////////////////////// What links here. Show pages that have linked this page /////////////////////// Juan Carlos Raña Trabado
/* What links here. Show pages that have linked this page */
if ($action =='links') {
@ -1554,10 +1541,7 @@ if ($action =='links') {
}
}
// Adding a new page
// Display the form for adding a new wiki page
echo '<div style="overflow:hidden">';
if ($action =='addnew') {
@ -1583,19 +1567,14 @@ if ($action =='addnew') {
Display::display_normal_message(get_lang('OnlyAddPagesGroupMembers'));
}
}
}
// Show home page
if (!$action OR $action =='show' AND !isset($_POST['SaveWikiNew'])) {
display_wiki_entry($newtitle);
}
// Show current page
if ($action =='showpage' AND !isset($_POST['SaveWikiNew'])) {
if ($_GET['title']) {
display_wiki_entry($newtitle);
@ -1699,7 +1678,6 @@ if (isset($action ) && $action =='edit') {
}
}
//
if (!empty($row['max_version']) && $row['version']>=$row['max_version']) {
$message=get_lang('HasReachedMaxiNumVersions');
Display::display_warning_message($message);
@ -1708,17 +1686,14 @@ if (isset($action ) && $action =='edit') {
}
}
//
if (!empty($row['max_text']) && $row['max_text']<=word_count($row['content'])) {
$message=get_lang('HasReachedMaxNumWords');
Display::display_warning_message($message);
if (!api_is_allowed_to_edit(false,true)) {
exit;
}
}
////
if (!empty($row['task'])) {
//previous change 0 by text
if ($row['startdate_assig']=='0000-00-00 00:00:00') {
@ -2145,14 +2120,12 @@ if ($action =='history' or $_POST['HistoryDifferences']) {
echo '</td>';
echo '</tr></table>';
echo '</div>';
}
}
}
echo '</div>';
}
// Recent changes
// @todo rss feed
@ -2175,8 +2148,6 @@ if ($action =='recentchanges') {
echo '<a href="index.php?action=recentchanges&amp;actionpage='.$lock_unlock_notify_all.'&amp;title='.api_htmlentities(urlencode($page)).'">'.$notify_all.'</a>';
echo '</span>'.get_lang('RecentChanges').'</div>';
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { //only by professors if page is hidden
$sql = 'SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.'
WHERE '.$tbl_wiki_conf.'.c_id= '.$course_id.' AND
@ -2214,7 +2185,6 @@ if ($action =='recentchanges') {
$icon_task='<img src="../img/px_transparent.gif" />';
}
$row = array ();
$row[] = api_get_local_time($obj->dtime, null, date_default_timezone_get());
$row[] = $ShowAssignment.$icon_task;

202
main/wiki/wiki.inc.php
Unescape View File

@ -65,32 +65,22 @@ function links_to($input) {
$input_array=preg_split("/(\[\[|\]\])/",$input,-1, PREG_SPLIT_DELIM_CAPTURE);
$all_links = array();
foreach ($input_array as $key=>$value)
{
if ($input_array[$key-1]=='[[' AND $input_array[$key+1]==']]')
{
foreach ($input_array as $key=>$value) {
if ($input_array[$key-1]=='[[' AND $input_array[$key+1]==']]') {
if (api_strpos($value, "|") !== false)
{
if (api_strpos($value, "|") !== false) {
$full_link_array=explode("|", $value);
$link=trim($full_link_array[0]);
$title=trim($full_link_array[1]);
}
else
{
} else {
$link=trim($value);
$title=trim($value);
}
unset($input_array[$key-1]);
unset($input_array[$key+1]);
$all_links[]= Database::escape_string(str_replace(' ','_',$link)).' '; //replace blank spaces by _ within the links. But to remove links at the end add a blank space
}
}
$output=implode($all_links);
return $output;
@ -207,14 +197,13 @@ function make_wiki_link_clickable($input) {
$full_link_array=explode("|", $value);
$link=trim(strip_tags($full_link_array[0]));
$title=trim($full_link_array[1]);
}
else{
} else {
$link=trim(strip_tags($value));
$title=trim($value);
}
//if wikilink is homepage
if($link=='index'){
if ($link=='index') {
$title=get_lang('DefaultTitle');
}
if ($link==get_lang('DefaultTitle')){
@ -222,13 +211,10 @@ function make_wiki_link_clickable($input) {
}
// note: checkreflink checks if the link is still free. If it is not used then it returns true, if it is used, then it returns false. Now the title may be different
if (checktitle(strtolower(str_replace(' ','_',$link))))
{
if (checktitle(strtolower(str_replace(' ','_',$link)))) {
$link = api_html_entity_decode($link);
$input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=addnew&amp;title='.api_htmlentities(urlencode($link)).'&group_id='.$groupId.'" class="new_wiki_link">'.$title.'</a>';
}
else
{
} else {
$input_array[$key]='<a href="'.api_get_path(WEB_PATH).'main/wiki/index.php?'.api_get_cidreq().'&action=showpage&amp;title='.urlencode(strtolower(str_replace(' ','_',$link))).'&group_id='.$groupId.'" class="wiki_link">'.$title.'</a>';
}
unset($input_array[$key-1]);
@ -283,38 +269,28 @@ function save_wiki() {
$_clean['fprogress3']=Database::escape_string($_POST['fprogress3']);
}
if(Security::remove_XSS($_POST['initstartdate']==1))
{
if(Security::remove_XSS($_POST['initstartdate']==1)) {
$_clean['startdate_assig']=Database::escape_string(get_date_from_select('startdate_assig'));
}
else
{
} else {
$_clean['startdate_assig']=Database::escape_string($_POST['startdate_assig']);
}
if(Security::remove_XSS($_POST['initenddate']==1))
{
if(Security::remove_XSS($_POST['initenddate']==1)) {
$_clean['enddate_assig']=Database::escape_string(get_date_from_select('enddate_assig'));
}
else
{
} else {
$_clean['enddate_assig']=Database::escape_string($_POST['enddate_assig']);
}
$_clean['delayedsubmit']=Database::escape_string($_POST['delayedsubmit']);
if(!empty($_POST['max_text']) || !empty($_POST['max_version']))
{
if(!empty($_POST['max_text']) || !empty($_POST['max_version'])) {
$_clean['max_text'] =Database::escape_string($_POST['max_text']);
$_clean['max_version']=Database::escape_string($_POST['max_version']);
}
$course_id = api_get_course_int_id();
$sql = "INSERT INTO ".$tbl_wiki." (c_id, page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip, session_id)
VALUES ($course_id, '".$_clean['page_id']."','".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$groupId."','".$dtime."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
$result = Database::query($sql);
$Id = Database::insert_id();
@ -362,9 +338,7 @@ function restore_wikipage($r_page_id, $r_reflink, $r_title, $r_content, $r_group
$result=Database::query($sql);
$Id = Database::insert_id();
api_item_property_update($_course, 'wiki', $Id, 'WikiAdded', api_get_user_id(), $r_group_id);
check_emailcue($r_reflink, 'P', $r_dtime, $r_user_id);
return get_lang('PageRestored');
}
@ -381,9 +355,7 @@ function delete_wiki() {
//identify the first id by group = identify wiki
$sql = 'SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY id DESC';
$allpages = Database::query($sql);
while ($row=Database::fetch_array($allpages)) {
while ($row=Database::fetch_array($allpages)) {
$id = $row['id'];
$group_id = $row['group_id'];
$session_id = $row['session_id'];
@ -416,8 +388,8 @@ function save_new_wiki() {
// session_id
$session_id = api_get_session_id();
if($_clean['assignment']==2 || $_clean['assignment']==1) {// Unlike ordinary pages of pages of assignments. Allow create a ordinary page although there is a assignment with the same name
// Unlike ordinary pages of pages of assignments. Allow create a ordinary page although there is a assignment with the same name
if($_clean['assignment']==2 || $_clean['assignment']==1) {
$page = str_replace(' ','_',$_POST['title']."_uass".$assig_user_id);
} else {
$page = str_replace(' ','_',$_POST['title']);
@ -438,20 +410,16 @@ function save_new_wiki() {
}
if($_clean['assignment']==2) {//config by default for individual assignment (students)
$_clean['user_id']=(int)Database::escape_string($assig_user_id);//Identifies the user as a creator, not the teacher who created
//Identifies the user as a creator, not the teacher who created
$_clean['user_id']=(int)Database::escape_string($assig_user_id);
$_clean['visibility']=0;
$_clean['visibility_disc']=0;
$_clean['ratinglock_disc']=0;
} else {
$_clean['user_id']=api_get_user_id();
$_clean['user_id']=api_get_user_id();
$_clean['visibility']=1;
$_clean['visibility_disc']=1;
$_clean['ratinglock_disc']=1;
}
$_clean['comment']=Database::escape_string($_POST['comment']);
@ -504,8 +472,7 @@ function save_new_wiki() {
($course_id, '".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$groupId."','".$dtime."','".$_clean['visibility']."','".$_clean['visibility_disc']."','".$_clean['ratinglock_disc']."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
$result = Database::query($sql);
$Id = Database::insert_id();
if ($Id > 0) {
if ($Id > 0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_WIKI, $Id, 'WikiAdded', api_get_user_id(), $groupId);
}
@ -517,13 +484,10 @@ function save_new_wiki() {
$sql="INSERT INTO ".$tbl_wiki_conf." (c_id, page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES
($course_id, '".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
Database::query($sql);
check_emailcue(0, 'A');
return get_lang('NewWikiSaved');
}
}//end filter no _uass
}
}
/**
@ -897,7 +861,6 @@ function display_wiki_entry($newtitle) {
if (empty($title)) {
$title=get_lang('DefaultTitle');
}
if (wiki_exist($title)) {
@ -920,8 +883,8 @@ function display_wiki_entry($newtitle) {
* @param string Document's text
* @return int Number of words
*/
function word_count($document) {
function word_count($document)
{
$search = array(
'@<script[^>]*?>.*?</script>@si',
'@<style[^>]*?>.*?</style>@siU',
@ -953,7 +916,6 @@ function word_count($document) {
# return the number of words
return count($wc);
}
/**
@ -992,7 +954,7 @@ function display_wiki_warning($variable) {
* @return html code
*/
function is_active_navigation_tab($paramwk) {
if ($_GET['action']==$paramwk) {
if (isset($_GET['action']) && $_GET['action'] == $paramwk) {
return ' class="active"';
}
}
@ -1007,16 +969,12 @@ function check_addnewpagelock() {
global $tbl_wiki;
global $groupfilter;
global $condition_session;
$groupId = api_get_group_id();
$course_id = api_get_course_int_id();
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
$status_addlock=$row['addlock'];
//change status
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockaddnew' && $status_addlock==1) {
@ -1031,11 +989,7 @@ function check_addnewpagelock() {
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
}
//show status
return $row['addlock'];
}
@ -1099,12 +1053,8 @@ function check_visibility_page()
ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
$status_visibility=$row['visibility'];
//change status
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
if (isset($_GET['actionpage']) && $_GET['actionpage']=='visible' && $status_visibility==0) {
$status_visibility=1;
@ -1118,7 +1068,9 @@ function check_visibility_page()
Database::query($sql);
//Although the value now is assigned to all (not only the first), these three lines remain necessary. They do that by changing the page state is made when you press the button and not have to wait to change his page
$sql = 'SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$sql = 'SELECT * FROM '.$tbl_wiki.'
WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.'
ORDER BY id ASC';
$result=Database::query($sql);
$row = Database::fetch_array($result);
}
@ -1152,14 +1104,11 @@ function check_visibility_discuss() {
$status_visibility_disc=$row['visibility_disc'];
//change status
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
{
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0)
{
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='showdisc' && $status_visibility_disc==0) {
$status_visibility_disc=1;
}
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1)
{
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='hidedisc' && $status_visibility_disc==1) {
$status_visibility_disc=0;
}
@ -1170,11 +1119,8 @@ function check_visibility_discuss() {
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
}
//show status
return $row['visibility_disc'];
return $row['visibility_disc'];
}
@ -1198,15 +1144,11 @@ function check_addlock_discuss() {
$status_addlock_disc=$row['addlock_disc'];
//change status
if (api_is_allowed_to_edit() || api_is_platform_admin())
{
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0)
{
if (api_is_allowed_to_edit() || api_is_platform_admin()) {
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockdisc' && $status_addlock_disc==0) {
$status_addlock_disc=1;
}
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1)
{
}
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockdisc' && $status_addlock_disc==1) {
$status_addlock_disc=0;
}
@ -1218,10 +1160,8 @@ function check_addlock_discuss() {
$sql='SELECT * FROM '.$tbl_wiki.'WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
}
//show status
return $row['addlock_disc'];
}
@ -1247,12 +1187,9 @@ function check_ratinglock_discuss() {
$status_ratinglock_disc=$row['ratinglock_disc'];
//change status
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
{
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0)
{
if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='lockrating' && $status_ratinglock_disc==0) {
$status_ratinglock_disc=1;
}
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='unlockrating' && $status_ratinglock_disc==1)
@ -1268,12 +1205,9 @@ function check_ratinglock_discuss() {
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' AND reflink="'.Database::escape_string($page).'" AND '.$groupfilter.$condition_session.' ORDER BY id ASC';
$result=Database::query($sql);
$row=Database::fetch_array($result);
}
//show status
return $row['ratinglock_disc'];
return $row['ratinglock_disc'];
}
/**
@ -1304,17 +1238,12 @@ function check_notify_page($reflink) {
$idm=$row['id'];
if (empty($idm))
{
if (empty($idm)) {
$status_notify=0;
}
else
{
} else {
$status_notify=1;
}
//change status
if (isset($_GET['actionpage']) && $_GET['actionpage'] =='locknotify' && $status_notify==0) {
$sql="INSERT INTO ".$tbl_wiki_mailcue." (c_id, id, user_id, type, group_id, session_id) VALUES
@ -1473,10 +1402,8 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') {
$email_page_name=$row['title'];
if ($row['visibility']==1) {
$allow_send_mail=true; //if visibility off - notify off
$sql='SELECT * FROM '.$tbl_wiki_mailcue.' WHERE c_id = '.$course_id.' AND id="'.$id.'" AND type="'.$type.'" OR type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"'; //type: P=page, D=discuss, F=full.
$result=Database::query($sql);
$emailtext=get_lang('EmailWikipageModified').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
}
} elseif ($type=='D') {
@ -1506,28 +1433,19 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') {
$row=Database::fetch_array($result);
$email_page_name=$row['title'];
if ($row['visibility_disc']==1)
{
if ($row['visibility_disc']==1) {
$allow_send_mail=true; //if visibility off - notify off
$sql='SELECT * FROM '.$tbl_wiki_mailcue.'WHERE c_id = '.$course_id.' AND id="'.$id.'" AND type="'.$type.'" OR type="F" AND group_id="'.$groupId.'" AND session_id="'.$session_id.'"'; //type: P=page, D=discuss, F=full
$result=Database::query($sql);
$emailtext=get_lang('EmailWikiPageDiscAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('Wiki');
}
}
elseif($type=='A')
{
//for added pages
} elseif($type=='A') {
//for added pages
$id=0; //for tbl_wiki_mailcue
$sql='SELECT * FROM '.$tbl_wiki.' WHERE c_id = '.$course_id.' ORDER BY id DESC'; //the added is always the last
$result=Database::query($sql);
$row=Database::fetch_array($result);
$email_page_name=$row['title'];
//Who is the author?
@ -1543,18 +1461,12 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') {
$seconds=substr($row['dtime'], 17,2);
$email_date_changes=$day.' '.$month.' '.$year.' '.$hours.":".$minutes.":".$seconds;
if($row['assignment']==0)
{
if($row['assignment']==0) {
$allow_send_mail=true;
}
elseif($row['assignment']==1)
{
} elseif($row['assignment']==1) {
$email_assignment=get_lang('AssignmentDescExtra').' ('.get_lang('AssignmentMode').')';
$allow_send_mail=true;
}
elseif($row['assignment']==2)
{
} elseif($row['assignment']==2) {
$allow_send_mail=false; //Mode tasks: avoids notifications to all users about all users
}
@ -1562,9 +1474,7 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') {
$result=Database::query($sql);
$emailtext=get_lang('EmailWikiPageAdded').' <strong>'.$email_page_name.'</strong> '.get_lang('In').' '. get_lang('Wiki');
}
elseif($type=='E')
{
} elseif($type=='E') {
$id=0;
$allow_send_mail=true;
@ -1583,14 +1493,9 @@ function check_emailcue($id_or_ref, $type, $lastime='', $lastuser='') {
$emailtext=get_lang('EmailWikipageDedeleted');
}
///make and send email
if ($allow_send_mail)
{
while ($row=Database::fetch_array($result))
{
if ($allow_send_mail) {
while ($row=Database::fetch_array($result)) {
$userinfo = Database::get_user_info_from_id($row['user_id']); //$row['user_id'] obtained from tbl_wiki_mailcue
$name_to = api_get_person_name($userinfo['firstname'], $userinfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$email_to = $userinfo['email'];
@ -2080,14 +1985,16 @@ function make_select($name,$values,$checked='') {
* Translates a form date into a more usable format
*
*/
function get_date_from_select($prefix) {
function get_date_from_select($prefix)
{
return $_POST[$prefix.'_year'].'-'.two_digits($_POST[$prefix.'_month']).'-'.two_digits($_POST[$prefix.'_day']).' '.two_digits($_POST[$prefix.'_hour']).':'.two_digits($_POST[$prefix.'_minute']).':00';
}
/**
* Converts 1-9 to 01-09
*/
function two_digits($number) {
function two_digits($number)
{
$number = (int)$number;
return ($number < 10) ? '0'.$number : $number;
}
@ -2098,7 +2005,8 @@ function two_digits($number) {
* @param int wiki id
* @return array wiki data
*/
function get_wiki_data($id) {
function get_wiki_data($id)
{
global $tbl_wiki;
$course_id = api_get_course_int_id();
$id = intval($id);

Write Preview
Loading…
Cancel
Save