diff --git a/inc/databap.php b/inc/databap.php index 3a6f354..e1835b1 100755 --- a/inc/databap.php +++ b/inc/databap.php @@ -1405,7 +1405,14 @@ class Databap extends PhpObject } } ksort($asSelectedOptions); - return $this->jsonExport($asSelectedOptions); + + //Admin options + $asAdminOptions = array(); + if($this->checkUserClearance(self::CLEARANCE_ADMIN)) + { + $asAdminOptions['companies'] = $this->oMySql->selectList(self::COMP_TABLE); + } + return $this->jsonExport(array('admin'=>$asAdminOptions, 'options'=>$asSelectedOptions)); } public function setOptions($asNewOptions, $bSilentUpdate=true, $iUserId=0) diff --git a/inc/mysqlmanager.php b/inc/mysqlmanager.php index ccb3a0e..97c9f81 100644 --- a/inc/mysqlmanager.php +++ b/inc/mysqlmanager.php @@ -445,6 +445,17 @@ class MySqlManager extends PhpObject $this->cleanSql($sTableName); return $this->setQuery("TRUNCATE ".$sTableName); } + + public function selectList($sTableName, $sColumnName='', $asConstraints=array()) + { + $sColumnName = $sColumnName==''?self::getText($sTableName):$sColumnName; + $sIdColumnName = self::getId($sTableName); + return $this->selectRows( array( 'select' => array($sIdColumnName, $sColumnName), + 'from' => $sTableName, + 'constraint'=> $asConstraints), + true, + $sIdColumnName); + } public function selectRows($asInfo, $bStringOnly=true, $sGroupBy='') { diff --git a/masks/logout.html b/masks/logout.html index c19f26e..f57e304 100644 --- a/masks/logout.html +++ b/masks/logout.html @@ -1,6 +1,9 @@ -
Déconnexion...
-