diff --git a/trunk/includes/js/LSform.js b/trunk/includes/js/LSform.js index 6d560b5c..290c038b 100644 --- a/trunk/includes/js/LSform.js +++ b/trunk/includes/js/LSform.js @@ -83,7 +83,7 @@ var LSform = new Class({ LSdebug(data); if ( data ) { if ( typeof(data.LSerror) != "undefined" ) { - varLSdefault.loadingImgHide(); + varLSdefault.loadingImgHide(data.imgload); varLSdefault.displayError(data.LSerror); return; } @@ -198,7 +198,7 @@ var LSform = new Class({ var data = Json.evaluate(responseText); if ( data ) { if ( typeof(data.LSerror) != "undefined" ) { - varLSdefault.loadingImgHide(); + varLSdefault.loadingImgHide(data.imgload); varLSdefault.displayError(data.LSerror); return; } @@ -236,7 +236,7 @@ var LSform = new Class({ var data = Json.evaluate(responseText); if ( data ) { if ( typeof(data.LSerror) != "undefined" ) { - varLSdefault.loadingImgHide(); + varLSdefault.loadingImgHide(data.imgload); varLSdefault.displayError(data.LSerror); return; } diff --git a/trunk/index_ajax.php b/trunk/index_ajax.php index 7d400449..0ff700cf 100644 --- a/trunk/index_ajax.php +++ b/trunk/index_ajax.php @@ -7,128 +7,133 @@ $GLOBALS['LSsession'] = new LSsession(); if ($_REQUEST['template'] != 'login') { if ( !$GLOBALS['LSsession'] -> startLSsession() ) { - echo json_encode(array('LSerror' => 'LSsession : Impossible d\'initialiser la LSsession.' )); + $_ERRORS = 'LSsession : Impossible d\'initialiser la LSsession.'; } } $data=NULL; -switch($_REQUEST['template']) { - case 'login': - switch($_REQUEST['action']) { - case 'onLdapServerChanged': - if ( isset($_REQUEST['server']) ) { - $GLOBALS['LSsession'] -> setLdapServer($_REQUEST['server']); - if ( $GLOBALS['LSsession'] -> LSldapConnect() ) { - session_start(); - $GLOBALS['LSsession'] -> loadLSobjects(); - $list = $GLOBALS['LSsession'] -> getSubDnLdapServerOptions($_SESSION['LSsession_topDn']); - if (is_string($list)) { - $list=""; - $data = array('list_topDn' => $list); - } - else if (is_array($list)){ - $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); +if (!isset($_ERRORS)) { + switch($_REQUEST['template']) { + case 'login': + switch($_REQUEST['action']) { + case 'onLdapServerChanged': + if ( isset($_REQUEST['server']) ) { + $GLOBALS['LSsession'] -> setLdapServer($_REQUEST['server']); + if ( $GLOBALS['LSsession'] -> LSldapConnect() ) { + session_start(); + $GLOBALS['LSsession'] -> loadLSobjects(); + $list = $GLOBALS['LSsession'] -> getSubDnLdapServerOptions($_SESSION['LSsession_topDn']); + if (is_string($list)) { + $list=""; + $data = array('list_topDn' => $list); + } + else if (is_array($list)){ + $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); + } + else { + $data = null; + } } else { - $data = null; + $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); } } - else { - $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); - } - } - break; - } - break; - case 'LSform': - switch($_REQUEST['action']) { - case 'onAddFieldBtnClick': - if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['objectdn'])) && (isset($_REQUEST['idform'])) && (isset($_REQUEST['img'])) ) { - $object = new $_REQUEST['objecttype'](); - $object -> loadData($_REQUEST['objectdn']); - $form = $object -> getForm($_REQUEST['idform']); - $emptyField=$form -> getEmptyField($_REQUEST['attribute']); - if ( $emptyField ) { - $data = array( - 'html' => $form -> getEmptyField($_REQUEST['attribute']), - 'img' => $_REQUEST['img'], - ); - } - else { - $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); - } - } - break; - case 'refreshField': - if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['objectdn'])) && (isset($_REQUEST['idform'])) ) { - $object = new $_REQUEST['objecttype'](); - //$object -> loadData($_REQUEST['objectdn']); - $form = $object -> getForm($_REQUEST['idform']); - $field=$form -> getElement($_REQUEST['attribute']); - $val = $field -> getDisplay(true); - if ( $val ) { - $data = array( - 'html' => $val['html'] - ); - } - else { - $data = array( - 'LSerror' => $GLOBALS['LSerror']->getErrors() + break; + } + break; + case 'LSform': + switch($_REQUEST['action']) { + case 'onAddFieldBtnClick': + if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['objectdn'])) && (isset($_REQUEST['idform'])) && (isset($_REQUEST['img'])) ) { + $object = new $_REQUEST['objecttype'](); + $object -> loadData($_REQUEST['objectdn']); + $form = $object -> getForm($_REQUEST['idform']); + $emptyField=$form -> getEmptyField($_REQUEST['attribute']); + if ( $emptyField ) { + $data = array( + 'html' => $form -> getEmptyField($_REQUEST['attribute']), + 'img' => $_REQUEST['img'], ); + } + else { + $data = array('LSerror' => $GLOBALS['LSerror']->getErrors()); + } } - } - break; - case 'generatePassword': - if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['fieldId'])) && (isset($_REQUEST['idform'])) ) { - $object = new $_REQUEST['objecttype'](); - $form = $object -> getForm($_REQUEST['idform']); - $field=$form -> getElement($_REQUEST['attribute']); - $val = $field -> generatePassword(); - if ( $val ) { - $data = array( - 'generatePassword' => $val, - 'fieldId' => $_REQUEST['fieldId'] - ); - } - else { - $data = array( - 'LSerror' => $GLOBALS['LSerror']->getErrors() + break; + case 'refreshField': + if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['objectdn'])) && (isset($_REQUEST['idform'])) ) { + $object = new $_REQUEST['objecttype'](); + //$object -> loadData($_REQUEST['objectdn']); + $form = $object -> getForm($_REQUEST['idform']); + $field=$form -> getElement($_REQUEST['attribute']); + $val = $field -> getDisplay(true); + if ( $val ) { + $data = array( + 'html' => $val['html'] ); + } + else { + $data = array( + 'LSerror' => $GLOBALS['LSerror']->getErrors() + ); + } } - } - break; - } - break; - case 'LSrelation': - switch($_REQUEST['action']) { - case 'refreshSession': - if ((isset($_REQUEST['id'])) && (isset($_REQUEST['href'])) ) { - if (isset($_SESSION['LSrelation'][$_REQUEST['id']])) { - $conf = $_SESSION['LSrelation'][$_REQUEST['id']]; - if ($GLOBALS['LSsession']->loadLSobject($conf['objectType'])) { - $object = new $conf['objectType'](); - if (($object -> loadData($conf['objectDn'])) && (isset($object->config['relations'][$conf['relationName']]))) { - $relationConf = $object->config['relations'][$conf['relationName']]; - if ($GLOBALS['LSsession'] -> relationCanEdit($object -> getValue('dn'),$conf['relationName'])) { - if (method_exists($relationConf['LSobject'],$relationConf['list_function'])) { - $objRel = new $relationConf['LSobject'](); - $list = $objRel -> $relationConf['list_function']($object); - $_SESSION['LSselect'][$relationConf['LSobject']]=array(); - if (is_array($list)) { - foreach($list as $o) { - $_SESSION['LSselect'][$relationConf['LSobject']][] = $o -> getDn(); + break; + case 'generatePassword': + if ((isset($_REQUEST['attribute'])) && (isset($_REQUEST['objecttype'])) && (isset($_REQUEST['fieldId'])) && (isset($_REQUEST['idform'])) ) { + $object = new $_REQUEST['objecttype'](); + $form = $object -> getForm($_REQUEST['idform']); + $field=$form -> getElement($_REQUEST['attribute']); + $val = $field -> generatePassword(); + if ( $val ) { + $data = array( + 'generatePassword' => $val, + 'fieldId' => $_REQUEST['fieldId'] + ); + } + else { + $data = array( + 'LSerror' => $GLOBALS['LSerror']->getErrors() + ); + } + } + break; + } + break; + case 'LSrelation': + switch($_REQUEST['action']) { + case 'refreshSession': + if ((isset($_REQUEST['id'])) && (isset($_REQUEST['href'])) ) { + if (isset($_SESSION['LSrelation'][$_REQUEST['id']])) { + $conf = $_SESSION['LSrelation'][$_REQUEST['id']]; + if ($GLOBALS['LSsession']->loadLSobject($conf['objectType'])) { + $object = new $conf['objectType'](); + if (($object -> loadData($conf['objectDn'])) && (isset($object->config['relations'][$conf['relationName']]))) { + $relationConf = $object->config['relations'][$conf['relationName']]; + if ($GLOBALS['LSsession'] -> relationCanEdit($object -> getValue('dn'),$conf['relationName'])) { + if (method_exists($relationConf['LSobject'],$relationConf['list_function'])) { + $objRel = new $relationConf['LSobject'](); + $list = $objRel -> $relationConf['list_function']($object); + $_SESSION['LSselect'][$relationConf['LSobject']]=array(); + if (is_array($list)) { + foreach($list as $o) { + $_SESSION['LSselect'][$relationConf['LSobject']][] = $o -> getDn(); + } } + $data = array( + 'href' => $_REQUEST['href'], + 'id' => $_REQUEST['id'] + ); + } + else { + $GLOBALS['LSerror'] -> addErrorCode(1013,$relationName); } - $data = array( - 'href' => $_REQUEST['href'], - 'id' => $_REQUEST['id'] - ); } else { - $GLOBALS['LSerror'] -> addErrorCode(1013,$relationName); + $GLOBALS['LSerror'] -> addErrorCode(1011); } } else { - $GLOBALS['LSerror'] -> addErrorCode(1011); + $GLOBALS['LSerror'] -> addErrorCode(1012); } } else { @@ -139,105 +144,51 @@ switch($_REQUEST['template']) { $GLOBALS['LSerror'] -> addErrorCode(1012); } } - else { - $GLOBALS['LSerror'] -> addErrorCode(1012); - } - } - break; - case 'refreshList': - if (isset($_REQUEST['id'])) { - if (isset($_SESSION['LSrelation'][$_REQUEST['id']])) { - $conf = $_SESSION['LSrelation'][$_REQUEST['id']]; - if ($GLOBALS['LSsession']->loadLSobject($conf['objectType'])) { - $object = new $conf['objectType'](); - if (($object -> loadData($conf['objectDn'])) && (isset($object->config['relations'][$conf['relationName']]))) { - $relationConf = $object->config['relations'][$conf['relationName']]; - if ($GLOBALS['LSsession'] -> relationCanEdit($object -> getValue('dn'),$conf['relationName'])) { - if (is_array($_SESSION['LSselect'][$relationConf['LSobject']])) { - if (method_exists($relationConf['LSobject'],$relationConf['update_function'])) { - $objRel = new $relationConf['LSobject'](); - if($objRel -> $relationConf['update_function']($object,$_SESSION['LSselect'][$relationConf['LSobject']])) { - if (method_exists($relationConf['LSobject'],$relationConf['list_function'])) { - $list = $objRel -> $relationConf['list_function']($object); - if (is_array($list)) { - foreach($list as $o) { - $data['html'].= "