From 40dd6251395bb094db3098eddc3a1a5fc6a96ec3 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 Apr 2008 13:05:31 +0000 Subject: [PATCH] 1.4.004 FCKeditor update (2.6) & security release --- doc/rpm-build/egroupware-1.4.spec | 43 +++++++++++++++------------- phpgwapi/setup/setup.inc.php | 4 +-- phpgwapi/setup/tables_update.inc.php | 43 ++++++++++++++++------------ 3 files changed, 50 insertions(+), 40 deletions(-) diff --git a/doc/rpm-build/egroupware-1.4.spec b/doc/rpm-build/egroupware-1.4.spec index 54d766a34a..a7d6504283 100644 --- a/doc/rpm-build/egroupware-1.4.spec +++ b/doc/rpm-build/egroupware-1.4.spec @@ -1,7 +1,7 @@ %define packagename eGroupWare %define egwdirname egroupware %define egwversion 1.4 -%define packaging 003 +%define packaging 004 #%define epoch 1 %if 0%{?suse_version} %define httpdroot /srv/www/htdocs @@ -9,7 +9,7 @@ %define source5 egroupware_suse.tar.bz2 %define distribution SUSE Linux %{?suse_version} %define php php5 - %define extra_requires apache2-mod_php5 + %define extra_requires apache2-mod_php5 %define cron cron %endif %if 0%{?fedora_version} @@ -29,7 +29,7 @@ %define source5 egroupware_fedora.tar.bz2 %define distribution Mandriva %{?mandriva_version} %define php php - %define extra_requires httpd + %define extra_requires httpd %define cron crontabs %endif %if 0%{?rhel_version} @@ -89,7 +89,7 @@ Release: #Epoch: %{epoch} Summary: eGroupWare is a web-based groupware suite written in php. Distribution: %{distribution} - + Group: Web/Database License: GPL/LGPL 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} 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} - + Prefix: /usr/share Buildarch: noarch AutoReqProv: no - + Vendor: eGroupWare Packager: Ralf Becker %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: -egroupware core with: admin, api, docs, etemplate, prefereces and setup, -addressbook, bookmarks, calendar, translation-tools, emailadmin, felamimail, -filemanager, infolog, manual, mydms, news admin, knowledgebase, polls, +egroupware core with: admin, api, docs, etemplate, prefereces and setup, +addressbook, bookmarks, calendar, translation-tools, emailadmin, felamimail, +filemanager, infolog, manual, mydms, news admin, knowledgebase, polls, 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. @@ -150,7 +150,7 @@ Provides: egw-%{addressbook} %description %{addressbook} Contact manager with Vcard support. %{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. %package %{bookmarks} @@ -170,7 +170,7 @@ Conflicts: %{packagename} AutoReqProv: no Requires: egw-core = %{egwversion}.%{packaging} %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. %package %{developer_tools} @@ -181,8 +181,8 @@ Conflicts: %{packagename} AutoReqProv: no Requires: egw-core = %{egwversion}.%{packaging} %description %{developer_tools} -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. +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. %package egw-pear Version: %{egwversion}.%{packaging} @@ -203,7 +203,7 @@ Conflicts: %{packagename} AutoReqProv: no Requires: egw-core = %{egwversion}.%{packaging}, %{packagename}-egw-pear = %{egwversion}.%{packaging}, php-openssl %description %{emailadmin} -EmailAdmin allow to maintain User email accounts +EmailAdmin allow to maintain User email accounts %package %{felamimail} Version: %{egwversion}.%{packaging} @@ -240,7 +240,7 @@ Version: %{egwversion}.%{packaging} Summary: The eGroupWare %{icalsrv} application Group: Web/Database AutoReqProv: no -Requires: egw-core = %{egwversion}.%{packaging} +Requires: egw-core = %{egwversion}.%{packaging} %description %{icalsrv} This is the %{icalsrv} app for eGroupWare. @@ -299,7 +299,7 @@ Summary: The eGroupWare %{news_admin} application Group: Web/Database Conflicts: %{packagename} AutoReqProv: no -Requires: egw-core = %{egwversion}.%{packaging} +Requires: egw-core = %{egwversion}.%{packaging} %description %{news_admin} This is the %{news_admin} app for eGroupWare. @@ -309,7 +309,7 @@ Summary: The eGroupWare %{notifications} application Group: Web/Database Conflicts: %{packagename} AutoReqProv: no -Requires: egw-core = %{egwversion}.%{packaging} +Requires: egw-core = %{egwversion}.%{packaging} %description %{notifications} This is the %{notifications} app for eGroupWare. @@ -414,7 +414,7 @@ AutoReqProv: no Requires: egw-core = %{egwversion}.%{packaging} %description %{timesheet} 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. %package %{tracker} @@ -734,6 +734,9 @@ ln -s sitemgr/sitemgr-link %changelog +* Mon Apr 15 2008 Ralf Becker 1.4.004 +- eGroupWare 1.4.004 FCKeditor update (2.6) & security release + * Mon Mar 19 2008 Ralf Becker 1.4.003 - eGroupWare 1.4.003 security & maintainace release diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php index 399a81ea41..715a1628d0 100755 --- a/phpgwapi/setup/setup.inc.php +++ b/phpgwapi/setup/setup.inc.php @@ -14,7 +14,7 @@ /* Basic information about this app */ $setup_info['phpgwapi']['name'] = 'phpgwapi'; $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']['enable'] = 3; $setup_info['phpgwapi']['app_order'] = 1; @@ -61,7 +61,7 @@ $setup_info['phpgwapi']['hooks']['addgroup'] = 'phpgwapi.vfs_home.addGroup'; $setup_info['phpgwapi']['hooks']['deletegroup'] = 'phpgwapi.vfs_home.deleteGroup'; $setup_info['phpgwapi']['hooks']['editgroup'] = 'phpgwapi.vfs_home.editGroup'; - + /* Basic information about this app */ $setup_info['notifywindow']['name'] = 'notifywindow'; $setup_info['notifywindow']['title'] = 'Notify Window'; diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index e341862e87..632472c4c7 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -24,7 +24,7 @@ { return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.001'; } - + $test[] = '1.2.008'; function phpgwapi_upgrade1_2_008() { @@ -80,14 +80,14 @@ // 6. 1.2 bugfix-release return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004'; } - + $test[] = '1.2.107'; function phpgwapi_upgrade1_2_107() { // 1.2.107 security update return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.004'; } - + // updates in HEAD / 1.3 $test[] = '1.3.001'; function phpgwapi_upgrade1_3_001() @@ -97,7 +97,7 @@ return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.002'; } - + $test[] = '1.3.002'; function phpgwapi_upgrade1_3_002() { @@ -108,7 +108,7 @@ { echo "
\ninitiating to create the default type 'contact' for addressbook"; } - + $newconf = array('n' => array( 'name' => 'contact', 'options' => array( @@ -122,7 +122,7 @@ echo " DONE!"; } /*************************************************************************/ - + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.003'; } @@ -202,11 +202,11 @@ $sri = ldap_search($ds,$context,'(objectclass=phpgwaccount)', array_merge(array('gidnumber','objectclass'),$phpgwAccountAttributes)); - + foreach(ldap_get_entries($ds, $sri) as $key => $entry) { if ($key === 'count') continue; - + // remove the phpgwAccounts objectclass $objectclass = $entry['objectclass']; unset($objectclass['count']); @@ -233,9 +233,9 @@ // store the important values of the phpgwaccount schema in the shadowAccount schema if (!$entry['phpgwaccountstatus'][0] || $entry['phpgwaccountexpires'][0] != -1) { - $to_write['shadowexpire'] = $entry['phpgwaccountexpires'][0] != -1 && - ($entry['phpgwaccountstatus'][0] || - !$entry['phpgwaccountstatus'][0] && $entry['phpgwaccountexpires'][0] < time()) ? + $to_write['shadowexpire'] = $entry['phpgwaccountexpires'][0] != -1 && + ($entry['phpgwaccountstatus'][0] || + !$entry['phpgwaccountstatus'][0] && $entry['phpgwaccountexpires'][0] < time()) ? $entry['phpgwaccountexpires'][0] / (24*3600) : 0; } if ($entry['phpgwlastpasswdchange'][0]) @@ -260,12 +260,12 @@ /** * 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, * 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+: * - access --> private (already done by Ralf) * - tel_msg --> tel_assistent @@ -418,7 +418,7 @@ " OR contact_value='' OR contact_value IS NULL". ($db2->capabilities['subqueries'] ? " OR contact_id NOT IN (SELECT contact_id FROM egw_addressbook)" : ''), __LINE__,__FILE__); - + // change the m/d/Y birthday format to Y-m-d $GLOBALS['egw_setup']->db->select('egw_addressbook','contact_id,contact_bday',"contact_bday != ''", __LINE__,__FILE__); @@ -603,7 +603,7 @@ 'acl_appname' => 'preferences', 'acl_location' => 'changepassword', ),__LINE__,__FILE__); - + // set the acl now for everyone NOT allowed to change the password foreach(array_diff($accounts,$change_passwd_acls) as $account_id) { @@ -638,7 +638,7 @@ 'precision' => '4' )); $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); return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.3.011'; @@ -820,3 +820,10 @@ // 1.4.003 security+bugfix release 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'; + }