diff --git a/java/sync/debian/control b/java/sync/debian/control index 1d8822718b..753e3cca49 100644 --- a/java/sync/debian/control +++ b/java/sync/debian/control @@ -20,7 +20,7 @@ Description: synchronization application for Open Business Management Package: obm-locator Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}), openssl +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl, insserv Description: Locator for Open Business Management This package is a J2E web service, which allows can be queried to retrieve the location of an OBM component. @@ -32,7 +32,7 @@ Description: Locator for Open Business Management Package: obm-provisioning Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: Provisioning API for Open Business Management This package is an HTTP web service, which can be queried to provision an OBM server. @@ -68,7 +68,7 @@ Description: Tomcat common libs for Open Business Management Package: obm-imap-archive Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: OBM component that perform email archiving obm-imap-archive is a http server exposing webservices to perform email archiving. . diff --git a/java/sync/debian/obm-imap-archive.init b/java/sync/debian/obm-imap-archive.init index 40b1e99cc0..1ec33c85bf 100755 --- a/java/sync/debian/obm-imap-archive.init +++ b/java/sync/debian/obm-imap-archive.init @@ -43,7 +43,14 @@ if [ -z "$APP_PORT" ]; then APP_PORT=8085 fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi if [ ! -d "$TMP_DIR" ]; then diff --git a/java/sync/debian/obm-provisioning.init b/java/sync/debian/obm-provisioning.init index a10ae65e9b..72fd5699bc 100755 --- a/java/sync/debian/obm-provisioning.init +++ b/java/sync/debian/obm-provisioning.init @@ -55,7 +55,14 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi # Timeout in seconds for the shutdown of all webapps diff --git a/java/sync/obm-locator/obm-locator.debian.sh b/java/sync/obm-locator/obm-locator.debian.sh index bd84180be1..54d89c0fc5 100755 --- a/java/sync/obm-locator/obm-locator.debian.sh +++ b/java/sync/obm-locator/obm-locator.debian.sh @@ -56,7 +56,14 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi # Timeout in seconds for the shutdown of all webapps diff --git a/java/tomcat/debian/control b/java/tomcat/debian/control index 75f8dec1cf..9d0aae92d0 100644 --- a/java/tomcat/debian/control +++ b/java/tomcat/debian/control @@ -10,7 +10,7 @@ Homepage: http://www.obm.org Package: obm-tomcat Architecture: all -Depends: openjdk-7-jre-headless, libapr1, ${misc:Depends} +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, libapr1, ${misc:Depends} Description: the Tomcat web application server for Open Business Management This package contains the 6.0.20 version of the Apache Tomcat application server for OBM. diff --git a/java/tomcat/debian/obm-tomcat.init b/java/tomcat/debian/obm-tomcat.init index 274e462405..29c980cc83 100644 --- a/java/tomcat/debian/obm-tomcat.init +++ b/java/tomcat/debian/obm-tomcat.init @@ -34,9 +34,15 @@ fi if [ -r /etc/default/rcS ]; then . /etc/default/rcS fi - if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi if [ -z "$SHUTDOWN_TIMEOUT" ]; then SHUTDOWN_TIMEOUT=10 diff --git a/satellite/debian/control b/satellite/debian/control index fdc4beed4e..01aaa3ee95 100644 --- a/satellite/debian/control +++ b/satellite/debian/control @@ -22,7 +22,7 @@ Description: integration of OBM with Cyrus and Postfix Package: libobmsatellite-perl Section: perl Architecture: all -Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, ${perl:Depends}, ${misc:Depends} +Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, libhttp-daemon-perl, ${perl:Depends}, ${misc:Depends} Description: library for the integration of OBM with Cyrus and Postfix This package contains the library used by obm-satellite to interact with Cyrus and Postfix. diff --git a/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm b/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm index fdce3bbdb5..797fa3e794 100644 --- a/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm +++ b/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm @@ -132,7 +132,13 @@ sub get { # Add authentication headers $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} ); - my $ua = LWP::UserAgent->new(); + my $ua = LWP::UserAgent->new( + ssl_opts => { + verify_hostname => 0, + SSL_verify_mode => 0 + } + ); + if( !$ua ) { $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 ); return 1; @@ -177,7 +183,12 @@ sub post { # Add authentication headers $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} ); - my $ua = LWP::UserAgent->new(); + my $ua = LWP::UserAgent->new( + ssl_opts => { + verify_hostname => 0, + SSL_verify_mode => 0 + } + ); if( !$ua ) { $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 ); return 1; diff --git a/ui/conf/hooks/user/mailchooser.inc.sample b/ui/conf/hooks/user/mailchooser.inc.sample index 47ba9aa5a5..d6878ab119 100644 --- a/ui/conf/hooks/user/mailchooser.inc.sample +++ b/ui/conf/hooks/user/mailchooser.inc.sample @@ -1,4 +1,3 @@ - + +?> diff --git a/ui/conf/webmail.inc.php.sample b/ui/conf/webmail.inc.php.sample index 189bd26014..b85991beda 100644 --- a/ui/conf/webmail.inc.php.sample +++ b/ui/conf/webmail.inc.php.sample @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/javascript/check_js.inc b/ui/obminclude/javascript/check_js.inc index 30f3dfebdf..2d5e006ee0 100644 --- a/ui/obminclude/javascript/check_js.inc +++ b/ui/obminclude/javascript/check_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/lang/en/account.inc b/ui/obminclude/lang/en/account.inc index a7e5569118..db72bae41e 100644 --- a/ui/obminclude/lang/en/account.inc +++ b/ui/obminclude/lang/en/account.inc @@ -1,4 +1,4 @@ - diff --git a/ui/obminclude/lang/fr/tools.inc b/ui/obminclude/lang/fr/tools.inc index b5aa550fd5..a5e75fed4a 100644 --- a/ui/obminclude/lang/fr/tools.inc +++ b/ui/obminclude/lang/fr/tools.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/of/of_search.php b/ui/obminclude/of/of_search.php index eb9ccc3222..afaa285716 100644 --- a/ui/obminclude/of/of_search.php +++ b/ui/obminclude/of/of_search.php @@ -51,7 +51,7 @@ public static function search($core, $pattern, $offset, $limit, $options) { // $pattern = strtolower($pattern); => do not work because of solr keyword "OR" and "AND" // replace compound word in pattern $pattern = preg_replace("/(?<=[a-zA-Z])-(?=[a-zA-Z])/"," + ", $pattern); - $pattern = preg_replace("/(\w*)\*/e", "strtolower('$1').'*'", $pattern); + $pattern = preg_replace_callback("/(\w*)\*/", function($m){return strtolower($m[1]).'*';}, $pattern); $response = $solr->search($pattern, $offset, $limit, $options); display_debug_solr($pattern, $cdg_solr, "OBM_Search::search($core)"); if($response->response->numFound > 0) { @@ -80,7 +80,7 @@ public static function count($core, $pattern) { $pattern = "domain:$obm[domain_id]"; } $pattern = preg_replace("/(?<=[a-zA-Z])-(?=[a-zA-Z])/"," + ", $pattern); - $pattern = preg_replace("/(\w*)\*/e", "strtolower('$1').'*'", $pattern); + $pattern = preg_replace_callback("/(\w*)\*/", function($m){return strtolower($m[1]).'*';}, $pattern); $response = $solr->search($pattern); return $response->response->numFound; } catch(Exception $e) { diff --git a/ui/obminclude/of/of_session.inc b/ui/obminclude/of/of_session.inc index 6a3c2f5e2a..fb1fac7d80 100644 --- a/ui/obminclude/of/of_session.inc +++ b/ui/obminclude/of/of_session.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/phplib/db_pgsql.inc b/ui/obminclude/phplib/db_pgsql.inc index 3a049f5c60..2d9ba19940 100644 --- a/ui/obminclude/phplib/db_pgsql.inc +++ b/ui/obminclude/phplib/db_pgsql.inc @@ -409,7 +409,7 @@ class DB_Sql { // #X(Y) => self:X(Y) if(!empty($match[1][$key])) { if(!is_null($args) && method_exists(__CLASS__, $match[2][$key])) { - $pcode = self::$match[2][$key]($args); + $pcode = self::{$match[2][$key]}($args); } elseif(property_exists(__CLASS__, $match[2][$key])) { $pcode = self::${$match[2][$key]}; } else { diff --git a/ui/obminclude/phplib/obmlib.inc b/ui/obminclude/phplib/obmlib.inc index 0ac2c4afd0..0dd3007c2d 100644 --- a/ui/obminclude/phplib/obmlib.inc +++ b/ui/obminclude/phplib/obmlib.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/account/account_js.inc b/ui/php/account/account_js.inc index c10debb83a..c1abcc5c64 100644 --- a/ui/php/account/account_js.inc +++ b/ui/php/account/account_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/control/control_index.php b/ui/php/control/control_index.php index 8ed372e702..4a9673c1bb 100644 --- a/ui/php/control/control_index.php +++ b/ui/php/control/control_index.php @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/control/control_query.inc b/ui/php/control/control_query.inc index 2b5f940b4b..0558f66437 100644 --- a/ui/php/control/control_query.inc +++ b/ui/php/control/control_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/group/group_query.inc b/ui/php/group/group_query.inc index 741bff4c9b..368962df40 100644 --- a/ui/php/group/group_query.inc +++ b/ui/php/group/group_query.inc @@ -87,7 +87,7 @@ function run_query_group_search($group) { $where .= " AND group_delegation $like '".$obm_q->escape($delegation)."%'"; } if ($email != '') { - list($left,$right) = split('@',$email); + list($left,$right) = explode('@',$email); if ($right === null){ $left = $obm_q->escape($left).'%'; $right = $obm_q->escape($left); diff --git a/ui/php/host/host_index.php b/ui/php/host/host_index.php index 103542963c..7f8df63a7e 100644 --- a/ui/php/host/host_index.php +++ b/ui/php/host/host_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/host/host_js.inc b/ui/php/host/host_js.inc index 233d805af0..66f7cf486b 100644 --- a/ui/php/host/host_js.inc +++ b/ui/php/host/host_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/invoice/invoice_display.inc b/ui/php/invoice/invoice_display.inc index d9320d707f..a8ef79488e 100644 --- a/ui/php/invoice/invoice_display.inc +++ b/ui/php/invoice/invoice_display.inc @@ -863,8 +863,8 @@ function dis_invoice_detail($inv_q) { $odf_relance = glob('relance_*.odt'); -list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); -list( $year_c, $month_c, $day_c ) = split( ',', date('Y,n,j')); +list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); +list( $year_c, $month_c, $day_c ) = explode( ',', date('Y,n,j')); $duration = (mktime(0,0,0, $month_c, $day_c, $year_c) - mktime(0,0,0, $month_o, $day_o, $year_o)); @@ -1987,7 +1987,7 @@ function dis_invoice_all_reminder($inv_q) { $l_expiration"; while($inv_q->next_record()) { - list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('expiration_date')))); + list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('expiration_date')))); $date_expiration=date('d/m/y',mktime(0,0,0, $month_o, $day_o, $year_o)); $block.=''.$inv_q->f('company_name').' @@ -2005,8 +2005,8 @@ function dis_invoice_reminder_company($inv_q) { while($inv_q->next_record()) { - list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); - list( $year_c, $month_c, $day_c ) = split( ',', date('Y,n,j')); + list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); + list( $year_c, $month_c, $day_c ) = explode( ',', date('Y,n,j')); $duration = (mktime(0,0,0, $month_c, $day_c, $year_c) - mktime(0,0,0, $month_o, $day_o, $year_o)); $duration_day = (int) ( $duration / (60 * 60 * 24)); diff --git a/ui/php/mailbox/mailbox_display.inc b/ui/php/mailbox/mailbox_display.inc index 9dacfc389c..80e6f9f559 100644 --- a/ui/php/mailbox/mailbox_display.inc +++ b/ui/php/mailbox/mailbox_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/mailbox/mailbox_index.php b/ui/php/mailbox/mailbox_index.php index b6219c8038..2bc5842114 100644 --- a/ui/php/mailbox/mailbox_index.php +++ b/ui/php/mailbox/mailbox_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailbox/mailbox_query.inc b/ui/php/mailbox/mailbox_query.inc index d5407470cc..3364ecac88 100644 --- a/ui/php/mailbox/mailbox_query.inc +++ b/ui/php/mailbox/mailbox_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/mailforward/mailforward_index.php b/ui/php/mailforward/mailforward_index.php index 2abb8b53a8..0a9c268b45 100644 --- a/ui/php/mailforward/mailforward_index.php +++ b/ui/php/mailforward/mailforward_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailshare/mailshare_index.php b/ui/php/mailshare/mailshare_index.php index 607531bffc..c864cbb5e1 100644 --- a/ui/php/mailshare/mailshare_index.php +++ b/ui/php/mailshare/mailshare_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailshare/mailshare_js.inc b/ui/php/mailshare/mailshare_js.inc index 797c673565..1aa6172d0c 100644 --- a/ui/php/mailshare/mailshare_js.inc +++ b/ui/php/mailshare/mailshare_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/obm.php b/ui/php/obm.php index f43205eef0..eb72292cfa 100644 --- a/ui/php/obm.php +++ b/ui/php/obm.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/obm_query.inc b/ui/php/obm_query.inc index a590ec8c05..32562439d6 100644 --- a/ui/php/obm_query.inc +++ b/ui/php/obm_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/password/password_display.inc b/ui/php/password/password_display.inc index 7504ce6dd7..9f016ce938 100644 --- a/ui/php/password/password_display.inc +++ b/ui/php/password/password_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/password/password_index.php b/ui/php/password/password_index.php index ff17425fb8..02994b2e75 100644 --- a/ui/php/password/password_index.php +++ b/ui/php/password/password_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/password/password_query.inc b/ui/php/password/password_query.inc index 5df36cf5c7..a095276fb2 100644 --- a/ui/php/password/password_query.inc +++ b/ui/php/password/password_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/planning/planning_display.inc b/ui/php/planning/planning_display.inc index 0484cea3ca..2e543fe48a 100644 --- a/ui/php/planning/planning_display.inc +++ b/ui/php/planning/planning_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/publication/publication_query.inc b/ui/php/publication/publication_query.inc index f35b08549f..8b458be4b5 100644 --- a/ui/php/publication/publication_query.inc +++ b/ui/php/publication/publication_query.inc @@ -303,7 +303,7 @@ function run_query_publication_auto_subscription($publication) { $list_sub = $publication['list']; $recept = sql_parse_id($c_focsys); $lang = $publication['lang']; - $lang_array = split('-', $lang); + $lang_array = explode('-', $lang); $domain_id = sql_parse_id($obm['domain_id']); $nb = 0; $uid = sql_parse_id($obm['uid']); diff --git a/ui/php/report/report_display.inc b/ui/php/report/report_display.inc index fe9ff33971..76ef5af773 100644 --- a/ui/php/report/report_display.inc +++ b/ui/php/report/report_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/report/report_index.php b/ui/php/report/report_index.php index 0c51e74b1b..dc4a590681 100644 --- a/ui/php/report/report_index.php +++ b/ui/php/report/report_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/samba/samba_display.inc b/ui/php/samba/samba_display.inc index f348b1131b..6e647286e6 100644 --- a/ui/php/samba/samba_display.inc +++ b/ui/php/samba/samba_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/samba/samba_index.php b/ui/php/samba/samba_index.php index 0a58a9303a..9ed484242e 100644 --- a/ui/php/samba/samba_index.php +++ b/ui/php/samba/samba_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/samba/samba_query.inc b/ui/php/samba/samba_query.inc index ddd68b749c..082ff9f205 100644 --- a/ui/php/samba/samba_query.inc +++ b/ui/php/samba/samba_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/tools/tools_index.php b/ui/php/tools/tools_index.php index d2b5f78660..5150477bd3 100644 --- a/ui/php/tools/tools_index.php +++ b/ui/php/tools/tools_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/user/user_query.inc b/ui/php/user/user_query.inc index 0bef1c6cbe..2f69465127 100644 --- a/ui/php/user/user_query.inc +++ b/ui/php/user/user_query.inc @@ -171,7 +171,7 @@ function run_query_user_search($user, $user_results_limit, $strongest_profile_le // If an email indication has been specified, get it if (trim($email) != '') { if (trim($where) != '') $where .= ' AND'; - list($left,$right) = split('@',$email); + list($left,$right) = explode('@',$email); if ($right === null){ $left = $left.'%'; $right = $left; diff --git a/ui/php/vacation/vacation_display.inc b/ui/php/vacation/vacation_display.inc index 9fcfb15858..82b2277dad 100644 --- a/ui/php/vacation/vacation_display.inc +++ b/ui/php/vacation/vacation_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/vacation/vacation_index.php b/ui/php/vacation/vacation_index.php index 68202d10f3..3c7f7a0328 100644 --- a/ui/php/vacation/vacation_index.php +++ b/ui/php/vacation/vacation_index.php @@ -32,7 +32,7 @@ ?> - +?> diff --git a/ui/php/vacation/vacation_js.inc b/ui/php/vacation/vacation_js.inc index f13526f5cb..2183702c70 100644 --- a/ui/php/vacation/vacation_js.inc +++ b/ui/php/vacation/vacation_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/resources/themes/default/theme.inc b/ui/resources/themes/default/theme.inc index 93d423a201..6302c1c551 100644 --- a/ui/resources/themes/default/theme.inc +++ b/ui/resources/themes/default/theme.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/obminclude/of/of_session.inc b/ui/scripts/2.2/update22/obminclude/of/of_session.inc index 48a3bbab69..4bbca785bc 100644 --- a/ui/scripts/2.2/update22/obminclude/of/of_session.inc +++ b/ui/scripts/2.2/update22/obminclude/of/of_session.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc b/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc index aa548f035e..a3523e6bab 100644 --- a/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc +++ b/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php b/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php index dd633ad0ba..e29bcb11fe 100644 --- a/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php +++ b/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php @@ -29,7 +29,7 @@ # applicable to the OBM software. */ ?> - +?> diff --git a/ui/tests/test-list.php b/ui/tests/test-list.php index ea87c19cf7..5af7d8d1f9 100644 --- a/ui/tests/test-list.php +++ b/ui/tests/test-list.php @@ -31,7 +31,7 @@ ?> - +?>