holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.4.004 FCKeditor update (2.6) & security release

Browse Source
This commit is contained in:
Ralf Becker 2008-04-15 13:05:31 +00:00
parent 81a955b8a4
commit 40dd625139
3 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
doc/rpm-build/egroupware-1.4.spec
View File

@ -1,7 +1,7 @@
%define packagename eGroupWare %define packagename eGroupWare
%define egwdirname egroupware %define egwdirname egroupware
%define egwversion 1.4 %define egwversion 1.4
%define packaging 003 %define packaging 004
#%define epoch 1 #%define epoch 1
%if 0%{?suse_version} %if 0%{?suse_version}
%define httpdroot /srv/www/htdocs %define httpdroot /srv/www/htdocs
@ -9,7 +9,7 @@
%define source5 egroupware_suse.tar.bz2 %define source5 egroupware_suse.tar.bz2
%define distribution SUSE Linux %{?suse_version} %define distribution SUSE Linux %{?suse_version}
%define php php5 %define php php5
%define extra_requires apache2-mod_php5 %define extra_requires apache2-mod_php5
%define cron cron %define cron cron
%endif %endif
%if 0%{?fedora_version} %if 0%{?fedora_version}
@ -29,7 +29,7 @@
%define source5 egroupware_fedora.tar.bz2 %define source5 egroupware_fedora.tar.bz2
%define distribution Mandriva %{?mandriva_version} %define distribution Mandriva %{?mandriva_version}
%define php php %define php php
%define extra_requires httpd %define extra_requires httpd
%define cron crontabs %define cron crontabs
%endif %endif
%if 0%{?rhel_version} %if 0%{?rhel_version}
@ -89,7 +89,7 @@ Release:
#Epoch: %{epoch} #Epoch: %{epoch}
Summary: eGroupWare is a web-based groupware suite written in php. Summary: eGroupWare is a web-based groupware suite written in php.
Distribution: %{distribution} Distribution: %{distribution}
Group: Web/Database Group: Web/Database
License: GPL/LGPL License: GPL/LGPL
URL: http://www.egroupware.org/ URL: http://www.egroupware.org/
@ -105,25 +105,25 @@ Requires: %{php} %{php}-mbstring %{php}-imap %{php}-gd %{php}-pear %{extra_requi
Provides: egw-core egw-%{addressbook} egw-%{etemplate} Provides: egw-core egw-%{addressbook} egw-%{etemplate}
Conflicts: %{packagename}-core %{packagename}-%{addressbook} %{packagename}-%{bookmarks} %{packagename}-%{calendar} %{packagename}-%{developer_tools} %{packagename}-%{emailadmin} %{packagename}-%{felamimail} %{packagename}-%{filemanager} %{packagename}-%{icalsrv} %{packagename}-%{infolog} %{packagename}-%{importexport} %{packagename}-%{manual} %{packagename}-%{mydms} %{packagename}-%{news_admin} %{packagename}-%{notifications} %{packagename}-%{phpbrain} %{packagename}-%{polls} %{packagename}-%{projectmanager} %{packagename}-%{registration} %{packagename}-%{resources} %{packagename}-%{sambaadmin} %{packagename}-%{sitemgr} %{packagename}-%{syncml} %{packagename}-%{timesheet} %{packagename}-%{wiki} Conflicts: %{packagename}-core %{packagename}-%{addressbook} %{packagename}-%{bookmarks} %{packagename}-%{calendar} %{packagename}-%{developer_tools} %{packagename}-%{emailadmin} %{packagename}-%{felamimail} %{packagename}-%{filemanager} %{packagename}-%{icalsrv} %{packagename}-%{infolog} %{packagename}-%{importexport} %{packagename}-%{manual} %{packagename}-%{mydms} %{packagename}-%{news_admin} %{packagename}-%{notifications} %{packagename}-%{phpbrain} %{packagename}-%{polls} %{packagename}-%{projectmanager} %{packagename}-%{registration} %{packagename}-%{resources} %{packagename}-%{sambaadmin} %{packagename}-%{sitemgr} %{packagename}-%{syncml} %{packagename}-%{timesheet} %{packagename}-%{wiki}
Obsoletes: %{packagename}-%{icalsrv} Obsoletes: %{packagename}-%{icalsrv}
Prefix: /usr/share Prefix: /usr/share
Buildarch: noarch Buildarch: noarch
AutoReqProv: no AutoReqProv: no
Vendor: eGroupWare Vendor: eGroupWare
Packager: Ralf Becker <RalfBecker@outdoor-training.de> Packager: Ralf Becker <RalfBecker@outdoor-training.de>
%description %description
eGroupWare is a web-based groupware suite written in PHP. eGroupWare is a web-based groupware suite written in PHP.
This package provides the eGroupWare default applications: This package provides the eGroupWare default applications:
egroupware core with: admin, api, docs, etemplate, prefereces and setup, egroupware core with: admin, api, docs, etemplate, prefereces and setup,
addressbook, bookmarks, calendar, translation-tools, emailadmin, felamimail, addressbook, bookmarks, calendar, translation-tools, emailadmin, felamimail,
filemanager, infolog, manual, mydms, news admin, knowledgebase, polls, filemanager, infolog, manual, mydms, news admin, knowledgebase, polls,
projectmanager, resources, sambaadmin, sitemgr, syncml, timesheet, tracker, wiki projectmanager, resources, sambaadmin, sitemgr, syncml, timesheet, tracker, wiki
It also provides an API for developing additional applications. It also provides an API for developing additional applications.
Further contributed applications are avalible in single packages. Further contributed applications are avalible in single packages.
@ -150,7 +150,7 @@ Provides: egw-%{addressbook}
%description %{addressbook} %description %{addressbook}
Contact manager with Vcard support. Contact manager with Vcard support.
%{addressbook} is the egroupware default contact application. %{addressbook} is the egroupware default contact application.
It makes use of the egroupware contacts class to store and retrieve It makes use of the egroupware contacts class to store and retrieve
contact information via SQL, LDAP or Active Directory. contact information via SQL, LDAP or Active Directory.
%package %{bookmarks} %package %{bookmarks}
@ -170,7 +170,7 @@ Conflicts: %{packagename}
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{calendar} %description %{calendar}
Powerful calendar with meeting request system, Alarms, ICal and E-Mail support, Powerful calendar with meeting request system, Alarms, ICal and E-Mail support,
and ACL security. and ACL security.
%package %{developer_tools} %package %{developer_tools}
@ -181,8 +181,8 @@ Conflicts: %{packagename}
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{developer_tools} %description %{developer_tools}
The TranslationTools allow to create and extend translations-files for eGroupWare. The TranslationTools allow to create and extend translations-files for eGroupWare.
They can search the sources for new / added phrases and show you the ones missing in your language. They can search the sources for new / added phrases and show you the ones missing in your language.
%package egw-pear %package egw-pear
Version: %{egwversion}.%{packaging} Version: %{egwversion}.%{packaging}
@ -203,7 +203,7 @@ Conflicts: %{packagename}
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging}, %{packagename}-egw-pear = %{egwversion}.%{packaging}, php-openssl Requires: egw-core = %{egwversion}.%{packaging}, %{packagename}-egw-pear = %{egwversion}.%{packaging}, php-openssl
%description %{emailadmin} %description %{emailadmin}
EmailAdmin allow to maintain User email accounts EmailAdmin allow to maintain User email accounts
%package %{felamimail} %package %{felamimail}
Version: %{egwversion}.%{packaging} Version: %{egwversion}.%{packaging}
@ -240,7 +240,7 @@ Version: %{egwversion}.%{packaging}
Summary: The eGroupWare %{icalsrv} application Summary: The eGroupWare %{icalsrv} application
Group: Web/Database Group: Web/Database
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{icalsrv} %description %{icalsrv}
This is the %{icalsrv} app for eGroupWare. This is the %{icalsrv} app for eGroupWare.
@ -299,7 +299,7 @@ Summary: The eGroupWare %{news_admin} application
Group: Web/Database Group: Web/Database
Conflicts: %{packagename} Conflicts: %{packagename}
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{news_admin} %description %{news_admin}
This is the %{news_admin} app for eGroupWare. This is the %{news_admin} app for eGroupWare.
@ -309,7 +309,7 @@ Summary: The eGroupWare %{notifications} application
Group: Web/Database Group: Web/Database
Conflicts: %{packagename} Conflicts: %{packagename}
AutoReqProv: no AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{notifications} %description %{notifications}
This is the %{notifications} app for eGroupWare. This is the %{notifications} app for eGroupWare.
@ -414,7 +414,7 @@ AutoReqProv: no
Requires: egw-core = %{egwversion}.%{packaging} Requires: egw-core = %{egwversion}.%{packaging}
%description %{timesheet} %description %{timesheet}
Simple timesheet application, which allow to record and report Simple timesheet application, which allow to record and report
the times and other expenses. It can be uses as well standalone the times and other expenses. It can be uses as well standalone
as together with the ProjectManager application. as together with the ProjectManager application.
%package %{tracker} %package %{tracker}
@ -734,6 +734,9 @@ ln -s sitemgr/sitemgr-link
%changelog %changelog
* Mon Apr 15 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.4.004
- eGroupWare 1.4.004 FCKeditor update (2.6) & security release
* Mon Mar 19 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.4.003 * Mon Mar 19 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.4.003
- eGroupWare 1.4.003 security & maintainace release - eGroupWare 1.4.003 security & maintainace release

4
phpgwapi/setup/setup.inc.php
View File

@ -14,7 +14,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'eGroupWare API'; $setup_info['phpgwapi']['title'] = 'eGroupWare API';
$setup_info['phpgwapi']['version'] = '1.4.003'; $setup_info['phpgwapi']['version'] = '1.4.004';
$setup_info['phpgwapi']['versions']['current_header'] = '1.28'; $setup_info['phpgwapi']['versions']['current_header'] = '1.28';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;
@ -61,7 +61,7 @@
$setup_info['phpgwapi']['hooks']['addgroup'] = 'phpgwapi.vfs_home.addGroup'; $setup_info['phpgwapi']['hooks']['addgroup'] = 'phpgwapi.vfs_home.addGroup';
$setup_info['phpgwapi']['hooks']['deletegroup'] = 'phpgwapi.vfs_home.deleteGroup'; $setup_info['phpgwapi']['hooks']['deletegroup'] = 'phpgwapi.vfs_home.deleteGroup';
$setup_info['phpgwapi']['hooks']['editgroup'] = 'phpgwapi.vfs_home.editGroup'; $setup_info['phpgwapi']['hooks']['editgroup'] = 'phpgwapi.vfs_home.editGroup';
/* Basic information about this app */ /* Basic information about this app */
$setup_info['notifywindow']['name'] = 'notifywindow'; $setup_info['notifywindow']['name'] = 'notifywindow';
$setup_info['notifywindow']['title'] = 'Notify Window'; $setup_info['notifywindow']['title'] = 'Notify Window';

43
phpgwapi/setup/tables_update.inc.php
View File

@ -24,7 +24,7 @@
{ {
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.001'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.001';
} }
$test[] = '1.2.008'; $test[] = '1.2.008';
function phpgwapi_upgrade1_2_008() function phpgwapi_upgrade1_2_008()
{ {
@ -80,14 +80,14 @@
// 6. 1.2 bugfix-release // 6. 1.2 bugfix-release
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004';
} }
$test[] = '1.2.107'; $test[] = '1.2.107';
function phpgwapi_upgrade1_2_107() function phpgwapi_upgrade1_2_107()
{ {
// 1.2.107 security update // 1.2.107 security update
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004';
} }
// updates in HEAD / 1.3 // updates in HEAD / 1.3
$test[] = '1.3.001'; $test[] = '1.3.001';
function phpgwapi_upgrade1_3_001() function phpgwapi_upgrade1_3_001()
@ -97,7 +97,7 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.002'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.002';
} }
$test[] = '1.3.002'; $test[] = '1.3.002';
function phpgwapi_upgrade1_3_002() function phpgwapi_upgrade1_3_002()
{ {
@ -108,7 +108,7 @@
{ {
echo "<br>\n<b>initiating to create the default type 'contact' for addressbook"; echo "<br>\n<b>initiating to create the default type 'contact' for addressbook";
} }
$newconf = array('n' => array( $newconf = array('n' => array(
'name' => 'contact', 'name' => 'contact',
'options' => array( 'options' => array(
@ -122,7 +122,7 @@
echo " DONE!</b>"; echo " DONE!</b>";
} }
/*************************************************************************/ /*************************************************************************/
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.003'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.003';
} }
@ -202,11 +202,11 @@
$sri = ldap_search($ds,$context,'(objectclass=phpgwaccount)', $sri = ldap_search($ds,$context,'(objectclass=phpgwaccount)',
array_merge(array('gidnumber','objectclass'),$phpgwAccountAttributes)); array_merge(array('gidnumber','objectclass'),$phpgwAccountAttributes));
foreach(ldap_get_entries($ds, $sri) as $key => $entry) foreach(ldap_get_entries($ds, $sri) as $key => $entry)
{ {
if ($key === 'count') continue; if ($key === 'count') continue;
// remove the phpgwAccounts objectclass // remove the phpgwAccounts objectclass
$objectclass = $entry['objectclass']; $objectclass = $entry['objectclass'];
unset($objectclass['count']); unset($objectclass['count']);
@ -233,9 +233,9 @@
// store the important values of the phpgwaccount schema in the shadowAccount schema // store the important values of the phpgwaccount schema in the shadowAccount schema
if (!$entry['phpgwaccountstatus'][0] || $entry['phpgwaccountexpires'][0] != -1) if (!$entry['phpgwaccountstatus'][0] || $entry['phpgwaccountexpires'][0] != -1)
{ {
$to_write['shadowexpire'] = $entry['phpgwaccountexpires'][0] != -1 && $to_write['shadowexpire'] = $entry['phpgwaccountexpires'][0] != -1 &&
($entry['phpgwaccountstatus'][0] || ($entry['phpgwaccountstatus'][0] ||
!$entry['phpgwaccountstatus'][0] && $entry['phpgwaccountexpires'][0] < time()) ? !$entry['phpgwaccountstatus'][0] && $entry['phpgwaccountexpires'][0] < time()) ?
$entry['phpgwaccountexpires'][0] / (24*3600) : 0; $entry['phpgwaccountexpires'][0] / (24*3600) : 0;
} }
if ($entry['phpgwlastpasswdchange'][0]) if ($entry['phpgwlastpasswdchange'][0])
@ -260,12 +260,12 @@
/** /**
* Updates the addressbook table to the new addressbook in 1.3 * Updates the addressbook table to the new addressbook in 1.3
* *
* The addressbook table was moved to the addressbook, but has to be moved back, * The addressbook table was moved to the addressbook, but has to be moved back,
* as the addressdata of the accounts is no stored only in the addressbook! * as the addressdata of the accounts is no stored only in the addressbook!
* *
* It is called, if needed, from phpgwap_upgrade1_3_007 function * It is called, if needed, from phpgwap_upgrade1_3_007 function
* *
* + changes / renamed fields in 1.3+: * + changes / renamed fields in 1.3+:
* - access --> private (already done by Ralf) * - access --> private (already done by Ralf)
* - tel_msg --> tel_assistent * - tel_msg --> tel_assistent
@ -418,7 +418,7 @@
" OR contact_value='' OR contact_value IS NULL". " OR contact_value='' OR contact_value IS NULL".
($db2->capabilities['subqueries'] ? " OR contact_id NOT IN (SELECT contact_id FROM egw_addressbook)" : ''), ($db2->capabilities['subqueries'] ? " OR contact_id NOT IN (SELECT contact_id FROM egw_addressbook)" : ''),
__LINE__,__FILE__); __LINE__,__FILE__);
// change the m/d/Y birthday format to Y-m-d // change the m/d/Y birthday format to Y-m-d
$GLOBALS['egw_setup']->db->select('egw_addressbook','contact_id,contact_bday',"contact_bday != ''", $GLOBALS['egw_setup']->db->select('egw_addressbook','contact_id,contact_bday',"contact_bday != ''",
__LINE__,__FILE__); __LINE__,__FILE__);
@ -603,7 +603,7 @@
'acl_appname' => 'preferences', 'acl_appname' => 'preferences',
'acl_location' => 'changepassword', 'acl_location' => 'changepassword',
),__LINE__,__FILE__); ),__LINE__,__FILE__);
// set the acl now for everyone NOT allowed to change the password // set the acl now for everyone NOT allowed to change the password
foreach(array_diff($accounts,$change_passwd_acls) as $account_id) foreach(array_diff($accounts,$change_passwd_acls) as $account_id)
{ {
@ -638,7 +638,7 @@
'precision' => '4' 'precision' => '4'
)); ));
$GLOBALS['egw_setup']->db->query('UPDATE egw_addressbook SET account_id=NULL WHERE account_id=0',__LINE__,__FILE__); $GLOBALS['egw_setup']->db->query('UPDATE egw_addressbook SET account_id=NULL WHERE account_id=0',__LINE__,__FILE__);
$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook',array('account_id'),true); $GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook',array('account_id'),true);
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.011'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.011';
@ -820,3 +820,10 @@
// 1.4.003 security+bugfix release // 1.4.003 security+bugfix release
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.4.003'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.4.003';
} }
$test[] = '1.4.003';
function phpgwapi_upgrade1_4_003()
{
// 1.4.004 FCKeditor update+security release
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.4.004';
}