Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <jo...@us...> - 2003-11-25 22:14:01
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv6823/includes
Modified Files:
event.php login.php todo.php
Log Message:
Fleshed out invalid login error response. Only checks for invalid
logins for non-HTTP authentication (even if there is no calendar map
for an HTTP authenticated user).
Switched some include() directives to include_once() to prevent
possible future redeclaration errors.
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** event.php 23 Nov 2003 17:56:27 -0000 1.19
--- event.php 25 Nov 2003 22:13:56 -0000 1.20
***************
*** 1,5 ****
<?php
define('BASE', '../');
! include (BASE.'functions/init.inc.php');
function decode_popup ($item) {
--- 1,5 ----
<?php
define('BASE', '../');
! include_once(BASE.'functions/init.inc.php');
function decode_popup ($item) {
Index: login.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** login.php 25 Nov 2003 21:50:13 -0000 1.6
--- login.php 25 Nov 2003 22:13:57 -0000 1.7
***************
*** 2,6 ****
// Hide the login block if logged in, there are no lock usernames,
// or if authenticated via HTTP.
! if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) {
// Set the login table width if not set.
if (!isset($login_width)) $login_width = "100%";
--- 2,6 ----
// Hide the login block if logged in, there are no lock usernames,
// or if authenticated via HTTP.
! if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) {
// Set the login table width if not set.
if (!isset($login_width)) $login_width = "100%";
***************
*** 18,23 ****
}
! // For Wesley
! $login_message = ($user_passed == TRUE) ? $invalid_login_lang : $login_lang;
echo <<<END
--- 18,23 ----
}
! // If the attempted login was invalid, change the box title.
! $login_message = ($invalid_login == TRUE) ? "<font color=\"red\">$invalid_login_lang</font>" : '';
echo <<<END
***************
*** 25,33 ****
<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
<tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_message}</div></td>
</tr>
<tr>
<td align="left" class="G10B">
<div style="padding: 5px;">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
--- 25,34 ----
<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
<tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_lang}</div></td>
</tr>
<tr>
<td align="left" class="G10B">
<div style="padding: 5px;">
+ {$login_message}
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
***************
*** 36,41 ****
</tr>
<tr>
! <td>Password:</td>
! <td><input class="login_style" type="{$password_lang}" size="8" name="password"></td>
</tr>
<tr>
--- 37,42 ----
</tr>
<tr>
! <td>{$password_lang}:</td>
! <td><input class="login_style" type="$password" size="8" name="password"></td>
</tr>
<tr>
Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** todo.php 22 Nov 2003 19:29:46 -0000 1.11
--- todo.php 25 Nov 2003 22:13:57 -0000 1.12
***************
*** 2,7 ****
define('BASE', '../');
! include (BASE.'functions/init.inc.php');
! include (BASE.'functions/date_functions.php');
$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
--- 2,7 ----
define('BASE', '../');
! include_once(BASE.'functions/init.inc.php');
! include_once(BASE.'functions/date_functions.php');
$vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array']));
|
|
From: <jo...@us...> - 2003-11-25 22:13:59
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv6823/functions
Modified Files:
ical_parser.php init.inc.php
Log Message:
Fleshed out invalid login error response. Only checks for invalid
logins for non-HTTP authentication (even if there is no calendar map
for an HTTP authenticated user).
Switched some include() directives to include_once() to prevent
possible future redeclaration errors.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** ical_parser.php 23 Nov 2003 21:41:51 -0000 1.135
--- ical_parser.php 25 Nov 2003 22:13:56 -0000 1.136
***************
*** 2,10 ****
if (!defined('BASE')) define('BASE', './');
! include(BASE.'functions/init.inc.php');
! include(BASE.'functions/date_functions.php');
! include(BASE.'functions/draw_functions.php');
! include(BASE.'functions/overlapping_events.php');
! include(BASE.'functions/timezones.php');
$fillTime = $day_start;
--- 2,10 ----
if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'functions/init.inc.php');
! include_once(BASE.'functions/date_functions.php');
! include_once(BASE.'functions/draw_functions.php');
! include_once(BASE.'functions/overlapping_events.php');
! include_once(BASE.'functions/timezones.php');
$fillTime = $day_start;
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** init.inc.php 25 Nov 2003 21:50:13 -0000 1.51
--- init.inc.php 25 Nov 2003 22:13:56 -0000 1.52
***************
*** 7,11 ****
// uncomment when developing, comment for shipping version
! error_reporting (E_ERROR | E_WARNING);
// Older versions of PHP do not define $_SERVER. Define it here instead.
--- 7,11 ----
// uncomment when developing, comment for shipping version
! error_reporting (E_ERROR | E_WARNING | E_PARSE);
// Older versions of PHP do not define $_SERVER. Define it here instead.
***************
*** 19,25 ****
// Pull in the configuration and some functions.
if (!defined('BASE')) define('BASE', './');
! include(BASE.'config.inc.php');
! include(BASE.'functions/error.php');
! include(BASE.'functions/calendar_functions.php');
if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
--- 19,25 ----
// Pull in the configuration and some functions.
if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'config.inc.php');
! include_once(BASE.'functions/error.php');
! include_once(BASE.'functions/calendar_functions.php');
if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
$phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
***************
*** 55,60 ****
else if (isset($HTTP_POST_VARS['password'])) $password = $HTTP_POST_VARS['password'];
! // Set the login cookie if logging in. Clear it if logging out.
$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
if ($action == 'login') {
$the_cookie = serialize(array('username' => $username, 'password' => $password));
--- 55,74 ----
else if (isset($HTTP_POST_VARS['password'])) $password = $HTTP_POST_VARS['password'];
! // Grab the action (login or logout).
$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
+
+ // Check to make sure the username and password is valid.
+ if (!key_exists("$username:$password", $locked_map)) {
+ // Don't login, instead logout.
+ $action = 'logout';
+
+ // Remember the invalid login, because we may want to
+ // display a message elsewhere.
+ $invalid_login = true;
+ } else {
+ $invalid_login = false;
+ }
+
+ // Set the login cookie if logging in. Clear it if logging out.
if ($action == 'login') {
$the_cookie = serialize(array('username' => $username, 'password' => $password));
|
|
From: <cl...@us...> - 2003-11-25 21:50:16
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv667/includes
Modified Files:
login.php
Log Message:
Added translations to login
Index: login.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** login.php 24 Nov 2003 04:05:38 -0000 1.5
--- login.php 25 Nov 2003 21:50:13 -0000 1.6
***************
*** 17,20 ****
--- 17,23 ----
echo '<input type="hidden" name="'.$key.'" value="'.$HTTP_GET_VARS[$key].'">';
}
+
+ // For Wesley
+ $login_message = ($user_passed == TRUE) ? $invalid_login_lang : $login_lang;
echo <<<END
***************
*** 22,26 ****
<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
<tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">Login</div></td>
</tr>
<tr>
--- 25,29 ----
<table cellpadding="0" cellspacing="0" border="0" width="{$login_width}" class="calborder">
<tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$login_message}</div></td>
</tr>
<tr>
***************
*** 29,42 ****
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
! <td width="5%">Username:</td>
<td width="95%"><input class="login_style" type="text" size="8" name="username"></td>
</tr>
<tr>
<td>Password:</td>
! <td><input class="login_style" type="password" size="8" name="password"></td>
</tr>
<tr>
<td> </td>
! <td><input class="login_style" type="submit" value="Login"></td>
</tr>
</table>
--- 32,45 ----
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
! <td width="5%">{$username_lang}:</td>
<td width="95%"><input class="login_style" type="text" size="8" name="username"></td>
</tr>
<tr>
<td>Password:</td>
! <td><input class="login_style" type="{$password_lang}" size="8" name="password"></td>
</tr>
<tr>
<td> </td>
! <td><input class="login_style" type="submit" value="{$login_lang}"></td>
</tr>
</table>
|
|
From: <cl...@us...> - 2003-11-25 21:50:16
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv667/functions Modified Files: init.inc.php Log Message: Added translations to login Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** init.inc.php 25 Nov 2003 15:59:27 -0000 1.50 --- init.inc.php 25 Nov 2003 21:50:13 -0000 1.51 *************** *** 7,11 **** // uncomment when developing, comment for shipping version ! // error_reporting (E_ERROR | E_WARNING); // Older versions of PHP do not define $_SERVER. Define it here instead. --- 7,11 ---- // uncomment when developing, comment for shipping version ! error_reporting (E_ERROR | E_WARNING); // Older versions of PHP do not define $_SERVER. Define it here instead. |
|
From: <cl...@us...> - 2003-11-25 21:50:16
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv667
Modified Files:
admin.php
Log Message:
Added translations to login
Index: admin.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** admin.php 25 Nov 2003 21:24:31 -0000 1.8
--- admin.php 25 Nov 2003 21:50:13 -0000 1.9
***************
*** 90,94 ****
// If User is Not Logged In, Display The Login Page
if ($is_loged_in == FALSE) {
! if (isset($username)) {
$login_error = "<font color=\"red\">$invalid_login_lang</font>";
} else {
--- 90,94 ----
// If User is Not Logged In, Display The Login Page
if ($is_loged_in == FALSE) {
! if (isset($username) && $username !='') {
$login_error = "<font color=\"red\">$invalid_login_lang</font>";
} else {
|
|
From: <jo...@us...> - 2003-11-25 21:24:34
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv27430 Modified Files: admin.php Log Message: For some reason, calendar_functions.php was being included twice. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin.php 22 Nov 2003 21:16:10 -0000 1.7 --- admin.php 25 Nov 2003 21:24:31 -0000 1.8 *************** *** 5,9 **** include (BASE.'functions/init.inc.php'); include (BASE.'functions/admin_functions.php'); - include (BASE.'functions/calendar_functions.php'); // Redirect if administration is not allowed --- 5,8 ---- |
|
From: <cl...@us...> - 2003-11-25 20:27:51
|
Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv14984/languages
Modified Files:
finnish.inc.php
Log Message:
Finnish for 1.0
Index: finnish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** finnish.inc.php 22 Nov 2003 03:45:33 -0000 1.10
--- finnish.inc.php 25 Nov 2003 20:27:48 -0000 1.11
***************
*** 4,15 ****
// For version 1.0 PHP iCalendar
//
! // Translation by Kari Somby (kar...@ra...)
//
// Submit new translations to ch...@ch...
! $day_lang = 'Päivä';
! $week_lang = 'Viikko';
! $month_lang = 'Kuukausi';
! $year_lang = 'Vuosi';
$calendar_lang = 'Kalenteri';
$next_day_lang = 'Seuraava Päivä';
--- 4,15 ----
// For version 1.0 PHP iCalendar
//
! // Translation by Kari Somby (kar...@pp...)
//
// Submit new translations to ch...@ch...
! $day_lang = 'Päivä';
! $week_lang = 'Viikko';
! $month_lang = 'Kuukausi';
! $year_lang = 'Vuosi';
$calendar_lang = 'Kalenteri';
$next_day_lang = 'Seuraava Päivä';
***************
*** 24,42 ****
$download_lang = 'Lataa tiedosto';
$powered_by_lang = 'Powered by';
! $event_lang = 'Tapahtuma';
$event_start_lang = 'Aloitusaika';
$event_end_lang = 'Lopetusaika';
$this_months_lang = 'Tämän Kuukauden tapahtumat';
! $date_lang = 'Päivä';
$summary_lang = 'Yhteenveto';
$all_day_lang = 'Koko päivän tapahtuma';
! $notes_lang = 'Muistiinpanot';
$this_years_lang = 'Tämän Vuoden tapahtumat';
! $today_lang = 'Today';
$this_week_lang = 'Tämä Viikko';
$this_month_lang = 'Tämä Kuukausi';
! $jump_lang = 'Siirry';
$tomorrows_lang = 'Huomisen Tapahtumat';
! $goday_lang = 'Mene Tähän Päivään';
$goweek_lang = 'Mene Tähän Viikkoon';
$gomonth_lang = 'Mene Tähän Kuukauteen';
--- 24,42 ----
$download_lang = 'Lataa tiedosto';
$powered_by_lang = 'Powered by';
! $event_lang = 'Tapahtuma';
$event_start_lang = 'Aloitusaika';
$event_end_lang = 'Lopetusaika';
$this_months_lang = 'Tämän Kuukauden tapahtumat';
! $date_lang = 'Päivä';
$summary_lang = 'Yhteenveto';
$all_day_lang = 'Koko päivän tapahtuma';
! $notes_lang = 'Muistiinpanot';
$this_years_lang = 'Tämän Vuoden tapahtumat';
! $today_lang = 'Today';
$this_week_lang = 'Tämä Viikko';
$this_month_lang = 'Tämä Kuukausi';
! $jump_lang = 'Siirry';
$tomorrows_lang = 'Huomisen Tapahtumat';
! $goday_lang = 'Mene Tähän Päivään';
$goweek_lang = 'Mene Tähän Viikkoon';
$gomonth_lang = 'Mene Tähän Kuukauteen';
***************
*** 44,104 ****
$search_lang = 'Etsi'; // the verb
$results_lang = 'Etsinnän Tulokset';
! $query_lang = 'Kysely'; // will be followed by the search query
$no_results_lang = 'Tapahtumia ei löytynyt';
$goprint_lang = 'Tulostettava versio';
! $time_lang = 'Aika';
$summary_lang = 'Yhteenveto';
$description_lang = 'Selitys';
! $this_site_is_lang = 'Tämä sivusto on';
! $no_events_day_lang = 'Ei tapahtumia tänään.';
$no_events_week_lang = 'Ei tapahtumia tällä viikolla.';
$no_events_month_lang = 'Ei tapahtumia tässä kuussa.';
! $rss_day_date = 'g:i A'; // Lists just the time
! $rss_week_date = '%b %e'; // Lists just the day
! $rss_month_date = '%b %e'; // Lists just the day
! $rss_language = 'fi-fi';
! $search_took_lang = 'Etsimiseen meni %s sekuntia';
$recurring_event_lang = 'Toistuva tapahtuma';
! $exception_lang = 'Poikkeus';
! $no_query_lang = 'Kyselyä ei annettu';
! $preferences_lang = 'Ominaisuudet';
! $printer_lang = 'Tulostin';
! $select_lang_lang = 'Valitse oletuskieli:';
! $select_cal_lang = 'Valitse oletuskalenteri:';
! $select_view_lang = 'Valitse oletusnäkymä:';
! $select_time_lang = 'Valitse oletusaloitusaika:';
! $select_day_lang = 'Valitse oletusaloituspäivä viikolle:';
! $select_style_lang = 'Valitse oletustyyli:';
! $set_prefs_lang = 'Aseta ominaisuudet';
$completed_date_lang = 'Valmistuu';
! $completed_lang = 'Valmis';
! $created_lang = 'Luotu:';
! $due_lang = 'Erääntyy:';
! $priority_lang = 'Tärkeys:';
! $priority_high_lang = 'Korkea';
! $priority_low_lang = 'Matala';
$priority_medium_lang = 'Keski';
! $priority_none_lang = 'Ei mitään';
! $status_lang = 'Tila:';
! $todo_lang = 'Tehtävät:';
! $unfinished_lang = 'Päättymättömät';
! $prefs_set_lang = 'Asetukset päivitetty';
! $prefs_unset_lang = 'Asetuksia ei päivitetty. Muutokset päivitetään seuraavan sivun ladattua';
! $unset_prefs_lang = 'Asetukset peruttu';
! $organizer_lang = 'Organisoija';
! $attendee_lang = 'Osanottajat';
! $status_lang = 'Status';
! $location_lang = 'Paikka';
! $admin_header_lang = 'PHP iCalendar Hallinta';
! $username_lang = 'Käyttäjätunnus';
! $password_lang = 'Salasana';
! $login_lang = 'Kirjaudu sisään';
! $invalid_login_lang = 'Väärä käyttäjätunnus tai salasana.';
! $addupdate_cal_lang = 'Lisää tai päivitä kalenteri';
! $addupdate_desc_lang = 'Lisää kalenteri lataamalla uusi tiedosto. Päivitä kalenteri samannimisellä tiedostolla';
! $delete_cal_lang = 'Tuhoa kalenteri';
! $logout_lang = 'Kirjaudu ulos';
! $cal_file_lang = 'Kalenteritiedosto';
! $php_error_lang = 'PHP virhe';
$upload_error_gen_lang = 'Tiedoston latauksessa oli ongelma.';
$upload_error_lang[0] = 'Tiedoston latauksessa oli ongelma.';
--- 44,104 ----
$search_lang = 'Etsi'; // the verb
$results_lang = 'Etsinnän Tulokset';
! $query_lang = 'Kysely'; // will be followed by the search query
$no_results_lang = 'Tapahtumia ei löytynyt';
$goprint_lang = 'Tulostettava versio';
! $time_lang = 'Aika';
$summary_lang = 'Yhteenveto';
$description_lang = 'Selitys';
! $this_site_is_lang = 'Tämä sivusto on';
! $no_events_day_lang = 'Ei tapahtumia tänään.';
$no_events_week_lang = 'Ei tapahtumia tällä viikolla.';
$no_events_month_lang = 'Ei tapahtumia tässä kuussa.';
! $rss_day_date = 'g:i A'; // Lists just the time
! $rss_week_date = '%b %e'; // Lists just the day
! $rss_month_date = '%b %e'; // Lists just the day
! $rss_language = 'fi-fi';
! $search_took_lang = 'Etsimiseen meni %s sekuntia';
$recurring_event_lang = 'Toistuva tapahtuma';
! $exception_lang = 'Poikkeus';
! $no_query_lang = 'Kyselyä ei annettu';
! $preferences_lang = 'Ominaisuudet';
! $printer_lang = 'Tulostin';
! $select_lang_lang = 'Valitse oletuskieli:';
! $select_cal_lang = 'Valitse oletuskalenteri:';
! $select_view_lang = 'Valitse oletusnäkymä:';
! $select_time_lang = 'Valitse oletusaloitusaika:';
! $select_day_lang = 'Valitse oletusaloituspäivä viikolle:';
! $select_style_lang = 'Valitse oletustyyli:';
! $set_prefs_lang = 'Aseta ominaisuudet';
$completed_date_lang = 'Valmistuu';
! $completed_lang = 'Valmis';
! $created_lang = 'Luotu:';
! $due_lang = 'Erääntyy:';
! $priority_lang = 'Tärkeys:';
! $priority_high_lang = 'Korkea';
! $priority_low_lang = 'Matala';
$priority_medium_lang = 'Keski';
! $priority_none_lang = 'Ei mitään';
! $status_lang = 'Tila:';
! $todo_lang = 'Tehtävät:';
! $unfinished_lang = 'Päättymättömät';
! $prefs_set_lang = 'Asetukset päivitetty';
! $prefs_unset_lang = 'Asetuksia ei päivitetty. Muutokset päivitetään seuraavan sivun ladattua';
! $unset_prefs_lang = 'Asetukset peruttu';
! $organizer_lang = 'Organisoija';
! $attendee_lang = 'Osanottajat';
! $status_lang = 'Status';
! $location_lang = 'Paikka';
! $admin_header_lang = 'PHP iCalendar Hallinta';
! $username_lang = 'Käyttäjätunnus';
! $password_lang = 'Salasana';
! $login_lang = 'Kirjaudu sisään';
! $invalid_login_lang = 'Väärä käyttäjätunnus tai salasana.';
! $addupdate_cal_lang = 'Lisää tai päivitä kalenteri';
! $addupdate_desc_lang = 'Lisää kalenteri lataamalla uusi tiedosto. Päivitä kalenteri samannimisellä tiedostolla';
! $delete_cal_lang = 'Tuhoa kalenteri';
! $logout_lang = 'Kirjaudu ulos';
! $cal_file_lang = 'Kalenteritiedosto';
! $php_error_lang = 'PHP virhe';
$upload_error_gen_lang = 'Tiedoston latauksessa oli ongelma.';
$upload_error_lang[0] = 'Tiedoston latauksessa oli ongelma.';
***************
*** 108,129 ****
$upload_error_lang[4] = 'Valitse ladattava tiedosto.';
$upload_error_type_lang = 'Vain .ics tiedostoja voidaan ladata.';
! $copy_error_lang = 'Tiedoston kopiointi epäonnistui.';
! $delete_error_lang = 'Tiedoston tuhoaminen epäonnistui.';
$delete_success_lang = 'Tuhoaminen onnistui.';
$action_success_lang = 'Toiminta onnistui.';
! $submit_lang = 'Lähetä';
! $delete_lang = 'Tuhoa';
! // ----- New for 1.0
! $all_cal_comb_lang = 'All calendars combined';
// - navigation
! $back_lang = 'Takaisin';
! $next_lang = 'Seuraava';
! $prev_lang = 'Edellinen';
! $day_view_lang = 'Päivänäkymä';
! $week_view_lang = 'Viikkonäkymä';
! $month_view_lang = 'Kuukausinäkymä';
! $year_view_lang = 'Vuosinäkymä';
// ---------------------------------
--- 108,129 ----
$upload_error_lang[4] = 'Valitse ladattava tiedosto.';
$upload_error_type_lang = 'Vain .ics tiedostoja voidaan ladata.';
! $copy_error_lang = 'Tiedoston kopiointi epäonnistui.';
! $delete_error_lang = 'Tiedoston tuhoaminen epäonnistui.';
$delete_success_lang = 'Tuhoaminen onnistui.';
$action_success_lang = 'Toiminta onnistui.';
! $submit_lang = 'Lähetä';
! $delete_lang = 'Tuhoa';
! // ----- New for 0.9.5
! $all_cal_comb_lang = 'Kaikki kalenterit yhdistetty';
// - navigation
! $back_lang = 'Takaisin';
! $next_lang = 'Seuraava';
! $prev_lang = 'Edellinen';
! $day_view_lang = 'Päivänäkymä';
! $week_view_lang = 'Viikkonäkymä';
! $month_view_lang = 'Kuukausinäkymä';
! $year_view_lang = 'Vuosinäkymä';
// ---------------------------------
***************
*** 143,149 ****
$format_recur_lang['secondly'] = array('sekuntti','sekunttia');
! $format_recur_lang['start'] = 'Joka %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until'] = '%date% asti'; // ie, 'until January 4'
! $format_recur_lang['count'] = '%int% kertaa'; // ie, 'for 5 times'
$format_recur_lang['bymonth'] = 'Kuukaudet: %list%'; // ie, 'In months: January, February, March'
--- 143,149 ----
$format_recur_lang['secondly'] = array('sekuntti','sekunttia');
! $format_recur_lang['start'] = 'Joka %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until'] = '%date% asti'; // ie, 'until January 4'
! $format_recur_lang['count'] = '%int% kertaa'; // ie, 'for 5 times'
$format_recur_lang['bymonth'] = 'Kuukaudet: %list%'; // ie, 'In months: January, February, March'
***************
*** 152,172 ****
$daysofweek_lang = array ('Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai');
! $daysofweekshort_lang = array ('Su','Ma','Ti','Ke','To','Pe','La');
! $daysofweekreallyshort_lang = array ('S','M','T','K','T','P','L');
$monthsofyear_lang = array ('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kesäkuu','Heinäkuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu');
! $monthsofyearshort_lang = array ('Tammi','Helmi','Maalis','Huhti','Touko','Kesä','Heinä','Elo','Syys','Loka','Marras','Joulu');
// For time formatting, check out: http://www.php.net/manual/en/function.date.php
! //$timeFormat = 'g:i A';
! $timeFormat = 'H:i';
! $timeFormat_small = 'H:i';
// For date formatting, see note below
! $dateFormat_day = '%A, %e %Bta';
! $dateFormat_week = '%e %B';
! $dateFormat_week_list = '%a, %e %b';
! $dateFormat_week_jump = '%b %e';
! $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %B %e';
/*
--- 152,172 ----
$daysofweek_lang = array ('Sunnuntai','Maanantai','Tiistai','Keskiviikko','Torstai','Perjantai','Lauantai');
! $daysofweekshort_lang = array ('Su','Ma','Ti','Ke','To','Pe','La');
! $daysofweekreallyshort_lang = array ('S','M','T','K','T','P','L');
$monthsofyear_lang = array ('Tammikuu','Helmikuu','Maaliskuu','Huhtikuu','Toukokuu','Kesäkuu','Heinäkuu','Elokuu','Syyskuu','Lokakuu','Marraskuu','Joulukuu');
! $monthsofyearshort_lang = array ('Tammi','Helmi','Maalis','Huhti','Touko','Kesä','Heinä','Elo','Syys','Loka','Marras','Joulu');
// For time formatting, check out: http://www.php.net/manual/en/function.date.php
! //$timeFormat = 'g:i A';
! $timeFormat = 'H:i';
! $timeFormat_small = 'H:i';
// For date formatting, see note below
! $dateFormat_day = '%A, %e %Bta';
! $dateFormat_week = '%e %B';
! $dateFormat_week_list = '%a, %e %b';
! $dateFormat_week_jump = '%b %e';
! $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %B %e';
/*
***************
*** 187,198 ****
// Error messages - %s will be replaced with a variable
! $error_title_lang = 'Virhe!';
! $error_window_lang = 'Tapahtui virhe!';
! $error_calendar_lang = 'Kalenteria "%s" käsiteltiin virheen sattuessa.';
! $error_path_lang = 'Polkua: "%s" ei voi avata';
! $error_back_lang = 'Ole hyvä ja käytä "Takaisin" nappia palataksesi takaisin.';
! $error_remotecal_lang = 'Tämä palvelin sallii vain hyväksyttyjen etäkalentereiden käytön.';
! $error_restrictedcal_lang = 'Yritit käyttää kalenteria, jonka käyttö on rajoitettu.';
! $error_invalidcal_lang = 'Ei kelvollinen kalenterin nimi. Ole hyvä ja yritä toista kalenteria.';
?>
--- 187,198 ----
// Error messages - %s will be replaced with a variable
! $error_title_lang = 'Virhe!';
! $error_window_lang = 'Tapahtui virhe!';
! $error_calendar_lang = 'Kalenteria "%s" käsiteltiin virheen sattuessa.';
! $error_path_lang = 'Polkua: "%s" ei voi avata';
! $error_back_lang = 'Ole hyvä ja käytä "Takaisin" nappia palataksesi takaisin.';
! $error_remotecal_lang = 'Tämä palvelin sallii vain hyväksyttyjen etäkalentereiden käytön.';
! $error_restrictedcal_lang = 'Yritit käyttää kalenteria, jonka käyttö on rajoitettu.';
! $error_invalidcal_lang = 'Ei kelvollinen kalenterin nimi. Ole hyvä ja yritä toista kalenteria.';
?>
|
|
From: <cl...@us...> - 2003-11-25 15:59:30
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv21567/functions
Modified Files:
init.inc.php
Log Message:
Blah
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** init.inc.php 24 Nov 2003 04:23:52 -0000 1.49
--- init.inc.php 25 Nov 2003 15:59:27 -0000 1.50
***************
*** 7,11 ****
// uncomment when developing, comment for shipping version
! error_reporting (E_ERROR | E_WARNING);
// Older versions of PHP do not define $_SERVER. Define it here instead.
--- 7,11 ----
// uncomment when developing, comment for shipping version
! // error_reporting (E_ERROR | E_WARNING);
// Older versions of PHP do not define $_SERVER. Define it here instead.
***************
*** 85,89 ****
if (ini_get('max_execution_time') < 60) {
! ini_set('max_execution_time', '60');
}
--- 85,89 ----
if (ini_get('max_execution_time') < 60) {
! @ini_set('max_execution_time', '60');
}
|
|
From: <cl...@us...> - 2003-11-24 04:23:56
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv804/functions Modified Files: init.inc.php Log Message: added bleed_time to default to day_start Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** init.inc.php 24 Nov 2003 04:05:37 -0000 1.48 --- init.inc.php 24 Nov 2003 04:23:52 -0000 1.49 *************** *** 37,40 **** --- 37,42 ---- } + if ($bleed_time == '') $bleed_time = $day_start; + // If not HTTP authenticated, try login via cookies or the web page. $username = ''; $password = ''; |
|
From: <cl...@us...> - 2003-11-24 04:23:56
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv804 Modified Files: config.inc.php Log Message: added bleed_time to default to day_start Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** config.inc.php 24 Nov 2003 04:05:37 -0000 1.131 --- config.inc.php 24 Nov 2003 04:23:52 -0000 1.132 *************** *** 25,30 **** $second_offset = '0'; // The time in seconds between your time and your server's time. $bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'. Is automatically set to $day_start if left blank. ! $cookie_uri = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar ! $download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar --- 25,30 ---- $second_offset = '0'; // The time in seconds between your time and your server's time. $bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'. Is automatically set to $day_start if left blank. ! $cookie_uri = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues. ! $download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues. $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar |
|
From: <jo...@us...> - 2003-11-24 04:05:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv30895/functions
Modified Files:
calendar_functions.php init.inc.php list_icals.php
Log Message:
Added HTTP authentication support. Modifications to non-HTTP
authentication login so that the two are mutually exclusive.
Moved calendar <option> listing into calendar_functions.php so it can
be shared by the navigation (via list_icals.php) and also by the
preferences.php file.
Fixed typo of $show_login to $allow_login.
Added E_ERROR to the debug error level, so fatal errors are logged.
Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calendar_functions.php 22 Nov 2003 21:16:10 -0000 1.1
--- calendar_functions.php 24 Nov 2003 04:05:37 -0000 1.2
***************
*** 15,23 ****
function availableCalendars($username, $password, $cal_filename, $admin = false) {
// Import globals.
! global $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $error_path_lang, $error_restrictedcal_lang, $ALL_CALENDARS_COMBINED;
// Create the list of available calendars.
$calendars = array();
// Grab the list of unlocked calendars.
$unlocked_cals = array();
--- 15,29 ----
function availableCalendars($username, $password, $cal_filename, $admin = false) {
// Import globals.
! global $calendar_path, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $error_path_lang, $error_restrictedcal_lang, $error_invalidcal_lang, $ALL_CALENDARS_COMBINED, $_SERVER;
// Create the list of available calendars.
$calendars = array();
+ // Grab any HTTP authentication.
+ unset($http_user);
+ if (isset($_SERVER['PHP_AUTH_USER'])) {
+ $http_user = $_SERVER['PHP_AUTH_USER'];
+ }
+
// Grab the list of unlocked calendars.
$unlocked_cals = array();
***************
*** 38,44 ****
$cal_name = substr($file, 0, -4);
if (in_array($cal_name, $blacklisted_cals)) continue;
! // Exclude locked calendars.
! if (!$admin &&
in_array($cal_name, $locked_cals) &&
!in_array($cal_name, $unlocked_cals))
--- 44,56 ----
$cal_name = substr($file, 0, -4);
if (in_array($cal_name, $blacklisted_cals)) continue;
+
+ // If HTTP authenticated, make sure this calendar is available
+ // to the user.
+ if (isset($http_user)) {
+ if (!in_array($cal_name, $apache_map[$http_user])) continue;
+ }
! // Otherwise exclude locked calendars.
! else if (!$admin &&
in_array($cal_name, $locked_cals) &&
!in_array($cal_name, $unlocked_cals))
***************
*** 52,56 ****
// Add web calendars.
! if (!$admin) {
foreach ($list_webcals as $file) {
// Make sure the URL ends with .ics.
--- 64,68 ----
// Add web calendars.
! if (!isset($http_user) && !$admin) {
foreach ($list_webcals as $file) {
// Make sure the URL ends with .ics.
***************
*** 70,76 ****
if (in_array($cal_filename, $blacklisted_cals))
exit(error($error_restrictedcal_lang, $cal_filename));
! // Make sure this calendar is not locked.
! if (in_array($cal_filename, $locked_cals) &&
!in_array($cal_filename, $unlocked_cals))
{
--- 82,98 ----
if (in_array($cal_filename, $blacklisted_cals))
exit(error($error_restrictedcal_lang, $cal_filename));
+
+ // If HTTP authenticated, make sure this calendar is available
+ // to the user.
+ if (isset($http_user)) {
+ if (!in_array($cal_filename, $apache_map[$http_user])) {
+ // Use the invalid calendar message so that the user is
+ // not made aware of locked calendars.
+ exit(error($error_invalidcal_lang, $cal_filename));
+ }
+ }
! // Otherwise make sure this calendar is not locked.
! else if (in_array($cal_filename, $locked_cals) &&
!in_array($cal_filename, $unlocked_cals))
{
***************
*** 112,113 ****
--- 134,194 ----
return $calendars;
}
+
+ // This function prints out the calendars available to the user, for
+ // selection. Should be enclosed within a <select>...</select>, which
+ // is not printed out by this function.
+ //
+ // $cals = The calendars (entire path, e.g. from availableCalendars).
+ function display_ical_list($cals) {
+ global $cal, $ALL_CALENDARS_COMBINED, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang;
+
+ // Print each calendar option.
+ foreach ($cals as $cal_tmp) {
+ // Format the calendar path for display.
+ //
+ // Only display the calendar name, replace all instances of "32" with " ",
+ // and remove the .ics suffix.
+ $cal_displayname_tmp = basename($cal_tmp);
+ $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
+ $cal_displayname_tmp = substr($cal_displayname_tmp, 0, -4);
+
+ // If this is a webcal, add 'Webcal' to the display name.
+ if (preg_match("/^(https?|webcal):\/\//i", $cal_tmp)) {
+ $cal_displayname_tmp .= " Webcal";
+ }
+
+ // Otherwise, remove all the path information, since that should
+ // not be used to identify local calendars. Also add the calendar
+ // label to the display name.
+ else {
+ // Strip path and .ics suffix.
+ $cal_tmp = basename($cal_tmp);
+ $cal_tmp = substr($cal_tmp, 0, -4);
+
+ // Add calendar label.
+ $cal_displayname_tmp .= " $calendar_lang";
+ }
+
+ // Encode the calendar path.
+ $cal_encoded_tmp = urlencode($cal_tmp);
+
+ // Display the option.
+ //
+ // The submitted calendar will be encoded, and always use http://
+ // if it is a webcal. So that is how we perform the comparison when
+ // trying to figure out if this is the selected calendar.
+ $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
+ if ($cal_httpPrefix_tmp == urldecode($cal)) {
+ print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected>$cal_displayname_tmp</option>";
+ } else {
+ print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>";
+ }
+ }
+
+ // option to open all (non-web) calenders together
+ if ($cal == $ALL_CALENDARS_COMBINED) {
+ print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected>$all_cal_comb_lang</option>";
+ } else {
+ print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>";
+ }
+ }
\ No newline at end of file
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** init.inc.php 24 Nov 2003 02:17:58 -0000 1.47
--- init.inc.php 24 Nov 2003 04:05:37 -0000 1.48
***************
*** 7,13 ****
// uncomment when developing, comment for shipping version
! error_reporting (E_WARNING);
$ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
if (!defined('BASE')) define('BASE', './');
include(BASE.'config.inc.php');
--- 7,21 ----
// uncomment when developing, comment for shipping version
! error_reporting (E_ERROR | E_WARNING);
!
! // Older versions of PHP do not define $_SERVER. Define it here instead.
! if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
! $_SERVER = &$HTTP_SERVER_VARS;
! }
+ // Define some magic strings.
$ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
+
+ // Pull in the configuration and some functions.
if (!defined('BASE')) define('BASE', './');
include(BASE.'config.inc.php');
***************
*** 24,54 ****
}
if ($cookie_uri == '') {
$cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
}
! // Look for a login cookie.
! unset($username, $password);
! if (isset($HTTP_COOKIE_VARS['phpicalendar_login'])) {
! $login_cookie = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar_login']));
! if (isset($login_cookie['username'])) $username = $login_cookie['username'];
! if (isset($login_cookie['password'])) $password = $login_cookie['password'];
! }
!
! // Look for a new username and password.
! if (isset($HTTP_GET_VARS['username'])) $username = $HTTP_GET_VARS['username'];
! else if (isset($HTTP_POST_VARS['username'])) $username = $HTTP_POST_VARS['username'];
! if (isset($HTTP_GET_VARS['password'])) $password = $HTTP_GET_VARS['password'];
! else if (isset($HTTP_POST_VARS['password'])) $password = $HTTP_POST_VARS['password'];
! // Set the login cookie if logging in. Clear it if logging out.
! $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
! if ($action == 'login') {
! $the_cookie = serialize(array('username' => $username, 'password' => $password));
! setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0);
! } else if ($action == 'logout') {
! setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $cookie_uri, 0);
! unset($username, $password);
}
--- 32,65 ----
}
+ // Set the cookie URI.
if ($cookie_uri == '') {
$cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
}
! // If not HTTP authenticated, try login via cookies or the web page.
! $username = ''; $password = '';
! if (!isset($_SERVER['PHP_AUTH_USER'])) {
! // Look for a login cookie.
! if (isset($HTTP_COOKIE_VARS['phpicalendar_login'])) {
! $login_cookie = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar_login']));
! if (isset($login_cookie['username'])) $username = $login_cookie['username'];
! if (isset($login_cookie['password'])) $password = $login_cookie['password'];
! }
! // Look for a new username and password.
! if (isset($HTTP_GET_VARS['username'])) $username = $HTTP_GET_VARS['username'];
! else if (isset($HTTP_POST_VARS['username'])) $username = $HTTP_POST_VARS['username'];
! if (isset($HTTP_GET_VARS['password'])) $password = $HTTP_GET_VARS['password'];
! else if (isset($HTTP_POST_VARS['password'])) $password = $HTTP_POST_VARS['password'];
! // Set the login cookie if logging in. Clear it if logging out.
! $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
! if ($action == 'login') {
! $the_cookie = serialize(array('username' => $username, 'password' => $password));
! setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0);
! } else if ($action == 'logout') {
! setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $cookie_uri, 0);
! $username = ''; $password = '';
! }
}
Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** list_icals.php 23 Nov 2003 19:53:29 -0000 1.22
--- list_icals.php 24 Nov 2003 04:05:37 -0000 1.23
***************
*** 4,34 ****
if (isset($query)) echo $query;
echo "');\">";
!
! $all_cals = availableCalendars($username, $password, $ALL_CALENDARS_COMBINED);
! foreach ($all_cals as $cal_tmp) {
! $cal_displayname_tmp = basename($cal_tmp);
! $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
! $cal_displayname_tmp = substr($cal_displayname_tmp, 0, -4);
!
! if (preg_match("/^(https?|webcal):\/\//i", $cal_tmp)) {
! $cal_displayname_tmp .= " Webcal";
! } else {
! $cal_tmp = basename($cal_tmp);
! $cal_tmp = substr($cal_tmp, 0, -4);
! $cal_displayname_tmp .= " $calendar_lang";
! }
! $cal_encoded_tmp = urlencode($cal_tmp);
! $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
! if ($cal_httpPrefix_tmp == urldecode($cal)) {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected>$cal_displayname_tmp</option>";
! } else {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>";
! }
! }
! if ($cal == $ALL_CALENDARS_COMBINED) {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected>$all_cal_comb_lang</option>";
! } else {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>";
! }
print "</select>";
--- 4,10 ----
if (isset($query)) echo $query;
echo "');\">";
!
! // List the calendars.
! display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
print "</select>";
|
|
From: <jo...@us...> - 2003-11-24 04:05:40
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv30895/includes
Modified Files:
calendar_nav.php login.php sidebar.php
Log Message:
Added HTTP authentication support. Modifications to non-HTTP
authentication login so that the two are mutually exclusive.
Moved calendar <option> listing into calendar_functions.php so it can
be shared by the navigation (via list_icals.php) and also by the
preferences.php file.
Fixed typo of $show_login to $allow_login.
Added E_ERROR to the debug error level, so fatal errors are logged.
Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** calendar_nav.php 22 Nov 2003 21:26:03 -0000 1.16
--- calendar_nav.php 24 Nov 2003 04:05:38 -0000 1.17
***************
*** 151,155 ****
if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! if (isset($username)) {
$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
if ($querys == $QUERY_STRING) $querys .= "&action=logout";
--- 151,155 ----
if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! if ($username != '') {
$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
if ($querys == $QUERY_STRING) $querys .= "&action=logout";
Index: login.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** login.php 24 Nov 2003 01:29:17 -0000 1.4
--- login.php 24 Nov 2003 04:05:38 -0000 1.5
***************
*** 1,5 ****
<?php
! // Hide the login block if logged in or there are no lock usernames.
! if (!isset($username) && $show_login == 'yes') {
// Set the login table width if not set.
if (!isset($login_width)) $login_width = "100%";
--- 1,6 ----
<?php
! // Hide the login block if logged in, there are no lock usernames,
! // or if authenticated via HTTP.
! if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) {
// Set the login table width if not set.
if (!isset($login_width)) $login_width = "100%";
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** sidebar.php 22 Nov 2003 21:16:10 -0000 1.29
--- sidebar.php 24 Nov 2003 04:05:38 -0000 1.30
***************
*** 40,44 ****
if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! if (isset($username)) {
$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
if ($querys == $QUERY_STRING) $querys .= '&action=logout';
--- 40,44 ----
if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! if ($username != '') {
$querys = preg_replace("/action=[^&]+/", "action=logout", $QUERY_STRING);
if ($querys == $QUERY_STRING) $querys .= '&action=logout';
|
|
From: <jo...@us...> - 2003-11-24 04:05:40
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv30895
Modified Files:
config.inc.php preferences.php
Log Message:
Added HTTP authentication support. Modifications to non-HTTP
authentication login so that the two are mutually exclusive.
Moved calendar <option> listing into calendar_functions.php so it can
be shared by the navigation (via list_icals.php) and also by the
preferences.php file.
Fixed typo of $show_login to $allow_login.
Added E_ERROR to the debug error level, so fatal errors are logged.
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** config.inc.php 24 Nov 2003 03:15:57 -0000 1.130
--- config.inc.php 24 Nov 2003 04:05:37 -0000 1.131
***************
*** 44,48 ****
$show_todos = 'yes'; // Show your todo list on the side of day and week view.
$show_completed = 'no'; // Show completed todos on your todo list.
! $show_login = 'no'; // Set to yes to prompt for login to unlock calendars.
// Webdav style publishing
--- 44,48 ----
$show_todos = 'yes'; // Show your todo list on the side of day and week view.
$show_completed = 'no'; // Show completed todos on your todo list.
! $allow_login = 'no'; // Set to yes to prompt for login to unlock calendars.
// Webdav style publishing
***************
*** 81,84 ****
// add more lines as necessary
!
! ?>
--- 81,88 ----
// add more lines as necessary
! $apache_map['user1'] = array(''); // Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array(''); // authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array(''); // given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array(''); // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
! // add more lines as necessary
! ?>
\ No newline at end of file
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** preferences.php 24 Nov 2003 03:35:51 -0000 1.37
--- preferences.php 24 Nov 2003 04:05:37 -0000 1.38
***************
*** 3,7 ****
define('BASE','./');
include(BASE.'functions/ical_parser.php');
- include(BASE.'functions/calendar_functions.php');
$display_date = $preferences_lang;
--- 3,6 ----
***************
*** 159,197 ****
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
! foreach ($filelist as $file) {
! $cal_filename_tmp = substr($file,0,-4);
! $cal_tmp = urlencode($cal_filename_tmp);
! $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
! if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
! if ($cal_tmp == $cookie_calendar) {
! print "<option value=\"$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>\n";
! } else {
! print "<option value=\"$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n";
! }
! }
! }
! // add option to open all (non-web) calenders together
! // Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here
! if ($cookie_calendar == $ALL_CALENDARS_COMBINED) {
! print "<option value=\"$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>\n";
! } else {
! print "<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>\n";
! }
!
! foreach($list_webcals as $cal_tmp) {
! if ($cal_tmp != '') {
! $cal_displayname_tmp = basename($cal_tmp);
! $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
! $cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
! $cal_encoded_tmp = urlencode($cal_tmp);
! if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! print "<option value=\"$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>\n";
! } else {
! print "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n";
! }
! }
! }
! closedir($dir_handle);
print "</select>\n";
?>
--- 158,162 ----
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
print "</select>\n";
?>
|
|
From: <jo...@us...> - 2003-11-24 03:35:54
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv26503
Modified Files:
preferences.php
Log Message:
1.36 was an old version, committed by mistake. 1.35 is good.
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** preferences.php 24 Nov 2003 03:15:57 -0000 1.36
--- preferences.php 24 Nov 2003 03:35:51 -0000 1.37
***************
*** 3,6 ****
--- 3,7 ----
define('BASE','./');
include(BASE.'functions/ical_parser.php');
+ include(BASE.'functions/calendar_functions.php');
$display_date = $preferences_lang;
***************
*** 158,169 ****
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
! $filelist = array();
! while ($file = readdir($dir_handle)) {
! if (preg_match("/^[^.].+\.ics$/", $file)) {
! array_push($filelist, $file);
! }
! }
! natcasesort($filelist);
foreach ($filelist as $file) {
$cal_filename_tmp = substr($file,0,-4);
--- 159,163 ----
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
foreach ($filelist as $file) {
$cal_filename_tmp = substr($file,0,-4);
|
|
From: <cl...@us...> - 2003-11-24 03:16:00
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv22524
Modified Files:
README config.inc.php preferences.php
Log Message:
Updated for 1.0 RC-1
Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** README 24 Nov 2003 01:44:48 -0000 1.54
--- README 24 Nov 2003 03:15:57 -0000 1.55
***************
*** 89,93 ****
1.0 RC-1
-Fixed all reported bugs.
! -Event popup now displays calendar name.
-Event popup now supports more than 1024 characters.
-Subscribe and download links now work again.
--- 89,93 ----
1.0 RC-1
-Fixed all reported bugs.
! -Event and Todo popup now displays calendar name.
-Event popup now supports more than 1024 characters.
-Subscribe and download links now work again.
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** config.inc.php 24 Nov 2003 01:36:15 -0000 1.129
--- config.inc.php 24 Nov 2003 03:15:57 -0000 1.130
***************
*** 30,34 ****
// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
--- 30,34 ----
// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals = 'yes'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
$use_sessions = 'no'; // This has not yet been implemented.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
***************
*** 39,43 ****
$daysofweek_dayview = 'no'; // Display the days of the week in day.php view.
$enable_rss = 'yes'; // Enable RSS access to your calendars (good thing).
- $enable_publishing = 'no'; // Enable webdav style publishing to your calendar's folder. READ calendars/publish.php before using!
$show_search = 'yes'; // Show the search box in the sidebar.
$allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies.
--- 39,42 ----
***************
*** 46,49 ****
--- 45,50 ----
$show_completed = 'no'; // Show completed todos on your todo list.
$show_login = 'no'; // Set to yes to prompt for login to unlock calendars.
+
+ // Webdav style publishing
$phpicalendar_publishing = ''; // Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** preferences.php 22 Nov 2003 21:16:10 -0000 1.35
--- preferences.php 24 Nov 2003 03:15:57 -0000 1.36
***************
*** 3,7 ****
define('BASE','./');
include(BASE.'functions/ical_parser.php');
- include(BASE.'functions/calendar_functions.php');
$display_date = $preferences_lang;
--- 3,6 ----
***************
*** 159,163 ****
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
foreach ($filelist as $file) {
$cal_filename_tmp = substr($file,0,-4);
--- 158,169 ----
//
print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
! $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
! $filelist = array();
! while ($file = readdir($dir_handle)) {
! if (preg_match("/^[^.].+\.ics$/", $file)) {
! array_push($filelist, $file);
! }
! }
! natcasesort($filelist);
foreach ($filelist as $file) {
$cal_filename_tmp = substr($file,0,-4);
|
|
From: <jo...@us...> - 2003-11-24 02:18:01
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv13544
Modified Files:
init.inc.php
Log Message:
Fixed grep typo. Should be checking for literal periods instead of any
character. ('\.' versus '.' in regexp.)
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** init.inc.php 24 Nov 2003 01:29:17 -0000 1.46
--- init.inc.php 24 Nov 2003 02:17:58 -0000 1.47
***************
*** 135,139 ****
// Sets the download and subscribe paths from the config if present.
! if ($download_uri == '') {
$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
$download_filename = $filename;
--- 135,139 ----
// Sets the download and subscribe paths from the config if present.
! if ($download_uri == '' && preg_match('/(^\/|\.\.\/)/', $filename) == 0) {
$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
$download_filename = $filename;
|
|
From: <cl...@us...> - 2003-11-24 01:44:53
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv9148 Modified Files: README Log Message: Added 1.0 RC-1 information. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** README 21 Nov 2003 03:37:22 -0000 1.53 --- README 24 Nov 2003 01:44:48 -0000 1.54 *************** *** 87,95 **** Changes: -------- ! 1.0 -Fixed all reported bugs. -Event popup now displays calendar name. -Event popup now supports more than 1024 characters. ! -URL support added. 0.9.5 --- 87,97 ---- Changes: -------- ! 1.0 RC-1 -Fixed all reported bugs. -Event popup now displays calendar name. -Event popup now supports more than 1024 characters. ! -Subscribe and download links now work again. ! -URL support added for popups. ! -Added config based calendar authentication. 0.9.5 |
|
From: <cl...@us...> - 2003-11-24 01:44:53
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv9148/includes Modified Files: footer.inc.php Log Message: Added 1.0 RC-1 information. Index: footer.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/footer.inc.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** footer.inc.php 22 Nov 2003 03:45:33 -0000 1.11 --- footer.inc.php 24 Nov 2003 01:44:48 -0000 1.12 *************** *** 1,5 **** <?php ! echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 1.0</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; --- 1,5 ---- <?php ! echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 1.0 RC-1</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; |
|
From: <cl...@us...> - 2003-11-24 01:36:18
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv8107 Modified Files: config.inc.php Log Message: Added publish on/off switch. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** config.inc.php 24 Nov 2003 01:29:17 -0000 1.128 --- config.inc.php 24 Nov 2003 01:36:15 -0000 1.129 *************** *** 40,49 **** $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). $enable_publishing = 'no'; // Enable webdav style publishing to your calendar's folder. READ calendars/publish.php before using! ! $show_search = 'yes'; // Show the search box in the sidebar. $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'no'; // Show completed todos on your todo list. $show_login = 'no'; // Set to yes to prompt for login to unlock calendars. // Administration settings --- 40,50 ---- $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). $enable_publishing = 'no'; // Enable webdav style publishing to your calendar's folder. READ calendars/publish.php before using! ! $show_search = 'yes'; // Show the search box in the sidebar. $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'no'; // Show completed todos on your todo list. $show_login = 'no'; // Set to yes to prompt for login to unlock calendars. + $phpicalendar_publishing = ''; // Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information; // Administration settings |
|
From: <cl...@us...> - 2003-11-24 01:29:20
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv7008/includes Modified Files: login.php Log Message: Made some changed to user:pass system to be more auto configuring, and now cookies work as well, as well as fixing subscribe and download links. Index: login.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.php 23 Nov 2003 19:53:30 -0000 1.3 --- login.php 24 Nov 2003 01:29:17 -0000 1.4 *************** *** 28,33 **** <table border="0" width="100%" cellspacing="0" cellpadding="2"> <tr> ! <td>Username:</td> ! <td><input class="login_style" type="text" size="8" name="username"></td> </tr> <tr> --- 28,33 ---- <table border="0" width="100%" cellspacing="0" cellpadding="2"> <tr> ! <td width="5%">Username:</td> ! <td width="95%"><input class="login_style" type="text" size="8" name="username"></td> </tr> <tr> |
|
From: <cl...@us...> - 2003-11-24 01:29:20
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv7008 Modified Files: config.inc.php Log Message: Made some changed to user:pass system to be more auto configuring, and now cookies work as well, as well as fixing subscribe and download links. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** config.inc.php 23 Nov 2003 21:41:51 -0000 1.127 --- config.inc.php 24 Nov 2003 01:29:17 -0000 1.128 *************** *** 21,34 **** $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information - $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. ! $bleed_time = '0400'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359' ! ! // Advanced settings for custom installs, cookies, etc. ! // In most cases these will not need to be set. $cookie_uri = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. --- 21,31 ---- $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. ! $bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'. Is automatically set to $day_start if left blank. $cookie_uri = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars + $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. *************** *** 76,83 **** // add more lines as necessary ! $locked_map[] = ''; // Map username:password accounts to locked calendars that should be ! $locked_map[] = ''; // unlocked if logged in. Calendar names should be the same as what is ! $locked_map[] = ''; // listed in the $locked_cals, again without the .ics suffix. ! $locked_map[] = ''; // Example: $locked_map['username:password'] = array('Locked1', 'Locked2'); // add more lines as necessary --- 73,80 ---- // add more lines as necessary ! $locked_map['user1:pass'] = array(''); // Map username:password accounts to locked calendars that should be ! $locked_map['user2:pass'] = array(''); // unlocked if logged in. Calendar names should be the same as what is ! $locked_map['user3:pass'] = array(''); // listed in the $locked_cals, again without the .ics suffix. ! $locked_map['user4:pass'] = array(''); // Example: $locked_map['username:password'] = array('Locked1', 'Locked2'); // add more lines as necessary |
|
From: <cl...@us...> - 2003-11-24 01:29:20
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv7008/functions
Modified Files:
init.inc.php
Log Message:
Made some changed to user:pass system to be more auto configuring, and
now cookies work as well, as well as fixing subscribe and download links.
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** init.inc.php 22 Nov 2003 21:16:10 -0000 1.45
--- init.inc.php 24 Nov 2003 01:29:17 -0000 1.46
***************
*** 24,27 ****
--- 24,31 ----
}
+ if ($cookie_uri == '') {
+ $cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
+ }
+
// Look for a login cookie.
unset($username, $password);
***************
*** 39,47 ****
// Set the login cookie if logging in. Clear it if logging out.
! if (isset($HTTP_GET_VARS['action'])) {
! $action = $HTTP_GET_VARS['action'];
! } else {
! $action = '';
! }
if ($action == 'login') {
$the_cookie = serialize(array('username' => $username, 'password' => $password));
--- 43,48 ----
// Set the login cookie if logging in. Clear it if logging out.
! $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
!
if ($action == 'login') {
$the_cookie = serialize(array('username' => $username, 'password' => $password));
***************
*** 134,141 ****
// Sets the download and subscribe paths from the config if present.
! if ($download_uri == '' && preg_match('/(^\/|..\/)/', $filename) == 0) {
$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
$download_filename = $filename;
! } else if ($download_uri != '') {
$newurl = eregi_replace("^(http://)", "", $download_uri);
$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
--- 135,142 ----
// Sets the download and subscribe paths from the config if present.
! if ($download_uri == '') {
$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
$download_filename = $filename;
! } elseif ($download_uri != '') {
$newurl = eregi_replace("^(http://)", "", $download_uri);
$subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
|
|
From: <cl...@us...> - 2003-11-23 22:55:26
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars
In directory sc8-pr-cvs1:/tmp/cvs-serv14011/calendars
Modified Files:
publish.php
Log Message:
Updated.
Index: publish.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/publish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** publish.php 19 Nov 2003 22:17:24 -0000 1.2
--- publish.php 23 Nov 2003 22:55:22 -0000 1.3
***************
*** 20,25 ****
3. make sure that PHP has write access to the calendars directory (or whatever you set $calendar_path to)
4. set up directory security on your calendars directory
! Usage:
1. Open iCal, select a calendar for publishing
2. Select "Publish" from the "Calendar" menu
--- 20,26 ----
3. make sure that PHP has write access to the calendars directory (or whatever you set $calendar_path to)
4. set up directory security on your calendars directory
+ 5. turn on publishing in your PHP iCalendar config file by setting $phpicalendar_publishing to 1.
! Usage (Apple iCal):
1. Open iCal, select a calendar for publishing
2. Select "Publish" from the "Calendar" menu
***************
*** 47,54 ****
$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : '';
// toggle logging
! define( 'PHPICALENDAR_LOG_PUBLISHING', 0 );
! // viewing
if($_SERVER['REQUEST_METHOD'] == 'GET')
{
--- 48,60 ----
$calendar_path = (isset($calendar_path) && $calendar_path != '') ? $calendar_path : '';
+ // allow/disallow publishing
+
+ $phpicalendar_publishing = isset($phpicalendar_publishing) ? $phpicalendar_publishing : 0;
+ define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );
+
// toggle logging
! define( 'PHPICALENDAR_LOG_PUBLISHING', 1 );
! /* force GET requests to main calendar view
if($_SERVER['REQUEST_METHOD'] == 'GET')
{
***************
*** 56,120 ****
return;
}
!
! // unpublishing
! if($_SERVER['REQUEST_METHOD'] == 'DELETE')
! {
! // get calendar filename
! $calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
!
! logmsg('received request to delete '.$calendar_file);
!
! // remove calendar file
! if(!unlink($calendar_file))
! {
! logmsg('unable to delete the calendar file');
! }
! else
! {
! logmsg('deleted');
! }
! return;
! }
!
! // publishing
! if($_SERVER['REQUEST_METHOD'] == 'PUT')
{
! // get calendar data
! $fp = fopen('php://input','r');
!
! while(!feof($fp))
{
! $data .= fgets($fp,4096);
}
! fclose($fp);
!
! if(isset($data))
{
!
! // get calendar name
! $cal_arr = explode("\n",$data);
!
! foreach($cal_arr as $k => $v)
{
! if(strstr($v,'X-WR-CALNAME:'))
{
! $arr = explode(':',$v);
! $calendar_name = trim($arr[1]);
! break;
}
}
!
! $calendar_name = isset($calendar_name) ? $calendar_name : 'default';
!
! // write to file
! if($fp = fopen($calendar_path.$calendar_name.'.ics','w+'))
{
! fputs($fp, $data, strlen($data) );
! fclose($fp);
}
! else
{
! logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' );
}
}
--- 62,135 ----
return;
}
! */
! // only allow publishing if explicitly enabled
! if(PHPICALENDAR_PUBLISHING == 1)
{
! // unpublishing
! if($_SERVER['REQUEST_METHOD'] == 'DELETE')
{
! // get calendar filename
! $calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
!
! logmsg('received request to delete '.$calendar_file);
!
! // remove calendar file
! if(!unlink($calendar_file))
! {
! logmsg('unable to delete the calendar file');
! }
! else
! {
! logmsg('deleted');
! }
! return;
}
! // publishing
! if($_SERVER['REQUEST_METHOD'] == 'PUT')
{
! // get calendar data
! if($fp = fopen('php://input','r'))
{
! while(!@feof($fp))
{
! $data .= fgets($fp,4096);
}
+
+ @fclose($fp);
}
! else
{
! logmsg('unable to read input data');
}
!
! if(isset($data))
{
!
! // get calendar name
! $cal_arr = explode("\n",$data);
!
! foreach($cal_arr as $k => $v)
! {
! if(strstr($v,'X-WR-CALNAME:'))
! {
! $arr = explode(':',$v);
! $calendar_name = trim($arr[1]);
! break;
! }
! }
!
! $calendar_name = isset($calendar_name) ? $calendar_name : 'default';
!
! // write to file
! if($fp = fopen($calendar_path.$calendar_name.'.ics','w+'))
! {
! fputs($fp, $data, strlen($data) );
! @fclose($fp);
! }
! else
! {
! logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' );
! }
}
}
|
|
From: <cl...@us...> - 2003-11-23 21:41:55
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv25980/functions
Modified Files:
ical_parser.php
Log Message:
Fixed some other bleed_time issues, now any bleeding event displays the
real end time no matter if its split or not.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** ical_parser.php 23 Nov 2003 01:54:19 -0000 1.134
--- ical_parser.php 23 Nov 2003 21:41:51 -0000 1.135
***************
*** 255,260 ****
} else {
$end_time_tmp = '2400';
! $display_end_tmp = '0000';
}
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
--- 255,261 ----
} else {
$end_time_tmp = '2400';
! $display_end_tmp = $end_time;
}
+
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url );
***************
*** 599,607 ****
} else {
$end_time_tmp = '2400';
! $display_end_tmp = '0000';
}
// Let's double check the until to not write past it
! $until_check = $recur_data_date.$time_tmp.'00';
if ($abs_until > $until_check) {
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
--- 600,608 ----
} else {
$end_time_tmp = '2400';
! $display_end_tmp = $end_time;
}
// Let's double check the until to not write past it
! $until_check = $start_date_tmp.$time_tmp.'00';
if ($abs_until > $until_check) {
$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
|
|
From: <cl...@us...> - 2003-11-23 21:41:54
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv25980 Modified Files: config.inc.php Log Message: Fixed some other bleed_time issues, now any bleeding event displays the real end time no matter if its split or not. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** config.inc.php 23 Nov 2003 19:56:13 -0000 1.126 --- config.inc.php 23 Nov 2003 21:41:51 -0000 1.127 *************** *** 25,29 **** $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. ! $bleed_time = '0200'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359' // Advanced settings for custom installs, cookies, etc. --- 25,29 ---- $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. ! $bleed_time = '0400'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359' // Advanced settings for custom installs, cookies, etc. |
