From 8226dbf41a86e75c24c7eab1f88f073fbe6706d0 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 17 Jan 2008 14:42:37 +0000 Subject: [PATCH] group clean up git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8466 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/groups/{ => apps}/application.tpl | 0 .../plugins/admin/groups/{ => apps}/application_options.tpl | 0 .../admin/groups/{ => apps}/class_groupApplication.inc | 0 .../plugins/admin/groups/{ => mail}/class_groupMail.inc | 6 +++--- gosa-core/plugins/admin/groups/{ => mail}/mail.tpl | 0 gosa-core/plugins/admin/groups/{ => mail}/mail_admins.tpl | 0 gosa-core/plugins/admin/groups/{ => mail}/mail_locals.tpl | 0 gosa-core/plugins/admin/groups/{ => mail}/paste_mail.tpl | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename gosa-core/plugins/admin/groups/{ => apps}/application.tpl (100%) rename gosa-core/plugins/admin/groups/{ => apps}/application_options.tpl (100%) rename gosa-core/plugins/admin/groups/{ => apps}/class_groupApplication.inc (100%) rename gosa-core/plugins/admin/groups/{ => mail}/class_groupMail.inc (99%) rename gosa-core/plugins/admin/groups/{ => mail}/mail.tpl (100%) rename gosa-core/plugins/admin/groups/{ => mail}/mail_admins.tpl (100%) rename gosa-core/plugins/admin/groups/{ => mail}/mail_locals.tpl (100%) rename gosa-core/plugins/admin/groups/{ => mail}/paste_mail.tpl (100%) diff --git a/gosa-core/plugins/admin/groups/application.tpl b/gosa-core/plugins/admin/groups/apps/application.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/application.tpl rename to gosa-core/plugins/admin/groups/apps/application.tpl diff --git a/gosa-core/plugins/admin/groups/application_options.tpl b/gosa-core/plugins/admin/groups/apps/application_options.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/application_options.tpl rename to gosa-core/plugins/admin/groups/apps/application_options.tpl diff --git a/gosa-core/plugins/admin/groups/class_groupApplication.inc b/gosa-core/plugins/admin/groups/apps/class_groupApplication.inc similarity index 100% rename from gosa-core/plugins/admin/groups/class_groupApplication.inc rename to gosa-core/plugins/admin/groups/apps/class_groupApplication.inc diff --git a/gosa-core/plugins/admin/groups/class_groupMail.inc b/gosa-core/plugins/admin/groups/mail/class_groupMail.inc similarity index 99% rename from gosa-core/plugins/admin/groups/class_groupMail.inc rename to gosa-core/plugins/admin/groups/mail/class_groupMail.inc index 6f0758355..8b48357e9 100644 --- a/gosa-core/plugins/admin/groups/class_groupMail.inc +++ b/gosa-core/plugins/admin/groups/mail/class_groupMail.inc @@ -567,7 +567,7 @@ class mailgroup extends plugin $smarty->assign("$type", $gmailfilter[$type]); } $smarty->assign("hint", print_sizelimit_warning()); - $display.= $smarty->fetch (get_template_path('mail_locals.tpl', TRUE)); + $display.= $smarty->fetch (get_template_path('mail_locals.tpl', TRUE, dirname(__FILE__))); return ($display); } @@ -709,7 +709,7 @@ class mailgroup extends plugin $smarty->assign("Forward_some",$this->gosaMailForwardingAddress_Some); $smarty->assign("multiple_support",$this->multiple_support_active); - $display.= $smarty->fetch (get_template_path('mail.tpl', TRUE)); + $display.= $smarty->fetch (get_template_path('mail.tpl', TRUE, dirname(__FILE__))); return ($display); } @@ -1188,7 +1188,7 @@ I: Only insider delivery */ $smarty->assign("gosaMailAlternateAddress",$this->gosaMailAlternateAddress); $smarty->assign("gosaMailForwardingAddress",$this->gosaMailForwardingAddress); $smarty->assign("mail",$this->mail); - $display= $smarty->fetch (get_template_path('paste_mail.tpl', TRUE)); + $display= $smarty->fetch (get_template_path('paste_mail.tpl', TRUE, dirname(__FILE__))); $ret = array(); $ret['string'] = $display; $ret['status'] = ""; diff --git a/gosa-core/plugins/admin/groups/mail.tpl b/gosa-core/plugins/admin/groups/mail/mail.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/mail.tpl rename to gosa-core/plugins/admin/groups/mail/mail.tpl diff --git a/gosa-core/plugins/admin/groups/mail_admins.tpl b/gosa-core/plugins/admin/groups/mail/mail_admins.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/mail_admins.tpl rename to gosa-core/plugins/admin/groups/mail/mail_admins.tpl diff --git a/gosa-core/plugins/admin/groups/mail_locals.tpl b/gosa-core/plugins/admin/groups/mail/mail_locals.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/mail_locals.tpl rename to gosa-core/plugins/admin/groups/mail/mail_locals.tpl diff --git a/gosa-core/plugins/admin/groups/paste_mail.tpl b/gosa-core/plugins/admin/groups/mail/paste_mail.tpl similarity index 100% rename from gosa-core/plugins/admin/groups/paste_mail.tpl rename to gosa-core/plugins/admin/groups/mail/paste_mail.tpl -- 2.30.2