Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ONLYOFFICE/onlyoffice-owncloud
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: acb78ef1da6f2670f95c3da130b4e3400b1ed70e
Choose a base ref
..
head repository: ONLYOFFICE/onlyoffice-owncloud
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c568f47c16e3827b0455cc500b8542fc528c4f59
Choose a head ref
Showing with 18 additions and 1 deletion.
  1. +2 −0 controller/callbackcontroller.php
  2. +6 −0 controller/joblistcontroller.php
  3. +2 −0 lib/command/documentserver.php
  4. +6 −0 lib/hookhandler.php
  5. +2 −1 settings.php
2 changes: 2 additions & 0 deletions controller/callbackcontroller.php
Original file line number Diff line number Diff line change
@@ -777,6 +777,8 @@ private function parseUserId($userId) {
* @param callable $operation
*
* @throws LockedException
*
* @return void
*/
private function retryOperation(callable $operation) {
$i = 0;
6 changes: 6 additions & 0 deletions controller/joblistcontroller.php
Original file line number Diff line number Diff line change
@@ -81,6 +81,8 @@ public function __construct($AppName, IRequest $request, ILogger $logger, AppCon
* Add a job to list
*
* @param IJob|string $job
*
* @return void
*/
private function addJob($job) {
if (!$this->jobList->has($job, null)) {
@@ -93,6 +95,8 @@ private function addJob($job) {
* Remove a job from list
*
* @param IJob|string $job
*
* @return void
*/
private function removeJob($job) {
if ($this->jobList->has($job, null)) {
@@ -104,6 +108,7 @@ private function removeJob($job) {
/**
* Add or remove EditorsCheck job depending on the value of _editors_check_interval
*
* @return void
*/
private function checkEditorsCheckJob() {
if ($this->config->GetEditorsCheckInterval() > 0) {
@@ -116,6 +121,7 @@ private function checkEditorsCheckJob() {
/**
* Method for sequentially calling checks of all jobs
*
* @return void
*/
public function checkAllJobs() {
$this->checkEditorsCheckJob();
2 changes: 2 additions & 0 deletions lib/command/documentserver.php
Original file line number Diff line number Diff line change
@@ -87,6 +87,8 @@ public function __construct(

/**
* Configures the current command.
*
* @return void
*/
protected function configure() {
$this
6 changes: 6 additions & 0 deletions lib/hookhandler.php
Original file line number Diff line number Diff line change
@@ -30,6 +30,12 @@
* @package OCA\Onlyoffice
*/
class HookHandler {

/**
* Adds scripts and styles
*
* @return void
*/
public static function PublicPage() {
$appName = "onlyoffice";

3 changes: 2 additions & 1 deletion settings.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/**
*
* @author Ascensio System SIA <integration@onlyoffice.com>
*
* (c) Copyright Ascensio System SIA 2023
*
* Licensed under the Apache License, Version 2.0 (the "License");