Skip to content

Commit

Permalink
Upgrade the 'almost optional' bits.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bbannon
bbannon committed Jul 26, 2023
1 parent 9e4d7dc commit e018643
Show file tree
Hide file tree
Showing 82 changed files with 809 additions and 816 deletions.
10 changes: 5 additions & 5 deletions about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
$replacements[1] = "";
$data = preg_replace ( $patterns, $replacements, $data );
}
print_header ( [], '<link href="includes/css/about.css" rel="stylesheet" />',
print_header ( [], '<link href="includes/css/about.css" rel="stylesheet">',
'', true, false, true );
echo ' <div id="creds">' . ( empty( $credits ) ? '
<a title="' . $PROGRAM_NAME . '" href="' . $PROGRAM_URL
. '" target="_blank">
<h2>' . translate( 'Title' ) . '</h2>
<p>' . str_replace( 'XXX', $PROGRAM_VERSION,
translate( 'version XXX' ) ) . '<br />' . $PROGRAM_DATE . '</p></a>
<br />
translate( 'version XXX' ) ) . '<br>' . $PROGRAM_DATE . '</p></a>
<br>
<p>' . translate( 'WebCalendar is a PHP application used...' ) . '</p>' : '' ) . '
</div>
<form action="about.php" name="aboutform" id="aboutform" method="post">';
print_form_key();
echo '<input type="submit" name="' . ( empty( $credits )
? 'Credits" value="' . translate( 'Credits' )
: 'About" value="' . translate( 'About' ) ) . '" />
: 'About" value="' . translate( 'About' ) ) . '">
<input type="button" id="ok" name="ok" value="' . translate( 'OK' )
. '" onclick="window.close()" />
. '" onclick="window.close()">
</form>' . ( empty ( $credits ) ? '' : "
<script>
function start() {
Expand Down
62 changes: 31 additions & 31 deletions access.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
$defConfigStr = translate( 'DEFAULT CONFIGURATION' );
$goStr = '
</select>
<input class="btn btn-primary" type="submit" value="' . translate( 'Go' ) . '" />
<input class="btn btn-primary" type="submit" value="' . translate( 'Go' ) . '">
</form>';
$saveStr = translate( 'Save' );
$undoStr = translate( 'Undo' );
Expand Down Expand Up @@ -102,9 +102,9 @@
$saved = true;
}
}
$checked = ' checked="checked"';
$checked = ' checked';
$guser = getPostValue( 'guser' );
$selected = ' selected="selected"';
$selected = ' selected';

if( $guser == '__default__' ) {
$otheruser = $guser;
Expand Down Expand Up @@ -151,10 +151,10 @@
}
}
print_header( '',
'<script type="text/javascript" src="includes/js/access.js?'
'<script src="includes/js/access.js?'
. filemtime( 'includes/js/access.js' ) . '"></script>
<link type="text/css" href="includes/css/access.css?'
. filemtime( 'includes/css/access.css' ) . '" rel="stylesheet" />',
<link href="includes/css/access.css?'
. filemtime( 'includes/css/access.css' ) . '" rel="stylesheet">',
( ! empty( $op['time'] ) && $op['time'] == 'Y'
? 'onload="enableAll( true );"' : '' ) );

Expand Down Expand Up @@ -214,8 +214,8 @@
echo '<form action="access.php" method="post" id="accessform" name="accessform">';
print_form_key();
echo '
<input type="hidden" name="auser" value="' . $guser . '" />
<input type="hidden" name="guser" value="' . $guser . '" />
<input type="hidden" name="auser" value="' . $guser . '">
<input type="hidden" name="guser" value="' . $guser . '">
<table>
<tbody>
<tr>
Expand Down Expand Up @@ -246,7 +246,7 @@
if( $show )
echo print_checkbox ( ['access_' . $order[$i], 'Y',
access_get_function_description( $order[$i] ),
substr( $access, $order[$i], 1 )], 'dito' ) . '<br />';
substr( $access, $order[$i], 1 )], 'dito' ) . '<br>';

if( ( $i + 1 ) % $div == 0 )
echo '
Expand All @@ -259,8 +259,8 @@
</tr>
</tbody>
</table>
<input class="btn btn-secondary" type="submit" value="' . $undoStr . '" />
<input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '" />
<input class="btn btn-secondary" type="submit" value="' . $undoStr . '">
<input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '">
</form>';

$pagetitle = translate( 'Allow Access to Other Users Calendar' );
Expand All @@ -284,7 +284,7 @@
<form action="access.php" method="post" name="SelectOther">';
print_form_key();
echo '
<input type="hidden" name="guser" value="' . $guser . '" />
<input type="hidden" name="guser" value="' . $guser . '">
<select class="form-control" name="otheruser" onchange="document.SelectOther.submit()">'
// Add a DEFAULT CONFIGURATION to be used as a mask.
. '
Expand All @@ -310,8 +310,8 @@
echo '<form action="access.php" method="post" name="EditOther">';
print_form_key();
echo '
<input type="hidden" name="guser" value="' . $guser . '" />
<input type="hidden" name="otheruser" value="' . $otheruser . '" /><br />
<input type="hidden" name="guser" value="' . $guser . '">
<input type="hidden" name="otheruser" value="' . $otheruser . '"><br>
<table cellpadding="5">
<tbody>
<tr>
Expand Down Expand Up @@ -350,15 +350,15 @@
if( $j == 1 )
echo '"invite"'
. ( ! empty( $op['invite'] ) && $op['invite'] == 'N' ? '' : $checked )
. ' />' . translate( 'Can Invite' );
. '>' . translate( 'Can Invite' );
elseif( $j == 2 )
echo '"email"'
. ( ! empty( $op['email'] ) && $op['email'] == 'N' ? '' : $checked )
. ' />' . translate( 'Can Email' );
. '>' . translate( 'Can Email' );
else {
echo '"time"'
. ( ! empty( $op['time'] ) && $op['time'] == 'Y' ? $checked : '' )
. ' onclick="enableAll( this.checked );" />'
. ' onclick="enableAll( this.checked );">'
. translate( 'Can See Time Only' );
$bottomedge = 'boxbottom';
}
Expand All @@ -368,40 +368,40 @@
<td class="aligncenter boxleft pub ' . $bottomedge . '">'
. '<input class="form-control-sm" type="checkbox" value="' . $j . '" name="v_' . $j . '"'
. ( ! empty( $op['view'] ) && ( $op['view'] & $j ) ? $checked : '' )
. ' /></td>
. '></td>
<td class="conf ' . $bottomedge . '"><input class="form-control-sm" type="checkbox" value="'
. $j * 8 . '" name="v_' . $j * 8 . '"'
. ( ! empty( $op['view'] ) && ( $op['view'] & ( $j * 8 ) )
? $checked : '' ) . ' /></td>
? $checked : '' ) . '></td>
<td class="priv ' . $bottomedge . '"><input class="form-control-sm" type="checkbox" value="'
. $j * 64 . '" name="v_' . $j * 64 . '"'
. ( ! empty( $op['view'] ) && ( $op['view'] & ( $j * 64 ) )
? $checked : '' ) . ' /></td>'
? $checked : '' ) . '></td>'
. ( $guser != '__public__' ? '
<td class="aligncenter boxleft pub ' . $bottomedge . '"><input '
. 'class="form-control-sm" type="checkbox" value="' . $j . '" name="e_' . $j . '"'
. ( ! empty( $op['edit'] ) && ( $op['edit'] & $j ) ? $checked : '' )
. ' /></td>
. '></td>
<td class="conf ' . $bottomedge . '"><input class="form-control-sm" type="checkbox" value="'
. $j * 8 . '" name="e_' . $j * 8 . '"'
. ( ! empty( $op['edit'] ) && ( $op['edit'] & ( $j * 8 ) )
? $checked : '' ) . ' /></td>
? $checked : '' ) . '></td>
<td class="priv ' . $bottomedge . '"><input class="form-control-sm" type="checkbox" value="'
. $j * 64 . '" name="e_' . $j * 64 . '"'
. ( ! empty( $op['edit'] ) && ( $op['edit'] & ( $j * 64 ) )
? $checked : '' ) . ' /></td>
? $checked : '' ) . '></td>
<td class="aligncenter boxleft pub ' . $bottomedge . '"><input '
. 'class="form-control-sm" type="checkbox" value="' . $j . '" name="a_' . $j . '"'
. ( ! empty( $op['approve'] ) && ( $op['approve'] & $j )
? $checked : '' ) . ' /></td>
? $checked : '' ) . '></td>
<td class="conf ' . $bottomedge . '"><input class="form-control-sm" type="checkbox" value="'
. $j * 8 . '" name="a_' . $j * 8 . '"'
. ( ! empty( $op['approve'] ) && ( $op['approve'] & ( $j * 8 ) )
? $checked : '' ) . ' /></td>
? $checked : '' ) . '></td>
<td class="boxright priv ' . $bottomedge
. '"><input class="form-control-sm" type="checkbox" value="' . $j * 64 . '" name="a_' . $j * 64
. '"' . ( ! empty( $op['approve'] ) && ( $op['approve'] & ( $j * 64 ) )
? $checked : '' ) . ' /></td>'
? $checked : '' ) . '></td>'
: '' ) . '
</tr>';
}
Expand All @@ -410,11 +410,11 @@
<td colspan="2" class="boxleft alignright">'
. ( $otheruser != '__default__' && $otheruser != '__public__' ? '
<input class="btn btn-secondary" type="button" value="' . translate( 'Assistant' )
. '" onclick="selectAll(63);" />&nbsp;&nbsp;' : '' ) . '
. '" onclick="selectAll(63);">&nbsp;&nbsp;' : '' ) . '
<input class="btn btn-secondary" type="button" value="' . translate( 'Select All' )
. '" onclick="selectAll(256);" />&nbsp;&nbsp;
. '" onclick="selectAll(256);">&nbsp;&nbsp;
<input class="btn btn-secondary" type="button" value="' . translate( 'Clear All' )
. '" onclick="selectAll(0);" />
. '" onclick="selectAll(0);">
</td>
<td colspan="9" class="boxright">
<table class="aligncenter" cellpadding="5" cellspacing="2">
Expand All @@ -431,8 +431,8 @@
echo '
<tr>
<td colspan="11" class="boxleft boxbottom boxright">
<input class="btn btn-secondary" type="submit" value="' . $undoStr . '" />
<input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '" />
<input class="btn btn-secondary" type="submit" value="' . $undoStr . '">
<input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '">
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion activity_log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
. '" class="next" href="activity_log.php' . ( $row[0] <= $previd
? ( $sys ? '?system=1' : '' )
: '?startid=' . $previd . ( $sys ? '&amp;system=1' : '' ) ) . '">'
. $nextStr . '&nbsp;' . $PAGE_SIZE . '&nbsp;' . $eventsStr . '</a><br />';
. $nextStr . '&nbsp;' . $PAGE_SIZE . '&nbsp;' . $eventsStr . '</a><br>';

dbi_free_result ( $res );
}
Expand Down
Loading

0 comments on commit e018643

Please sign in to comment.