![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index dc7ef05b902b3d16e938d265f3b831f49f6932b5..703f197cbf68a50531adedcc830c9d7f017882bf 100644 (file)
var $usedPackages = array();
var $buffer = NULL;
- var $newDialogShown =false;
+ var $newDialogShown = false;
var $FAIstate = "";
var $view_logged = FALSE;
var $base;
var $FAIpackage ;
+ var $packageSelect ;
+
var $FAIinstallMethods = array( "install", "ninstall", "remove",
"dselect-upgrade", "taskinst", "taskrm",
"hold", "clean", "aptitude", "aptitude-r",
if($dn != "new"){
$this->dn =$dn;
- /* Get FAIstate */
- if(isset($this->attrs['FAIstate'][0])){
- $this->FAIstate = $this->attrs['FAIstate'][0];
- }
-
/* Check if there are already some packages in this list
*/
$this->usedPackages = array();
if(isset($this->attrs['FAIpackage'])){
unset($this->attrs['FAIpackage']['count']);
foreach($this->attrs['FAIpackage'] as $pkg){
- $name = preg_replace("/^\-/","",$pkg);
+ $name = preg_replace("/\-$/","",$pkg);
$this->usedPackages[$name] = $pkg;
}
ksort($this->usedPackages);
$tmp['Type'] = $attr['FAIvariableType'][0];
if (isset($attr['FAIvariableContent'][0])){
- if(!in_array($attr['FAIvariableType'],array("multiselect"))){
+ if(!in_array_strict($attr['FAIvariableType'],array("multiselect"))){
$tmp['Value'] = $attr['FAIvariableContent'][0];
}else{
$content = array();
/* Generate package list */
$this->list= $this->genPkgs(TRUE);
+
+ // Prepare lists
+ $this->packageList = new sortableListing();
+ $this->packageList->setDeleteable(false);
+ $this->packageList->setEditable(false);
+ $this->packageList->setWidth("100%");
+ $this->packageList->setHeight("200px");
+ $this->packageList->setColspecs(array('20px','*','*','100px','60px'));
+ $this->packageList->setHeader(array(_("Status"),_("Name"),_("Description"),_("Version")));
+ $this->packageList->setDefaultSortColumn(1);
}
/* Assemble release name */
$release = $this->parent->parent->fai_release;
- $tmp= preg_replace('/[,]*'.normalizePreg(get_ou('faiou')).'.*$/', '', $release);
+ $tmp= preg_replace('/[,]*'.preg_quote(get_ou("faiManagement", "faiBaseRDN"), '/').'.*$/i', '', $release);
$tmp= preg_replace('/ou=/', '', $tmp);
- $rev= array_reverse(split(',', $tmp));
+ $rev= array_reverse(explode(',', $tmp));
$this->FAIdebianRelease= "/";
foreach ($rev as $part){
$this->FAIdebianRelease.= "/$part";
* Add
******/
- /* + was pressed to open the package dialog */
- if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage")){
- $this->dialog = new faiPackageEntry($this->config, $this->FAIdebianRelease,$this->usedPackages);
- $this->is_dialog =true;
+ if(isset($_POST['AddManualpkg']) &&
+ isset($_POST['addPpkgsText']) &&
+ strlen($_POST['addPpkgsText']) &&
+ $this->acl_is_writeable("FAIpackage") &&
+ !preg_match("/freeze/",$this->FAIstate)){
+
+ // Check all splitted packages for valid package names
+ $add_packages = preg_split( "/[\s,]+/", get_post('addPpkgsText'), -1, PREG_SPLIT_NO_EMPTY );
+ if( is_array($add_packages) ) {
+ $valid_packages = array();
+ $invalid_packages = array();
+ foreach ($add_packages as $value) {
+ if(!preg_match( "/^[a-z0-9][-0-9a-z+\.]+$/",$value)){
+ $invalid_packages[] = trim($value);
+ }else{
+ $valid_packages[] = trim($value);
+ }
+ }
+ if(count($invalid_packages)){
+ $str = implode(", ",$invalid_packages);
+ msg_dialog::display(_("Invalid package names"),
+ sprintf(_("The following package names don't match the Debian policy: %s"),$str),
+ ERROR_DIALOG);
+ }
+
+
+ // If we have a complete list of valid packages, add them
+ if(count($valid_packages)){
+
+ foreach($valid_packages as $key => $value){
+ if(array_key_exists($value,$this->usedPackages)) {
+ unset($valid_packages[$key]);
+ }
+ }
+
+ // Query SI-Deamon for additional package information
+ $daemon = new gosaSupportDaemon();
+ $query_attrs = array("distribution", "package","version", "section", "description", "timestamp");
+ $do_si_query = true;
+
+
+ foreach ($valid_packages as $value) {
+
+ if( $do_si_query == true ) {
+ $res = $daemon->FAI_get_packages($this->FAIdebianRelease,$query_attrs,array($value),0,1);
+ if( ! $daemon->is_error()){
+
+ if(count($res)){
+
+ // We just use the last answer - there shouldn't be multiple
+ $res_attrs = array_pop( $res );
+ $this->list[$value] = $res_attrs;
+ $this->usedPackages[$value] = $res_attrs['PACKAGE'];
+
+ }else{
+ $this->usedPackages[$value] = $value;
+ }
+ }else{
+ msg_dialog::display(_("Service infrastructure"),
+ msgPool::siError($daemon->get_error()),
+ ERROR_DIALOG);
+ $do_si_query = false;
+ }
+ }
+ }
+
+ ksort($this->usedPackages);
+
+ /* Generate package list */
+ $this->list= $this->genPkgs(TRUE);
+ }
+ }
+ }
+
+ // Open the packageSelect dialog to allow adding packages out of a list.
+ if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage") && !preg_match("/freeze/",$this->FAIstate)){
+ $this->packageSelect = new packageSelect($this->config, get_userinfo());
+ session::set('packageSelect_Release',$this->FAIdebianRelease);
+ $this->dialog =true;
+ }
+
+ // Close packageSelect dialog.
+ if(isset($_POST['packageSelect_cancel'])){
+ $this->packageSelect = FALSE;
+ $this->dialog =FALSE;
}
+ // Close packageSelect dialog and add the selected packages.
+ if(isset($_POST['packageSelect_save']) && $this->packageSelect instanceOf packageSelect){
+ if(!preg_match("/freeze/i", $this->FAIstate)){
+ $use = $this->packageSelect->save();
+
+ foreach($use as $pkg){
+ $item = array();
+ for($i =0; $i < $pkg['count']; $i++){
+ $item[$pkg[$i]] = $pkg[$pkg[$i]][0];
+ }
+ $this->usedPackages[$item['PACKAGE']] = $item['PACKAGE'];
+ }
+
+ ksort($this->usedPackages);
+
+ /* Generate package list */
+ $this->list= $this->genPkgs(TRUE);
+ }
+ $this->packageSelect = FALSE;
+ $this->dialog =FALSE;
+ }
+
+ // Display package add dialog
+ if($this->packageSelect instanceOf packageSelect){
+
+ session::set('filterBlacklist', array('PACKAGE' => $this->usedPackages));
+ return $this->packageSelect->execute();
+ }
+
+
/* Check image Posts
*/
foreach($_POST as $name => $value){
* Mark as removed
******/
- if(!preg_match('/^freeze/', $this->FAIstate) && preg_match("/^removal_package_/",$name)){
- $id = @base64_decode(preg_replace("/^removal_package_(.*)_[xy]*$/","\\1",$name));
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^removal_package_/",$name)){
+ $id = @postDecode(preg_replace("/^removal_package_(.*)$/","\\1",$name));
if(isset($this->usedPackages[$id])){
$pkg = $this->usedPackages[$id];
- if (preg_match('/^-/', $pkg)){
- $pkg= preg_replace('/^-/', '', $pkg);
+ if (preg_match('/\-$/', $pkg)){
+ $pkg= preg_replace('/\-$/', '', $pkg);
} else {
- $pkg= preg_replace('/^/', '-', $pkg);
+ $pkg= preg_replace('/$/', '-', $pkg);
}
$this->usedPackages[$id] = $pkg;
}
/******
* Delete Pkgs
******/
- if(!preg_match('/^freeze/', $this->FAIstate) && preg_match("/^remove_package_/",$name)){
- $id = @base64_decode(preg_replace("/^remove_package_(.*)_[xy]*$/","\\1",$name));
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^remove_package_/",$name)){
+ $id = @postDecode(preg_replace("/^remove_package_(.*)$/","\\1",$name));
if(isset($this->usedPackages[$id])){
unset($this->usedPackages[$id]);
}
/******
* Configure Pkgs
******/
- if(!preg_match('/^freeze/', $this->FAIstate) && preg_match("/^configure_package_/",$name)){
- $pkg = @base64_decode(preg_replace("/^configure_package_(.*)_[xy]*$/","\\1",$name));
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^configure_package_/",$name)){
+ $pkg = @postDecode(preg_replace("/^configure_package_(.*)$/","\\1",$name));
if(isset($this->usedPackages[$pkg])){
$this->is_dialog=false;
}
- /* attach new packages */
- if(isset($_POST['SaveSubObject'])) {
- if(!preg_match("/^freeze/", $this->FAIstate)){
- $this->dialog->save_object();
- if(count($this->dialog->check())){
- foreach($this->dialog->check() as $msgs){
- msg_dialog::display(_("Error"), $msgs, ERROR_DIALOG);
- }
- }else{
- $use = $this->dialog->save();
- $this->usedPackages = $use;
- $this->dialog = false;
- $this->is_dialog=false;
- ksort($this->usedPackages);
-
- /* Generate package list */
- $this->list= $this->genPkgs(TRUE);
- }
- }else{
- $this->dialog = false;
- $this->is_dialog=false;
- }
- }
-
/* Save Configuration */
if(isset($_POST['SaveObjectConfig'])){
if(!preg_match("/^freeze/", $this->FAIstate)){
* Display UI / HTML / smarty
******/
- /* Create divlist to display a list of all currently used packages
+ /* Create list to display a list of all currently used packages
*/
- $divlist = new divSelectBox("faiPackages");
-
- ksort($this->usedPackages);
+ $data = $lData = array();
if(is_array($this->usedPackages)){
- foreach($this->usedPackages as $usedName => $name){
+ foreach($this->usedPackages as $usedName => $name){
- /* Append message if package is configured */
- $configured = "<img src='images/empty.png' alt=' ' class='center'>";
- if(isset($this->ConfiguredPackages[$usedName])){
- $configured = "<img src='images/package_configure.png' alt='"._("Configured")."'
- title='"._("Configured")."' class='center'>";
- }
+ /* Append message if package is configured */
+ $configured = image('images/empty.png');
+ if(isset($this->ConfiguredPackages[$usedName])){
+ $configured = image('plugins/fai/images/package_configure.png','',_("Configured"));
+ }
- /* Adapt used name if we're marked for removal */
- $removal = "<img src='images/empty.png' alt=' ' class='center'>";
- if (preg_match('/^-/', $name)){
- $removal = "<img src='images/negate.png' alt='"._("Package marked for removal")."'
- title='"._("Package marked for removal")."' class='center'>";
- }
+ /* Adapt used name if we're marked for removal */
+ $removal = image('images/empty.png');
+ if (preg_match('/\-$/', $name)){
+ $removal = image('plugins/fai/images/removal_mark.png','',_("Package marked for removal"));
+ }
- /* Get Version */
- $version = " ";
- if(isset($this->list[$usedName]['VERSION'])){
- $version = $this->list[$usedName]['VERSION'];
- }
-
- /* Get description */
- $description = " ";
- if(isset($this->list[$usedName]['DESCRIPTION'])){
- $description = $this->list[$usedName]['DESCRIPTION'];
- }
-
- if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
- $actions = "<input type='image' class='center' title='"._("Mark package for removal")."'
- src='images/negate.png' name='removal_package_".base64_encode($usedName)."' >";
- }
- if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
- $actions.= " <input type='image' class='center' title='"._("Configure this package")."'
- src='images/package_configure.png' name='configure_package_".base64_encode($usedName)."' >";
- }
- if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
- $actions.= " <input type='image' class='center' title='"._("Remove this package")."'
- src='images/lists/trash.png' name='remove_package_".base64_encode($usedName)."' >";
- }
+ /* Get Version */
+ $version = "";
+ if(isset($this->list[$usedName]['VERSION'])){
+ $version = $this->list[$usedName]['VERSION'];
+ }
- $field1 = array("string" => $configured." ".$removal,"attach" => "style='width:40px;'");
- $field2 = array("string" => $usedName ,"attach" => "style='width:200px;'");
- $field3 = array("string" => $version);
- $field4 = array("string" => $description);
- $field5 = array("string" => $actions ,"attach" => "style='width:60px; border-right:0px;'");
- $divlist->AddEntry(array($field1,$field2,$field3,$field4,$field5));
- }
+ /* Get description */
+ $description = "";
+ if(isset($this->list[$usedName]['DESCRIPTION'])){
+ $description = base64_decode($this->list[$usedName]['DESCRIPTION']);
+ }
+
+ $actions= image('plugins/fai/images/removal_mark.png',
+ 'removal_package_'.postEncode($usedName),
+ _("Mark package for removal"));
+
+ if(isset($this->list[$usedName]['TEMPLATE']) &&
+ !preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
+ $actions.= image('plugins/fai/images/package_configure.png',
+ 'configure_package_'.postEncode($usedName),
+ _("Configure this package"));
+ }
+ if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
+ $actions.= image('images/lists/trash.png',
+ 'remove_package_'.postEncode($usedName),
+ _("Remove this package"));
+ }
+ $data[$usedName] = $usedName;
+ $lData[$usedName] = array('data'=>
+ array(
+ $configured." ".$removal,
+ $usedName ,set_post($description), $version, $actions));
+ }
}
+ $this->packageList->setAcl($this->getacl("FAIpackage",preg_match('/^freeze/', $this->FAIstate)));
+ $this->packageList->setListData($data,$lData);
+ $this->packageList->update();
/* Assign variables */
foreach($this->attributes as $attrs){
- $smarty->assign($attrs,$this->$attrs);
+ $smarty->assign($attrs,set_post($this->$attrs));
}
$smarty->assign( "FAIinstallMethods", $this->FAIinstallMethods );
foreach($tmp['plProvidedAcls'] as $name => $translated){
$smarty->assign($name."ACL",$this->getacl($name,preg_match("/freeze/",$this->FAIstate)));
}
-
- $smarty->assign("divlist",$divlist->DrawList());
+
+ $smarty->assign("freeze", preg_match("/freeze/",$this->FAIstate));
+ $smarty->assign("listing",$this->packageList->render());
$smarty->assign("release" ,$this->FAIdebianRelease);
$smarty->assign("sections",$this->sections);
$smarty->assign("section" ,$strsec);
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$release = $this->parent->parent->fai_release;
- $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $release, $this->dn);
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $this->dn);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
new log("remove","fai/".get_class($this),$use_dn,$this->attributes);
foreach($this->ConfiguredPackages as $pkgname => $attrs){
foreach($attrs as $name => $attr){
$pkgdn = "FAIvariable=".$name.",".$this->dn;
- $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $release, $pkgdn);
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $pkgdn);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
}
}
*/
if($this->is_new){
$release = $this->parent->parent->fai_release;
- $new_dn= 'cn='.$this->cn.",".get_ou('faipackageou').get_ou('faiou').$release;
+ $new_dn= 'cn='.$this->cn.",".get_ou("faiPackage", "faiPackageRDN").get_ou("faiManagement", "faiBaseRDN").$release;
$res = faiManagement::check_class_name("FAIpackageList",$this->cn,$new_dn);
if(isset($res[$this->cn])){
$message[] = msgPool::duplicated(_("Name"));
*/
function genPkgs($force = false)
{
+ if(empty($this->FAIdebianRelease)) return;
+
if(!count($this->buffer) || $force){
$q = new gosaSupportDaemon();
- $attrs = array("distribution", "package","version", "section", "description", "timestamp");
+ $attrs = array("distribution", "package","version", "section", "description", "timestamp","template");
$packages = array_keys($this->usedPackages);
if($this->FAIdebianRelease == "ClearFromCopyPaste"){
$current_release = $this->parent->parent->fai_release;
- $tmp= preg_replace('/,'.normalizePreg(get_ou('faiou')).'.*$/', '', $current_release);
+ $tmp= preg_replace('/,'.preg_quote(get_ou("faiManagement", "faiBaseRDN"), '/').'.*$/i', '', $current_release);
$tmp= preg_replace('/ou=/', '', $tmp);
- $rev= array_reverse(split(',', $tmp));
+ $rev= array_reverse(explode(',', $tmp));
$this->FAIdebianRelease= "";
foreach ($rev as $part){
$this->FAIdebianRelease.= "/$part";
/* Tag object */
$this->tag_attrs($pkgattrs, $pkgdn, $this->gosaUnitTag);
- if(in_array($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){
+ if(in_array_strict($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){
if($pkgattrs['FAIvariableType'] == "text" && $pkgattrs['FAIvariableContent'] == ""){
gosa_log("Skipped saving FAIvariable '$name' empty string can't be saved.");
"plPriority" => 28,
"plSection" => array("administration"),
"plCategory" => array("fai"),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "faiPackageRDN",
+ "type" => "rdn",
+ "default" => "ou=packages,",
+ "description" => _("RDN for FAI package storage."),
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "migrate_faiPackageRDN",
+ "group" => "plugin",
+ "mandatory" => TRUE)),
+
"plProvidedAcls" => array(
"cn" => _("Name"),
"description" => _("Description"),
"FAIpackage" => _("Packages"),
- "FAIdebianSection" => _("Section")." ("._("Readonly").")",
+ "FAIdebianSection" => _("Section")." ("._("Read-only").")",
"FAIinstallMethod" => _("Install Method"),
"FAIdebconfInfo" => _("Package configuration"),
- "FAIdebianRelease" => _("Release")." ("._("Readonly").")")
+ "FAIdebianRelease" => _("Release")." ("._("Read-only").")")
));
}
$tmp['Type'] = $attr['FAIvariableType'][0];
if (isset($attr['FAIvariableContent'][0])){
- if(!in_array($attr['FAIvariableType'],array("multiselect"))){
+ if(!in_array_strict($attr['FAIvariableType'],array("multiselect"))){
$tmp['Value'] = $attr['FAIvariableContent'][0];
}else{
$content = array();
if(isset($attrs['FAIrepository'])){
for($i =0 ; $i < $attrs['FAIrepository']['count']; $i++){
$obj = $attrs['FAIrepository'][$i];
- $tmp = split("\|",$obj);
+ $tmp = explode("|",$obj);
if(count($tmp)==4){
- foreach(split(",",$tmp[3]) as $sec){
+ foreach(explode(",",$tmp[3]) as $sec){
if(!empty($sec)){
$ret[$tmp[2]][] = $sec;
}
{
$vars = array("cn");
$smarty = get_smarty();
- $smarty->assign("cn", htmlentities($this->cn));
+ $smarty->assign("cn", set_post($this->cn));
$str = $smarty->fetch(get_template_path("paste_generic.tpl",TRUE));
$ret = array();
$ret['string'] = $str;