Merge branch 'main' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud

FROM nextcloud:26.0.8-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_HELPER_JOB_ID="812372"

ARG THEME_HELPER_JOB_ID="824758"

ARG NOTES_VERSION="4.9.2"

ARG CONTACTS_JOB_ID="740210"

ARG CONTACTS_JOB_ID="821699"

ARG CALENDAR_JOB_ID="812355"

ARG EMAIL_RECOVERY_JOB_ID="738840"

ARG EA_JOB_ID="738865"

ARG LAUNCHER_JOB_ID="798389"

ARG LAUNCHER_JOB_ID="819432"

ARG GOOGLE_INTEGRATION_VERSION="2.1.0"

ARG DASHBOARD_JOB_ID="748055"

ARG DASHBOARD_JOB_ID="831213"

ARG SNAPPY_VERSION="2.29.1"

ARG SNAPPY_THEME_VERSION="3.0.0"

ARG USER_MIGRATION_JOB_ID="608716"

ARG MEMORIES_VERSION="5.4.1"

ARG MEMORIES_VERSION="6.1.5"

ARG DROP_ACCOUNT_VERSION="2.3.2"

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

RUN sed -i 's/26,0,8,2/26,0,8,25/' ${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

From nextcloud as selfhost

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="26.0.0"

ARG THEME_VERSION="26.0.2"

ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"

ARG SELFHOST_THEME_VERSION="1.0.0"

ARG SELFHOST_THEME_VERSION="2.0.0"

ARG IS_SELFHOST=true

# Patches

        curl -fsSL -o selfhost-theme-helper.tar.gz \

        "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/selfhost-theme-helper/-/archive/${SELFHOST_THEME_VERSION}/selfhost-theme-helper-${SELFHOST_THEME_VERSION}.tar.gz" && \

        tar -xf selfhost-theme-helper.tar.gz -C /tmp/ && \

        mv /tmp/selfhost-theme-helper-1.0.0/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \

        mv /tmp/selfhost-theme-helper-${SELFHOST_THEME_VERSION}/ ${BASE_DIR}/custom_apps/selfhost-theme-helper && \

        chown -R www-data:www-data ${BASE_DIR}/custom_apps/selfhost-theme-helper/ && \

        rm -f selfhost-theme-helper.tar.gz;\

    fi

# Set default class of hidden to settings-hint

RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php

From selfhost as ecloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="26.0.0"

ARG THEME_VERSION="26.0.2"

ARG LDAP_WRITE_SUPPORT_VERSION="1.8.0"

ARG OIDC_LOGIN_VERSION="2.6.0"

ARG IS_SELFHOST=false

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

# Add data-object-type to notification

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

#Hide Archive/Unarchive feature in memories app

RUN sed -i 's/{name:(0,O.Iu)("memories","Archive"),icon:Yo,callback:this.archiveSelection.bind(this),if:()=>!this.routeIsArchiveFolder()&&!this.routeIsAlbums},{name:(0,O.Iu)("memories","Unarchive"),icon:Ko,callback:this.archiveSelection.bind(this),if:()=>this.routeIsArchiveFolder()},//g' ${BASE_DIR}/custom_apps/memories/js/memories-main.js

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

# Rename Memories to Gallery

RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml

RUN cd ${BASE_DIR}/custom_apps/memories/js && sed -i 's/Memories has been/Gallery has been/g' memories-main.js && sed -i 's/Memories has been/Gallery has been/g' memories-admin.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

#enable email search in memories app

RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[bc\.D\.SHARE_TYPE_USER,bc\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[bc.D.SHARE_TYPE_USER,bc.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js

RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/this\.currentSearchResults=e\.data\./this\.currentSearchResults=r\.data\./g' js/memories-main.js

# sharing search by email

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/$S.principalPropertySearchByDisplayname(t);/$S.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js

# Remove colored background from email template logo

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

+		return [];

 	}

 	/**

@@ -59,11 +59,6 @@

 	 * @throws Exception

 	 */

 	public function findOne(int $shareType, string $shareWith) {

-		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);

-

-		if ($contact) {

-			return $contact;

-		}

 		return new JSONResponse([], Http::STATUS_NOT_FOUND);

 	}

 }