Commit 39fe54f2 authored by Loïc DAYOT's avatar Loïc DAYOT
Browse files

fix(): various

remove preview extend of tinyMCE
must preview before send a localgroup form.
relative path to theme files
display events in the past for a localgroup

close #57
parent 8e4307f3
......@@ -35,7 +35,7 @@ include('inc/config.inc.php');
/*
* Return a string with path and name to file in path theme if
* exists else to default path
*
*
* $filename param could be 'text/text.inc.php'
* or 'template/header.php' ...
*/
......@@ -43,17 +43,17 @@ function _themeFile($filename)
{
global $default_theme, $theme;
if (is_file('./'. $theme. '/'. $filename))
if (is_file(/*'./'.*/ $theme. '/'. $filename))
{
return './'. $theme. '/'. $filename;
}
elseif (is_file('./'. $default_theme. '/'. $filename))
return /*'./'.*/ $theme. '/'. $filename;
}
elseif (is_file(/*'./'.*/ $default_theme. '/'. $filename))
{
return './'. $default_theme. '/'. $filename;
}
return /*'./'.*/ $default_theme. '/'. $filename;
}
else
{
die('./'. $default_theme. '/'. $filename. " introuvable");
die(/*'./'.*/ $default_theme. '/'. $filename. " introuvable");
}
}
......@@ -98,8 +98,8 @@ if ($noUser = $user->is_table_empty())
}
}
if (!$noUser && (($privateAgenda && (!isset($privatePage) || $privatePage!=false))
|| (isset($privatePage) && $privatePage==true)))
if (!$noUser && (($privateAgenda && (!isset($privatePage) || $privatePage!=false))
|| (isset($privatePage) && $privatePage==true)))
{
$user->identify();
}
<?php
/*
* Copyright 2007-2017
* Copyright 2007-2018
* - Mélanie Bats <melanie POINT bats CHEZ utbm POINT fr>
* - Thomas Petazzoni <thomas POINT petazzoni CHEZ enix POINT org>
* - Loic Dayot <ldayot CHEZ ouvaton POINT org>
......@@ -102,6 +102,8 @@ if ($db->numRows($events))
// Dans le passé
unset($eventList->start);
$eventList->daylimit = 0;
$eventList->past = true;
$events = $eventList->getEventsList();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment