summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/theming/lib/Controller/ThemingController.php3
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php10
-rw-r--r--apps/user_ldap/ajax/wizard.php2
-rw-r--r--lib/private/App/CodeChecker/DeprecationCheck.php7
-rw-r--r--lib/private/AppFramework/Core/API.php13
-rw-r--r--lib/public/BackgroundJob.php92
6 files changed, 4 insertions, 123 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index b4e3a95710f..09b4a14f2b0 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -331,14 +331,12 @@ class ThemingController extends Controller {
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 0.8;' .
'color: ' . $textColor . ';'.
"}\n" .
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 1.0;' .
'color: ' . $textColor . ';'.
"}\n" .
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -398,6 +396,7 @@ class ThemingController extends Controller {
$responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
$responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
$responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
+ $responseCss .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
$responseCss .= '.nc-theming-contrast {color: #000000}' . "\n";
$responseCss .= '.ui-widget-header { color: #000000; }' . "\n";
} else {
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 193e0bdcb4b..d9d5005e25f 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -440,14 +440,12 @@ class ThemingControllerTest extends TestCase {
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
'border: 1px solid '.$color.';'.
'background-color: '.$color.';'.
- 'opacity: 0.8;' .
'color: #ffffff;'.
"}\n" .
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
'border: 1px solid '.$color.';'.
'background-color: '.$color.';'.
- 'opacity: 1.0;' .
'color: #ffffff;'.
"}\n" .
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -530,14 +528,12 @@ class ThemingControllerTest extends TestCase {
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 0.8;' .
'color: #000000;'.
"}\n" .
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 1.0;' .
'color: #000000;'.
"}\n" .
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -570,6 +566,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
$expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
$expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
+ $expectedData .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
$expectedData .= '.nc-theming-contrast {color: #000000}' . "\n";
$expectedData .= '.ui-widget-header { color: #000000; }' . "\n";
@@ -706,14 +703,12 @@ class ThemingControllerTest extends TestCase {
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
'border: 1px solid '.$color.';'.
'background-color: '.$color.';'.
- 'opacity: 0.8;' .
'color: #ffffff;'.
"}\n" .
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
'border: 1px solid '.$color.';'.
'background-color: '.$color.';'.
- 'opacity: 1.0;' .
'color: #ffffff;'.
"}\n" .
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -813,14 +808,12 @@ class ThemingControllerTest extends TestCase {
'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 0.8;' .
'color: #000000;'.
"}\n" .
'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
'border: 1px solid '.$elementColor.';'.
'background-color: '.$elementColor.';'.
- 'opacity: 1.0;' .
'color: #000000;'.
"}\n" .
'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
@@ -871,6 +864,7 @@ class ThemingControllerTest extends TestCase {
$expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
$expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
$expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
+ $expectedData .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
$expectedData .= '.nc-theming-contrast {color: #000000}' . "\n";
$expectedData .= '.ui-widget-header { color: #000000; }' . "\n";
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 826f94f0003..5d994f40dcb 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -46,7 +46,7 @@ $prefix = (string)$_POST['ldap_serverconfig_chooser'];
$ldapWrapper = new \OCA\User_LDAP\LDAP();
$configuration = new \OCA\User_LDAP\Configuration($prefix);
-$con = new \OCA\User_LDAP\Connection($ldapWrapper, '', null);
+$con = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix, null);
$con->setConfiguration($configuration->getConfiguration());
$con->ldapConfigurationActive = true;
$con->setIgnoreValidation(true);
diff --git a/lib/private/App/CodeChecker/DeprecationCheck.php b/lib/private/App/CodeChecker/DeprecationCheck.php
index 60e7fdf078d..a700345238b 100644
--- a/lib/private/App/CodeChecker/DeprecationCheck.php
+++ b/lib/private/App/CodeChecker/DeprecationCheck.php
@@ -114,13 +114,6 @@ class DeprecationCheck extends AbstractCheck implements ICheck {
'OCP\AppFramework\IAppContainer::isAdminUser' => '8.0.0',
'OCP\AppFramework\IAppContainer::log' => '8.0.0',
- 'OCP\BackgroundJob::addQueuedTask' => '6.0.0',
- 'OCP\BackgroundJob::addRegularTask' => '6.0.0',
- 'OCP\BackgroundJob::allQueuedTasks' => '6.0.0',
- 'OCP\BackgroundJob::allRegularTasks' => '6.0.0',
- 'OCP\BackgroundJob::deleteQueuedTask' => '6.0.0',
- 'OCP\BackgroundJob::findQueuedTask' => '6.0.0',
- 'OCP\BackgroundJob::queuedTaskWhereAppIs' => '6.0.0',
'OCP\BackgroundJob::registerJob' => '8.1.0',
'OCP\Files::tmpFile' => '8.1.0',
diff --git a/lib/private/AppFramework/Core/API.php b/lib/private/AppFramework/Core/API.php
index 85cdc00a63a..683962d67dc 100644
--- a/lib/private/AppFramework/Core/API.php
+++ b/lib/private/AppFramework/Core/API.php
@@ -170,19 +170,6 @@ class API implements IApi{
}
}
-
- /**
- * Register a backgroundjob task
- * @param string $className full namespace and class name of the class
- * @param string $methodName the name of the static method that should be
- * called
- * @deprecated Use \OC::$server->getJobList()->add();
- */
- public function addRegularTask($className, $methodName) {
- \OCP\Backgroundjob::addRegularTask($className, $methodName);
- }
-
-
/**
* Tells ownCloud to include a template in the admin overview
* @param string $mainPath the path to the main php file without the php
diff --git a/lib/public/BackgroundJob.php b/lib/public/BackgroundJob.php
index b49dd922786..43f445362dc 100644
--- a/lib/public/BackgroundJob.php
+++ b/lib/public/BackgroundJob.php
@@ -90,96 +90,4 @@ class BackgroundJob {
$jobList = \OC::$server->getJobList();
$jobList->add($job, $argument);
}
-
- /**
- * @deprecated 6.0.0
- * creates a regular task
- * @param string $klass class name
- * @param string $method method name
- * @return boolean|null
- * @since 4.5.0
- */
- public static function addRegularTask($klass, $method) {
- if (!\OCP\Util::needUpgrade()) {
- self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
- return true;
- }
- }
-
- /**
- * @deprecated 6.0.0
- * gets all regular tasks
- * @return array
- *
- * key is string "$klass-$method", value is array( $klass, $method )
- * @since 4.5.0
- */
- static public function allRegularTasks() {
- return [];
- }
-
- /**
- * @deprecated 6.0.0
- * Gets one queued task
- * @param int $id ID of the task
- * @return BackgroundJob\IJob|null
- * @since 4.5.0
- */
- public static function findQueuedTask($id) {
- $jobList = \OC::$server->getJobList();
- return $jobList->getById($id);
- }
-
- /**
- * @deprecated 6.0.0
- * Gets all queued tasks
- * @return array an array of associative arrays
- * @since 4.5.0
- */
- public static function allQueuedTasks() {
- return [];
- }
-
- /**
- * @deprecated 6.0.0
- * Gets all queued tasks of a specific app
- * @param string $app app name
- * @return array an array of associative arrays
- * @since 4.5.0
- */
- public static function queuedTaskWhereAppIs($app) {
- return [];
- }
-
- /**
- * @deprecated 6.0.0
- * queues a task
- * @param string $app app name
- * @param string $class class name
- * @param string $method method name
- * @param string $parameters all useful data as text
- * @return boolean id of task
- * @since 4.5.0
- */
- public static function addQueuedTask($app, $class, $method, $parameters) {
- self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
- return true;
- }
-
- /**
- * @deprecated 6.0.0
- * deletes a queued task
- * @param int $id id of task
- * @return boolean|null
- *
- * Deletes a report
- * @since 4.5.0
- */
- public static function deleteQueuedTask($id) {
- $jobList = \OC::$server->getJobList();
- $job = $jobList->getById($id);
- if ($job) {
- $jobList->remove($job);
- }
- }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-06 21:00:09 +0000