Merge

FROM nextcloud:25.0.6-fpm AS nextcloud

FROM nextcloud:25.0.8-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

<<<<<<< HEAD

ARG THEME_HELPER_JOB_ID="602630"

ARG NOTES_VERSION="4.7.2"

ARG CONTACTS_JOB_ID="582012"

ARG DASHBOARD_JOB_ID="608827"

ARG SNAPPY_VERSION="2.28.1"

ARG SNAPPY_THEME_VERSION="2.0.3"

RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php

=======

ARG THEME_HELPER_JOB_ID="639638"

ARG NOTES_VERSION="4.8.0"

ARG CONTACTS_JOB_ID="620997"

ARG CALENDAR_JOB_ID="628427"

ARG EMAIL_RECOVERY_JOB_ID="582038"

ARG EA_JOB_ID="644363"

ARG LAUNCHER_JOB_ID="616075"

ARG GOOGLE_INTEGRATION_VERSION="1.0.9"

ARG DASHBOARD_JOB_ID="616067"

ARG SNAPPY_VERSION="2.27.2"

ARG SNAPPY_THEME_VERSION="2.0.7"

ARG USER_MIGRATION_JOB_ID="608716"

ARG MEMORIES_VERSION="5.1.0"

>>>>>>> main

RUN sed -i 's/25,0,8,2/25,0,8,9/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images

    tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm snappymail.tar.gz;

RUN curl -fsSL -o user_migration.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \

    unzip user_migration.zip && \

    mv dist/user_migration ${BASE_DIR}/custom_apps/ && \

    rm user_migration.zip;

# Fix snappymail icon

RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml

    chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \

    rm -rf Murena-snappymail-theme.tar.gz

RUN curl -fsSL -o memories.tar.gz \

    "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \

    tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm memories.tar.gz;

# Remove unzip when unzipping is done

RUN apt-get -y remove unzip

# Fix the navbar entries

RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/dist/core-main.js

# Fix total quota value for users in settings and files

RUN sed -i "s/'total'/'quota'/" ${BASE_DIR}/apps/files/lib/Controller/ViewController.php

RUN sed -i "s/'total'/'quota'/" ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php

RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserData.php

From selfhost as ecloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

<<<<<<< HEAD

ARG THEME_VERSION="25.0.11"

=======

ARG THEME_VERSION="25.0.12"

>>>>>>> main

ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"

ARG OIDC_LOGIN_VERSION="2.5.1"

ARG OIDC_LOGIN_VERSION="2.6.0"

# Patches

COPY patches/ ${TMP_PATCH_DIR}/

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch

RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch

RUN rm -rf ${TMP_PATCH_DIR}

RUN curl -fsSL -o ldap_write_support.tar.gz \

    tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \

    rm oidc_login.tar.gz

# Remove user avatar generation for system addressbook card

RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php

# Replace "Get your own free account" NC link with /e/ Account link in public pages

RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php

RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js

# Add data-object-type to notification

RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js

#Hide Archive/Unarchive feature in memories app

RUN sed -i 's/{name:(0,be.Iu)("memories","Archive"),icon:la,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchive()&&!this.routeIsAlbum()},{name:(0,be.Iu)("memories","Unarchive"),icon:ua,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchive()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js

RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js

# autocomplete leak tweak apps frontend with sed, disable group suggestion

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js

RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/<step>OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml

RUN cd ${BASE_DIR}/apps/theming && sed -i 's/<step>OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml

# Remove colored background from email template logo

RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php

## Contributing

Anyone can fork a project on our GitLab instance, but to prevent abuse it's disabled by default. Get in touch with us [by e-mail](mailto:join@e.email) or through our support channels and we will let you create a fork and submit MRs.

Anyone can fork a project on our GitLab instance, but to prevent abuse it's disabled by default. Get in touch with us [by e-mail](mailto:dev@murena.com) or through our support channels and we will let you create a fork and submit MRs.

    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/

    rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/

    rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

else

    echo "Skipping rsync step as version not updated!"

fi

-	p('active');

-} ?>" <?php if ($_['mode'] === 'admin') { print_unescaped('aria-current="page"'); } ?>

-				href="<?php print_unescaped($_['urlAdminDocs']); ?>">

+			<a href="https://support.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">

+			<a href="https://doc.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">

 				<span class="help-list__text">

-					<?php p($l->t('Administrator documentation')); ?>

+					<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>

From: Avinash Gusain <avinash.gusain.ext@murena.com>

Date: Fri, 16 June 2023 18:50:00 +0530

Subject: [PATCH] Create a task calendar on first login

This patch creates a default task VTODO calender on first login

--- ./apps/dav/lib/HookManager.php	2023-06-16 19:01:35.894535512 +0530

+++ ./apps/dav/lib/HookManager-new.php	2023-06-16 19:07:09.374531373 +0530

@@ -179,6 +179,11 @@

 						'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),

 						'components' => 'VEVENT'

 					]);

+					$this->calDav->createCalendar($principal, 'tasks', [

+						'{DAV:}displayname' => 'Tasks',

+						'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),

+						'components' => 'VTODO'

+					]);

 				} catch (\Exception $e) {

 					\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);

 				}