From d75fbab5d21cade3174466bf9a80d42da1f42a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20K=C3=B6hr?= <janis.koehr@novatec-gmbh.de>
Date: Mon, 16 Sep 2019 21:14:11 +0200
Subject: [PATCH] Removed duplicate defintion of app name and rebased/rebuilt.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Janis Köhr <janis.koehr@novatec-gmbh.de>
---
apps/accessibility/js/accessibility.js | Bin 89144 -> 89324 bytes
apps/accessibility/js/accessibility.js.map | Bin 450483 -> 450483 bytes
.../accessibility/lib/AppInfo/Application.php | 12 ++++++------
.../lib/Migration/RepairUserConfig.php | 12 +++++-------
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/apps/accessibility/js/accessibility.js b/apps/accessibility/js/accessibility.js
index 1303fba27ee40a954b6008388308783aab58f9bd..6e0b9c3958d033ee8a1db39993595e7fde1ff40e 100644
GIT binary patch
delta 1482
zcmZuxYfM~46wcZ0@>)c;JX>D73v};v?=A(jBCrUS)?n;I(4s7l-N5B#vx~bIXuE7p
zQ}jn0+vtfIZJ{c`2inAvF}c*#Qfh>%4UJThgy<h){DBl|u+_AQ&RtMw^v}IBbG|v}
zeBU`|Mn-hMUeKMt69od^iF%k>^@nvJ&?P6t<Aqo~4lgF)Ol(pV2@)cfIl6^aTa+O?
zk%%uia%vwJoMpC}I+D{O?p?E28%(U*(67O`coXKwzmGHVX7*?N^%$JUH1b&6h7<5!
z=2gAwx2VhQGwzUHw<NN;tYeWSLUX65QEu~k1c?N8N=~WHQ7)<REA7o*-%fX9tMDI)
z)$BLdIreZEd&hn}5=lWGt0_3H#kryiv=;B$c;5|=Lj@i!E(W~l7-CH&=QC2)03_g(
z<W8T**dq8u56=*7^#eFr|4<kayBzxj3~R{6?G3XS>)HVXt6U-;acu>{K6EX`gcLjH
zjb@7XP(0@JCbM0=E#Y|XL<$=}5gr}47Dgt4XE;Ssz@KR9?vTK8Yn$Jm)$Nu!MYD9U
z@jz#jWETJD%6f%Xk~LL%1X+|+H=J78o1+^1>vTTLJ@YZ(Y~RmpwExApknT^gu3>Eq
z2(R%9zdD+aqoaFuM3ng@!{sZ0Q)6GT(^rNxya|rlAP%1&kB)FRH3_n+L)(`>uAL__
z?|3iZZxff;Cs%)gb<9XW_VU_smmhq63=-G!CxOOd_m(Z4f@&+d_Ou31PFmQfleaZE
z^sO_U6iN0bx9qn2TfN;qJ${+1V{Y^KC7;YyK;zU)cy`K!m!>M&gEtu9*moac`}YH=
zpRQ!J(@Tk*-%|_acxu7LSBnc4mT<ElctOlKwYVAQ7t=6&sU15wkg!*liU2R)N@cUR
zY@964FQ;hRIK}McQ!6{XzML3A3Y)!xhsT~@&SEjYw})}t!Mj!*xcl<`9n}=-s7LPA
z=@bOm2y{>bZ?9v{J9)p4ds0<Vs<n`&qy7lU0ip~<z?7=CtcS<=kLjUBtAbLZ;fD?U
zAlCq!HUxq}LSqb&xpI)LJj>VNN_R5YRLo#1xD;&~90uBx4ulS-gIPm@w9E<?dNUm+
zIp$&p|IB58h5w?A@P=~M2nE15(<Ug@648SldZSWc21!TzEU=A!V}WeCXaO5d5#R;~
zb`Y@OnaN0+PPlnB8-CcP%n&G5T_sx~Rmr!)7wYD=2qv0n0~24Xtwf)+!FC=fv^%+)
z9-*!bNTU1fkhE?BJtQDG)Y(wGj)+o-NeH^>0pGum03RJXX@@=kFjdNPK-ThTBY7~P
z9La~;Fw<J^@e0Ulkyf4?k3*fcB1xcsJPHLgrw|UUD<~gL$-zfL87Tz6mToNp0z|1Q
z0fS~8iUhhsU9QNbV2cDndA9;S*K%O}ZWxVFQuo6cL=bypXq@R>HS~p%U@*wD=D-T&
z+H>%ks#8dtw`!naGiPdV=n~9Eb7*xykT_S5>|c>Aj&e{Dt#^VslGKTLq>hV2d8~B$
Ho)hqI5i|o5
delta 1339
zcmZuwZA@EL7|z>LDCI*6Eo0-OrLgW^ciUzI8B)r}GSn;?%5-F|d^K>Pb*`Q51xC6X
zqbynG!koU*gW)4#35Ge1;)&jALfA;0xEP!z8xcn|YUW4W?99kE-PBVOiYETK_nz}U
z=Xsv@Iq&`TBhA^fn)hz&@Q&^wYES9Yp#F>zr!sUnrZ?hJMs||S3$?CZZe>4HUu+Qe
zyBtm1Id`pXUo-FM5*}YIPGxA(r_Z4;>W5WmGMKT(Fpk#@g;Z;tOUH#G6W%Ub0+}up
zk0qNsyZ!BwFW~1yK3pfd#b(zIktyxAcLsuWo^~$|*>e+wI?;|N2Mn+7Nucxg1Ibuh
zzJ-R$kE!v#^D%s+vM%G_G=7&T(~-(bz(v;t?XP;*v_4+u!$DE%4*JbqTu|`yGVW?Q
zh0&Ih1fj?E1oEw0(A~O-Wo_HBuT8)=+jx4ZEt-z!17`YN;E*9ZPQ>hbVs8EHA=BWI
zt|VMMzJV?uPfXRvK@uN+ighM1zgfB`{hTC-yv#&xgE{{L+B=xXQt2I>R^hgxt@N3p
zw*ZYJKhQr$4rby0$ww)jRHeTH2D~_3f`3ids|87>4d-S64KuTJX=Xx2X55g4qZd+>
zJRKdJ#FXCoWNCGC9sTe^KVZe|6umQh4b}|sVJX1km+8%m{a}cj=fmxl9;>yRW0jXa
zZ&2aYIV)9vv8=+oU+&9uiuMkV<gtgmf!@Q1LlW!K;`4{Zpkxv7xybW)Gh)Wf`3BlC
z|32Wl%ct@D<uPo((m+4B@>@2JU*CbhTyMplH#X7WjbUI@W=JWlXDmUt)Xa=KqPelu
zuqB#|-lz{FQ6v2+>V#M~nOcTi$&yz8Zd2ibTP7U1HNf7v_|>vOEAthd0nRV1Yy_5*
zY2UIh5x@U)Gd^(d$bUwqBQ`4I_nI||S_OI_Mm3DCCBW{uG01pWHp*ve$k&h`wP07W
zlOduaKc_%7;ZvatWCc@UA%VQDhxO{PER(N!D2lB%DiJ+cl9c5f5E6(bAKH}ueCPvm
zzW_L5H9;ZSod#wyssk-KXo5LXZDs|p8LZ@GGrXp3EQD=9nk`VHj9TERhFCdpkVX!Q
zNtgqHOmGk(fAg@3oZ{hOa+L>5Z0S>c4?;DN)0-iWbU7K2Dd<Q|F=!MJ;3$w|Hl}^X
z#<XJ-L%y*=8AIjR;Y8d~3fWc44%Is#6)UrJY3AVSFUb;l-2vI`0HiS*#=VB!Kzt6U
zkCSMXZyg}1$(|DURLL&|cVa<&zF4{vi=TJ)c!FlXOY-_cPLaG(0p%o80f*M^iTy>Q
zOOll)Cxq1GQWbE@-73(l))0KSCpN%JUM<*?@r6O7(z+8S)Wq2Y1&XyE#<a?8Bb<Xo
zd%H(!_mY!)VK_mSWg&(o3|p#%pN5Ztl(`|8BZ&6a9?oL6@UgFFIgvH)mqJ3UT2C^X
Q*p)U5TX{C6F@ec{02e3fod5s;
diff --git a/apps/accessibility/js/accessibility.js.map b/apps/accessibility/js/accessibility.js.map
index 5c54f18579dfe22773d552592f8b7e2be977e36c..cafc3dd859483568f14294f923b58816ac69736a 100644
GIT binary patch
delta 1454
zcmYjRe@v8R9N*`;<Cn!RJ4I&%79zqMcw7)HsXgy;9(cZ9x9d93O$|A8cYv3WM-b4=
zUj<{+-RPNfCE3jW(1pC_Gk>I8x;8hkwT4P<%&cXl2&1)zfc1T0ZT<0n-{<@JKF|02
z`Tlqw{mL@^%Ci0qTi}ejx4a6M-nZqCI8wTUIVAgoMJZmcl{oB*gY%jViZeDAtXQgX
z?M3?>RIAi*dvI<Uc%7{Fy448jZ`HkGhC6mPR7~<-XwX=PUw~WxJ=~ZIZ_M9T2B&_g
zEgSIYXWp?G*f(9-=^AfU!)n-N1Per~6mRVBt`*Sq%<jT8^0EG?6}$D$qgFGtSpTsg
z$whr@mU=n&C?tG##mVh9)o&d4Z&X}*xG$Yip!VZSKwf%3ttv)+Y;-t_4n7|KiSoO1
z)0aZYY^pYnc*|>z3~s4J^uVpnKp^(Z?aj1T9Vw-C>xhlmo*ucsgrFmn#pH2tGLi+a
zShEm$&}7|0+*?4ZmWd*`Wk)7{OoLwp3h^|Y;=4jvL>Gz0Uhc3}M%F1V&RqpzRdI9f
zR{p;)4?g**5IJUYcDMu?qSS_Lc%|Qlaz=l`I4HvRrPymhjqtm$o#J11VRjKkx>SP=
zbn=O9*q;>O&Jue;rQ(uDw&64tLptlQlByvi+c9JWsHjI_oW>ndhw#)RLmsThA`t#j
z!#r+vh%*g@-)q2QkoRAA;$uYQ{s?+tsph;|@pJoHPNnD7wlY=GWbQ7kV+e>{&7e}r
zu4Y^_!6n=+sDMZIwBR2z`RQrLNq9s_2lC+)Z*<@WG*Q%v*HA6?b>e->Gx=TIC(2@K
z52k7BU+-azj6d(i2V`vA2WJ5q#g|`T9ReTr6Idg<`k^Ff+-bEp+5{iKayi<M2})Od
zJAe}M5vL=UG)1SVn(*uRjEFwg@f=+8*|V6TvWl#8$RXa9=fF%9ed7gWnbs<r2%X2n
zd41KwW|ceNR>MvsZLO(QRp$34P%)~bYE<kzk4$;<0*)o3Rz$C273xLbRa_=*>oqJT
z_pR43oj`f)9z>KzO*|OFDJuJs8(2=(i#M<-p3ud^u##Fej2WX6j@#Hqzt3+|5B$<O
zf;&bF^G1#N6P{7x?Gw>ayhKL^MiEGY_vDkmf$p<N9zz46ZDTYWwD<Z$yi8mY$FZ7v
zQa+9{qvuT%py3yoq?sF>Kr+qY4--_dd8`|CqGyuWx~2I~<j2#2qA8S8*|$%@xCaO3
zH2KvOGK`Fd9~q4jTc;@_pV%`^oV_x825*AY!?RQqx4bxu2!p@3fUSVL*TbkQz3r?C
zuHJF>HT7!%EJ*A#m|+nrWAspoPZ*1kt8^1PWg;J!<Jk^lqH`13gZQlfUV~P3?m1|v
z3>B%y?GCA7TDXKYm1U9-cPjG{#}ldSAZgF1v1e!k)~B)KCPK%bVmYXj77I&a79YI~
z)K*^GvSa=gtW-SGx|ls&fKr*goZU5}MVfNibx@CoRx+O@WasrNR~l7r=gR6iSu9KQ
z*nUPCUCL+O31lWhL2)Rbt)dcL$Y)`3w}9m&&Knf>!4!qjXQIzcUz|));!o)R0=0M4
A!T<mO
delta 1456
zcmYjReN2^A7~k*Q%ZHYH*hO?kU?C!$fa?{~rM2^3uGh=!^>%l=U2#)GF4Db#B<3|t
zZRS_O*mQSv##~7@vp;kpuX*N2x+QCKLt1Mn)W*zOR*EoMYY1A;3v26-bKdj(p7Z>k
z&-WNt=Nnh&cdgwBSKPPp6?lx!jejJN&>GIAy(?Ut;uGFdmy^4Ms9MWi@!{~wdAjhv
z;GBZ0d6jU6r;e4ck=9vLf?DIPnwPEc#?M8T(0(`4Yo4P^;Wd7bHl)HI5A9k8mvLlQ
z4hTE@j?KirX~{{~MY9&wqPpp<GPaug<A1j-gl=TD7Nrr#nqzisH})R0TcO9hj)!T_
z=v*<+FNB{5ga|shTR0tB$TSbF;~pd0na;@3?h|uCEbX7JUV=z`s6U$wANT)6`Q5%5
zOrd1fdrXtS@@g}KTN(v*=+*`x6#r#l1KrgI%jn!Z=zz~SGk9+<K^<dDh_QF9F&lol
zVm9)jtD4!kJCj6j7K-6jd$RCj8iKO22v5T$zbk@Gw$L`mCtQy5#tN<rp%+Fq?i0et
z|9>wZe)X^jxmF@OT8d0r=0FZ%AqSQ-`VuCna_ajs?6;v(hIDKp|5tQ8${<gdtFV?V
zpV*9pGeW{$>MShh9@ViKXQ&v;U4unb4b`{>H%tdB>rj-S3s=k~{dLGxhwG35!au5?
z#_cY7wx002^>_?o|8*-qMuR%oh&I^VLU?#cI9CZOz3@1eX<S!%+fcy}lH0a}N~K!1
zqsIb|^zFn-_*C0Y{9`4aw%s@dpDf*j0tDpid(a167VpKYaLWUG@jm4_>s{QVkmdM3
zOwiT8-or2{f8LJ|NZD`z?n2bbFTX$qLLYV!SSee&z>{?0wmTafQgma18tTF*r7OSf
zMk#S57|0`u8{}1&Ap@ULppOka2akI8944u(GW$GoDem&~U>5Se?jo`+tGF&B7w}+O
zUOao7CfsjpQMZ}4x2aj<)Ay2iP<UcmOm4k^EOqlDjwho^#;##8BC_)uu8_2;2lI%&
zxd#(Tl*f)<#Awvy{Tnz<W$)<20@7aU!}>%*=k&u);_7}(nw4-3U^9I_AD|utlzR}j
z%@*blne!+8Llk#F#)j}BnRE}Kat8dTp8O5;Kg(Ies3&ySFwF+tz5W0%Q7p+LD50J#
zAHg!S=S`!a;g=Yrnd=?JEb{TgC>3lPYelte8>48w%K9e?63L)=9A#AYE#ol%gF{o2
z`f41RW=8!F%|^*h6O>Uv?wg>P{VHb?Z-T_5kEkYIb?Ffr8G`MFY$3euenwqs-_4rf
zZXaP^Q@^^w!W4ZbGc{6Uj2<fa31f{!m2P3DEyQspk=2?LotMn+CuaZm8Z>KD&p~~8
zq?o!RL_~|y!6WUdEQ>gNsVqn_o=jzjNqRnwJwp?)CXJo25IXV{%SE-a+1Lzbqn9N>
zGcKxk)=s~I<=m(2bJ&BKSgLXsusc@lP?kJ)9n|9+i&)TB>lAgG;Iy2AmrU)=sw|%!
zWR%h60@j)o(aeCt@<;(&Yzc6$iM}E46tdjpX%+V#PT`D}g_f08f=c0uCyjprBFoeY
diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php
index e87341b6c1c..e884acad0af 100644
--- a/apps/accessibility/lib/AppInfo/Application.php
+++ b/apps/accessibility/lib/AppInfo/Application.php
@@ -31,7 +31,7 @@ use OCP\IURLGenerator;
class Application extends App {
/** @var string */
- protected $appName = 'accessibility';
+ public const APP_NAME = 'accessibility';
/** @var IConfig */
private $config;
@@ -43,7 +43,7 @@ class Application extends App {
private $urlGenerator;
public function __construct() {
- parent::__construct($this->appName);
+ parent::__construct(self::APP_NAME);
$this->config = \OC::$server->getConfig();
$this->userSession = \OC::$server->getUserSession();
$this->urlGenerator = \OC::$server->getURLGenerator();
@@ -53,11 +53,11 @@ class Application extends App {
// Inject the fake css on all pages if enabled and user is logged
$loggedUser = $this->userSession->getUser();
if (!is_null($loggedUser)) {
- $userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
+ $userValues = $this->config->getUserKeys($loggedUser->getUID(), self::APP_NAME);
// we want to check if any theme or font is enabled.
if (count($userValues) > 0) {
- $hash = $this->config->getUserValue($loggedUser->getUID(), $this->appName, 'icons-css', md5(implode('-', $userValues)));
- $linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => $hash]);
+ $hash = $this->config->getUserValue($loggedUser->getUID(), self::APP_NAME, 'icons-css', md5(implode('-', $userValues)));
+ $linkToCSS = $this->urlGenerator->linkToRoute(self::APP_NAME . '.accessibility.getCss', ['md5' => $hash]);
\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
}
}
@@ -65,7 +65,7 @@ class Application extends App {
public function injectJavascript() {
$linkToJs = $this->urlGenerator->linkToRoute(
- $this->appName . '.accessibility.getJavascript',
+ self::APP_NAME . '.accessibility.getJavascript',
[
'v' => \OC::$server->getConfig()->getAppValue('accessibility', 'cachebuster', '0'),
]
diff --git a/apps/accessibility/lib/Migration/RepairUserConfig.php b/apps/accessibility/lib/Migration/RepairUserConfig.php
index 0f80927839d..bd409f94d47 100644
--- a/apps/accessibility/lib/Migration/RepairUserConfig.php
+++ b/apps/accessibility/lib/Migration/RepairUserConfig.php
@@ -22,6 +22,7 @@ declare (strict_types = 1);
namespace OCA\Accessibility\Migration;
+use OCA\Accessibility\AppInfo\Application;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserManager;
@@ -30,9 +31,6 @@ use OCP\Migration\IRepairStep;
class RepairUserConfig implements IRepairStep {
- /** @var string */
- private const APP_NAME = 'accessibility';
-
/** @var IUserManager */
protected $userManager;
@@ -72,13 +70,13 @@ class RepairUserConfig implements IRepairStep {
public function run(IOutput $output) {
$output->startProgress();
$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
- $theme = $this->config->getUserValue($user->getUID(), self::APP_NAME, 'theme', false);
+ $theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
if ($theme === 'themedark') {
- $this->config->setUserValue($user->getUID(), self::APP_NAME, 'theme', 'dark');
+ $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
}
if ($theme === 'themehighcontrast') {
- $this->config->setUserValue($user->getUID(), self::APP_NAME, 'highcontrast', 'highcontrast');
- $this->config->deleteUserValue($user->getUID(), self::APP_NAME, 'theme');
+ $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
+ $this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
}
$output->advance();
});
--
GitLab