extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged in patch for calendar

Browse Source
This commit is contained in:
jengo 2000-12-18 16:36:43 +00:00
parent 7ecbb0810e
commit 2058628f02
8 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
admin/editaccount.php
View File

@ -51,9 +51,9 @@
} }
if (! $totalerrors) { if (! $totalerrors) {
$cd = account_edit(array("loginid" => $n_loginid, "permissions" => $new_permissions, $cd = account_edit(array("loginid" => $n_loginid, "permissions" => $new_permissions,
"firstname" => $n_firstname, "lastname" => $n_lastname, "firstname" => $n_firstname, "lastname" => $n_lastname,
"passwd" => $n_passwd, "account_status" => $n_account_status, "passwd" => $n_passwd, "account_status" => $n_account_status,
"old_loginid" => $old_loginid, "account_id" => rawurldecode($account_id), "old_loginid" => $old_loginid, "account_id" => rawurldecode($account_id),
"groups" => $phpgw->accounts->groups_array_to_string($n_groups))); "groups" => $phpgw->accounts->groups_array_to_string($n_groups)));
} }
@ -126,7 +126,7 @@
} }
} }
for ($i=0;$i<200;) { // The $i<200 is only used for a brake for ($i=0;$i<200;) { // The $i<200 is only used for a brake
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
$perm_html .= '<tr><td>' . lang($perm_display[$i][1]) . '</td>' $perm_html .= '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
@ -157,14 +157,14 @@
?> ?>
<form method="POST" action="<?php echo $phpgw->link("editaccount.php"); ?>"> <form method="POST" action="<?php echo $phpgw->link("editaccount.php"); ?>">
<input type="hidden" name="account_id" value="<? <input type="hidden" name="account_id" value="<?
if ($phpgw_info["server"]["account_repository"] == "ldap") if ($phpgw_info["server"]["account_repository"] == "ldap")
{ {
echo rawurlencode($userData["account_dn"]); echo rawurlencode($userData["account_dn"]);
} }
else else
{ {
echo $userData["account_id"]; echo $userData["account_id"];
}?>"> }?>">
<input type="hidden" name="old_loginid" value="<? echo $userData["account_lid"]; ?>"> <input type="hidden" name="old_loginid" value="<? echo $userData["account_lid"]; ?>">
<?php <?php
if ($error) { if ($error) {
@ -195,11 +195,11 @@
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record()) {
echo "<option value=\"" . $phpgw->db->f("group_id") . "\""; echo "<option value=\"" . $phpgw->db->f("group_id") . "\"";
for ($i=0; $i<count($user_groups); $i++) { for ($i=0; $i<count($user_groups); $i++) {
if ($user_groups[$i][0] == $phpgw->db->f("group_id")) { if ($user_groups[$i][0] == $phpgw->db->f("group_id")) {
echo " selected"; echo " selected";
} }
} }
echo ">" . $phpgw->db->f("group_name") . "</option>\n"; echo ">" . $phpgw->db->f("group_name") . "</option>\n";
} }
?> ?>
</select> </select>
@ -212,13 +212,13 @@
$perm_display[$i][1] = $permission[1]["title"]; $perm_display[$i][1] = $permission[1]["title"];
$i++; $i++;
} }
} }
for ($i=0;$i<200;) { // The $i<200 is only used for a brake for ($i=0;$i<200;) { // The $i<200 is only used for a brake
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<tr><td>' . lang($perm_display[$i][1]) . '</td>' echo '<tr><td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
echo " checked"; echo " checked";
} }
@ -227,20 +227,20 @@
if (! $perm_display[$i][1]) break; if (! $perm_display[$i][1]) break;
echo '<td>' . lang($perm_display[$i][1]) . '</td>' echo '<td>' . lang($perm_display[$i][1]) . '</td>'
. '<td><input type="checkbox" name="new_permissions[' . '<td><input type="checkbox" name="new_permissions['
. $perm_display[$i][0] . ']" value="True"'; . $perm_display[$i][0] . ']" value="True"';
if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) { if ($new_permissions[$perm_display[$i][0]] || $db_perms[$perm_display[$i][0]]) {
echo " checked"; echo " checked";
} }
echo "></td></tr>"; echo "></td></tr>";
$i++; $i++;
} }
?> ?>
<tr> <tr>
<td><?php echo lang("Account active"); ?></td> <td><?php echo lang("Account active"); ?></td>
<td> <td>
<input type="checkbox" name="n_account_status" value="A" <input type="checkbox" name="n_account_status" value="A"
<?php if ($userData["status"] == "A") { echo " checked"; } ?> <?php if ($userData["status"] == "A") { echo " checked"; } ?>
> >
</td> </td>
</tr> </tr>
<tr> <tr>

6
admin/newaccount.php
View File

@ -72,9 +72,9 @@
if (! $error) { if (! $error) {
$cd = account_add(array("loginid" => $n_loginid, "permissions" => $new_permissions, $cd = account_add(array("loginid" => $n_loginid, "permissions" => $new_permissions,
"firstname" => $n_firstname, "lastname" => $n_lastname, "firstname" => $n_firstname, "lastname" => $n_lastname,
"passwd" => $n_passwd, "passwd" => $n_passwd,
"groups" => $phpgw->accounts->groups_array_to_string($n_groups))); "groups" => $phpgw->accounts->groups_array_to_string($n_groups)));
Header("Location: " . $phpgw->link("accounts.php","cd=$cd")); Header("Location: " . $phpgw->link("accounts.php","cd=$cd"));
exit; exit;

2
calendar/day.php
View File

@ -1,4 +1,4 @@
<?php php_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Calendar * * phpGroupWare - Calendar *

2
calendar/delete.php
View File

@ -1,4 +1,4 @@
<?phpphp_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Calendar * * phpGroupWare - Calendar *

2
calendar/edit_entry.php
View File

@ -1,4 +1,4 @@
<?php php_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Calendar * * phpGroupWare - Calendar *

1
calendar/edit_entry_handler.php
View File

@ -1,4 +1,3 @@
<?php_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\

2
calendar/search.php
View File

@ -1,4 +1,4 @@
<?php php_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Calendar * * phpGroupWare - Calendar *

2
calendar/week.php
View File

@ -1,4 +1,4 @@
<?php php_track_vars?> <?php_track_vars?>
<?php <?php
/**************************************************************************\ /**************************************************************************\
* phpGroupWare - Calendar * * phpGroupWare - Calendar *