Formatting

This commit is contained in:
Miles Lott 2001-05-10 11:36:19 +00:00
parent d3b1b37058
commit b77db18323
3 changed files with 122 additions and 98 deletions

View File

@ -34,8 +34,9 @@
} }
} }
if ($submit) { if ($submit)
$totalerrors = 0; {
$totalerrors = 0;
if ($phpgw_info['server']['account_repository'] == 'ldap' && ! $allow_long_loginids) if ($phpgw_info['server']['account_repository'] == 'ldap' && ! $allow_long_loginids)
{ {
@ -142,7 +143,8 @@
$apps->account_id = $account_id; $apps->account_id = $account_id;
$apps->account_apps = Array(Array()); $apps->account_apps = Array(Array());
if ($account_permissions) { if ($account_permissions)
{
@reset($account_permissions); @reset($account_permissions);
while ($app = each($account_permissions)) while ($app = each($account_permissions))
{ {
@ -162,14 +164,16 @@
$phpgw->db->query("insert into phpgw_acl values ('preferences','changepassword','$account_id','1')",__LINE__,__FILE__); $phpgw->db->query("insert into phpgw_acl values ('preferences','changepassword','$account_id','1')",__LINE__,__FILE__);
// Assign user to groups // Assign user to groups
if ($account_groups) { if ($account_groups)
{
for ($i=0;$i<count($account_groups);$i++) for ($i=0;$i<count($account_groups);$i++)
{ {
$phpgw->acl->add_repository('phpgw_group',$account_groups[$i],$account_id,1); $phpgw->acl->add_repository('phpgw_group',$account_groups[$i],$account_id,1);
} }
} }
if ($apps_after) { if ($apps_after)
{
$pref = CreateObject('phpgwapi.preferences',$account_id); $pref = CreateObject('phpgwapi.preferences',$account_id);
$phpgw->common->hook_single('add_def_pref','admin'); $phpgw->common->hook_single('add_def_pref','admin');
while ($apps = each($apps_after)) while ($apps = each($apps_after))
@ -188,15 +192,15 @@
$phpgw->db->unlock(); $phpgw->db->unlock();
/* /*
// start inlcuding other admin tools // start inlcuding other admin tools
while($app = each($apps_after)) while($app = each($apps_after))
{ {
$phpgw->common->hook_single('add_user_data', $value); $phpgw->common->hook_single('add_user_data', $value);
} }
*/ */
Header('Location: ' . $phpgw->link('/admin/accounts.php','cd='.$cd)); Header('Location: ' . $phpgw->link('/admin/accounts.php','cd='.$cd));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} }
} }
else else
{ {
@ -284,7 +288,7 @@
// groups list // groups list
$groups_select = '<select name="account_groups[]" multiple>'; $groups_select = '<select name="account_groups[]" multiple>';
$groups = $phpgw->accounts->get_list('groups'); $groups = $phpgw->accounts->get_list('groups');
while (list(,$group) = each($groups)) while (list(,$group) = each($groups))
{ {

View File

@ -11,98 +11,118 @@
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $phpgw_info = array();
$phpgw_info["flags"] = array("currentapp" => "admin", "noheader" => True, "nonavbar" => True, $phpgw_info['flags'] = array(
"enable_nextmatchs_class" => True); 'currentapp' => 'admin',
include("../header.inc.php"); 'noheader' => True,
'nonavbar' => True,
'enable_nextmatchs_class' => True
);
include('../header.inc.php');
$phpgw->template->set_file(array("form" => "application_form.tpl", $phpgw->template->set_file(array(
"row" => "application_form_row.tpl" 'form' => 'application_form.tpl',
)); 'row' => 'application_form_row.tpl'
));
function display_row($label, $value) function display_row($label, $value)
{ {
global $phpgw; global $phpgw;
$phpgw->template->set_var("tr_color",$phpgw->nextmatchs->alternate_row_color()); $phpgw->template->set_var('tr_color',$phpgw->nextmatchs->alternate_row_color());
$phpgw->template->set_var("label",$label); $phpgw->template->set_var('label',$label);
$phpgw->template->set_var("value",$value); $phpgw->template->set_var('value',$value);
$phpgw->template->parse("rows","row",True); $phpgw->template->parse('rows','row',True);
} }
if ($submit) { if ($submit)
$totalerrors = 0; {
$totalerrors = 0;
if (! $app_order) { if (! $app_order)
$app_order = 0; {
} $app_order = 0;
}
$phpgw->db->query("select count(*) from phpgw_applications where app_name='" $phpgw->db->query("select count(*) from phpgw_applications where app_name='"
. addslashes($n_app_name) . "'",__LINE__,__FILE__); . addslashes($n_app_name) . "'",__LINE__,__FILE__);
$phpgw->db->next_record(); $phpgw->db->next_record();
if ($phpgw->db->f(0) != 0) { if ($phpgw->db->f(0) != 0)
$error[$totalerrors++] = lang("That application name already exsists."); {
} $error[$totalerrors++] = lang("That application name already exsists.");
}
if (preg_match("/\D/",$app_order)) { if (preg_match("/\D/",$app_order))
$error[$totalerrors++] = lang("That application order must be a number."); {
} $error[$totalerrors++] = lang("That application order must be a number.");
}
if (! $n_app_name) if (! $n_app_name)
$error[$totalerrors++] = lang("You must enter an application name."); {
$error[$totalerrors++] = lang("You must enter an application name.");
}
if (! $n_app_title) if (! $n_app_title)
$error[$totalerrors++] = lang("You must enter an application title."); {
$error[$totalerrors++] = lang("You must enter an application title.");
}
if (! $totalerrors) { if (! $totalerrors)
$phpgw->db->query("insert into phpgw_applications (app_name,app_title,app_enabled,app_order) values('" {
. addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','" $phpgw->db->query("insert into phpgw_applications (app_name,app_title,app_enabled,app_order) values('"
. "$n_app_status','$app_order')",__LINE__,__FILE__); . addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
. "$n_app_status','$app_order')",__LINE__,__FILE__);
if($n_app_anonymous) { if($n_app_anonymous)
$phpgw->acl->add_repository($n_app_name,'everywhere',0,PHPGW_ACL_READ); {
} $phpgw->acl->add_repository($n_app_name,'everywhere',0,PHPGW_ACL_READ);
}
Header("Location: " . $phpgw->link("/admin/applications.php")); Header("Location: " . $phpgw->link("/admin/applications.php"));
$phpgw->common->phpgw_exit(); $phpgw->common->phpgw_exit();
} else { }
$phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>"); else
} {
} else { // else submit $phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>");
$phpgw->template->set_var("error",""); }
} }
$phpgw->common->phpgw_header(); else
echo parse_navbar(); { // else submit
$phpgw->template->set_var("error","");
}
$phpgw->common->phpgw_header();
echo parse_navbar();
$phpgw->template->set_var("lang_header",lang("Add new application")); $phpgw->template->set_var("lang_header",lang("Add new application"));
$phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]); $phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
$phpgw->template->set_var("hidden_vars",""); $phpgw->template->set_var("hidden_vars","");
$phpgw->template->set_var("form_action",$phpgw->link("/admin/newapplication.php")); $phpgw->template->set_var("form_action",$phpgw->link("/admin/newapplication.php"));
display_row(lang("application name"),'<input name="n_app_name" value="' . $n_app_name . '">'); display_row(lang("application name"),'<input name="n_app_name" value="' . $n_app_name . '">');
display_row(lang("application title"),'<input name="n_app_title" value="' . $n_app_title . '">'); display_row(lang("application title"),'<input name="n_app_title" value="' . $n_app_title . '">');
if(!isset($n_app_status)) $n_app_status = 1; if(!isset($n_app_status)) { $n_app_status = 1; }
$selected[$n_app_status] = " selected"; $selected[$n_app_status] = " selected";
$status_html = '<option value="0"' . $selected[0] . '>' . lang("Disabled") . '</option>' $status_html = '<option value="0"' . $selected[0] . '>' . lang("Disabled") . '</option>'
. '<option value="1"' . $selected[1] . '>' . lang("Enabled") . '</option>' . '<option value="1"' . $selected[1] . '>' . lang("Enabled") . '</option>'
. '<option value="2"' . $selected[2] . '>' . lang("Enabled - Hidden from navbar") . '</option>'; . '<option value="2"' . $selected[2] . '>' . lang("Enabled - Hidden from navbar") . '</option>';
display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>'); display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
if (! $app_order) { if (! $app_order)
$phpgw->db->query("select (max(app_order)+1) as max from phpgw_applications"); {
$phpgw->db->next_record(); $phpgw->db->query("select (max(app_order)+1) as max from phpgw_applications");
$app_order = $phpgw->db->f("max"); $phpgw->db->next_record();
} $app_order = $phpgw->db->f("max");
}
display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">'); display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">');
display_row(lang("Allow Anonymous access to this app"),'<input type="checkbox" name="n_app_anonymous" value="True">'); display_row(lang("Allow Anonymous access to this app"),'<input type="checkbox" name="n_app_anonymous" value="True">');
$phpgw->template->set_var("lang_submit_button",lang("add")); $phpgw->template->set_var("lang_submit_button",lang("add"));
$phpgw->template->pparse("out","form"); $phpgw->template->pparse("out","form");
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();
?> ?>