diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 8e34de931c9672c2a4f4d00817ac3a1922259b8a..38753f4b171a9a38fd8b77c4e86453203709576f 100644 (file)
<?php
/*
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2003 Cajus Pollmeier
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+ This code is part of GOsa (https://gosa.gonicus.de)
+ Copyright (C) 2003 Cajus Pollmeier
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
require "tabs_department.inc";
class departmentManagement extends plugin
{
- /* Definitions */
- var $plHeadline= "Departments";
- var $plDescription= "This does something";
-
- /* CLI vars */
- var $cli_summary= "Handling of LDAP subtrees";
- var $cli_description= "Some longer text\nfor help";
- var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
- /* Headpage attributes */
- var $last_dep_sorting= "invalid";
- var $departments= array();
- var $deptabs= NULL;
-
- /* attribute list for save action */
- var $attributes= array();
- var $objectclasses= array();
-
- function departmentManagement ($config, $ui)
- {
- $this->ui= $ui;
- $this->dn= "";
- $this->config= $config;
-
- /* Get global filter config */
- if (!is_global("depfilter")){
- $base= get_base_from_people($ui->dn);
- $depfilter= array("depselect" => $base,
- "regex" => "*");
- register_global("depfilter", $depfilter);
- }
- }
-
- function execute()
- {
- /* Reload departments */
- $this->config->departments= get_departments();
- $this->config->make_idepartments();
- $smarty= get_smarty();
-
- /* Save data */
- $depfilter= get_global("depfilter");
- foreach( array("depselect", "regex") as $type){
- if (isset($_POST[$type])){
- $depfilter[$type]= $_POST[$type];
- }
- }
- if (isset($_GET['search'])){
- $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
- if ($s == "**"){
- $s= "*";
- }
- $depfilter['regex']= $s;
- }
- register_global("depfilter", $depfilter);
-
-
- /* Create new department? */
- if (isset($_POST['new_department'])){
- $this->acl= array(":all");
- $this->dn= "new";
-
- /* Register deptabs to trigger edit dialog */
- $this->deptabs= new deptabs($this->config,
- $this->config->data['TABS']['DEPTABS'], $this->dn);
- $this->deptabs->set_acl($this->acl);
+ /* Definitions */
+ var $plHeadline= "Departments";
+ var $plDescription= "This does something";
+
+ /* CLI vars */
+ var $cli_summary= "Handling of LDAP subtrees";
+ var $cli_description= "Some longer text\nfor help";
+ var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+
+ /* Headpage attributes */
+ var $last_dep_sorting= "invalid";
+ var $departments= array();
+ var $deptabs= NULL;
+
+ /* attribute list for save action */
+ var $attributes= array();
+ var $objectclasses= array();
+
+ function departmentManagement ($config, $ui)
+ {
+ $this->ui= $ui;
+ $this->dn= "";
+ $this->config= $config;
+
+ /* Get global filter config */
+ if (!is_global("depfilter")){
+ $base= get_base_from_people($ui->dn);
+ $depfilter= array("depselect" => $base,
+ "regex" => "*");
+ register_global("depfilter", $depfilter);
+ }
}
- /* Edit existing department */
- if ((isset($_POST['select_department']) || (isset($_POST['edit_helper']) && $_POST['edit_helper'] == "1")) && isset($_POST['deplist']) != ""){
- $this->dn= $this->config->departments[trim($_POST['deplist'])];
+ function execute()
+ {
+ /* Reload departments */
+ $this->config->departments = get_departments();
+ $smarty = get_smarty();
+ $display = "";
+ $depfilter = get_global("depfilter");
+ $s_action = ""; // Will contain an action, like del or edit
+ $s_entry = ""; // The entry name for edit delete -...
+
+ $this->config->make_idepartments();
- /* Check locking, save current plugin in 'back_plugin', so
- the dialog knows where to return. */
- if (($user= get_lock($this->dn)) != ""){
- return(gen_locked_message ($user, $this->dn));
+ if (isset($_POST['regex'])){
+ $depfilter['regex']= $_POST['regex'];
}
- /* Lock the current entry, so everyone will get the
- above dialog */
- add_lock ($this->dn, $this->ui->dn);
+ // Check Post action
+ foreach($_POST as $key => $val){
+ // Post for delete
+ if(preg_match("/dep_del.*/",$key)){
+ $s_action = "del";
+ $s_entry = preg_replace("/dep_".$s_action."_/i","",$key);
+ // Post for edit
+ }elseif(preg_match("/dep_edit_.*/",$key)){
+ $s_action="edit";
+ $s_entry = preg_replace("/dep_".$s_action."_/i","",$key);
+ // Post for new
+ }elseif(preg_match("/dep_new.*/",$key)){
+ $s_action="new";
+ }elseif(preg_match("/dep_back.*/i",$key)){
+ $s_action="back";
+ }elseif(preg_match("/dep_home.*/i",$key)){
+ $s_action="home";
+ }elseif(preg_match("/dep_root.*/i",$key)){
+ $s_action="root";
+ }
+ }
- /* Set up the users ACL's for this 'dn' */
- $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+ if(isset($_POST['depselect']) && $_POST['depselect']){
+ $depfilter['depselect']= $_POST['depselect'];
+ $this->reload();
+ }
+
+ if($s_action=="root"){
+ $depfilter['depselect']=($this->config->current['BASE']);
+ $this->reload();
+ }
- /* Register deptabs to trigger edit dialog */
- $this->deptabs= new deptabs($this->config,
- $this->config->data['TABS']['DEPTABS'], $this->dn);
- $this->deptabs->set_acl($this->acl);
- $_SESSION['objectinfo']= $this->dn;
- }
+ if($s_action=="home"){
+ $depfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
+ $depfilter['depselect']=(preg_replace("/^[^,]+,/","",$depfilter['depselect']));
+ $this->reload();
+ }
+ if($s_action=="back"){
+ $base_back = preg_replace("/^[^,]+,/","",$depfilter['depselect']);
+ $base_back = convert_department_dn($base_back);
+
+ if(isset($this->config->departments[trim($base_back)])){
+ $depfilter['depselect']= $this->config->departments[trim($base_back)];
+ }else{
+ $depfilter['depselect']= $this->config->departments["/"];
+ }
+ $this->reload();
+ }
- /* Delete requested department */
- $display= "";
- if (isset($_POST['delete_department']) && isset($_POST['deplist'])){
- $this->dn= $this->config->departments[trim($_POST['deplist'])];
+ if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
+ $s_action="open";
+ $s_entry = base64_decode($_GET['dep_id']);
+ $depfilter['depselect']= $this->config->departments[trim($s_entry)];
+ $this->reload();
+ }
- /* Check locking */
- if (($user= get_lock($this->dn)) != ""){
- $_SESSION['dn']= $this->dn;
- return(gen_locked_message($user, $this->dn));
- } else {
- # Lock this dn for editing
- add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("info", sprintf(_("You're about to delete the whole LDAP subtree placed under '%s'."), $this->dn));
- $display.= $smarty->fetch (get_template_path('remove.tpl', TRUE));
- return ($display);
+ $s_entry = preg_replace("/_.*/","",$s_entry);
+
+ if (isset($_GET['search'])){
+ $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
+ if ($s == "**"){
+ $s= "*";
+ }
+ $depfilter['regex']= $s;
}
- }
+ register_global("depfilter", $depfilter);
- /* Finally delete department */
- if (isset($_POST['delete_department_confirm'])){
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- $acl= get_module_permission($acl, "department", $this->dn);
- if (chkacl($acl, "all") == ""){
- $this->remove_from_parent();
- gosa_log ("Department object'".$this->dn."' has been removed");
- $this->reload ();
- } else {
- print_red (_("You have no permission to remove this department."));
+ /* New Entry if Posted action (s_action) == new
+ */
+ if ($s_action=="new"){
+ $this->acl= array(":all");
+ $this->dn= "new";
+
+ $this->deptabs= new deptabs($this->config,
+ $this->config->data['TABS']['DEPTABS'], $this->dn);
+ $this->deptabs->set_acl($this->acl);
}
- }
- /* Finish request */
- if (isset($_POST['edit_finish'])){
+ /* Edit Entry if Posted action (s_action) == edit
+ * The entry which will be edited is defined in $s_entry
+ */
+ if ($s_action=="edit"){
- /* Check tabs, will feed message array */
- $message= $this->deptabs->check();
+ $this->dn= $this->config->departments[trim($s_entry)];
- /* Save, or display error message? */
- if (count($message) == 0){
+ if (($user= get_lock($this->dn)) != ""){
+ return(gen_locked_message ($user, $this->dn));
+ }
- /* Save user data to ldap */
- $this->deptabs->save();
- gosa_log ("Department object'".$this->dn."' has been saved");
+ /* Lock the current entry, so everyone will get the above dialog */
+ add_lock ($this->dn, $this->ui->dn);
- /* Group has been saved successfully, remove lock from
- LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
- }
+ /* Set up the users ACL's for this 'dn' */
+ $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- /* There's no page reload so we have to read new users at
- this point. */
- $this->reload ();
- unset ($this->deptabs);
- $this->deptabs= NULL;
- unset ($_SESSION['objectinfo']);
+ /* Register deptabs to trigger edit dialog */
+ $this->deptabs= new deptabs($this->config,$this->config->data['TABS']['DEPTABS'], $this->dn);
+ $this->deptabs->set_acl($this->acl);
+ $_SESSION['objectinfo']= $this->dn;
+ }
- } else {
- /* Ok. There seem to be errors regarding to the tab data,
- show message and continue as usual. */
- show_errors($message);
- }
- }
+ /* Delete Entry if Posted action (s_action) == del
+ * The entry which will be deleted is defined in $s_entry
+ */
+ if ($s_action =="del"){
+ $this->dn= $this->config->departments[trim($s_entry)];
+
+ /* Check locking */
+ if (($user= get_lock($this->dn)) != ""){
+ $_SESSION['dn']= $this->dn;
+ return(gen_locked_message($user, $this->dn));
+ } else {
+ add_lock ($this->dn, $this->ui->dn);
+ $smarty->assign("info", sprintf(_("You're about to delete the whole LDAP subtree placed under '%s'."), $this->dn));
+ $display.= $smarty->fetch (get_template_path('remove.tpl', TRUE));
+ return ($display);
+ }
+ }
+ /* If department deletion is accepted ...
+ * Finally delete department
+ */
+ if (isset($_POST['delete_department_confirm'])){
+ $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+ $acl= get_module_permission($acl, "department", $this->dn);
+ if (chkacl($acl, "all") == ""){
+ $this->remove_from_parent();
+ gosa_log ("Department object'".$this->dn."' has been removed");
+ $this->reload ();
+ } else {
+ print_red (_("You have no permission to remove this department."));
+ }
+ }
- /* Cancel dialog */
- if (isset($_POST['edit_cancel']) || isset($_POST['delete_cancel']) ||
- isset($_POST['delete_department_confirm']) || isset($_POST['delete_lock'])){
+ /* Edit Complete ...
+ * Finish request
+ */
+ if (isset($_POST['edit_finish'])){
+
+ /* Check tabs, will feed message array */
+ $message= $this->deptabs->check();
+
+ /* Save, or display error message? */
+ if (count($message) == 0){
+
+ /* Save user data to ldap */
+ $this->deptabs->save();
+ gosa_log ("Department object'".$this->dn."' has been saved");
+
+ /* Group has been saved successfully, remove lock from
+ LDAP. */
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
+
+ /* There's no page reload so we have to read new users at
+ this point. */
+ $this->reload ();
+ unset ($this->deptabs);
+ $this->deptabs= NULL;
+ unset ($_SESSION['objectinfo']);
+
+ } else {
+ /* Ok. There seem to be errors regarding to the tab data,
+ show message and continue as usual. */
+ show_errors($message);
+ }
+ }
- del_lock ($this->dn);
- unset($this->depdabs);
- $this->deptabs= NULL;
- unset ($_SESSION['objectinfo']);
- }
+
+ /* User cancelt edit oder delete
+ * Cancel dialog
+ */
+ if (isset($_POST['edit_cancel']) || isset($_POST['delete_cancel']) ||
+ isset($_POST['delete_department_confirm']) || isset($_POST['delete_lock'])){
+
+ del_lock ($this->dn);
+ unset($this->depdabs);
+ $this->deptabs= NULL;
+ unset ($_SESSION['objectinfo']);
+ }
- /* Headpage or normal plugin screen? */
- if ($this->deptabs == NULL){
- /* Check sorting variable */
- $this->reload();
-
- /* Check for exeeded sizelimit */
- if (($message= check_sizelimit()) != ""){
- return($message);
- }
-
- /* Show main page */
- $smarty->assign("departments", $this->departments);
- $smarty->assign("search_image", get_template_path('images/search.png'));
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
- $smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/launch.png'));
- $smarty->assign("deplist", $this->config->idepartments);
- foreach( array("depselect", "regex") as $type){
- $smarty->assign("$type", $depfilter[$type]);
+ /* Headpage or normal plugin screen? */
+ if ($this->deptabs == NULL){
+ /* Check sorting variable */
+ $this->reload();
+
+ /* Check for exeeded sizelimit */
+ if (($message= check_sizelimit()) != ""){
+ return($message);
+ }
+
+ /* Prepare departments */
+ $options= "";
+ foreach ($this->config->idepartments as $key => $value){
+ if ($depfilter['depselect'] == $key){
+ $options.= "<option selected value='$key'>$value</option>";
+ } else {
+ $options.= "<option value='$key'>$value</option>";
+ }
+ }
+
+ /* Generate list head */
+ $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
+ " <input type='image' src='images/list_up.png' align='middle' title='"._("Go up one department")."' name='dep_back' alt='"._("Up")."'> ".
+ " <input type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ".
+ " <input type='image' src='images/list_home.png' align='middle' title='"._("Go to users home department")."' name='dep_home' alt='"._("Home")."'> ".
+ " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
+ " <input type='image' src='images/list_new_department.png' align='middle' alt='"._("Create new department")."' name='dep_new'> ".
+ " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
+ _("Current base")." <select name='depselect' onChange='mainform.submit()'>$options</select>".
+ " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
+ "</div>";
+
+ /* Show main page */
+ $divlist = new divlist();
+ $divlist->SetSummary(_("This table displays all departments, in the selected tree."));
+ $divlist->SetEntriesPerPage(20);
+ $actions= "<input type='image' src='images/edit.png' alt='"._("edit")."' name='dep_edit_%KEY%' title='"._("Edit this entry")."'>";
+ $actions.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='dep_del_%KEY%' title='"._("Delete this entry")."'>";
+
+ $linkopen = "<a href='?plug=".$_GET['plug']."&act=dep_open&dep_id=%s'>%s</a>";
+
+ $divlist->SetHeader(array(array("string" => " "),
+ array("string"=>_("Department name")),
+ array("string" =>_("Actions"), "attach" => "style='text-align: right;border:none'")));
+
+ foreach($this->departments as $key => $val) {
+ if(!isset($this->config->departments[trim($key)])){
+ $this->config->departments[trim($key)]="";
+ }
+ $field0 = array("string" => "<img src='images/folder.png' alt='department'>","attach"=>"style='width:20px;'");
+ $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "width='100%'");
+ $field2 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none'");
+
+ $divlist->AddEntry( array($field0,$field1,$field2));
+
+ }
+ $smarty->assign("departments",$divlist->DrawList() );
+ $smarty->assign("departmentshead",$listhead);
+ $smarty->assign("search_image", get_template_path('images/search.png'));
+ $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("infoimage", get_template_path('images/info.png'));
+ $smarty->assign("launchimage", get_template_path('images/launch.png'));
+ $smarty->assign("deplist", $this->config->idepartments);
+
+ foreach( array("depselect", "regex") as $type){
+ $smarty->assign("$type", $depfilter[$type]);
+ }
+
+ /* Extend if we are not using javascript */
+ $smarty->assign("apply", apply_filter());
+ $smarty->assign("alphabet", generate_alphabet());
+ $smarty->assign("hint", print_sizelimit_warning());
+
+ $display= $smarty->fetch(get_template_path('headpage.tpl', TRUE));
+ return($display);
}
- /* Extend if we are not using javascript */
- $smarty->assign("apply", apply_filter());
- $smarty->assign("alphabet", generate_alphabet());
- $smarty->assign("hint", print_sizelimit_warning());
+ /* Show main page (tabs) */
+ $display= $this->deptabs->execute();
+
+ $display.= "<p style=\"text-align:right\">\n";
+ $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+ $display.= " \n";
+ $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+ $display.= "</p>";
- $display= $smarty->fetch(get_template_path('headpage.tpl', TRUE));
- return($display);
+ return ($display);
}
- /* Show main page (tabs) */
- $display= $this->deptabs->execute();
- $display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
- $display.= " \n";
- $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
- $display.= "</p>";
+ function reload()
+ {
+ /* Get config */
+ $depfilter= get_global('depfilter');
+ // Added for dirlist function...
+
+ if(isset($_POST['deplist'])){
+ $depfilter= get_global("depfilter");
+ $depfilter['depselect']= $this->config->departments[trim($_POST['deplist'])];
+ register_global("depfilter", $depfilter);
+ }
+
+ /* Set base for all searches */
+ $base= $depfilter['depselect'];
+
+ /* Regex filter? */
+ if ($depfilter['regex'] != ""){
+ $regex= $depfilter['regex'];
+ } else {
+ $regex= "*";
+ }
- return ($display);
- }
+ // Configure Back Address
+ $base_back = preg_replace("/^[^,]+,/","",$base);
+ // Create Array to Test if we have a valid back button
+ $tmp = array_flip($_SESSION['config']->departments);
- function reload()
- {
- /* Get config */
- $depfilter= get_global('depfilter');
+ // In case of a valid back button create entry
+ if(isset($tmp[$base_back])){
+ $tmp2 ['dn'] = convert_department_dn($base_back);
- /* Set base for all searches */
- $base= $depfilter['depselect'];
+ // If empty always go to top
+ if(empty($tmp2['dn'])){
+ $tmp2['dn']="/";
+ }
+ $tmp2 ['description'][0] = _("..");
+ $result[$tmp[$base_back]]=$tmp2;
+ }
- /* Regex filter? */
- if ($depfilter['regex'] != ""){
- $regex= $depfilter['regex'];
- } else {
- $regex= "*";
- }
+ $res= get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
+ TRUE, $base, array("ou", "description"), TRUE);
+
+ //hickert Replaced Block
+ // $this->departments= array();
+ // foreach ($res as $value){
+ // $title= convert_department_dn($value["dn"]);
+ // $this->departments[$title]= "$title [".$value["description"][0]."]";
+ // $this->departments[$value['dn']]= "[".$value["description"][0]."]";
+ // }
+
+ $this->departments= array();
+ foreach ($res as $value){
+ if($value["description"][0]!=".."){
+ $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+ }else{
+ $this->departments[$value['dn']]=$value["description"][0];
+ }
+ }
+ natcasesort ($this->departments);
+ reset ($this->departments);
+ }
- /*Get all gosaDepartments */
- $res= get_list($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))", TRUE, $base, array("ou", "description"), TRUE);
+ function remove_from_parent()
+ {
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd ($this->dn);
+ $ldap->recursive_remove();
+
+ /* Optionally execute a command after we're done */
+ $this->postremove();
+
+ /* Delete references to object groups */
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
+ while ($ldap->fetch()){
+ $og= new ogroup($this->config, $ldap->getDN());
+ unset($og->member[$this->dn]);
+ $og->save ();
+ }
- $this->departments= array();
- foreach ($res as $value){
- $title= convert_department_dn($value["dn"]);
- $this->departments[$title]= "$title [".$value["description"][0]."]";
}
- natcasesort ($this->departments);
- reset ($this->departments);
- }
-
- function remove_from_parent()
- {
- $ldap= $this->config->get_ldap_link();
- $ldap->cd ($this->dn);
- $ldap->recursive_remove();
-
- /* Optionally execute a command after we're done */
- $this->postremove();
-
- /* Delete references to object groups */
- $ldap->cd ($this->config->current['BASE']);
- $ldap->search ("(&(objectClass=gosaGroupOfNames)(member=".$this->dn."))", array("cn"));
- while ($ldap->fetch()){
- $og= new ogroup($this->config, $ldap->getDN());
- unset($og->member[$this->dn]);
- $og->save ();
- }
-
- }
-
- function remove_lock()
- {
- if (isset($this->dn)){
- del_lock ($this->dn);
+
+ function remove_lock()
+ {
+ if (isset($this->dn)){
+ del_lock ($this->dn);
+ }
}
- }
-}
+ }
-?>
+ ?>