![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
index bd52510615586c5a0b040746250ca6e9ecf969fa..f584a00693c71a60307469f0975c243d69565922 100644 (file)
var $gotoPrinterPPD = "";
var $initial_PPD = "";
var $orig_dn = "";
+ var $orig_cn = "";
+ var $orig_base = "";
var $UserMember ="";
var $UserMembers =array();
var $AdminMembers =array();
var $AdminMemberKeys =array();
+ var $ppdServerPart = "";
+
var $PPDdialogToSave = NULL;
var $BelongsTo = "unknown"; // Specifies if this is a standalone printer, or belongs to a terminal / WS
var $view_logged = FALSE;
var $parent;
+
+ // Memeber dialog object
+ var $userSelect;
+ var $adminUserSelect;
+
function printgeneric (&$config, $dn,$parent_init,$parent)
{
$this->config = &$config;
/* Update dn, to ensure storing as printer instead of WS / terminal */
if(preg_match("/Terminal/i",$this->BelongsTo) || preg_match("/TerminalTemplate/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
$this->orig_dn = $this->dn;
} else {
/* Set base and check if the extracted base exists */
- if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->dn)){
- $this->base= preg_replace("/".normalizePreg(get_ou('incomingou'))."/","",dn2base($this->dn));
+ if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->dn)){
+ $this->base= preg_replace("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i","",dn2base($this->dn));
}else{
- $this->base= preg_replace("/".normalizePreg(get_ou('printerou'))."/","",dn2base($this->dn));
+ $this->base= preg_replace("/".preg_quote(get_ou('printerRDN'), '/')."/i","",dn2base($this->dn));
}
if(!isset($this->config->idepartments[$this->base])){
}
}
+ /* If no ppd is selected, remove this attribute */
+ if(!empty($this->gotoPrinterPPD) && $this->initially_was_account) {
+ $this->ppdServerPart = preg_replace("/^(http.*ppd)\/.*$/i","\\1",$this->gotoPrinterPPD);
+ }else{
+
+ /* Detect PPD server part */
+ if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
+ $method="https://";
+ }else{
+ $method="http://";
+ }
+
+ /* Get servername */
+ $server = $_SERVER['SERVER_NAME'];
+ if(tests::is_ip($server)){
+ $server_name = @gethostbyaddr($server);
+ }else{
+ $server_name = @gethostbyaddr(gethostbyname($server));
+ }
+ $this->ppdServerPart = $method.str_replace("//","/",$server_name."/ppd");
+ }
+
/* Extract selected ppd */
if(isset($this->gotoPrinterPPD)){
$this->gotoPrinterPPD = preg_replace("/^http.*ppd\//i","",$this->gotoPrinterPPD);
/* $this->members contains all members */
$this->member[$type]=array();
- if (isset($this->attrs[$attr]['count'])) {
- unset($this->attrs[$attr]['count']);
- }
-
if(isset($this->attrs[$attr])){
- foreach($this->attrs[$attr] as $mem){
+ $ldap->cd($this->config->current['BASE']) ;
+ for($i = 0 ; $i < $this->attrs[$attr]['count']; $i++){
+
+ $mem = $this->attrs[$attr][$i];
if(preg_match("/Group/",$type)){
- $ldap->search("(&(objectClass=posixGroup)(cn=".$mem."))",array("cn","description"));
+ $ldap->search("(&(|(objectClass=posixGroup)(objectClass=gosaGroupOfNames))(cn=".$mem."))",array("cn","description"));
if($ldap->count()){
$entry = $ldap->fetch();
$this->member[$type][$entry['cn'][0]]=$entry;
}
}
}
+ $this->orig_cn = $this->cn;
+ $this->orig_base = $this->base;
}
function set_acl_base($base)
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
/* Detect if this is a valid printer account;
new log("view","printer/".get_class($this),$this->dn);
}
-
/* If type of printer couldn't be detected (because of missing parent object in construction)
* hide this tab.
*/
/* If this is a WS / Terminal depending printer, display account state button */
if(!preg_match("/^Printer$/i",$this->BelongsTo)){
- if((empty($this->cn)) && ($this->dn != "new")){
+ if($this->cn == "" && ($this->dn != "new")){
$display= $this->show_enable_header(_("Add printer extension"),
msgPool::featuresDisabled(_("printer"))._("You can't enable it while 'cn' is not present in entry. Possibly you are currently creating a new terminal template."),TRUE,TRUE);
$this->is_account= false;
}
}else{
if(preg_match("/^Workstation$/i",$this->BelongsTo)){
- $display= $this->show_disable_header(_("Add printer extension"),
+ $display= $this->show_enable_header(_("Add printer extension"),
msgPool::featuresEnabled(_("printer")));
}elseif(preg_match("/^Terminal$/i",$this->BelongsTo)){
$display= $this->show_enable_header(_("Add printer extension"),
$smarty->assign("$attr", $this->$attr);
}
+ // Act on add user/grouo requests
if(isset($_POST['AddUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser");
- }
- if(isset($_POST['AddGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup");
+ $this->userSelect = new userGroupSelect($this->config, get_userinfo());
+ $this->dialog = TRUE;
}
if(isset($_POST['AddAdminUser'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser");
- }
- if(isset($_POST['AddAdminGroup'])){
- $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup");
+ $this->adminUserSelect = new userGroupSelect($this->config, get_userinfo());
+ $this->dialog = TRUE;
}
/* Display ppd configure/select dialog */
if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){
$this->dialog = $this->PPDdialogToSave;
}else{
- $this->dialog = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD);
+
+ if(is_array($this->gotoPrinterPPD)){
+ $this->dialog = new printerPPDDialog($this->config, $this->dn,"");
+ }else{
+ $this->dialog = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD);
+ }
$this->dialog->cn= $this->cn;
}
+
+ // Detect edit acl base
+ $ldap = $this->config->get_ldap_link();
+ if($ldap->dn_exists($this->dn)){
+ $acl_base = $this->dn;
+ }else{
+ $acl_base = $this->base;
+ }
+
+ $this->dialog->set_acl_base($acl_base);
}
/* remove ppd */
if(isset($_POST['RemoveDriver'])){
+ /* Detect PPD server part */
+ if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
+ $method="https://";
+ }else{
+ $method="http://";
+ }
+
+ /* Get servername */
+ $server = $_SERVER['SERVER_NAME'];
+ if(tests::is_ip($server)){
+ $server_name = @gethostbyaddr($server);
+ }else{
+ $server_name = @gethostbyaddr(gethostbyname($server));
+ }
+ $this->ppdServerPart = $method.str_replace("//","/",$server_name."/ppd");
$this->gotoPrinterPPD = array();
$this->PPDdialogToSave = NULL;
}
}
}
- /* Abort user / group adding dialog */
- if(isset($_POST['PrinterCancel'])){
- unset($this->dialog);
- $this->dialog= FALSE;
+ // Abort user / group adding dialog
+ if(isset($_POST['userGroupSelect_cancel'])){
+ $this->dialog=FALSE;
+ $this->userSelect = NULL;
+ $this->adminUserSelect = NULL;
+ }
+
+ // Save selected users / groups
+ if(isset($_POST['userGroupSelect_save'])){
+ $users = array();
+ if($this->userSelect instanceOf userGroupSelect){
+ $users = $this->userSelect->save();
+ $add = '';
+ }elseif($this->adminUserSelect instanceOf userGroupSelect){
+ $users = $this->adminUserSelect->save();
+ $add = 'Admin';
+ }
+ foreach($users as $user){
+ if(in_array('gosaAccount', $user['objectClass'])){
+ $type = 'Add'.$add.'User';
+ }else{
+ $type = 'Add'.$add.'Group';
+ }
+ $this->AddMember($type, $user['dn']);
+ }
+ $this->dialog=FALSE;
+ $this->userSelect = NULL;
+ $this->adminUserSelect = NULL;
}
- /* Save selected users / groups */
- if(isset($_POST['PrinterSave'])){
- $this->dialog->save_object();
- if(count($this->dialog->check())){
- foreach($this->dialog->check() as $msg){
- msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
- }
- }else{
- $data= $new = $this->dialog->save();
- unset($data['type']);
- foreach($data as $mem){
- $this->AddMember($new['type'], $mem['dn']);
+ // Display add user/group dialogs
+ if($this->userSelect instanceOf userGroupSelect || $this->adminUserSelect instanceOf userGroupSelect){
+
+ // Build up blocklist
+ $used = array();
+ foreach($this->member as $type => $members){
+ foreach($members as $member){
+ $used['dn'][] = $member['dn'];
}
- unset($this->dialog);
- $this->dialog=FALSE;
+ }
+ session::set('filterBlacklist', $used);
+ if($this->userSelect instanceOf userGroupSelect){
+ return($this->userSelect->execute());
+ }elseif($this->adminUserSelect instanceOf userGroupSelect){
+ return($this->adminUserSelect->execute());
}
}
+
/* Display dialog, if there is currently one open*/
if(is_object($this->dialog)){
$this->dialog->save_object();
/* Parse selected ppd file */
$config = session::get('config');
- if((isset($config->data['MAIN']['PPD_PATH']))&&(is_dir($config->data['MAIN']['PPD_PATH']))){
-
- $path = $config->data['MAIN']['PPD_PATH'];
+ if ($config->get_cfg_value("ppdPath") != ""){
+ $path = $config->get_cfg_value("ppdPath");
if(!preg_match("/\/$/",$path)){
$path = $path."/";
}
$ppdManager= new ppdManager($path);
+ $smarty->assign("displayServerPath",true);
if(!empty($this->gotoPrinterPPD)){
if((!file_exists($path.$this->gotoPrinterPPD))){
$smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD)."</b>");
}else{
- $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
+ $ppdDesc = $ppdManager->loadDescription($path.$this->gotoPrinterPPD);
+ $smarty->assign("driverInfo", $ppdDesc['name']);
}
}else{
$smarty->assign("driverInfo", _("Not defined"));
+ $smarty->assign("displayServerPath",false);
}
}else{
$smarty->assign("driverInfo",_("Can't get ppd informations."));
+ $smarty->assign("displayServerPath",true);
}
+ $smarty->assign("ppdServerPart",$this->ppdServerPart);
+
/* Create user & admin user list */
$list=$this->generateList();
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/').",/i",get_ou('printerRDN'),$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
/* Check if this dn points to a printer, to avoid deleting something else */
plugin::save_object();
$this->base = $base_tmp;
+ if(isset($_POST['ppdServerPart'])){
+ $this->ppdServerPart = get_post('ppdServerPart');
+ }
+
if(is_object($this->netConfigDNS)){
$this->netConfigDNS->save_object();
}
}
}
- $dn= "cn=".$this->cn.get_ou('printerou').",".$this->base;
+ $dn= "cn=".$this->cn.get_ou('printerRDN').",".$this->base;
/* must: cn */
- if(($this->BelongsTo == "Printer") && (empty($this->cn))){
+ if(($this->BelongsTo == "Printer") && $this->cn == ""){
$message[]= msgPool::required(_("Name"));
}
if (($this->orig_dn != $dn)&&( preg_match("/printer/i",$this->BelongsTo))){
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->base);
- $ldap->ls("(cn=".$this->cn.")",get_ou('printerou').$this->base, array("cn"));
+ $ldap->ls("(cn=".$this->cn.")",get_ou('printerRDN').$this->base, array("cn"));
if ($ldap->count() != 0){
while ($attrs= $ldap->fetch()){
if(preg_match("/cn=dhcp,/",$attrs['dn'])){
}
}
+ /* Check if we are allowed to create or move this object
+ */
+ if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
+ $message[] = msgPool::permCreate();
+ }elseif($this->orig_dn != "new" && $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){
+ $message[] = msgPool::permMove();
+ }
+
return ($message);
}
/* Update dn, to ensure storing as printer instead of WS / terminal
*/
if(preg_match("/terminal/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('terminalou')).",/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
if(preg_match("/workstation/i",$this->BelongsTo)){
- $this->dn= preg_replace("/".normalizePreg(get_ou('workstationou'))."/",get_ou('printerou'),$this->dn);
+ $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
}
if(!$this->is_account) return;
/* save ppd configuration */
if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){
+
$this->PPDdialogToSave->save_ppd();
+
+ /* Rename the generated ppd to match the gzip ending '.gz', if necessary.
+ */
+ $path = $this->config->get_cfg_value("ppdPath");
+ if(!preg_match("/\/$/",$path)){
+ $path = $path."/";
+ }
+ $ppdManager= new ppdManager($path);
+ if($ppdManager->useGzip && !preg_match('/\.gz$/',$this->gotoPrinterPPD)){
+ if(rename($path.$this->gotoPrinterPPD,$path.$this->gotoPrinterPPD.'.gz')){
+ $this->gotoPrinterPPD .= '.gz';
+ }
+ }elseif(!$ppdManager->useGzip && preg_match('/\.gz$/',$this->gotoPrinterPPD)){
+ $new_ppd = preg_replace('/\.gz$/','',$this->gotoPrinterPPD);
+ if(rename($path.$this->gotoPrinterPPD,$path.$new_ppd)){
+ $this->gotoPrinterPPD = $new_ppd;
+ }
+ }
}
- if($this->orig_dn != $this->dn){
+ if($this->orig_dn != $this->dn && $this->orig_dn != "new"){
if(!empty($this->gotoPrinterPPD)) {
$this->PPDdialogToSave = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD);
$this->PPDdialogToSave->cn = $this->cn;
}
}
- if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
- $method="https://";
- }else{
- $method="http://";
- }
-
- /* Get servername */
- $server = $_SERVER['SERVER_NAME'];
- if(tests::is_ip($server)){
- $server_name = gethostbyaddr($server);
- }else{
- $server_name = gethostbyaddr(gethostbyname($server));
- }
-
/* If no ppd is selected, remove this attribute */
- if(!empty($this->gotoPrinterPPD) && $this->initially_was_account) {
- $this->gotoPrinterPPD = $method.str_replace("//","/",$server_name."/ppd/".$this->gotoPrinterPPD);
+ if(!empty($this->gotoPrinterPPD)) {
+ $this->gotoPrinterPPD = $this->ppdServerPart.'/'.$this->gotoPrinterPPD;
}else{
$this->gotoPrinterPPD = array();
}
}
/* Ensure to create a new object */
- if(preg_match("/".normalizePreg(get_ou('incomingou'))."/",$this->orig_dn)){
+ if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->orig_dn)){
$this->orig_dn = "new";
}
$this->gotoPrinterPPD = "";
}
+
+
+ function is_modal_dialog()
+ {
+ return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+ }
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: