R53020 - in /branches/14.2/setup: ./ admin_account.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 53020

URL: http://svn.stylite.de/viewvc/egroupware?rev=53020&view=rev
Log:
also give Admins apps of all users group Defaults, in case one forgot to add admins to it

Modified:
branches/14.2/setup/ (props changed)
branches/14.2/setup/admin_account.php

Propchange: branches/14.2/setup/

— svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 1 09:25:38 2015
@@ -1,1 +1,1 @@
-/trunk/setup:51812,52135,52360,52747,52912
+/trunk/setup:51812,52135,52360,52747,52912,53019

Modified: branches/14.2/setup/admin_account.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/setup/admin_account.php?rev=53020&r1=53019&r2=53020&view=diff

— branches/14.2/setup/admin_account.php (original)
+++ branches/14.2/setup/admin_account.php Wed Jul 1 09:25:38 2015
@@ -113,7 +113,7 @@
// remove accounts from addressbook
$GLOBALS[‘egw_setup’]->db->delete(‘egw_addressbook’,‘account_id IS NOT NULL’,LINE,FILE);
}

  • /* Create the demo groups */
  • // create our stock groups: Default (all users) and Admins (administrators)
    $defaultgroupid = (int)$GLOBALS[‘egw_setup’]->add_account(‘Default’,‘Default’,‘Group’,False,False);
    $admingroupid = (int)$GLOBALS[‘egw_setup’]->add_account(‘Admins’,‘Admin’,‘Group’,False,False);

@@ -130,7 +130,8 @@
}

// Group perms for the default group
  • $GLOBALS[‘egw_setup’]->add_acl(array(‘addressbook’,‘calendar’,‘infolog’,‘mail’,‘filemanager’,‘preferences’,‘manual’,‘groupdav’,‘notifications’,‘timesheet’,‘importexport’,‘activesync’),‘run’,$defaultgroupid);

  • $default_group_apps = karray(‘addressbook’,‘calendar’,‘infolog’,‘mail’,‘filemanager’,‘preferences’,‘manual’,‘groupdav’,‘notifications’,‘timesheet’,‘importexport’,‘activesync’);

  • $GLOBALS[‘egw_setup’]->add_acl($default_group_apps,‘run’,$defaultgroupid);

    $apps = array();
    foreach($GLOBALS[‘egw_setup’]->db->select($GLOBALS[‘egw_setup’]->applications_table,‘app_name’,‘app_enabled < 3’,LINE,FILE) as $row)
    @@ -141,7 +142,10 @@
    // not yet set for the default group or development only apps like (etemplate, jinn, tt’s)
    if (!$_POST[‘admin_all_apps’])
    {

  •   $apps = array_intersect(array('admin','bookmarks','emailadmin','news_admin','phpbrain','phpsysinfo','phpfreechat','projectmanager','resources','sitemgr','timesheet','tracker','wiki'),$apps);

  •   $apps = array_intersect(

  •   	// also give Admins apps of all users group Defaults, in case one forgot to add admins to it

  •   	array_unique(array_merge($default_group_apps,

  •   		array('admin','bookmarks','emailadmin','news_admin','phpbrain','phpsysinfo','phpfreechat','projectmanager','resources','sitemgr','timesheet','tracker','wiki'))),$apps);
    }
    $GLOBALS[‘egw_setup’]->add_acl($apps,‘run’,$admingroupid);

Don’t Limit Your Business. Reach for the Cloud.
GigeNET’s Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs