summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5a1f84)
raw | patch | inline | side by side (parent: c5a1f84)
author | psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 24 Mar 2009 10:13:32 +0000 (10:13 +0000) | ||
committer | psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 24 Mar 2009 10:13:32 +0000 (10:13 +0000) |
new object is created, when _GET['reset'] is set to 1.
+ Add missing reset handling where it was removed by changeset
13288.
(Fixes Trac #2270)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13559 594d385d-05f5-0310-b6e9-bd551577e9d8
+ Add missing reset handling where it was removed by changeset
13288.
(Fixes Trac #2270)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13559 594d385d-05f5-0310-b6e9-bd551577e9d8
23 files changed:
diff --git a/trunk/gosa-core/plugins/admin/acl/main.inc b/trunk/gosa-core/plugins/admin/acl/main.inc
index 82fb5b003f8e46eb52d339fc048c97462b36ec23..47b604853dc42dc5b489059c507c11ae8061b0d3 100644 (file)
$display= "No headpage yet for this module";
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('macl');
+ }
+
/* Create usermanagement object on demand */
if (!session::is_set('macl')){
session::set('macl',new aclManagement($config, $ui));
$display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('macl');
- }
$display.= $output;
session::set('macl',$macl);
diff --git a/trunk/gosa-core/plugins/admin/departments/main.inc b/trunk/gosa-core/plugins/admin/departments/main.inc
index 2cf55f74569fe2fd51f749096ca3de6d0519b574..244e7aa503a9a043688076d84d23aa388c0da7bc 100644 (file)
session::un_set('department');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('department');
+ }
+
/* Create usermanagement object on demand */
if (!session::is_set('department')){
session::set('department',new departmentManagement($config, $ui));
$display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('department');
- }
$display.= $output;
session::set('department',$department);
diff --git a/trunk/gosa-core/plugins/admin/groups/main.inc b/trunk/gosa-core/plugins/admin/groups/main.inc
index 30fd058be61762b68b4bbb394abb766a5d6a5cb1..cf16bd025244fcef56bbb7bcf9b493582289357e 100644 (file)
if ( $cleanup ){
session::un_set('groupManagement');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('groupManagement');
+ }
/* Create groupManagement object on demand */
if (!session::is_set('groupManagement')){
$display.= $output;
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('groupManagement');
- }
-
/* Show and save dialog */
session::set('groupManagement',$groupManagement);
}
diff --git a/trunk/gosa-core/plugins/admin/ogroups/main.inc b/trunk/gosa-core/plugins/admin/ogroups/main.inc
index 6de420cc09e86f23ff170bf6c2985d335a4c23b1..8d0838ea13be218f67174ad4dd0a91c0cdbf9e55 100644 (file)
session::un_set('ogroup');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('ogroup');
+ }
+
/* Create object object on demand */
if (!session::is_set('ogroup')){
session::set('ogroup',new ogroupManagement ($config));
diff --git a/trunk/gosa-core/plugins/admin/users/main.inc b/trunk/gosa-core/plugins/admin/users/main.inc
index 1b37c9d462cc685b7e6a70ef3462677405d15199..e73a3f715822df7c8507f05fbb45fbd175cc235e 100644 (file)
if ( $cleanup ){
session::un_set('userManagement');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('userManagement');
+ }
/* Create usermanagement object on demand */
if (!session::is_set('userManagement')){
/* Generate dialog output */
$display.= $output;
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('userManagement');
- }
-
/* Show and save dialog */
session::set('userManagement',$userManagement);
}
diff --git a/trunk/gosa-plugins/addressbook/addons/addressbook/main.inc b/trunk/gosa-plugins/addressbook/addons/addressbook/main.inc
index 8807c001820a7d09b7125085f3a3f65925239e62..d6a7b54b28ce1c1e3e8ee6d8f284a4c2b9989700 100644 (file)
session::un_set('addressbook');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('addressbook');
+ }
/* Create phonelist object on demand */
if (!session::is_set('addressbook')){
diff --git a/trunk/gosa-plugins/dak/addons/dak/main.inc b/trunk/gosa-plugins/dak/addons/dak/main.inc
index c2fcbb005ea079034a2f9ce00c1d946103f7cc08..f85f66570e140eec1921ba10946552174532d4c2 100644 (file)
if ( $cleanup ){
session::un_set('dak_plug');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('dak_plug');
+ }
if (!session::is_set('dak_plug')){
session::set('dak_plug',new dakplug($config));
diff --git a/trunk/gosa-plugins/dfs/addons/godfs/main.inc b/trunk/gosa-plugins/dfs/addons/godfs/main.inc
index 424b3c54d8397ed37392ed7bd05cca46bdf79ce6..5609d0c98bf573269afb60500efd5e29b67d38fb 100644 (file)
if ( $cleanup ){
session::un_set('dfsManagment');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('dfsManagment');
+ }
# create dfsManagment object
if (!session::is_set('dfsManagment')){
index e1013fd80c52e407419334a64437bb0796b29a51..4212400c72bfab6ef9ae69aadb23089d6a22d086 100644 (file)
if ( $cleanup ){
session::un_set('FAI');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('FAI');
+ }
/* Create usermanagement object on demand */
if (!session::is_set('FAI')){
$FAI->save_object();
$output= $FAI->execute();
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('FAI');
- }
/* Page header*/
if (get_object_info() != ""){
$display= print_header(get_template_path($FAI->plIcon), _("Software deployment"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
diff --git a/trunk/gosa-plugins/gofax/gofax/blocklists/main.inc b/trunk/gosa-plugins/gofax/gofax/blocklists/main.inc
index 602d617a8d24a7b12cfbf46ac46add7104d027c8..17bf9640c289dc03687766cf49d8b64055ab5e60 100644 (file)
if ( $cleanup ){
session::un_set('blocklist');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('blocklist');
+ }
/* Create blocklist object on demand */
if (!session::is_set('blocklist')){
$blocklist->save_object();
$output= $blocklist->execute();
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('blocklist');
- }
-
/* Page header*/
if (get_object_info() != ""){
$display= print_header(get_template_path($blocklist->plIcon), _("Blocklist management"), "<img alt=\"\"align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
diff --git a/trunk/gosa-plugins/gofax/gofax/faxreports/main.inc b/trunk/gosa-plugins/gofax/gofax/faxreports/main.inc
index ac1ffc359d5fbbfd16fb4b798afe4e2c260a21fc..5599127893cbea340d26347f425a1df009c46e94 100644 (file)
if ( $cleanup ){
session::un_set('faxreport');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('faxreport');
+ }
/* Create faxreport object on demand */
if (!session::is_set('faxreport')){
diff --git a/trunk/gosa-plugins/gofon/gofon/conference/main.inc b/trunk/gosa-plugins/gofon/gofon/conference/main.inc
index 43ad9547c8521e84b68345294b82816e38c3439e..24e81fa9edb912f685d4a1090e7402aee6b43b96 100644 (file)
if ( $cleanup ){
session::un_set('conference');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('conference');
+ }
/* Create usermanagement object on demand */
if (!session::is_set('conference')){
$display= print_header(get_template_path('plugins/gofon/images/conference.png'), _("Conference management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('conference');
- }
-
/* Show and save dialog */
$display.= $output;
session::set('conference',$conference);
diff --git a/trunk/gosa-plugins/gofon/gofon/fonreports/main.inc b/trunk/gosa-plugins/gofon/gofon/fonreports/main.inc
index cbd957edd2a3a93a9122cbab549d4541ea68fda0..137169510b91b664bc798a4f5f964f1b5c32455e 100644 (file)
if ( $cleanup ){
session::un_set('fonreport');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('fonreport');
+ }
/* Create fonreport object on demand */
if (!session::is_set('fonreport')){
diff --git a/trunk/gosa-plugins/gofon/gofon/macro/main.inc b/trunk/gosa-plugins/gofon/gofon/macro/main.inc
index 8d4521ed3ad18e4c0bb86c4371e702e28b0bef3b..1e038e90d65da1bd0f6675cac7a361f0ed7594da 100644 (file)
if ( $cleanup ){
session::un_set('macroManagement');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('macroManagement');
+ }
/* Create macroManagement object on demand */
if (!session::is_set('macroManagement')){
$display= print_header(get_template_path('plugins/gofon/images/macros.png'), _("Phone macro management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('macroManagement');
- }
-
/* Show and save dialog */
$display.= $output;
session::set('macroManagement',$macroManagement);
diff --git a/trunk/gosa-plugins/goto/addons/goto/main.inc b/trunk/gosa-plugins/goto/addons/goto/main.inc
index af6b0ab7e3e7b569174ca9b3b28c813154de4676..0b1e937bbf260328cf7891e883b3456a043c68f5 100644 (file)
if ( $cleanup ){
session::un_set('gotomasses');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('gotomasses');
+ }
/* Create gotomasses object on demand */
if (!session::is_set('gotomasses') || isset($_POST['reload_gotomass_data'])){
diff --git a/trunk/gosa-plugins/goto/admin/applications/main.inc b/trunk/gosa-plugins/goto/admin/applications/main.inc
index 99a7a72c861748f7c93faf8155ac669dd844bed2..ac2228b5276b43dde50e9d02338c7332a50674eb 100644 (file)
if ( $cleanup ){
session::un_set('applicationManagement');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('applicationManagement');
+ }
/* Create applicationManagement object on demand */
if (!session::is_set('applicationManagement')){
$display= print_header(get_template_path($applicationManagement->plIcon), _("Application management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('applicationManagement');
- }
-
/* Show and save dialog */
$display.= $output;
session::set('applicationManagement',$applicationManagement);
diff --git a/trunk/gosa-plugins/goto/admin/devices/main.inc b/trunk/gosa-plugins/goto/admin/devices/main.inc
index dd9d451fd88807f4de3744fcf92a328688f0d015..6983903be2d25f8edcf5ae05cfd87fa1f45f4346 100644 (file)
if ( $cleanup ){
session::un_set('DeviceManagement');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('DeviceManagement');
+ }
/* Create DeviceManagement object on demand */
if (!session::is_set('DeviceManagement')){
$display= print_header(get_template_path($DeviceManagement->plIcon), _("Hotplug device management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('DeviceManagement');
- }
-
/* Show and save dialog */
$display.= $output;
session::set('DeviceManagement',$DeviceManagement);
diff --git a/trunk/gosa-plugins/goto/admin/mimetypes/main.inc b/trunk/gosa-plugins/goto/admin/mimetypes/main.inc
index cbd12a1cc9315cfe957ff599666d4bc15c501310..ef6fc5f359cedf84bd928f3410d4627a7c9ddb8f 100644 (file)
if ( $cleanup ){
session::un_set('MimeTypeManagement');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('MimeTypeManagement');
+ }
/* Create MimeTypeManagement object on demand */
if (!session::is_set('MimeTypeManagement')){
$display= print_header(get_template_path($MimeTypeManagement->plIcon), _("Mimetype management"));
}
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('MimeTypeManagement');
- }
-
/* Show and save dialog */
$display.= $output;
session::set('MimeTypeManagement',$MimeTypeManagement);
diff --git a/trunk/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc b/trunk/gosa-plugins/ldapmanager/addons/ldapmanager/main.inc
index 0edc380685db6a73d458a25df7998650af5ed667..65f09124e4f8ed637d1f1b4aeb99f36383143228 100644 (file)
if ( $cleanup ){
session::un_set('ldif');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('ldif');
+ }
/* Create phonelist object on demand */
if (!session::is_set('ldif')){
diff --git a/trunk/gosa-plugins/log/addons/logview/main.inc b/trunk/gosa-plugins/log/addons/logview/main.inc
index 13a811a7b2ee265c784029f91ef27d178fb2c070..fb51d77a21854fb71c61ad3c52f1c56bfd279c96 100644 (file)
if ( $cleanup ){
session::un_set('log_tabs');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('log_tabs');
+ }
/* Create logview object on demand */
if (!session::is_set('log_tabs')){
diff --git a/trunk/gosa-plugins/mail/addons/mailqueue/main.inc b/trunk/gosa-plugins/mail/addons/mailqueue/main.inc
index 3d937387538728ad9427127eae9837d947fd4123..03dbd5c3fa79a780a8b8d6d33d83678b7814060c 100644 (file)
if ( $cleanup ){
session::un_set('mailqueue');
}else{
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('sudoManagement');
+ }
/* Create mailqueue object on demand */
if (!session::is_set('mailqueue')){
diff --git a/trunk/gosa-plugins/sudo/admin/sudo/main.inc b/trunk/gosa-plugins/sudo/admin/sudo/main.inc
index e30efdd7b5deb161c4871687ac903d32835e6423..ebdcbcd2702022425eb274a495fe543cae13c243 100644 (file)
if ( $cleanup ){
session::un_set('sudoManagement');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('sudoManagement');
+ }
+
/* Create sudoManagement object on demand */
if (!session::is_set('sudoManagement')){
session::set('sudoManagement',new sudoManagement ($config, $ui));
$display.= $output;
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('sudoManagement');
- }
-
- /* Show and save dialog */
+ /* Show and save dialog */
session::set('sudoManagement',$sudoManagement);
}
diff --git a/trunk/gosa-plugins/systems/admin/systems/main.inc b/trunk/gosa-plugins/systems/admin/systems/main.inc
index 81c52565a625dec2c5c9729b8014042794d53728..22a7568144045a6d207073516f9f1d0ba644847f 100644 (file)
if ( $cleanup ){
session::un_set('systems');
}else{
-
+ /* Reset requested? */
+ if (isset($_GET['reset']) && $_GET['reset'] == 1){
+ session::un_set ('systems');
+ }
/* Create usermanagement object on demand */
if (!session::is_set('systems')){
$systems->save_object();
$output= $systems->execute();
- /* Reset requested? */
- if (isset($_GET['reset']) && $_GET['reset'] == 1){
- session::un_set ('systems');
- }
-
/* Page header*/
if (get_object_info() != ""){
$display= print_header(get_template_path($systems->plIcon), _("System management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));